Author: branden
Date: 2003-10-07 21:27:36 -0500 (Tue, 07 Oct 2003)
New Revision: 632
Modified:
branches/4.3.0/sid/debian/patches/097_mouse_zaxis_mapping_pushes_up_buttons.diff
Log:
Really merge patch #097 from the trunk. (It had been merged, but didn't
properly apply to the 4.3.0 source tree.)
- debian/patches/097_mouse_zaxis_mapping_pushes_up_buttons.diff
Modified:
branches/4.3.0/sid/debian/patches/097_mouse_zaxis_mapping_pushes_up_buttons.diff
===================================================================
---
branches/4.3.0/sid/debian/patches/097_mouse_zaxis_mapping_pushes_up_buttons.diff
2003-10-07 22:16:08 UTC (rev 631)
+++
branches/4.3.0/sid/debian/patches/097_mouse_zaxis_mapping_pushes_up_buttons.diff
2003-10-08 02:27:36 UTC (rev 632)
@@ -5,12 +5,11 @@
Already submitted upstream; see
<http://bugs.xfree86.org/show_bug.cgi?id=346>.
-diff -ruN xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c
xc.new/programs/Xserver/hw/xfree86/input/mouse/mouse.c
---- xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c 2001-12-19
17:05:22.000000000 +0100
-+++ xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c 2003-08-15
13:55:08.000000000 +0200
-@@ -406,6 +406,45 @@
- int i,
- pointer LastSelectMask);
+--- xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c~ 2003-10-07
21:08:52.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c 2003-10-07
21:09:06.000000000 -0500
+@@ -362,6 +362,45 @@
+ }
+ #endif
+static void
+MousePrepareShiftData(MouseDevPtr pMse)
@@ -54,7 +53,7 @@
/* Process options common to all mouse types. */
static void
MouseCommonOptions(InputInfoPtr pInfo)
-@@ -588,6 +627,10 @@
+@@ -656,6 +695,10 @@
if (origButtons != pMse->buttons)
from = X_CONFIG;
xf86Msg(from, "%s: Buttons: %d\n", pInfo->name, pMse->buttons);
@@ -64,8 +63,8 @@
+ MousePrepareShiftData(pMse);
}
-
-@@ -2036,6 +2079,23 @@
+ /*
+@@ -2120,6 +2163,23 @@
}
}
@@ -89,7 +88,7 @@
static void
MousePostEvent(InputInfoPtr pInfo, int buttons, int dx, int dy, int dz, int
dw)
{
-@@ -2063,6 +2123,7 @@
+@@ -2146,6 +2206,7 @@
}
break;
default: /* buttons */
@@ -97,14 +96,13 @@
buttons &= ~(pMse->negativeZ | pMse->positiveZ
| pMse->negativeW | pMse->positiveW);
if (dw < 0 || dz < -1)
-diff -ruN xc/programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h
xc.new/programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h
---- xc/programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h 2001-08-06
22:51:10.000000000 +0200
-+++ xc/programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h 2003-08-13
16:52:37.000000000 +0200
-@@ -151,6 +151,7 @@
- int positiveY;
- int wheelYDistance;
- int wheelXDistance;
-+ int * buttonsShiftData;
+--- xc/programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h~ 2003-10-07
21:09:01.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h 2003-10-07
21:10:08.000000000 -0500
+@@ -163,6 +163,7 @@
+ dataGoodProc dataGood;
+ int angleOffset;
+ pointer pDragLock; /* drag lock area */
++ int * buttonsShiftData;
} MouseDevRec, *MouseDevPtr;
/* Z axis mapping */
