summaryrefslogtreecommitdiffstats
path: root/xorg/X11R7.6
diff options
context:
space:
mode:
authorJim Grandy <jgrandy@authentic8.com>2013-06-30 12:40:39 -0700
committerJim Grandy <jgrandy@authentic8.com>2013-08-22 12:49:40 -0700
commit3fdd9bc3789cc745df8b86492ddf72b72f9d9dd2 (patch)
treeb618ef0eadcf1a53d2158b75f63aa9c48560ff61 /xorg/X11R7.6
parentdfe5911b5552fb9faaf94e998b019727a32ca21d (diff)
downloadxrdp-proprietary-3fdd9bc3789cc745df8b86492ddf72b72f9d9dd2.tar.gz
xrdp-proprietary-3fdd9bc3789cc745df8b86492ddf72b72f9d9dd2.zip
Hand-apply patches (keyboard fix for alt,shift on focus in) from Authentic8 branch: 108e625 29947e5
Diffstat (limited to 'xorg/X11R7.6')
-rw-r--r--xorg/X11R7.6/rdp/rdpinput.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/xorg/X11R7.6/rdp/rdpinput.c b/xorg/X11R7.6/rdp/rdpinput.c
index 39cd78dd..9fa7fa0a 100644
--- a/xorg/X11R7.6/rdp/rdpinput.c
+++ b/xorg/X11R7.6/rdp/rdpinput.c
@@ -916,9 +916,13 @@ KbdAddEvent(int down, int param1, int param2, int param3, int param4)
if (x_scancode > 0)
{
+ /* left or right shift */
+ if ((rdp_scancode == 42) || (rdp_scancode == 54))
+ {
+ g_shift_down = down ? x_scancode : 0;
+ }
rdpEnqueueKey(type, x_scancode);
}
-
break;
case 56: /* left - right alt button */
@@ -932,6 +936,7 @@ KbdAddEvent(int down, int param1, int param2, int param3, int param4)
x_scancode = 64; /* left alt button */
}
+ g_alt_down = down ? x_scancode : 0;
rdpEnqueueKey(type, x_scancode);
break;