xorg-server: Changes to 'ubuntu'
debian/changelog | 9 ++-
debian/patches/216_dix-valuator-count-of-0-is-valid.diff | 45 +++++++++++++++
debian/patches/series | 1
3 files changed, 54 insertions(+), 1 deletion(-)
New commits:
commit 74acb8b958a0e19beae993f0c1f4627ab2296ee0
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Mon Feb 21 13:12:35 2011 +0200
debian/patches/216_dix-valuator-count-of-0-is-valid.diff:
* debian/patches/216_dix-valuator-count-of-0-is-valid.diff:
- For all but motion and proximity events, having no valuators is ok.
Regression from 1.9, keyboard events are not converted to protocol
events. (LP: #714696)
diff --git a/debian/changelog b/debian/changelog
index a89c72d..3f67222 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
xorg-server (2:1.9.99.902-2ubuntu1) UNRELEASED; urgency=low
+ [ Christopher James Halse Rogers ]
* Merge from Debian experimental. Remaining Ubuntu changes:
- rules:
+ Disable SELinux, libaudit-dev is not in main yet. (LP #406226)
@@ -78,7 +79,13 @@ xorg-server (2:1.9.99.902-2ubuntu1) UNRELEASED; urgency=low
xorg-devel mailing list. Prevents segfault on logout and server
regenerate, and possibly other times. (LP: #711422)
- -- Christopher James Halse Rogers <raof@ubuntu.com> Mon, 21 Feb 2011 16:39:06 +1100
+ [ Timo Aaltonen ]
+ * debian/patches/216_dix-valuator-count-of-0-is-valid.diff:
+ - For all but motion and proximity events, having no valuators is ok.
+ Regression from 1.9, keyboard events are not converted to protocol
+ events. (LP: #714696)
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 21 Feb 2011 13:05:55 +0200
xorg-server (2:1.9.99.902-2) experimental; urgency=low
diff --git a/debian/patches/216_dix-valuator-count-of-0-is-valid.diff b/debian/patches/216_dix-valuator-count-of-0-is-valid.diff
new file mode 100644
index 0000000..b1adb72
--- /dev/null
+++ b/debian/patches/216_dix-valuator-count-of-0-is-valid.diff
@@ -0,0 +1,45 @@
+For all but motion and proximity events, having no valuators is ok.
+Regression from 1.9, keyboard events are not converted to protocol events.
+
+X.Org Bug 34510 <http://bugs.freedesktop.org/show_bug.cgi?id=34510>
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ dix/eventconvert.c | 16 ++++++++++++++--
+ 1 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/dix/eventconvert.c b/dix/eventconvert.c
+index 7b894f0..dd1ca46 100644
+--- a/dix/eventconvert.c
++++ b/dix/eventconvert.c
+@@ -263,8 +263,20 @@ eventToKeyButtonPointer(DeviceEvent *ev, xEvent **xi, int *count)
+ num_events = (countValuators(ev, &first) + 5)/6; /* valuator ev */
+ if (num_events <= 0)
+ {
+- *count = 0;
+- return BadMatch;
++ switch (ev->type)
++ {
++ case ET_KeyPress:
++ case ET_KeyRelease:
++ case ET_ButtonPress:
++ case ET_ButtonRelease:
++ /* no axes is ok */
++ break;
++ case ET_Motion:
++ case ET_ProximityIn:
++ case ET_ProximityOut:
++ *count = 0;
++ return BadMatch;
++ }
+ }
+
+ num_events++; /* the actual event event */
+--
+1.7.4
+
+_______________________________________________
+xorg-devel@lists.x.org: X.Org development
+Archives: http://lists.x.org/archives/xorg-devel
+Info: http://lists.x.org/mailman/listinfo/xorg-devel
+
diff --git a/debian/patches/series b/debian/patches/series
index 88a97be..48b830c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -37,3 +37,4 @@
213_xichangehierarchy-check-oom.patch
214_glx_dri_searchdirs.patch
215_glx_drawable_refcounting.diff
+216_dix-valuator-count-of-0-is-valid.diff
Reply to: