X Strike Force X.Org X11 SVN commit: r1004 - in trunk/debian: . patches patches/general
Author: dnusinow
Date: 2006-01-04 17:19:52 -0500 (Wed, 04 Jan 2006)
New Revision: 1004
Removed:
trunk/debian/patches/general/097_mouse_zaxis_mapping_pushes_up_buttons.diff
Modified:
trunk/debian/NEWS
trunk/debian/changelog
trunk/debian/patches/series
Log:
* Remove general/097_mouse_zaxis_mapping_pushes_up_buttons.diff which is now
obsolete. Thanks Christopher Martin. (closes: #343728)
* Document the change in debian/NEWS, as this affects some people's
configurations. Thanks again to Christopher for the pointer.
Modified: trunk/debian/NEWS
===================================================================
--- trunk/debian/NEWS 2006-01-04 21:12:14 UTC (rev 1003)
+++ trunk/debian/NEWS 2006-01-04 22:19:52 UTC (rev 1004)
@@ -4,6 +4,10 @@
xorg.conf file had "xfree86" as the value for the "XkbRules" parameter in
the InputDevice section for your keyboard, you'll need to change the value
to "xorg".
+ * Changes to ZAxisMapping were made to accomodate mice with more buttons.
+ This may break things like mozilla's scrolling with mouse buttons, so
+ you'll have to use xmodmap to re-map the buttons for these apps. See
+ #343728 for more info.
-- David Nusinow <dnusinow@debian.org> Wed, 4 Jan 2006 16:06:04 -0500
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-01-04 21:12:14 UTC (rev 1003)
+++ trunk/debian/changelog 2006-01-04 22:19:52 UTC (rev 1004)
@@ -18,6 +18,8 @@
where it belongs. Sorry everyone. (closes: #345387)
+ Make xlibs conflict and replace xlibs-data (= 6.9.0.dfsg.1-1) to prevent
upgrade errors
+ * Remove general/097_mouse_zaxis_mapping_pushes_up_buttons.diff which is now
+ obsolete. Thanks Christopher Martin. (closes: #343728)
[ David Martínez Moreno ]
* Added -n in order to avoid newline in xdm script (closes: #310000).
@@ -26,7 +28,7 @@
Perrier (closes: #345609). While at it, added whitespace that made all
the translations gain 1 fuzzy string.
- -- David Nusinow <dnusinow@debian.org> Wed, 4 Jan 2006 16:02:26 -0500
+ -- David Nusinow <dnusinow@debian.org> Wed, 4 Jan 2006 17:17:26 -0500
xorg-x11 (6.9.0.dfsg.1-1) unstable; urgency=low
Deleted: trunk/debian/patches/general/097_mouse_zaxis_mapping_pushes_up_buttons.diff
===================================================================
--- trunk/debian/patches/general/097_mouse_zaxis_mapping_pushes_up_buttons.diff 2006-01-04 21:12:14 UTC (rev 1003)
+++ trunk/debian/patches/general/097_mouse_zaxis_mapping_pushes_up_buttons.diff 2006-01-04 22:19:52 UTC (rev 1004)
@@ -1,112 +0,0 @@
-$Id$
-
-This patch by Bartosz Zapalowski.
-
-Already submitted upstream; see
-<http://bugs.xfree86.org/show_bug.cgi?id=346>.
-
-Index: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c
-===================================================================
---- xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c.orig 2005-12-24 16:43:04.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c 2005-12-24 17:07:15.000000000 -0500
-@@ -378,6 +378,45 @@
- }
- #endif
-
-+static void
-+MousePrepareShiftData(MouseDevPtr pMse)
-+{
-+ int wheels = 0;
-+ int c, cs = 1, shifted = 0, s, ss, seen, mayshift = 0;
-+
-+ if (!pMse->buttonsShiftData)
-+ return;
-+
-+ wheels |= pMse->negativeZ | pMse->positiveZ
-+ | pMse->negativeW | pMse->positiveW;
-+
-+ for (c = 0; c < pMse->buttons; c++, cs = cs << 1)
-+ {
-+ if ((wheels & cs) == cs)
-+ shifted++;
-+ else if (shifted > 0)
-+ mayshift++;
-+
-+ if (shifted == 0)
-+ pMse->buttonsShiftData[c] = cs;
-+ else {
-+ ss = cs;
-+ seen = 1;
-+ for (s = c; s < pMse->buttons; s++, ss = ss << 1)
-+ {
-+ if ((wheels & ss) == ss)
-+ continue;
-+ if (seen < (shifted + mayshift)) {
-+ seen++;
-+ continue;
-+ }
-+ pMse->buttonsShiftData[c] = ss;
-+ break;
-+ }
-+ }
-+ }
-+}
-+
- /* Process options common to all mouse types. */
- static void
- MouseCommonOptions(InputInfoPtr pInfo)
-@@ -708,6 +747,10 @@
- buttons_from = X_CONFIG;
- xf86Msg(buttons_from, "%s: Buttons: %d\n", pInfo->name, pMse->buttons);
-
-+ pMse->buttonsShiftData = xcalloc(sizeof(int), pMse->buttons);
-+
-+ MousePrepareShiftData(pMse);
-+
- pMse->doubleClickSourceButtonMask = 0;
- pMse->doubleClickTargetButtonMask = 0;
- pMse->doubleClickTargetButton = 0;
-@@ -2318,6 +2361,23 @@
- }
- }
-
-+static int
-+MouseShiftButtons (MouseDevPtr pMse, int buttons)
-+{
-+ int i, s = 1;
-+ int newbuttons = 0;
-+
-+ if (!pMse->buttonsShiftData)
-+ return buttons;
-+
-+ for (i = 0; i < pMse->buttons; i++, s = s << 1) {
-+ if (buttons & s)
-+ newbuttons |= pMse->buttonsShiftData[i];
-+ }
-+
-+ return newbuttons;
-+}
-+
- static void
- MousePostEvent(InputInfoPtr pInfo, int truebuttons,
- int dx, int dy, int dz, int dw)
-@@ -2358,6 +2418,7 @@
- }
- break;
- default: /* buttons */
-+ buttons = MouseShiftButtons (pMse, buttons);
- buttons &= ~(pMse->negativeZ | pMse->positiveZ
- | pMse->negativeW | pMse->positiveW);
- if (dw < 0 || dz < -1)
-Index: xc/programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h
-===================================================================
---- xc/programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h.orig 2005-12-24 16:43:02.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h 2005-12-24 17:07:15.000000000 -0500
-@@ -282,6 +282,7 @@
- int angleOffset;
- pointer pDragLock; /* drag lock area */
- int xisbscale; /* buffer size for 1 event */
-+ int * buttonsShiftData;
- int wheelButtonTimeout;/* Timeout for the wheel button emulation */
- CARD32 wheelButtonExpires;
- int doubleClickSourceButtonMask;
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2006-01-04 21:12:14 UTC (rev 1003)
+++ trunk/debian/patches/series 2006-01-04 22:19:52 UTC (rev 1004)
@@ -56,7 +56,6 @@
general/091_xkb_implement_compose:caps.diff -p0
general/093_xkb_fix_macintosh_problems.diff -p0
general/095_fontutils_are_not_fonts.diff -p0
-general/097_mouse_zaxis_mapping_pushes_up_buttons.diff -p0
general/098_en_US.UTF-8_Compose_fix_Unicode_plane_1.diff -p0
general/099a_improve_search_for_libXcursor.diff -p0
general/099c_support_loadable_external_Xcursor_lib.diff -p0
Reply to: