ChangeLog | 367
Xi/exevents.c | 190
Xi/xiallowev.c | 81
configure.ac | 6
debian/changelog | 7
debian/control | 4
dix/events.c | 57
dix/getevents.c | 21
dix/inpututils.c | 3
dix/touch.c | 73
hw/xfree86/common/xf86Xinput.c | 10
hw/xfree86/dri2/dri2.c | 20
hw/xfree86/os-support/xf86_OSlib.h | 2
hw/xfree86/parser/InputClass.c | 76
hw/xfree86/parser/xf86Parser.h | 20
hw/xquartz/GL/capabilities.c | 7
hw/xquartz/X11Application.m | 29
hw/xquartz/X11Controller.m | 7
hw/xquartz/bundle/Makefile.am | 82
hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib | 7549
++++------
hw/xquartz/bundle/Resources/ar.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/Resources/ca.lproj/InfoPlist.strings |binary
hw/xquartz/bundle/Resources/ca.lproj/Localizable.strings |binary
hw/xquartz/bundle/Resources/ca.lproj/locversion.plist | 14
hw/xquartz/bundle/Resources/ca.lproj/main.nib/designable.nib | 3640 ++++
hw/xquartz/bundle/Resources/ca.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/Resources/cs.lproj/InfoPlist.strings |binary
hw/xquartz/bundle/Resources/cs.lproj/Localizable.strings |binary
hw/xquartz/bundle/Resources/cs.lproj/locversion.plist | 14
hw/xquartz/bundle/Resources/cs.lproj/main.nib/designable.nib | 3617 ++++
hw/xquartz/bundle/Resources/cs.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/Resources/el.lproj/locversion.plist | 4
hw/xquartz/bundle/Resources/el.lproj/main.nib/designable.nib | 7047 ++++-----
hw/xquartz/bundle/Resources/el.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/Resources/fi.lproj/main.nib/designable.nib | 18
hw/xquartz/bundle/Resources/fi.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/Resources/he.lproj/InfoPlist.strings |binary
hw/xquartz/bundle/Resources/he.lproj/Localizable.strings |binary
hw/xquartz/bundle/Resources/he.lproj/locversion.plist | 4
hw/xquartz/bundle/Resources/he.lproj/main.nib/designable.nib | 7312 +++++----
hw/xquartz/bundle/Resources/he.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/Resources/hr.lproj/InfoPlist.strings |binary
hw/xquartz/bundle/Resources/hr.lproj/Localizable.strings |binary
hw/xquartz/bundle/Resources/hr.lproj/locversion.plist | 14
hw/xquartz/bundle/Resources/hr.lproj/main.nib/designable.nib | 3533 ++++
hw/xquartz/bundle/Resources/hr.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/Resources/hu.lproj/InfoPlist.strings |binary
hw/xquartz/bundle/Resources/hu.lproj/Localizable.strings |binary
hw/xquartz/bundle/Resources/hu.lproj/locversion.plist | 14
hw/xquartz/bundle/Resources/hu.lproj/main.nib/designable.nib | 3642 ++++
hw/xquartz/bundle/Resources/hu.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/Resources/no.lproj/locversion.plist | 4
hw/xquartz/bundle/Resources/no.lproj/main.nib/designable.nib | 7482 ++++-----
hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/Resources/ro.lproj/InfoPlist.strings |binary
hw/xquartz/bundle/Resources/ro.lproj/Localizable.strings |binary
hw/xquartz/bundle/Resources/ro.lproj/locversion.plist | 14
hw/xquartz/bundle/Resources/ro.lproj/main.nib/designable.nib | 3485 ++++
hw/xquartz/bundle/Resources/ro.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/Resources/sk.lproj/Localizable.strings |binary
hw/xquartz/bundle/Resources/sk.lproj/locversion.plist | 4
hw/xquartz/bundle/Resources/sk.lproj/main.nib/designable.nib | 7022 ++++-----
hw/xquartz/bundle/Resources/sk.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/Resources/th.lproj/InfoPlist.strings |binary
hw/xquartz/bundle/Resources/th.lproj/Localizable.strings |binary
hw/xquartz/bundle/Resources/th.lproj/locversion.plist | 14
hw/xquartz/bundle/Resources/th.lproj/main.nib/designable.nib | 3758 ++++
hw/xquartz/bundle/Resources/th.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/Resources/tr.lproj/InfoPlist.strings |binary
hw/xquartz/bundle/Resources/tr.lproj/Localizable.strings |binary
hw/xquartz/bundle/Resources/tr.lproj/locversion.plist | 14
hw/xquartz/bundle/Resources/tr.lproj/main.nib/designable.nib | 3611 ++++
hw/xquartz/bundle/Resources/tr.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/Resources/uk.lproj/InfoPlist.strings |binary
hw/xquartz/bundle/Resources/uk.lproj/Localizable.strings |binary
hw/xquartz/bundle/Resources/uk.lproj/locversion.plist | 14
hw/xquartz/bundle/Resources/uk.lproj/main.nib/designable.nib | 3492 ++++
hw/xquartz/bundle/Resources/uk.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/mk_bundke.sh | 2
hw/xquartz/darwinEvents.c | 22
hw/xquartz/darwinEvents.h | 1
include/exevents.h | 7
include/input.h | 7
include/inputstr.h | 5
include/list.h | 114
test/.gitignore | 1
test/input.c | 12
test/list.c | 132
test/xi2/.gitignore | 1
xfixes/cursor.c | 16
90 files changed, 47967 insertions(+), 18751 deletions(-)
New commits:
commit 99dfe337792470eab1b58ae1a28789df6264554f
Author: Cyril Brulebois <k...@debian.org>
Date: Mon Mar 5 11:18:49 2012 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 9efe9d1..9cad2d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg-server (2:1.12.0-1) UNRELEASED; urgency=low
+xorg-server (2:1.12.0-1) experimental; urgency=low
* New upstream release.
* Bump x11proto-input-dev in Build-Depends and Depends.
- -- Cyril Brulebois <k...@debian.org> Fri, 24 Feb 2012 13:47:33 +0100
+ -- Cyril Brulebois <k...@debian.org> Mon, 05 Mar 2012 11:18:41 +0100
xorg-server (2:1.11.99.902-1) experimental; urgency=low
commit 2faeb517df40bb6dd36cb15d4055a2289dd283d5
Author: Cyril Brulebois <k...@debian.org>
Date: Mon Mar 5 11:18:37 2012 +0100
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 7d616e0..cd36840 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,167 @@
+commit b1be72c5ca6cb98ba64637990b142be0f1710a19
+Author: Keith Packard <kei...@keithp.com>
+Date: Sun Mar 4 20:26:18 2012 -0800
+
+ Version bumped to 1.12
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit e08ed0b757b9b48344a301f612fabb3e39ffec78
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Sun Feb 26 17:51:50 2012 -0500
+
+ test: add new test cases to .gitignore
+
+ Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit 2416ee4a015068359807a10f433e8c54192c78a9
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Wed Feb 22 15:32:56 2012 +1000
+
+ dix: avoid NULL-pointer dereference on button-only devices (#38313)
+
+ And for such devices simply take the last.valuators[] which must be valid
at
+ all times anyway. UpdateSlaveDeviceCoords takes care of that.
+
+ X.Org Bug 38313 <http://bugs.freedesktop.org/show_bug.cgi?id=38313>
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Reviewed-by: Chase Douglas <chase.doug...@canonical.com>
+
+commit 38000e7d1f958f5944e641de3e716944a5876d41
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Tue Jan 31 11:06:21 2012 -0800
+
+ Revert "dix: don't XWarpPointer through the last slave anymore (#38313)"
+
+ This reverts commit 2bfb802839688ecf328119c4c6979390fc60348d.
+
+ This commit caused a regression.
+
+ See: http://xquartz.macosforge.org/trac/ticket/517#comment:10
+
+ Acked-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit cb6a32da27f09261c4d561c19d1877c750d98cc3
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Fri Feb 17 13:44:12 2012 -0800
+
+ XQuartz: Short-circuit activateX:
+
+ This also avoids a deadlock when calling activateX: before the server
+ thread has initialized
+
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+
+commit 1562c4a1ca748d2c4a8c69d57ba09ff7ca9cc453
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Fri Feb 17 13:54:57 2012 -0800
+
+ XQuartz: Actually install the new locales
+
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+
+commit 71594746c7da32e1c7986341a0da30f241a7a2be
+Merge: d53235a eaba06a
+Author: Keith Packard <kei...@keithp.com>
+Date: Wed Feb 22 18:07:20 2012 +1300
+
+ Merge remote-tracking branch 'whot/for-keith'
+
+commit eaba06a27c5520a02f08431ac1e4b0e0bdc22cd8
+Author: Chase Douglas <chase.doug...@canonical.com>
+Date: Mon Feb 13 16:00:48 2012 -0800
+
+ Keep virtual core pointer touch class around if new slave doesn't have one
+
+ The VCP may have active touch grabs. The touch records must be kept so
+ these touch grabs may be accepted/rejected in the future. This means the
+ touch class list will not represent the touch class of the attached
+ slave device if it does not have a touch class, but we already were
+ breaking that assumption by keeping a separate touches array for the
+ VCP.
+
+ Signed-off-by: Chase Douglas <chase.doug...@canonical.com>
+ Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 8573b3519af138a3a12a2e77098718165f9fd8ff
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Mon Feb 13 16:00:47 2012 -0800
+
+ Don't clobber virtual core pointer touches array length
+
+ The VCP has its own touches array, don't overwrite it when the class is
+ copied from the SD to the master.
+
+ Reported-by: Chase Douglas <chase.doug...@canonical.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Reviewed-by: Chase Douglas <chase.doug...@canonical.com>
+
+commit 03d32fe7a718d9016053cdb5d57f51a74ef99b59
+Author: Chase Douglas <chase.doug...@ubuntu.com>
+Date: Mon Feb 13 12:09:32 2012 -0800
+
+ Don't dereference a touch after it has been ended when punting to next
owner
+
+ In this case, we have ended the touch because the last owner has
+ rejected it. We need to return from the function right now so we don't
+ attempt to dereference another touch client for early acceptance
+ processing.
+
+ Signed-off-by: Chase Douglas <chase.doug...@ubuntu.com>
+ Reviewed-by: Chase Douglas <chase.doug...@canonical.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 1ecb7aaf2adedad1996cd26176ef5802113e3ad9
+Author: Chase Douglas <chase.doug...@ubuntu.com>
+Date: Sat Feb 11 07:58:38 2012 -0800
+
+ Focus event button state must show the logical buttons, not physical
buttons
+
+ Similar to the fix in fcda98c48610fd507ca0b89c6006a5497d9dc1c9. This
+ ensures we show the correct logical state of the buttons in device focus
+ events too.
+
+ Signed-off-by: Chase Douglas <chase.doug...@canonical.com>
+ Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 6f28388187cffae9e5bc9bfc9425acff4f478b59
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Sat Feb 11 01:29:26 2012 +1000
+
+ dix: reset last.scroll when resetting the valuator (#45611)
+
+ last.scroll remained on the last-submitted scrolling value but
last.valuator
+ was changed whenever the slave device changed. The first scrolling delta
+ after a switch was then calculated as (last.scroll - new abs value),
causing
+ erroneous scrolling events.
+
+ Test case:
+ - synaptics with a scrolling method enabled, other device with 3+ axes
(e.g.
+ wacom)
+ - scroll on touchpad
+ - use other device
+ - scroll on touchpad
+
+ The second scroll caused erroneous button press/release events.
+
+ X.Org Bug 45611 <http://bugs.freedesktop.org/show_bug.cgi?id=45611>
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Reviewed-by: Chase Douglas <chase.doug...@canonical.com>
+
+commit d53235af85d50774c68347720ce132daf9a5bc49
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Mon Feb 13 23:06:07 2012 -0800
+
+ XQuartz: Build fix for possible conflict of BOOL type
+
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+
commit 62edd970f6f36058fcb31de4555eb7c1329cce74
Author: Keith Packard <kei...@keithp.com>
Date: Sat Feb 11 16:13:44 2012 +1300
@@ -26,6 +190,17 @@ Date: Fri Jan 27 12:41:09 2012 +1000
Reviewed-by: Keith Packard <kei...@keithp.com>
Signed-off-by: Keith Packard <kei...@keithp.com>
+commit ceb026c6a6f1eea8b34e745f06f1ebcd652c0ba1
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Fri Jan 27 12:41:09 2012 +1000
+
+ Xi: handle new XIAllowEvents request in inputproto 2.1.99.6
+
+ grab_window and touchid were removed from the struct for ABI compatibility
+ reasons, we need to pull in the new, XI 2.2-specific struct.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
commit b96275c4cdb164aa71f7aa9fbf88be18886d1936
Author: Benjamin Otte <o...@redhat.com>
Date: Tue Feb 7 18:01:25 2012 +1000
diff --git a/debian/changelog b/debian/changelog
index b258bf2..9efe9d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-xorg-server (2:1.11.99.903-1) UNRELEASED; urgency=low
+xorg-server (2:1.12.0-1) UNRELEASED; urgency=low
- * New upstream release candidate (1.12 RC3).
+ * New upstream release.
* Bump x11proto-input-dev in Build-Depends and Depends.
-- Cyril Brulebois <k...@debian.org> Fri, 24 Feb 2012 13:47:33 +0100
commit b1be72c5ca6cb98ba64637990b142be0f1710a19
Author: Keith Packard <kei...@keithp.com>
Date: Sun Mar 4 20:26:18 2012 -0800
Version bumped to 1.12
Signed-off-by: Keith Packard <kei...@keithp.com>
diff --git a/configure.ac b/configure.ac
index a44a12a..2693ce7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.11.99.903,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2012-02-11"
+AC_INIT([xorg-server], 1.12.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2012-03-04"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit e08ed0b757b9b48344a301f612fabb3e39ffec78
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Sun Feb 26 17:51:50 2012 -0500
test: add new test cases to .gitignore
Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
Signed-off-by: Keith Packard <kei...@keithp.com>
diff --git a/test/.gitignore b/test/.gitignore
index e5aa9ec..5d4fdfa 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -3,6 +3,7 @@ input
list
misc
string
+touch
xfree86
xkb
xtest
diff --git a/test/xi2/.gitignore b/test/xi2/.gitignore
index 3e9816d..817aa7b 100644
--- a/test/xi2/.gitignore
+++ b/test/xi2/.gitignore
@@ -8,3 +8,4 @@ protocol-xiqueryversion
protocol-xiselectevents
protocol-xisetclientpointer
protocol-xiwarppointer
+xi2
commit 2416ee4a015068359807a10f433e8c54192c78a9
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Wed Feb 22 15:32:56 2012 +1000
dix: avoid NULL-pointer dereference on button-only devices (#38313)
And for such devices simply take the last.valuators[] which must be valid at
all times anyway. UpdateSlaveDeviceCoords takes care of that.
X.Org Bug 38313 <http://bugs.freedesktop.org/show_bug.cgi?id=38313>
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
Reviewed-by: Chase Douglas <chase.doug...@canonical.com>
diff --git a/dix/getevents.c b/dix/getevents.c
index 6ea4ba0..306d0ff 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -840,10 +840,15 @@ scale_to_desktop(DeviceIntPtr dev, ValuatorMask *mask,
ScreenPtr scr = miPointerGetScreen(dev);
double x, y;
- BUG_WARN(!dev->valuator);
- BUG_WARN(dev->valuator->numAxes < 2);
+ BUG_WARN(!dev->valuator || dev->valuator->numAxes < 2);
if (!dev->valuator || dev->valuator->numAxes < 2)
+ {
+ /* if we have no axes, last.valuators must be in screen coords
+ * anyway */
+ *devx = *screenx = dev->last.valuators[0];
+ *devy = *screeny = dev->last.valuators[1];
return scr;
+ }
if (valuator_mask_isset(mask, 0))
x = valuator_mask_get_double(mask, 0);
@@ -1493,8 +1498,6 @@ GetPointerEvents(InternalEvent *events, DeviceIntPtr
pDev, int type,
{
CARD32 ms = GetTimeInMillis();
int num_events = 0, nev_tmp;
- int h_scroll_axis = pDev->valuator->h_scroll_axis;
- int v_scroll_axis = pDev->valuator->v_scroll_axis;
ValuatorMask mask;
ValuatorMask scroll;
int i;
@@ -1519,6 +1522,14 @@ GetPointerEvents(InternalEvent *events, DeviceIntPtr
pDev, int type,
{
double val, adj;
int axis;
+ int h_scroll_axis = -1;
+ int v_scroll_axis = -1;
+
+ if (pDev->valuator)
+ {
+ h_scroll_axis = pDev->valuator->h_scroll_axis;
+ v_scroll_axis = pDev->valuator->v_scroll_axis;
+ }
/* Up is negative on valuators, down positive */
switch (buttons) {
commit 91ab10452d2a33113db206f98954319146056609
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Feb 24 13:50:00 2012 +0100
Bump x11proto-input-dev in Build-Depends and Depends.
diff --git a/debian/changelog b/debian/changelog
index bde2ccb..b258bf2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xorg-server (2:1.11.99.903-1) UNRELEASED; urgency=low
* New upstream release candidate (1.12 RC3).
+ * Bump x11proto-input-dev in Build-Depends and Depends.
-- Cyril Brulebois <k...@debian.org> Fri, 24 Feb 2012 13:47:33 +0100
diff --git a/debian/control b/debian/control
index 8181bb8..8db33e2 100644
--- a/debian/control
+++ b/debian/control
@@ -39,7 +39,7 @@ Build-Depends:
x11proto-xf86vidmode-dev (>= 2.2.99.1),
xtrans-dev (>= 1.2.2),
libxau-dev (>= 1:1.0.5-2),
- x11proto-input-dev (>= 2.1.99.5),
+ x11proto-input-dev (>= 2.1.99.6),
x11proto-dri2-dev (>= 2.6),
libxdmcp-dev (>= 1:0.99.1),
libxfont-dev (>= 1:1.4.2),
@@ -158,7 +158,7 @@ Architecture: any
Depends:
libpixman-1-dev (>= 0.21.8),
x11proto-core-dev (>= 7.0.22),
- x11proto-input-dev (>= 2.1.99.3),
+ x11proto-input-dev (>= 2.1.99.6),
x11proto-xext-dev (>= 7.1.99),
x11proto-video-dev,
x11proto-randr-dev (>= 1.2.99.3),
commit 33a6a98b6fdd183130c40d6b8f52eabe8435302f
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Feb 24 13:47:51 2012 +0100
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 1208d58..7d616e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,195 @@
+commit 62edd970f6f36058fcb31de4555eb7c1329cce74
+Author: Keith Packard <kei...@keithp.com>
+Date: Sat Feb 11 16:13:44 2012 +1300
+
+ Bump to version 1.11.99.903 (1.12 RC3)
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit 42b6756463ee0476340656707f1088dc6c2fd220
+Merge: 7674d00 ca64912
+Author: Keith Packard <kei...@keithp.com>
+Date: Sat Feb 11 15:36:43 2012 +1300
+
+ Merge remote-tracking branch 'alanc/master'
+
+commit 7674d00b04da5cf73cfa5c7ed1d3a9f42b59960e
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Fri Jan 27 12:41:09 2012 +1000
+
+ Xi: handle new XIAllowEvents request in inputproto 2.1.99.6
+
+ grab_window and touchid were removed from the struct for ABI compatibility
+ reasons, we need to pull in the new, XI 2.2-specific struct.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Reviewed-by: Keith Packard <kei...@keithp.com>
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit b96275c4cdb164aa71f7aa9fbf88be18886d1936
+Author: Benjamin Otte <o...@redhat.com>
+Date: Tue Feb 7 18:01:25 2012 +1000
+
+ dix: fix an out-of-memory crash
+
+ Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 6241b5e4fdbdb08d30cc8787d858ac27122d2d49
+Author: Chase Douglas <chase.doug...@canonical.com>
+Date: Fri Feb 3 16:19:11 2012 -0800
+
+ Implement touch early accept
+
+ This doesn't really implement early accept as it should. Ideally, the
+ server should send end events to all subsequent touch clients as soon as
+ an early accept comes in. However, this implementation is still protocol
+ compliant. We can always improve it later.
+
+ Signed-off-by: Chase Douglas <chase.doug...@canonical.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit b0c54856df71f9cabf9dad176fdade960ef8c5d9
+Author: Chase Douglas <chase.doug...@canonical.com>
+Date: Fri Feb 3 16:19:10 2012 -0800
+
+ Implement early touch reject
+
+ Signed-off-by: Chase Douglas <chase.doug...@canonical.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 656ab879f20892975510723ce8fe78faf64aadb4
+Author: Chase Douglas <chase.doug...@canonical.com>
+Date: Fri Feb 3 16:19:09 2012 -0800
+
+ Check for proper window ID when processing touch allow requests
+
+ Signed-off-by: Chase Douglas <chase.doug...@canonical.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 9a260e9af83feb5c53ffd3b2da2dc3adf06240a1
+Author: Chase Douglas <chase.doug...@canonical.com>
+Date: Fri Feb 3 16:19:08 2012 -0800
+
+ Move AllowTouch to dix/touch.c, and rename to TouchAcceptReject
+
+ Signed-off-by: Chase Douglas <chase.doug...@canonical.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 192b2c9a2ec04522655675ddfe71de5cf974cc7b
+Author: Chase Douglas <chase.doug...@canonical.com>
+Date: Fri Feb 3 16:19:07 2012 -0800
+
+ Export TouchEventRejected as TouchRejected
+
+ This function is mostly correct for early reject usage. With a small
+ change to pass the client resource explicitly and making the
+ TouchOwnership event optional, it is usable for all rejection scenarios.
+ This change exports it for use outside Xi/exevents.c and modifies the
+ name accordingly.
+
+ Signed-off-by: Chase Douglas <chase.doug...@canonical.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 19073425e5df1317f73f74ce0b95ab24e0e0da14
+Author: Chase Douglas <chase.doug...@canonical.com>
+Date: Fri Feb 3 16:19:06 2012 -0800
+
+ Factor out TouchEnd generation and delivery
+
+ The server often needs to generate and deliver TouchEnd events for
+ circumstances including touch grab acceptance and rejection. This change
+ refactors the code so it can be used more easily.
+
+ Signed-off-by: Chase Douglas <chase.doug...@canonical.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit ab60cadc2afb9d8882144e30fde11c3ef0f999cd
+Author: Chase Douglas <chase.doug...@canonical.com>
+Date: Fri Feb 3 16:19:05 2012 -0800
+
+ Store window pointer in touch listener record
+
+ Signed-off-by: Chase Douglas <chase.doug...@canonical.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit f92ba92adfce0e1975feb54ab0e1165b7c2a7bea
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Sat Feb 4 19:27:21 2012 +1000
+
+ Revert "dix: deduplicate callers of DeliverDeviceEvents in
DeliverGrabbedEvents"
+
+ This call was supposed to have no functional changes but in some cases
+ DeliverDeviceEvents() was called with a uninitialised win variable.
+ Revert, safer than trying to sort this out otherwise.
+
+ This reverts commit 6eff14a789341d366b3013c5aa020e959c954651.
+
+ Reported-by: Mathieu Taillefumier <mathieu.taillefum...@free.fr>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Reviewed-by: Keith Packard <kei...@keithp.com>
+
+commit ca64912c02bdff486fee420a49b11f54f8f5ba08
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Thu Jan 26 16:41:25 2012 -0800
+
+ Namespace list api to reduce conflicts with similar system headers
+
+ Rename functions/macros from list_* to xorg_list_*
+ Rename struct from struct list to struct xorg_list.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+ Reviewed-by: Keith Packard <kei...@keithp.com>
+ In-sed-I-trust: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 1541e242d1607d0db57b0cc12faca9b1c2850c67
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Fri Dec 23 15:17:28 2011 -0800
+
+ Stop including <sys/proc.h> from xf86_OSlib.h on Solaris
+
+ We don't need anything from that header (which defines /proc & kernel
+ structures for process information), and it causes some namespace
conflicts.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+ Reviewed-by: Keith Packard <kei...@keithp.com>
+
+commit 85cecd981191f9c3dab0fb13310d91eff643d423
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Sat Jan 28 16:06:28 2012 -0800
+
+ XQuartz: Release all buttons and keys when deactivating
+
+ http://xquartz.macosforge.org/trac/ticket/486
+
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+ Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 47b457541b33f00807fd495f5b0b24d5f143bf84
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Sat Jan 28 23:11:44 2012 -0800
+
+ XQuartz: Toggle off fullscreen mode when XQuartz is hidden
+
+ http://xquartz.macosforge.org/trac/ticket/478
+
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+
+commit c2ba3f339f089c595386c4c579935c7984a2a545
+Author: Jeremy Huddleston <jerem...@apple.com>
+Date: Sun Jan 29 14:26:47 2012 -0800
+
+ XQuartz: Localization Updates
+
+ Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
+
commit 052ca3f22eadd0aa60dd24ac7d5d76137273926f
Author: Keith Packard <kei...@keithp.com>
Date: Fri Jan 27 22:08:08 2012 -0800
diff --git a/debian/changelog b/debian/changelog
index 7a2167b..bde2ccb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.11.99.903-1) UNRELEASED; urgency=low
+
+ * New upstream release candidate (1.12 RC3).
+
+ -- Cyril Brulebois <k...@debian.org> Fri, 24 Feb 2012 13:47:33 +0100
+
xorg-server (2:1.11.99.902-1) experimental; urgency=low
* New upstream release candidate (1.12 RC2):
commit 38000e7d1f958f5944e641de3e716944a5876d41
Author: Jeremy Huddleston <jerem...@apple.com>
Date: Tue Jan 31 11:06:21 2012 -0800
Revert "dix: don't XWarpPointer through the last slave anymore (#38313)"
This reverts commit 2bfb802839688ecf328119c4c6979390fc60348d.
This commit caused a regression.
See: http://xquartz.macosforge.org/trac/ticket/517#comment:10
Acked-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/dix/events.c b/dix/events.c
index 9998845..9244795 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -3449,21 +3449,16 @@ XineramaWarpPointer(ClientPtr client)
{
WindowPtr dest = NULL;
int x, y, rc;
- DeviceIntPtr dev;
- SpritePtr pSprite;
+ SpritePtr pSprite = PickPointer(client)->spriteInfo->sprite;
REQUEST(xWarpPointerReq);
+
if (stuff->dstWid != None) {
rc = dixLookupWindow(&dest, stuff->dstWid, client, DixReadAccess);
if (rc != Success)
return rc;
}
-
- /* Post through the XTest device */
- dev = PickPointer(client);
- dev = GetXTestDevice(dev);
- pSprite = dev->spriteInfo->sprite;
x = pSprite->hotPhys.x;
y = pSprite->hotPhys.y;
@@ -3513,9 +3508,9 @@ XineramaWarpPointer(ClientPtr client)
else if (y >= pSprite->physLimits.y2)
y = pSprite->physLimits.y2 - 1;
if (pSprite->hotShape)
- ConfineToShape(dev, pSprite->hotShape, &x, &y);
+ ConfineToShape(PickPointer(client), pSprite->hotShape, &x, &y);
- XineramaSetCursorPosition(dev, x, y, TRUE);
+ XineramaSetCursorPosition(PickPointer(client), x, y, TRUE);
return Success;
}
@@ -3533,7 +3528,7 @@ ProcWarpPointer(ClientPtr client)
WindowPtr dest = NULL;
int x, y, rc;
ScreenPtr newScreen;
- DeviceIntPtr dev, tmp, xtest_dev = NULL;
+ DeviceIntPtr dev, tmp;
SpritePtr pSprite;
REQUEST(xWarpPointerReq);
@@ -3546,13 +3541,11 @@ ProcWarpPointer(ClientPtr client)
rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixWriteAccess);
if (rc != Success)
return rc;
- if (IsXTestDevice(tmp, dev))
- xtest_dev = tmp;
}
}
- /* Use the XTest device to actually move the pointer */
- dev = xtest_dev;
+ if (dev->lastSlave)
+ dev = dev->lastSlave;
pSprite = dev->spriteInfo->sprite;
#ifdef PANORAMIX
commit cb6a32da27f09261c4d561c19d1877c750d98cc3
Author: Jeremy Huddleston <jerem...@apple.com>
Date: Fri Feb 17 13:44:12 2012 -0800
XQuartz: Short-circuit activateX:
This also avoids a deadlock when calling activateX: before the server
thread has initialized
Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 5b38eae..048e787 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -191,6 +191,9 @@ static void message_kit_thread (SEL selector, NSObject
*arg) {
}
- (void) activateX:(OSX_BOOL)state {
+ if (_x_active == state)
+ return;
+
DEBUG_LOG("state=%d, _x_active=%d, \n", state, _x_active);
if (state) {
if(bgMouseLocationUpdated) {
commit 1562c4a1ca748d2c4a8c69d57ba09ff7ca9cc453
Author: Jeremy Huddleston <jerem...@apple.com>
Date: Fri Feb 17 13:54:57 2012 -0800
XQuartz: Actually install the new locales
Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
diff --git a/hw/xquartz/bundle/mk_bundke.sh b/hw/xquartz/bundle/mk_bundke.sh
index 58d5f6a..288c6a9 100755
--- a/hw/xquartz/bundle/mk_bundke.sh
+++ b/hw/xquartz/bundle/mk_bundke.sh
@@ -6,7 +6,7 @@ SRCDIR=$1
BUILDDIR=$2
BUNDLE_ROOT=$3
-localities="Dutch English French German Italian Japanese Spanish da fi ko no
pl pt pt_PT ru sv zh_CN zh_TW"
+localities="Dutch English French German Italian Japanese Spanish ar ca cs da
el fi he hr hu ko no pl pt pt_PT ro ru sk sv th tr uk zh_CN zh_TW"
for lang in ${localities} ; do
[ -d ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj ] && rm -rf
${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj
mkdir -p ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/main.nib
commit eaba06a27c5520a02f08431ac1e4b0e0bdc22cd8
Author: Chase Douglas <chase.doug...@canonical.com>
Date: Mon Feb 13 16:00:48 2012 -0800
Keep virtual core pointer touch class around if new slave doesn't have one
The VCP may have active touch grabs. The touch records must be kept so
these touch grabs may be accepted/rejected in the future. This means the
touch class list will not represent the touch class of the attached
slave device if it does not have a touch class, but we already were
breaking that assumption by keeping a separate touches array for the
VCP.
Signed-off-by: Chase Douglas <chase.doug...@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/Xi/exevents.c b/Xi/exevents.c
index ca8060d..f390f67 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -704,13 +704,10 @@ DeepCopyPointerClasses(DeviceIntPtr from, DeviceIntPtr to)
t->motionMask = f->motionMask;
/* to->touches and to->num_touches are separate on the master,
* don't copy */
- } else if (to->touch)
- {
- ClassesPtr classes;
- classes = to->unused_classes;
- classes->touch = to->touch;
- to->touch = NULL;
}
+ /* Don't remove touch class if from->touch is non-existent. The to device
+ * may have an active touch grab, so we need to keep the touch class record
+ * around. */
}
/**
commit 8573b3519af138a3a12a2e77098718165f9fd8ff
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Mon Feb 13 16:00:47 2012 -0800
Don't clobber virtual core pointer touches array length
The VCP has its own touches array, don't overwrite it when the class is
copied from the SD to the master.
Reported-by: Chase Douglas <chase.doug...@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
Reviewed-by: Chase Douglas <chase.doug...@canonical.com>
diff --git a/Xi/exevents.c b/Xi/exevents.c
index 816dfa7..ca8060d 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -671,7 +671,7 @@ DeepCopyPointerClasses(DeviceIntPtr from, DeviceIntPtr to)
if (from->touch)
{
- TouchPointInfoPtr tmp;
+ TouchClassPtr t, f;
if (!to->touch)
{
classes = to->unused_classes;
@@ -692,10 +692,18 @@ DeepCopyPointerClasses(DeviceIntPtr from, DeviceIntPtr to)
} else
classes->touch = NULL;
}
- tmp = to->touch->touches;
- memcpy(to->touch, from->touch, sizeof(TouchClassRec));
- to->touch->touches = tmp;
- to->touch->sourceid = from->id;
+
+
+ t = to->touch;
+ f = from->touch;
+ t->sourceid = f->sourceid;
+ t->max_touches = f->max_touches;
+ t->mode = f->mode;
+ t->buttonsDown = f->buttonsDown;
+ t->state = f->state;
+ t->motionMask = f->motionMask;
+ /* to->touches and to->num_touches are separate on the master,
+ * don't copy */
} else if (to->touch)
{
ClassesPtr classes;
commit 03d32fe7a718d9016053cdb5d57f51a74ef99b59
Author: Chase Douglas <chase.doug...@ubuntu.com>
Date: Mon Feb 13 12:09:32 2012 -0800
Don't dereference a touch after it has been ended when punting to next owner
In this case, we have ended the touch because the last owner has
rejected it. We need to return from the function right now so we don't
attempt to dereference another touch client for early acceptance
processing.
Signed-off-by: Chase Douglas <chase.doug...@ubuntu.com>
Reviewed-by: Chase Douglas <chase.doug...@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/Xi/exevents.c b/Xi/exevents.c
index de7d50a..816dfa7 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -1164,6 +1164,7 @@ TouchPuntToNextOwner(DeviceIntPtr dev, TouchPointInfoPtr
ti,
{
EmitTouchEnd(dev, ti, 0, 0);
TouchEndTouch(dev, ti);
+ return;
}
if (ti->listeners[0].state == LISTENER_EARLY_ACCEPT)
commit 1ecb7aaf2adedad1996cd26176ef5802113e3ad9
Author: Chase Douglas <chase.doug...@ubuntu.com>
Date: Sat Feb 11 07:58:38 2012 -0800
Focus event button state must show the logical buttons, not physical buttons
Similar to the fix in fcda98c48610fd507ca0b89c6006a5497d9dc1c9. This
ensures we show the correct logical state of the buttons in device focus
events too.
Signed-off-by: Chase Douglas <chase.doug...@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/Xi/exevents.c b/Xi/exevents.c
index 1ecc3ba..de7d50a 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -2215,7 +2215,7 @@ DeviceFocusEvent(DeviceIntPtr dev, int type, int mode,
int detail,
for (i = 0; mouse && mouse->button && i < mouse->button->numButtons; i++)
if (BitIsOn(mouse->button->down, i))
- SetBit(&xi2event[1], i);
+ SetBit(&xi2event[1], mouse->button->map[i]);
if (dev->key)
{
commit 6f28388187cffae9e5bc9bfc9425acff4f478b59
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Sat Feb 11 01:29:26 2012 +1000
dix: reset last.scroll when resetting the valuator (#45611)
last.scroll remained on the last-submitted scrolling value but last.valuator
was changed whenever the slave device changed. The first scrolling delta
after a switch was then calculated as (last.scroll - new abs value), causing
erroneous scrolling events.
Test case:
- synaptics with a scrolling method enabled, other device with 3+ axes (e.g.
wacom)
- scroll on touchpad
- use other device
- scroll on touchpad
The second scroll caused erroneous button press/release events.
X.Org Bug 45611 <http://bugs.freedesktop.org/show_bug.cgi?id=45611>
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1s4vur-0004rg...@vasks.debian.org
