diff options
| author | Jim Grandy <jgrandy@authentic8.com> | 2013-08-07 21:02:22 -0700 |
|---|---|---|
| committer | Jim Grandy <jgrandy@authentic8.com> | 2013-08-22 12:56:51 -0700 |
| commit | b7b3d9ef28e14e7e7ab20d74a71b1582bccf9430 (patch) | |
| tree | 4cd5f3482a0c8053dc8301d572040cb791c791d5 /xorg/X11R7.6/rdp/rdpinput.c | |
| parent | aa5b9e56b2eadc1a10f7abe46c8ca7745fffc97e (diff) | |
| download | xrdp-proprietary-b7b3d9ef28e14e7e7ab20d74a71b1582bccf9430.tar.gz xrdp-proprietary-b7b3d9ef28e14e7e7ab20d74a71b1582bccf9430.zip | |
Hand-apply patches (misc) from Authentic8: b18667d 6d22ada 95d93a3 433b49c b96f85f 8c32c46 f87f6b3 c93cce0 26ce9ce
Diffstat (limited to 'xorg/X11R7.6/rdp/rdpinput.c')
| -rw-r--r-- | xorg/X11R7.6/rdp/rdpinput.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/xorg/X11R7.6/rdp/rdpinput.c b/xorg/X11R7.6/rdp/rdpinput.c index 3fd4bcf4..d1e4949a 100644 --- a/xorg/X11R7.6/rdp/rdpinput.c +++ b/xorg/X11R7.6/rdp/rdpinput.c @@ -455,9 +455,9 @@ rdpMouseCtrl(DeviceIntPtr pDevice, PtrCtrl *pCtrl) int rdpMouseProc(DeviceIntPtr pDevice, int onoff) { - BYTE map[6]; + BYTE map[8]; DevicePtr pDev; - Atom btn_labels[6]; + Atom btn_labels[8]; Atom axes_labels[2]; DEBUG_OUT_INPUT(("rdpMouseProc\n")); @@ -473,17 +473,21 @@ rdpMouseProc(DeviceIntPtr pDevice, int onoff) map[3] = 3; map[4] = 4; map[5] = 5; + map[6] = 6; + map[7] = 7; btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT); btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE); btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT); btn_labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP); btn_labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN); + btn_labels[5] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_LEFT); + btn_labels[6] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_RIGHT); axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X); axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y); - InitPointerDeviceStruct(pDev, map, 5, btn_labels, rdpMouseCtrl, + InitPointerDeviceStruct(pDev, map, 7, btn_labels, rdpMouseCtrl, GetMotionHistorySize(), 2, axes_labels); break; @@ -866,7 +870,7 @@ PtrAddEvent(int buttonMask, int x, int y) rdpEnqueueMotion(x, y); - for (i = 0; i < 5; i++) + for (i = 0; i < 7; i++) { if ((buttonMask ^ g_old_button_mask) & (1 << i)) { |