xorg-server: Changes to 'ubuntu'
ChangeLog | 351 +++++++++++++++++++++++++++++++
Xi/exevents.c | 20 +
configure.ac | 8
debian/changelog | 19 +
debian/control | 4
dix/devices.c | 44 ++-
dix/getevents.c | 2
dix/window.c | 9
fb/fbpict.c | 1
hw/xfree86/common/xf86Events.c | 10
hw/xfree86/common/xf86cmap.c | 31 +-
hw/xfree86/doc/man/xorg.conf.man.pre | 45 +++
hw/xfree86/os-support/solaris/sun_VTsw.c | 26 +-
hw/xfree86/os-support/solaris/sun_init.c | 19 +
hw/xfree86/x86emu/ops.c | 70 +++---
hw/xquartz/bundle/Info.plist.cpp | 4
hw/xquartz/quartzKeyboard.c | 4
hw/xquartz/xpr/xprScreen.c | 13 +
os/utils.c | 4
randr/rrproperty.c | 5
render/render.c | 141 ++++++++++++
xkb/xkmread.c | 6
xorg-server.m4 | 3
23 files changed, 754 insertions(+), 85 deletions(-)
New commits:
commit 2d19524ecfa4254471d92cca9dc03da5b516fb7e
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Feb 16 08:00:32 2010 +0100
Prepare Changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 21a6368..7e01ab1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.7.5-1) UNRELEASED; urgency=low
+xorg-server (2:1.7.5-1) unstable; urgency=low
[ Julien Cristau ]
* Remove myself from Uploaders
@@ -13,7 +13,7 @@ xorg-server (2:1.7.5-1) UNRELEASED; urgency=low
closes: #566147.
* Bump Standards-Version to 3.8.4.
- -- Julien Cristau <jcristau@debian.org> Sat, 23 Jan 2010 01:43:22 +0100
+ -- Brice Goglin <bgoglin@debian.org> Tue, 16 Feb 2010 08:00:27 +0100
xorg-server (2:1.7.4-2) unstable; urgency=low
commit e50770c0f17d94e07e69b93c7f342017c1fe758b
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Feb 16 09:21:10 2010 +0100
Bump Standards-Version to 3.8.4
diff --git a/debian/changelog b/debian/changelog
index 327beeb..21a6368 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ xorg-server (2:1.7.5-1) UNRELEASED; urgency=low
closes: #569036.
+ Xi: reset the sli pointers after copying device classes,
closes: #566147.
+ * Bump Standards-Version to 3.8.4.
-- Julien Cristau <jcristau@debian.org> Sat, 23 Jan 2010 01:43:22 +0100
diff --git a/debian/control b/debian/control
index a1c3481..68f93ef 100644
--- a/debian/control
+++ b/debian/control
@@ -76,7 +76,7 @@ Build-Depends:
libglib2.0-dev,
xkb-data,
x11-xkb-utils,
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Vcs-Git: git://git.debian.org/git/pkg-xorg/xserver/xorg-server
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/xserver/xorg-server.git
commit 1f109dd5257e157f4fb364d222aa19a3fc1d26d9
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Feb 16 07:59:43 2010 +0100
Add bug closers
diff --git a/debian/changelog b/debian/changelog
index 51496c6..327beeb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,12 @@ xorg-server (2:1.7.5-1) UNRELEASED; urgency=low
[ Brice Goglin ]
* New upstream release.
+ + Restore lastDeviceEventTime update in dixSaveScreens,
+ closes: #563816.
+ + Don't double-swap the RandR PropertyNotify event,
+ closes: #569036.
+ + Xi: reset the sli pointers after copying device classes,
+ closes: #566147.
-- Julien Cristau <jcristau@debian.org> Sat, 23 Jan 2010 01:43:22 +0100
commit 99cc4f69754aad5e974e97d6207ab29a17a1c521
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Feb 16 07:50:56 2010 +0100
New upstream release
diff --git a/ChangeLog b/ChangeLog
index 2386bf7..4cbe6fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,354 @@
+commit f0ec2e0d7d0533b3b3fcccd9d78b76e4c9002d1e
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Feb 16 11:34:38 2010 +1000
+
+ xserver 1.7.5
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 15e9a3fc0c4776f3ff02a59375e61d9090e35a22
+Author: Julien Cristau <jcristau@debian.org>
+Date: Fri Feb 12 23:34:57 2010 +0100
+
+ dix: restore lastDeviceEventTime update in dixSaveScreens
+
+ This was removed in 6b5978dcf1f7ac3ecc2f22df06f7000f360e2066 (Do not
+ reset lastDeviceEventTime when we do dixSaveScreens), but caused a
+ regression for XResetScreenSaver. Add the lastDeviceEventTime update
+ back, but restrict it to that case.
+
+ X.Org bug#25855 <http://bugs.freedesktop.org/25855>
+
+ Reported-by: Lubos Lunak <l.lunak@suse.cz>
+ Tested-by: Lubos Lunak <l.lunak@suse.cz>
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 001ce71dc11287dc94cc2fbc5d35677c046e6c04)
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 38a83dce236da44856c075b5589d38ef0a662d4b
+Author: Peter Harris <pharris@opentext.com>
+Date: Fri Feb 12 15:36:30 2010 -0500
+
+ Don't double-swap the RandR PropertyNotify event
+
+ The event is already swapped in randr.c/SRROutputPropertyNotifyEvent, so
+ it should not be swapped here.
+
+ X.Org Bugzilla #26511: http://bugs.freedesktop.org/show_bug.cgi?id=26511
+
+ Tested-by: Leonardo Chiquitto <leonardo@ngdn.org>
+ Acked-by: Adam Jackson <ajax at redhat.com>
+ Reviewed-by: Julien Cristau <jcristau at debian.org>
+ Signed-off-by: Peter Harris <pharris@opentext.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 97b03037f4d99fcebc7603011f41c3aff9871ce2)
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 829980a4ff36b46745cf958824338b6341302c7b
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Jan 13 15:03:45 2010 +1000
+
+ Xi: reset the sli pointers after copying device classes. (#25640)
+
+ If the indicator flags have the XkbSLI_IsDefault bit set, the indicator map
+ and names aren't their own bit of memory but rather point into the
+ device->key->xkbInfo->desc structure. XkbCopySrvLedInfo knows about this and
+ leaves the pointers alone.
+
+ When copying the classes from the slave to the master, these pointers are
+ copied and still point to the dev->key class of the slave device. If the
+ slave device is removed, the memory becomes invalid and a call to modify
+ this data (e.g. XkbSetIndicators) may cause a deadlock.
+
+ The copying of dev->key relies on dev->kbdfeed to be already set up. Hence
+ the pointers need to be reset once _both_ kbdfeed and key have been copied
+ into the master device.
+
+ X.Org Bug 25640 <http://bugs.freedesktop.org/show_bug.cgi?id=25640>
+ Fedora Bug 540584 <https://bugzilla.redhat.com/show_bug.cgi?id=540584>
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 48f7298657f91843db36566b8d66d6c4c18dbd4c)
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 34cedd1e3d80cc84277662a94de797738bdb5fce
+Author: Robert Morell <rmorell@nvidia.com>
+Date: Fri Jan 29 19:07:03 2010 -0800
+
+ RENDER: Fix gradient and solid fill pictures with Xinerama, and misc cleanup
+
+ If these aren't wrapped, then procs that are wrapped (such as
+ RenderChangePicture) will fail in Xinerama when they see the resource
+ type of a picture created through one of these interfaces is PictureType
+ and not XRT_PICTURE like those allocated via RenderCreatePicture.
+
+ Signed-off-by: Robert Morell <rmorell@nvidia.com>
+ Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 4d575b0559817258f7a0ce6c4d2d0f9e7e5bba63)
+
+commit 85b04bb0ebaf7a6f1b1a34f7b1704a3e6cbdab8a
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Feb 5 18:08:37 2010 +1000
+
+ xserver 1.7.4.902
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 219a0d8fb54f179c7ac8d5953585849ab65a778b
+Author: Oldřich Jedlička <oldium.pro@seznam.cz>
+Date: Sun Jan 17 17:59:03 2010 +0100
+
+ Allow driver to call DeleteInputDeviceRequest during UnInit
+
+ When the input driver (like xf86-input-wacom) removes it's devices
+ during a call to UnInit, the CloseDownDevices() cannot handle it. The
+ "next" variable can become a pointer to freed memory.
+
+ The patch introduces order-independent device freeing mechanism by
+ remembering the already freed device ids. The devices can reorder any
+ time during freeing. No device will be double-freed - if the removing
+ failed for any reason; some implementations of DeleteInputDeviceRequest
+ don't free the devices already.
+
+ Signed-off-by: Oldřich Jedlička <oldium.pro@seznam.cz>
+ Reviewed-by: Simon Thum <simon.thum@gmx.de>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 08b22c7faf97217ea4d497eec6624fc3dd916d9b)
+
+commit a6a4c20121301905399c4e1c23980993bcbf2152
+Author: Horst Wente <horst.wente@acm.org>
+Date: Wed Dec 30 19:35:20 2009 +0100
+
+ xkb: make ctrl+alt+keypad + / ctrl+alt+keypad - work again (#25743)
+
+ Video mode switching via keypad keys did not work
+
+ Signed-off-by: Horst Wente <horst.wente@acm.org>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit b91cec26de367f75388e620772747b08eee34294)
+
+commit a5b558d065e24880ff14b3781f27d1a9ea6094ab
+Author: Oldřich Jedlička <oldium.pro@seznam.cz>
+Date: Tue Jan 12 19:15:06 2010 +0100
+
+ Fix typo in updateSlaveDeviceCoords
+
+ The index [0] for the second valuator looks bogus; fix it.
+
+ Signed-off-by: Oldřich Jedlička <oldium.pro@seznam.cz>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 993e78d6c433f65bd8a87890a6bb6da480b2cdc4)
+
+commit 5d34e78c81bfba3d14146ddfd8e714cdfd9a1692
+Author: Robert Morell <rmorell@nvidia.com>
+Date: Thu Jan 21 12:38:47 2010 -0800
+
+ Render: Fix request size verification
+
+ RenderSetPictureClipRectangles and the Xinerama version of
+ RenderChangePicture were using the wrong structure types for request
+ size verification.
+
+ Signed-off-by: Robert Morell <rmorell@nvidia.com>
+ Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 8d6b1838330625b758ebc55bb0df1b425c5cefaf)
+
+commit 6f533994921725653306753f474c343fbb3b88a4
+Author: Simon Thum <simon.thum@gmx.de>
+Date: Sat Jan 23 13:36:22 2010 +0100
+
+ xfree86: remove man page reference inexistent acceleration profile
+
+ not implemented in the X.org server 1.7
+
+ Signed-off-by: Simon Thum <simon.thum@gmx.de>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 1c126ba53161933fa1a756e696e98f1395dfa61a
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sat Jan 30 14:49:02 2010 -0800
+
+ XQuartz: Attatch a stub display when CoreGraphics reports no displays.
+
+ This is half of the required changes to address the "stuck mouse pointer"
+ bug that occurs when X11 launches while the displays are asleep. The
+ remainder of the fix is part of libXplugin which needs to be updated to
+ send XP_EVENT_DISPLAY_CHANGED when the display wakes up. If you don't
+ have a recent enough libXplugin (expected in 2.5.0_beta2 or later), you
+ can cause this event to be sent by changing your display resolution (or
+ you could just start X11.app with your screens awake).
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+ (cherry picked from commit 52456c602c3cdd7d5eac677889a18fad37dfb7ae)
+
+commit 734a6b9c2150ce38cf120e179cdac9d3c625434e
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Tue Jan 26 22:25:04 2010 -0800
+
+ Avoid segfaults in XF86VidMode GammaRamp functions if randr_crtc is NULL
+
+ Fixes crash when xscreensaver tries to use GammaRamp calls to fade out
+ http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6915712
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit b47231b2fd4e403403945d6da6119398b16f385d
+Author: Aaron Zang <Aaron.Zang@Sun.COM>
+Date: Mon Dec 14 17:55:46 2009 -0800
+
+ Solaris: Avoid switching to inactive VT's
+
+ Fix for OpenSolaris bug 6876992: "[vconsole] Ctrl+Alt+F12 switchs to blank
+ console screen with hotkeys property turned-off"
+ http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6876992
+
+ Xorg needs to do sanity test for the VT it is commanded to switch to.
+ If the VT is not opened by any process, discard the switching request.
+
+ The changes also contain the fix for some flaws discovered when
+ getting the new gdm to run.
+
+ Signed-off-by: Aaron Zang <Aaron.Zang@Sun.COM>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 66b6e2fd49fdc650703e56aa176a902e4921251c
+Author: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
+Date: Wed Jan 27 14:03:03 2010 -0800
+
+ Fix source pictures getting random transforms after 2d6a8f668342a5190cdf43b5.
+
+ *xoff and *yoff were uninitialized for source-only pictures.x
+
+ Signed-off-by: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
+ Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit a6bd5d2e482a5aa84acb3d4932e2a166d8670ef1)
+
+commit a191318f8dde2a4ff47c051244e8c88e8f92883a
+Author: Christian Zander <chzander@nvidia.com>
+Date: Mon Jan 11 12:29:07 2010 -0800
+
+ x86emu: Respect the LEA 67h address size prefix.
+
+ Signed-off-by: Christian Zander <chzander@nvidia.com>
+ Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
+ Tested-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit f57bc0ede8e018c7e264b917927c42a018cd1d5a)
+
+commit d3e54304578cbeb948a13654614b75bea4c55449
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Sat Jan 23 12:55:38 2010 +1300
+
+ xserver 1.7.4.901
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 43412c6b8bc7af7df0c07590002c2f96d57ba861
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Wed Jan 13 11:20:29 2010 -0800
+
+ XQuartz: Update copyright in bundle for 2010
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
+ (cherry picked from commit 6bde306f7f6b9bbabeaa8bb910ea549be906cd8b)
+
+commit 268c00d24b1938aaa75ad23892fba6ef241fbe9d
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Mon Jan 11 18:02:55 2010 -0800
+
+ XQuartz: Setup the modifier map in the quartz thread
+
+ This avoids possible doing it twice which could result in incorrect
+ keycodes for alt due to our loss of information about its side.
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
+ (cherry picked from commit 6008cc116493cb2825ad0bda0b407b7aefabb3f4)
+
+commit b852834bb1974a2c149869b6e19aff000a2b4187
+Author: Simon Thum <simon.thum@gmx.de>
+Date: Wed Jan 6 18:13:27 2010 +0100
+
+ os: state effect of -a and -t options more precisely
+
+ Signed-off-by: Simon Thum <simon.thum@gmx.de>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 14e4e4a294e648e0bdcb70c34748e1b81c5bb64f)
+
+commit d76f09406d07fd04a03d9cb3965419b1e95bdd03
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Jan 7 15:23:34 2010 -0500
+
+ macros: use PKG_CONFIG variable rather than executable name
+
+ User can defined alternate location for pkg-config.
+ Once option in place, all instances of pkg-config must be converted.
+
+ Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 6a2a57832709798d99d19ff4c587e22f3b3c150d)
+
+commit 08c2df881d61fccfd488b5ca4482686a7f3b47c0
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Jan 8 19:04:25 2010 -0500
+
+ configure: use backticks rather than $() for commands
+
+ This patch to xserver configure.ac is to increase code portability to
+ non POSIX system by using backticks rather than $() for command
+ substitution for BUILD_DATE and BUILD_TIME.
+
+ Reviewed-by: Rémi Cardona <remi@gentoo.org>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 6313d2da6c6910827d68cf31fe00b46a34c5bfc7)
+
+commit b7e903526c28eb4d5368d916708ff30486e94319
+Author: Simon Thum <simon.thum@gmx.de>
+Date: Tue Jan 19 17:34:49 2010 +1300
+
+ xfree86: document pointer acceleration in xorg.conf.man
+
+ Signed-off-by: Simon Thum <simon.thum@gmx.de>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 0722c287a4c8a6cdedca9756192547bfcf77ade5)
+
+ Conflicts:
+
+ hw/xfree86/doc/man/xorg.conf.man.pre
+
+commit c5e5a7adf0ed378b6f3b28f04af5ad8d967b31bc
+Author: Simon Thum <simon.thum@gmx.de>
+Date: Tue Jan 19 17:33:09 2010 +1300
+
+ doc: actually document SendDragEvents
+
+ Signed-off-by: Simon Thum <simon.thum@gmx.de>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 14039b5a7982fbf8130501bb00766176a4e9bccb)
+
+ Conflicts:
+
+ hw/xfree86/doc/man/xorg.conf.man.pre
+
commit 88582f3d41315abf548a52622e52b7652d2c5281
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 8 09:38:58 2010 +1000
diff --git a/debian/changelog b/debian/changelog
index 1339a0f..51496c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
-xorg-server (2:1.7.4-3) UNRELEASED; urgency=low
+xorg-server (2:1.7.5-1) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Remove myself from Uploaders
+ [ Brice Goglin ]
+ * New upstream release.
+
-- Julien Cristau <jcristau@debian.org> Sat, 23 Jan 2010 01:43:22 +0100
xorg-server (2:1.7.4-2) unstable; urgency=low
commit f0ec2e0d7d0533b3b3fcccd9d78b76e4c9002d1e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Feb 16 11:34:38 2010 +1000
xserver 1.7.5
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index fc7ff05..8cb9048 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.7.4.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2010-02-05"
+AC_INIT([xorg-server], 1.7.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2010-02-16"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE
commit 15e9a3fc0c4776f3ff02a59375e61d9090e35a22
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Feb 12 23:34:57 2010 +0100
dix: restore lastDeviceEventTime update in dixSaveScreens
This was removed in 6b5978dcf1f7ac3ecc2f22df06f7000f360e2066 (Do not
reset lastDeviceEventTime when we do dixSaveScreens), but caused a
regression for XResetScreenSaver. Add the lastDeviceEventTime update
back, but restrict it to that case.
X.Org bug#25855 <http://bugs.freedesktop.org/25855>
Reported-by: Lubos Lunak <l.lunak@suse.cz>
Tested-by: Lubos Lunak <l.lunak@suse.cz>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 001ce71dc11287dc94cc2fbc5d35677c046e6c04)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/dix/window.c b/dix/window.c
index caff1cb..2676a54 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -3233,8 +3233,13 @@ dixSaveScreens(ClientPtr client, int on, int mode)
}
}
screenIsSaved = what;
- if (mode == ScreenSaverReset)
- SetScreenSaverTimer();
+ if (mode == ScreenSaverReset) {
+ if (on == SCREEN_SAVER_FORCER) {
+ UpdateCurrentTimeIf();
+ lastDeviceEventTime = currentTime;
+ }
+ SetScreenSaverTimer();
+ }
return Success;
}
commit 38a83dce236da44856c075b5589d38ef0a662d4b
Author: Peter Harris <pharris@opentext.com>
Date: Fri Feb 12 15:36:30 2010 -0500
Don't double-swap the RandR PropertyNotify event
The event is already swapped in randr.c/SRROutputPropertyNotifyEvent, so
it should not be swapped here.
X.Org Bugzilla #26511: http://bugs.freedesktop.org/show_bug.cgi?id=26511
Tested-by: Leonardo Chiquitto <leonardo@ngdn.org>
Acked-by: Adam Jackson <ajax at redhat.com>
Reviewed-by: Julien Cristau <jcristau at debian.org>
Signed-off-by: Peter Harris <pharris@opentext.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 97b03037f4d99fcebc7603011f41c3aff9871ce2)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/randr/rrproperty.c b/randr/rrproperty.c
index 146facb..12e30e4 100644
--- a/randr/rrproperty.c
+++ b/randr/rrproperty.c
@@ -47,11 +47,6 @@ DeliverPropertyEvent(WindowPtr pWin, void *value)
event->sequenceNumber = client->sequence;
event->window = pRREvent->window->drawable.id;
- if (client->swapped) {
- int n;
- swaps(&event->sequenceNumber, n);
- swapl(&event->window, n);
- }
WriteEventsToClient(pRREvent->client, 1, (xEvent *)event);
}
commit 829980a4ff36b46745cf958824338b6341302c7b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jan 13 15:03:45 2010 +1000
Xi: reset the sli pointers after copying device classes. (#25640)
If the indicator flags have the XkbSLI_IsDefault bit set, the indicator map
and names aren't their own bit of memory but rather point into the
device->key->xkbInfo->desc structure. XkbCopySrvLedInfo knows about this and
leaves the pointers alone.
When copying the classes from the slave to the master, these pointers are
copied and still point to the dev->key class of the slave device. If the
slave device is removed, the memory becomes invalid and a call to modify
this data (e.g. XkbSetIndicators) may cause a deadlock.
The copying of dev->key relies on dev->kbdfeed to be already set up. Hence
the pointers need to be reset once _both_ kbdfeed and key have been copied
into the master device.
X.Org Bug 25640 <http://bugs.freedesktop.org/show_bug.cgi?id=25640>
Fedora Bug 540584 <https://bugzilla.redhat.com/show_bug.cgi?id=540584>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 48f7298657f91843db36566b8d66d6c4c18dbd4c)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/Xi/exevents.c b/Xi/exevents.c
index cb2452b..ee32ba8 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -444,6 +444,26 @@ DeepCopyKeyboardClasses(DeviceIntPtr from, DeviceIntPtr to)
to->key = NULL;
}
+ /* If a SrvLedInfoPtr's flags are XkbSLI_IsDefault, the names and maps
+ * pointer point into the xkbInfo->desc struct. XkbCopySrvLedInfo
+ * didn't update the pointers so we need to do it manually here.
+ */
+ if (to->kbdfeed)
+ {
+ KbdFeedbackPtr k;
+
+ for (k = to->kbdfeed; k; k = k->next)
+ {
+ if (!k->xkb_sli)
+ continue;
+ if (k->xkb_sli->flags & XkbSLI_IsDefault)
+ {
+ k->xkb_sli->names = to->key->xkbInfo->desc->names->indicators;
+ k->xkb_sli->maps = to->key->xkbInfo->desc->indicators->maps;
+ }
+ }
+ }
+
/* We can't just copy over the focus class. When an app sets the focus,
* it'll do so on the master device. Copying the SDs focus means losing
* the focus.
commit 34cedd1e3d80cc84277662a94de797738bdb5fce
Author: Robert Morell <rmorell@nvidia.com>
Date: Fri Jan 29 19:07:03 2010 -0800
RENDER: Fix gradient and solid fill pictures with Xinerama, and misc cleanup
If these aren't wrapped, then procs that are wrapped (such as
RenderChangePicture) will fail in Xinerama when they see the resource
type of a picture created through one of these interfaces is PictureType
and not XRT_PICTURE like those allocated via RenderCreatePicture.
Signed-off-by: Robert Morell <rmorell@nvidia.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 4d575b0559817258f7a0ce6c4d2d0f9e7e5bba63)
diff --git a/render/render.c b/render/render.c
index 10554ad..3f7edf7 100644
--- a/render/render.c
+++ b/render/render.c
@@ -3235,6 +3235,138 @@ PanoramiXRenderAddTraps (ClientPtr client)
return result;
}
+static int
+PanoramiXRenderCreateSolidFill (ClientPtr client)
+{
+ REQUEST(xRenderCreateSolidFillReq);
+ PanoramiXRes *newPict;
+ int result = Success, j;
+
+ REQUEST_AT_LEAST_SIZE(xRenderCreateSolidFillReq);
+
+ if(!(newPict = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes))))
+ return BadAlloc;
+
+ newPict->type = XRT_PICTURE;
+ newPict->info[0].id = stuff->pid;
+ newPict->u.pict.root = FALSE;
+
+ for(j = 1; j < PanoramiXNumScreens; j++)
+ newPict->info[j].id = FakeClientID(client->index);
+
+ FOR_NSCREENS_BACKWARD(j) {
+ stuff->pid = newPict->info[j].id;
+ result = (*PanoramiXSaveRenderVector[X_RenderCreateSolidFill]) (client);
+ if(result != Success) break;
+ }
+
+ if (result == Success)
+ AddResource(newPict->info[0].id, XRT_PICTURE, newPict);
+ else
+ xfree(newPict);
+
+ return result;
+}
+
+static int
+PanoramiXRenderCreateLinearGradient (ClientPtr client)
+{
+ REQUEST(xRenderCreateLinearGradientReq);
+ PanoramiXRes *newPict;
+ int result = Success, j;
+
+ REQUEST_AT_LEAST_SIZE(xRenderCreateLinearGradientReq);
+
+ if(!(newPict = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes))))
+ return BadAlloc;
+
+ newPict->type = XRT_PICTURE;
+ newPict->info[0].id = stuff->pid;
+ newPict->u.pict.root = FALSE;
+
+ for(j = 1; j < PanoramiXNumScreens; j++)
+ newPict->info[j].id = FakeClientID(client->index);
+
+ FOR_NSCREENS_BACKWARD(j) {
+ stuff->pid = newPict->info[j].id;
+ result = (*PanoramiXSaveRenderVector[X_RenderCreateLinearGradient]) (client);
+ if(result != Success) break;
+ }
+
+ if (result == Success)
+ AddResource(newPict->info[0].id, XRT_PICTURE, newPict);
+ else
+ xfree(newPict);
+
+ return result;
+}
+
+static int
+PanoramiXRenderCreateRadialGradient (ClientPtr client)
+{
+ REQUEST(xRenderCreateRadialGradientReq);
+ PanoramiXRes *newPict;
+ int result = Success, j;
+
+ REQUEST_AT_LEAST_SIZE(xRenderCreateRadialGradientReq);
+
+ if(!(newPict = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes))))
+ return BadAlloc;
+
+ newPict->type = XRT_PICTURE;
+ newPict->info[0].id = stuff->pid;
+ newPict->u.pict.root = FALSE;
+
+ for(j = 1; j < PanoramiXNumScreens; j++)
+ newPict->info[j].id = FakeClientID(client->index);
+
+ FOR_NSCREENS_BACKWARD(j) {
+ stuff->pid = newPict->info[j].id;
+ result = (*PanoramiXSaveRenderVector[X_RenderCreateRadialGradient]) (client);
+ if(result != Success) break;
+ }
+
+ if (result == Success)
+ AddResource(newPict->info[0].id, XRT_PICTURE, newPict);
+ else
+ xfree(newPict);
+
+ return result;
+}
+
+static int
+PanoramiXRenderCreateConicalGradient (ClientPtr client)
+{
+ REQUEST(xRenderCreateConicalGradientReq);
+ PanoramiXRes *newPict;
+ int result = Success, j;
+
+ REQUEST_AT_LEAST_SIZE(xRenderCreateConicalGradientReq);
+
+ if(!(newPict = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes))))
+ return BadAlloc;
+
+ newPict->type = XRT_PICTURE;
+ newPict->info[0].id = stuff->pid;
+ newPict->u.pict.root = FALSE;
+
+ for(j = 1; j < PanoramiXNumScreens; j++)
+ newPict->info[j].id = FakeClientID(client->index);
+
+ FOR_NSCREENS_BACKWARD(j) {
+ stuff->pid = newPict->info[j].id;
+ result = (*PanoramiXSaveRenderVector[X_RenderCreateConicalGradient]) (client);
+ if(result != Success) break;
+ }
+
+ if (result == Success)
+ AddResource(newPict->info[0].id, XRT_PICTURE, newPict);
+ else
+ xfree(newPict);
+
+ return result;
+}
+
void
PanoramiXRenderInit (void)
{
@@ -3263,6 +3395,11 @@ PanoramiXRenderInit (void)
ProcRenderVector[X_RenderTriStrip] = PanoramiXRenderTriStrip;
ProcRenderVector[X_RenderTriFan] = PanoramiXRenderTriFan;
ProcRenderVector[X_RenderAddTraps] = PanoramiXRenderAddTraps;
+
+ ProcRenderVector[X_RenderCreateSolidFill] = PanoramiXRenderCreateSolidFill;
+ ProcRenderVector[X_RenderCreateLinearGradient] = PanoramiXRenderCreateLinearGradient;
+ ProcRenderVector[X_RenderCreateRadialGradient] = PanoramiXRenderCreateRadialGradient;
+ ProcRenderVector[X_RenderCreateConicalGradient] = PanoramiXRenderCreateConicalGradient;
}
void
commit 85b04bb0ebaf7a6f1b1a34f7b1704a3e6cbdab8a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 5 18:08:37 2010 +1000
xserver 1.7.4.902
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 2b6ec6b..fc7ff05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.7.4.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2010-01-23"
+AC_INIT([xorg-server], 1.7.4.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2010-02-05"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE
commit 219a0d8fb54f179c7ac8d5953585849ab65a778b
Author: Oldřich Jedlička <oldium.pro@seznam.cz>
Date: Sun Jan 17 17:59:03 2010 +0100
Allow driver to call DeleteInputDeviceRequest during UnInit
When the input driver (like xf86-input-wacom) removes it's devices
during a call to UnInit, the CloseDownDevices() cannot handle it. The
"next" variable can become a pointer to freed memory.
The patch introduces order-independent device freeing mechanism by
remembering the already freed device ids. The devices can reorder any
time during freeing. No device will be double-freed - if the removing
failed for any reason; some implementations of DeleteInputDeviceRequest
don't free the devices already.
Signed-off-by: Oldřich Jedlička <oldium.pro@seznam.cz>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 08b22c7faf97217ea4d497eec6624fc3dd916d9b)
diff --git a/dix/devices.c b/dix/devices.c
index 245a95b..ef199b7 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -878,13 +878,43 @@ CloseDevice(DeviceIntPtr dev)
}
/**
+ * Shut down all devices of one list and free all resources.
+ */
+static
+void
+CloseDeviceList(DeviceIntPtr *listHead)
+{
+ /* Used to mark devices that we tried to free */
+ Bool freedIds[MAXDEVICES];
+ DeviceIntPtr dev;
+ int i;
+
+ if (listHead == NULL)
+ return;
+
+ for (i = 0; i < MAXDEVICES; i++)
+ freedIds[i] = FALSE;
+
+ dev = *listHead;
+ while (dev != NULL)
+ {
+ freedIds[dev->id] = TRUE;
+ DeleteInputDeviceRequest(dev);
+
+ dev = *listHead;
+ while (dev != NULL && freedIds[dev->id])
+ dev = dev->next;
+ }
+}
+
+/**
* Shut down all devices, free all resources, etc.
* Only useful if you're shutting down the server!
*/
void
CloseDownDevices(void)
{
- DeviceIntPtr dev, next;
+ DeviceIntPtr dev;
/* Float all SDs before closing them. Note that at this point resources
* (e.g. cursors) have been freed already, so we can't just call
@@ -897,16 +927,8 @@ CloseDownDevices(void)
dev->u.master = NULL;
}
- for (dev = inputInfo.devices; dev; dev = next)
- {
- next = dev->next;
- DeleteInputDeviceRequest(dev);
- }
- for (dev = inputInfo.off_devices; dev; dev = next)
- {
- next = dev->next;
- DeleteInputDeviceRequest(dev);
- }
+ CloseDeviceList(&inputInfo.devices);
+ CloseDeviceList(&inputInfo.off_devices);
CloseDevice(inputInfo.pointer);
CloseDevice(inputInfo.keyboard);
commit a6a4c20121301905399c4e1c23980993bcbf2152
Author: Horst Wente <horst.wente@acm.org>
Date: Wed Dec 30 19:35:20 2009 +0100
xkb: make ctrl+alt+keypad + / ctrl+alt+keypad - work again (#25743)
Video mode switching via keypad keys did not work
Signed-off-by: Horst Wente <horst.wente@acm.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit b91cec26de367f75388e620772747b08eee34294)
diff --git a/xkb/xkmread.c b/xkb/xkmread.c
index 6623d1b..3c2df03 100644
--- a/xkb/xkmread.c
+++ b/xkb/xkmread.c
@@ -531,7 +531,13 @@ XkbAction *act;
act->devval.v2_ndx = wire.actionData[5];
act->devval.v2_what = wire.actionData[6];
break;
+
case XkbSA_XFree86Private:
+ /* copy the kind of action */
+ strncpy((char*)act->any.data, (char*)wire.actionData,
+ XkbAnyActionDataSize);
+ break ;
+
case XkbSA_Terminate:
/* no args, kinda (note: untrue for xfree86). */
break;
commit a5b558d065e24880ff14b3781f27d1a9ea6094ab
Author: Oldřich Jedlička <oldium.pro@seznam.cz>
Date: Tue Jan 12 19:15:06 2010 +0100
Fix typo in updateSlaveDeviceCoords
The index [0] for the second valuator looks bogus; fix it.
Signed-off-by: Oldřich Jedlička <oldium.pro@seznam.cz>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 993e78d6c433f65bd8a87890a6bb6da480b2cdc4)
diff --git a/dix/getevents.c b/dix/getevents.c
index 2df32e8..18c6302 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -296,7 +296,7 @@ updateSlaveDeviceCoords(DeviceIntPtr master, DeviceIntPtr pDev)
&pDev->last.remainder[0], NULL, pDev->valuator->axes + 0, scr->width);
if(pDev->valuator->numAxes > 1)
pDev->last.valuators[1] = rescaleValuatorAxis(pDev->last.valuators[1], pDev->last.remainder[1],
- &pDev->last.remainder[0], NULL, pDev->valuator->axes + 1, scr->height);
+ &pDev->last.remainder[1], NULL, pDev->valuator->axes + 1, scr->height);
/* calculate the other axis as well based on info from the old
* slave-device. If the old slave had less axes than this one,
Reply to: