Only release Shift if non-physical shift plus Ctrl is pressed;
not if CapsLock is active. This should solve bug 1228691. git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@1217 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
parent
c05dbc98b1
commit
ffb111b2a1
17
xkeymap.c
17
xkeymap.c
@ -629,13 +629,18 @@ xkeymap_translate_key(uint32 keysym, unsigned int keycode, unsigned int state)
|
||||
}
|
||||
}
|
||||
|
||||
if ((tr.modifiers & MapLeftShiftMask)
|
||||
&& ((remote_modifier_state & MapLeftCtrlMask)
|
||||
|| (remote_modifier_state & MapRightCtrlMask))
|
||||
&& get_key_state(state, XK_Caps_Lock))
|
||||
/* Windows interprets CapsLock+Ctrl+key
|
||||
differently from Shift+Ctrl+key. Since we
|
||||
are simulating CapsLock with Shifts, things
|
||||
like Ctrl+f with CapsLock on breaks. To
|
||||
solve this, we are releasing Shift if Ctrl
|
||||
is on, but only if Shift isn't physically pressed. */
|
||||
if (MASK_HAS_BITS(tr.modifiers, MapShiftMask)
|
||||
&& MASK_HAS_BITS(remote_modifier_state, MapCtrlMask)
|
||||
&& !MASK_HAS_BITS(state, ShiftMask))
|
||||
{
|
||||
DEBUG_KBD(("CapsLock + Ctrl pressed, releasing LeftShift\n"));
|
||||
tr.modifiers ^= MapLeftShiftMask;
|
||||
DEBUG_KBD(("Non-physical Shift + Ctrl pressed, releasing Shift\n"));
|
||||
MASK_REMOVE_BITS(tr.modifiers, MapShiftMask);
|
||||
}
|
||||
|
||||
DEBUG_KBD(("Found scancode translation, scancode=0x%x, modifiers=0x%x\n",
|
||||
|
Loading…
Reference in New Issue
Block a user