From 11f02bd9dccb9e04887742801d7e230c9e07f431 Mon Sep 17 00:00:00 2001
From: Michael Gernoth <michael@gernoth.net>
Date: Sun, 23 Jan 2005 19:29:31 +0000
Subject: [PATCH] Don't send shift when CapsLock is on and Ctrl is pressed,
 too. Fixes 858618 and 1069927

git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@809 423420c4-83ab-492f-b58f-81f9feb106b5
---
 xkeymap.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/xkeymap.c b/xkeymap.c
index 3c0a9fe..f26f3a7 100644
--- a/xkeymap.c
+++ b/xkeymap.c
@@ -408,6 +408,13 @@ xkeymap_translate_key(uint32 keysym, unsigned int keycode, unsigned int state)
 		}
 	}
 
+	if (((remote_modifier_state & MapLeftCtrlMask)
+	     || (remote_modifier_state & MapRightCtrlMask)) && get_key_state(state, XK_Caps_Lock))
+	{
+		DEBUG_KBD(("CapsLock + Ctrl pressed, releasing LeftShift\n"));
+		tr.modifiers ^= MapLeftShiftMask;
+	}
+
 	if (tr.scancode != 0)
 	{
 		DEBUG_KBD(("Found key translation, scancode=0x%x, modifiers=0x%x\n",