xorg-server: Changes to 'ubuntu-lucid'
debian/changelog | 14 ++++
debian/patches/201_xinerama_negative_screen_index_fix.patch | 35 ++++++++++++
debian/patches/series | 1
3 files changed, 50 insertions(+)
New commits:
commit da65367dda05a0f1ba7549ec6cac220714b1bb8a
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Wed Jun 16 15:38:54 2010 +1000
Add patch from upstream to fix erratic mouse behaviour on screens with negative Xinerama index (LP: #563100)
diff --git a/debian/changelog b/debian/changelog
index 02147e4..9f3bdd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+xorg-server (2:1.7.6-2ubuntu7.2) UNRELEASED; urgency=low
+
+ [ Mackenzie Morgan ]
+ * Added debian/patches/uint_to_int.patch:
+ - Changes back to uints for positioning so that mouse movements can
+ go to negative positions relative to root window (LP: #563100)
+
+ [ Christopher James Halse Rogers ]
+ * Rename debian/patches/uint_to_int.patch to
+ 201_xinerama_negative_screen_index_fix.patch to better describe it and
+ match our patch guidelines
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Wed, 16 Jun 2010 15:30:08 +1000
+
xorg-server (2:1.7.6-2ubuntu7.1) lucid-proposed; urgency=low
[Bryce Harrington]
diff --git a/debian/patches/201_xinerama_negative_screen_index_fix.patch b/debian/patches/201_xinerama_negative_screen_index_fix.patch
new file mode 100644
index 0000000..b4b7e35
--- /dev/null
+++ b/debian/patches/201_xinerama_negative_screen_index_fix.patch
@@ -0,0 +1,35 @@
+From 63976636a43b7ff69e07a213331060280276f5ab Mon Sep 17 00:00:00 2001
+From: Chris Humbert <freedesktop@mahadri.com>
+Date: Mon, 3 May 2010 00:59:21 -0500
+Subject: [PATCH] dix: make DeviceEvent coordinates signed for Xinerama. #24986
+
+With Xinerama enabled, event coordinates are relative to Screen 0, so
+they can be negative. The new DeviceEvent's coordinates are of type
+uint16_t, making screens above and to the left of Screen 0 unusable.
+
+X.Org Bug 24986 <https://bugs.freedesktop.org/show_bug.cgi?id=24986>
+
+Signed-off-by: Chris Humbert <freedesktop@mahadri.com>
+---
+ include/eventstr.h | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/eventstr.h b/include/eventstr.h
+index 79685c1..433227e 100644
+--- a/include/eventstr.h
++++ b/include/eventstr.h
+@@ -91,9 +91,9 @@ struct _DeviceEvent
+ uint32_t button; /**< Button number */
+ uint32_t key; /**< Key code */
+ } detail;
+- uint16_t root_x; /**< Pos relative to root window in integral data */
++ int16_t root_x; /**< Pos relative to root window in integral data */
+ float root_x_frac; /**< Pos relative to root window in frac part */
+- uint16_t root_y; /**< Pos relative to root window in integral part */
++ int16_t root_y; /**< Pos relative to root window in integral part */
+ float root_y_frac; /**< Pos relative to root window in frac part */
+ uint8_t buttons[(MAX_BUTTONS + 7)/8]; /**< Button mask */
+ struct {
+--
+1.6.4.4
+
diff --git a/debian/patches/series b/debian/patches/series
index f63f7d9..71ecb3d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -51,3 +51,4 @@
198_nohwaccess.patch
199_xfvb-help-typo.patch
200_randr-null.patch
+201_xinerama_negative_screen_index_fix.patch
Reply to: