xorg-server: Changes to 'ubuntu+1'
ChangeLog | 69 +++++++++++++++++++------------
debian/changelog | 7 +++
debian/patches/220_grab_event_time.patch | 38 -----------------
debian/patches/series | 1
dix/events.c | 5 +-
render/animcur.c | 3 +
6 files changed, 56 insertions(+), 67 deletions(-)
New commits:
commit 0fddbe32539b4d0a4080089dc5673c2c19e1459d
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Tue Jan 17 19:52:18 2012 +0100
releasing version 2:1.11.3-0ubuntu4
diff --git a/debian/changelog b/debian/changelog
index e59db4b..266632f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg-server (2:1.11.3-0ubuntu4) UNRELEASED; urgency=low
+xorg-server (2:1.11.3-0ubuntu4) precise; urgency=low
* Merge in input changes from upstream master through commit 954bb99
* Remove temporary patch 220_grab_event_time.patch
- -- Chase Douglas <chase.douglas@ubuntu.com> Tue, 17 Jan 2012 19:51:45 +0100
+ -- Chase Douglas <chase.douglas@ubuntu.com> Tue, 17 Jan 2012 19:52:04 +0100
xorg-server (2:1.11.3-0ubuntu3) precise; urgency=low
commit 14a5279300f7c473285c6d9455e3a79816ef04b5
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Tue Jan 17 19:52:00 2012 +0100
Remove temporary patch 220_grab_event_time.patch
diff --git a/debian/changelog b/debian/changelog
index 1d78c47..e59db4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
xorg-server (2:1.11.3-0ubuntu4) UNRELEASED; urgency=low
* Merge in input changes from upstream master through commit 954bb99
+ * Remove temporary patch 220_grab_event_time.patch
- -- Chase Douglas <chase.douglas@ubuntu.com> Tue, 17 Jan 2012 19:50:43 +0100
+ -- Chase Douglas <chase.douglas@ubuntu.com> Tue, 17 Jan 2012 19:51:45 +0100
xorg-server (2:1.11.3-0ubuntu3) precise; urgency=low
diff --git a/debian/patches/220_grab_event_time.patch b/debian/patches/220_grab_event_time.patch
deleted file mode 100644
index e28920f..0000000
--- a/debian/patches/220_grab_event_time.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 7aca9306a2ef3c9df5abfb1c0a2e86b2022d00f8 Mon Sep 17 00:00:00 2001
-From: Chase Douglas <chase.douglas@canonical.com>
-Date: Wed, 11 Jan 2012 07:31:06 -0800
-Subject: [PATCH 2/2] Use event time instead of CurrentTime for grab times
-
-When {XI,X,}AllowEvents is called, the timestamp is compared against the
-grab time to ensure that the request pertains to the current grab in the
-server. While many clients may use CurrentTime (client-side), the
-timestamp of the event causing the grab is also valid.
-
-This change ensures that the server's notion of the grab time is the
-time of the event that activated the grab rather than the time that the
-grab is actually activated.
-
-This bug was exposed through nested touch then pointer grabs.
-
-Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
----
- dix/events.c | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/dix/events.c b/dix/events.c
-index 5360267..d4b00e0 100644
---- a/dix/events.c
-+++ b/dix/events.c
-@@ -3723,7 +3723,8 @@ ActivatePassiveGrab(DeviceIntPtr device, GrabPtr grab, InternalEvent *event,
- }
- }
-
-- (*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE);
-+ (*grabinfo->ActivateGrab)(device, grab,
-+ ClientTimeToServerTime(event->any.time), TRUE);
-
- if (xE)
- {
---
-1.7.7.3
-
diff --git a/debian/patches/series b/debian/patches/series
index d9abe51..a37033e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,4 +27,3 @@
208_switch_on_release.diff
209_add_legacy_bgnone_option.patch
214_glx_dri_searchdirs.patch
-220_grab_event_time.patch
commit a23b34ed3fc06c659964dcd78ffaf6d3f3bb235e
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Tue Jan 17 19:51:20 2012 +0100
Merge in input changes from upstream master through commit 954bb99
diff --git a/ChangeLog b/ChangeLog
index 5733c56..8fcaea4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,42 +1,59 @@
-commit a607cde134173b158335b2c1d92a91b2ec876aa9
-Author: Keith Packard <keithp@keithp.com>
-Date: Mon Jan 9 13:17:37 2012 -0800
+commit 7014cf0a6497f122bfa2b0e6e7794dc3e30c0c6f
+Author: Chase Douglas <chase.douglas@canonical.com>
+Date: Wed Jan 11 07:38:12 2012 -0800
- Merge remote-tracking branch 'whot/multitouch'
+ Use event time instead of CurrentTime for grab times
- (cherry picked from commit e476af417d83730b11054f4e5b127ab5540bb332)
+ When {XI,X,}AllowEvents is called, the timestamp is compared against the
+ grab time to ensure that the request pertains to the current grab in the
+ server. While many clients may use CurrentTime (client-side), the
+ timestamp of the event causing the grab is also valid.
- Conflicts:
+ This change ensures that the server's notion of the grab time is the
+ time of the event that activated the grab rather than the time that the
+ grab is actually activated.
- configure.ac
+ This bug was exposed through nested touch then pointer grabs.
+
+ Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit f9e6858d5c10be6a8439c0f18bfb2325fa0ee070)
+
+ Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
-commit fe5444bfe3c7cc56cd8bddb32d2dc45b22431aea
-Author: Keith Packard <keithp@keithp.com>
-Date: Mon Jan 9 11:40:23 2012 -0800
+commit 4989bff6bfe2c0409127a523e56f177b3141b8d1
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Jan 6 13:20:45 2012 +1000
- Merge remote-tracking branch 'whot/for-keith'
- (cherry picked from commit 0b2c6491c5e5e1c9ba067299f3de61f5acee263b)
+ render: don't bother with animated cursors on floating slaves (#39989)
+
+ X.Org Bug 39989 <http://bugs.freedesktop.org/show_bug.cgi?id=39989>
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+ (cherry picked from commit bbb6b8c834e0e1491ca14403b5d0840dd14380d3)
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
-commit 447156777040e0695391ecac709de3a857368a8d
-Author: Chase Douglas <chase.douglas@canonical.com>
-Date: Thu Dec 22 12:00:37 2011 -0800
+commit b5f71a5f124eb44eab08f68d3c8ef946df05bb45
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Jan 9 15:04:10 2012 +1000
- test/xi2: Really fix infinite loop in test_convert_XITouchOwnershipEvent
+ dix: Update pointer limits for floating devices too (#43635)
- long i;
- for (i = 1; ; i <<= 1)
- if (i == (1 << 31))
- break;
+ When the screen is restructured, the pointer limits need to be reset for
+ floating slave devices as well, not just for master pointers. Only skip
+ devices that don't have a cursor (attached slaves and keyboard)
- (1 << 31) is compiled as an int, and thus is equal to -2147483648. We
- are trying to compare it against a long, which on 64-bit machines is
- 2147483648. This results in an infinite loop.
+ Bug reproducer: float an absolute slave device, rotate the screen - the
+ device is now confined to a section of the screen only.
- Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
- Signed-off-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit a28ff2cf92c2b35e02eacca21af929afabbf6b83)
+ X.Org Bug 43635 <http://bugs.freedesktop.org/show_bug.cgi?id=43635>
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
+ (cherry picked from commit 35bd77e9d0701daae87d681900d749604fc6471f)
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
diff --git a/debian/changelog b/debian/changelog
index 0c3f380..1d78c47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.11.3-0ubuntu4) UNRELEASED; urgency=low
+
+ * Merge in input changes from upstream master through commit 954bb99
+
+ -- Chase Douglas <chase.douglas@ubuntu.com> Tue, 17 Jan 2012 19:50:43 +0100
+
xorg-server (2:1.11.3-0ubuntu3) precise; urgency=low
* Add temporary patch for fixing grab time bug
commit 7014cf0a6497f122bfa2b0e6e7794dc3e30c0c6f
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Wed Jan 11 07:38:12 2012 -0800
Use event time instead of CurrentTime for grab times
When {XI,X,}AllowEvents is called, the timestamp is compared against the
grab time to ensure that the request pertains to the current grab in the
server. While many clients may use CurrentTime (client-side), the
timestamp of the event causing the grab is also valid.
This change ensures that the server's notion of the grab time is the
time of the event that activated the grab rather than the time that the
grab is actually activated.
This bug was exposed through nested touch then pointer grabs.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit f9e6858d5c10be6a8439c0f18bfb2325fa0ee070)
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
diff --git a/dix/events.c b/dix/events.c
index 0c4255c..04d7fb5 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -3723,7 +3723,8 @@ ActivatePassiveGrab(DeviceIntPtr device, GrabPtr grab, InternalEvent *event,
}
}
- (*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE);
+ (*grabinfo->ActivateGrab)(device, grab,
+ ClientTimeToServerTime(event->any.time), TRUE);
if (xE)
{
commit 4989bff6bfe2c0409127a523e56f177b3141b8d1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 6 13:20:45 2012 +1000
render: don't bother with animated cursors on floating slaves (#39989)
X.Org Bug 39989 <http://bugs.freedesktop.org/show_bug.cgi?id=39989>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit bbb6b8c834e0e1491ca14403b5d0840dd14380d3)
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
diff --git a/render/animcur.c b/render/animcur.c
index 31cbab9..8d4a9c2 100644
--- a/render/animcur.c
+++ b/render/animcur.c
@@ -208,6 +208,9 @@ AnimCurDisplayCursor (DeviceIntPtr pDev,
AnimCurScreenPtr as = GetAnimCurScreen(pScreen);
Bool ret;
+ if (IsFloating(pDev))
+ return FALSE;
+
Unwrap (as, pScreen, DisplayCursor);
if (IsAnimCur(pCursor))
{
commit b5f71a5f124eb44eab08f68d3c8ef946df05bb45
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jan 9 15:04:10 2012 +1000
dix: Update pointer limits for floating devices too (#43635)
When the screen is restructured, the pointer limits need to be reset for
floating slave devices as well, not just for master pointers. Only skip
devices that don't have a cursor (attached slaves and keyboard)
Bug reproducer: float an absolute slave device, rotate the screen - the
device is now confined to a section of the screen only.
X.Org Bug 43635 <http://bugs.freedesktop.org/show_bug.cgi?id=43635>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
(cherry picked from commit 35bd77e9d0701daae87d681900d749604fc6471f)
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
diff --git a/dix/events.c b/dix/events.c
index 5360267..0c4255c 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -1368,7 +1368,7 @@ ScreenRestructured (ScreenPtr pScreen)
for (pDev = inputInfo.devices; pDev; pDev = pDev->next)
{
- if (!DevHasCursor(pDev))
+ if (!IsFloating(pDev) && !DevHasCursor(pDev))
continue;
/* GrabDevice doesn't have a confineTo field, so we don't need to
Reply to: