xorg-server: Changes to 'debian-experimental'
ChangeLog | 1142 +++++++++++++++++++++++++++++++++
Makefile.am | 7
Xext/xselinux.c | 22
Xext/xselinux.h | 45 +
Xi/queryst.c | 14
Xi/xiquerydevice.c | 41 -
Xi/xiquerydevice.h | 8
composite/compinit.c | 4
configure.ac | 56 +
debian/changelog | 6
dev/null |binary
dix/Makefile.am | 9
dix/colormap.c | 3
dix/cursor.c | 3
dix/devices.c | 15
dix/dixfonts.c | 2
dix/events.c | 73 +-
exa/exa_driver.c | 4
exa/exa_mixed.c | 4
exa/exa_render.c | 71 +-
glx/glapi.c | 7
glx/unpack.h | 2
hw/dmx/dmx.c | 3
hw/dmx/dmxwindow.c | 3
hw/dmx/input/dmxinputinit.c | 22
hw/kdrive/fake/Makefile.am | 3
hw/kdrive/fake/kbd.c | 137 ---
hw/kdrive/linux/evdev.c | 15
hw/kdrive/linux/tslib.c | 4
hw/xfree86/Makefile.am | 5
hw/xfree86/common/xf86Events.c | 5
hw/xfree86/common/xf86Init.c | 4
hw/xfree86/common/xf86Mode.c | 29
hw/xfree86/common/xf86Xinput.c | 26
hw/xfree86/common/xf86cmap.c | 2
hw/xfree86/dri2/dri2ext.c | 2
hw/xfree86/i2c/fi1236.c | 10
hw/xfree86/loader/loadmod.c | 7
hw/xfree86/loader/sdksyms.sh | 1
hw/xfree86/modes/xf86Crtc.c | 31
hw/xfree86/modes/xf86EdidModes.c | 51 +
hw/xfree86/modes/xf86Modes.c | 34
hw/xfree86/modes/xf86Modes.h | 3
hw/xfree86/os-support/linux/lnx_axp.c | 16
hw/xfree86/os-support/linux/lnx_ev56.c | 18
hw/xfree86/os-support/misc/SlowBcopy.c | 62 +
hw/xfree86/parser/Flags.c | 2
hw/xquartz/X11Application.h | 1
hw/xquartz/X11Application.m | 15
hw/xquartz/X11Controller.h | 5
hw/xquartz/X11Controller.m | 20
hw/xquartz/applewm.c | 20
hw/xquartz/bundle/Info.plist.cpp | 4
hw/xquartz/mach-startup/bundle-main.c | 83 +-
hw/xquartz/mach-startup/stub.c | 2
hw/xquartz/pbproxy/app-main.m | 4
hw/xquartz/pbproxy/main.m | 16
hw/xquartz/quartzKeyboard.c | 193 +++--
hw/xquartz/xpr/xprFrame.c | 47 +
hw/xwin/InitOutput.c | 2
hw/xwin/Makefile.am | 1
hw/xwin/XWin.rc | 11
hw/xwin/winmouse.c | 2
hw/xwin/winprocarg.c | 4
hw/xwin/winresource.h | 1
hw/xwin/winscrinit.c | 6
include/dix.h | 4
m4/dolt.m4 | 3
mi/miinitext.c | 28
miext/rootless/rootless.h | 9
miext/rootless/rootlessCommon.c | 3
miext/rootless/rootlessCommon.h | 4
miext/rootless/rootlessScreen.c | 4
miext/rootless/rootlessWindow.c | 76 --
miext/rootless/rootlessWindow.h | 2
os/Makefile.am | 4
os/access.c | 3
randr/randrstr.h | 12
render/mipict.c | 8
test/Makefile.am | 4
test/xi2/Makefile.am | 4
xkb/ddxLoad.c | 5
xkb/xkb.c | 2
83 files changed, 1991 insertions(+), 654 deletions(-)
New commits:
commit d249d5c16c8ed4a228f123d69204a3a107d83ce1
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Nov 26 16:28:04 2009 +0100
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 67410e9..0864cdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,1145 @@
+commit 19b24f014f4dad1cc73e2454d15c64ae05ac8ef2
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Nov 20 15:29:05 2009 +1000
+
+ xserver 1.7.1.902
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit bebf7b1a342eaa37849a5b373bd1a507052233a8
+Author: Julien Cristau <jcristau@debian.org>
+Date: Sat Nov 14 18:39:00 2009 +0100
+
+ xfree86: set a sane umask before opening the log
+
+ Xorg creates its log file following the umask of the user running
+ startx, which may result in a world-writable log. Set umask to 022 to
+ prevent this.
+
+ Debian bug#555308 <http://bugs.debian.org/555308>
+ See also http://thread.gmane.org/gmane.comp.security.oss.general/2299
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 30be7ceaf228497ac1ff0a1123c1b35e3aa1fc73)
+
+commit e6872c89bcb8a0308cf83089194051e0ef69fba9
+Author: Chase Douglas <chasedouglas@gmail.com>
+Date: Mon Nov 9 22:54:39 2009 -0500
+
+ Move FD_CLR above pInfo->read_input
+
+ The event fd may be invalidated by the pInfo->read_input call. If it is
+ invalidated, the subsequent FD_CLR call will segfault. Thus, the FD_CLR
+ call must precede the pInfo->read_input call.
+
+ Signed-off-by: Chase Douglas <chasedouglas@gmail.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit b5aa2e0a5fe233dc883084a5026013472e85bca4)
+
+commit a2e4bcc2a02f86ca3c23ccf1b4abc2f1d3fa3218
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Nov 10 09:50:50 2009 +1000
+
+ dix: increase default number of buttons to 10.
+
+ Currently the XTEST device is limited to the same number of buttons the core
+ device has. This breaks if a user has a mouse with more than 3 buttons
+ connected and is using a core client to fake button 8+ presses.
+
+ Rather than expecting all clients to fix themselves, just increase the
+ default number of buttons to 10, which is somewhat a compromise. Ideally,
+ the XTEST devices should adjust themselves to the highest number of buttons
+ available on the slave devices (like the master pointers already do), but
+ that's a taks for another day.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 982f6648fd29d085265bf6035c1bf4d1b2499316)
+
+commit 2b9ad701967d6fd9c1d98e87ce94a806a05125e5
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Sun Nov 1 18:19:14 2009 +0000
+
+ Avoid a null dereference if IFF_BROADCAST is set but there is no broadcast address
+
+ It seems that the getifaddrs() function can return interfaces with
+ IFF_BROADCAST & IFF_UP set, but no broadcast address (at least
+ under Cygwin 1.7, this seems to happen for v6 mapped v4 addresses)
+
+ Avoid a null dereference if this ever happens
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+ (cherry picked from commit 28eb61fc04811bb9bbb523e0a252933313bb16ce)
+
+commit 71f4b404c0c5b4e8f41d779687e026efd580a988
+Author: Colin Harrison <colin.harrison@virgin.net>
+Date: Wed Nov 4 15:16:03 2009 +0000
+
+ Xming: Add mouse motion events with flag POINTER_SCREEN in winEnqueueMotion()
+
+ Add mouse motion events with flag POINTER_SCREEN in winEnqueueMotion(), as
+ they are in screen coordindates and may need to be scaled to the axis range
+ appropriately
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ (cherry picked from commit 019a601de6a8ae083852c2d384c814dcc7aeeb72)
+
+commit f0325c2f6007f358bcc7c2632476dd6370fa0919
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Fri Jun 19 21:12:55 2009 +0100
+
+ Cygwin/X: Remove a couple of extraneous '\n' in logged version info
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ (cherry picked from commit 2a38f7c0dbc890e6408eee143d77719f265d583d)
+
+commit 20beb2580f33add2ca7911a6d9410422a1d3079b
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Nov 9 11:12:22 2009 -0500
+
+ randr: Fill in errorValue when verifying outputs/crtcs/modes
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit c7d1319872e0ae0b7d945e9af8c4027ee5aa2055)
+
+commit 2db157924b582933c4b6897505e6f4170e23b56f
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Oct 13 10:15:00 2009 +1000
+
+ loader: actually stat something that has some chance of existing. (v2)
+
+ FindModuleInSubdir seems to expect a / at the end of the subdir its
+ finding for, so we add the / early, the stat will fail if its
+ not a subdir, I'm leaving the S_ISDIR in just in case there is another
+ reason it could return 0. This does look a bit silly in strace
+ but it seems to work fine.
+
+ I have a very intermittent issue where drivers loses its / that
+ I've been seeing on/off for a while, this may or may not fix it.
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit d85ab6b6483d6ca7d9d22298d05ed1fa3076b042)
+
+commit 7e7e7935eeb86b5990664a662471800cfd2e7ce0
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Mon Nov 9 13:09:55 2009 -0800
+
+ XQuartz: Explicitly pass a bellProc to make XBell() work again.
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
+ (cherry picked from commit 9071b0d69748cfa7ecca17b4cb0e431bbb0ef2a4)
+
+commit d6495bb272c9be8b3376d65b16bf0342c5975bd0
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Tue Oct 27 17:16:57 2009 -0700
+
+ XQuartz: pbproxy: Wait for the server to finish starting up, so display is valid.
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
+ (cherry picked from commit e87a03fd531ce7974877688680d3bf9b85c2d835)
+
+commit 909d04000cf3a9a2cc11f7f890f4c14408453e08
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Sun Nov 8 20:25:42 2009 -0800
+
+ XQuartz: Buildfix for Leopard and older
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
+ (cherry picked from commit 15fc56addcc906592af7c0f4c0a5ac906fa5c389)
+
+commit afc7663f0dc4e268ba12c8065238b34add8bdcdf
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Wed Nov 4 18:39:16 2009 -0800
+
+ XQuartz: Cleanup X11Controller.m compilation warnings.
+
+ Declare X11Controller as implementing NSTableViewDataSource.
+ Use selectRowIndexes:byExtendingSelection instead of selectRow:byExtendingSelection
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
+ (cherry picked from commit 840a68dc5e3b4d285894f86df2a8c41fca5a4bec)
+
+commit 6b70e145b7544a36c05e8bef960f377cc52e0ddc
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Wed Nov 4 18:15:08 2009 -0800
+
+ XQuartz: Use dixLookupResourceByType instead of LookupIDByType
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
+ (cherry picked from commit 0e3ad44c3b05cbe7b1d8f5ce7949fec3c7ae2e7c)
+
+commit f203963678d42644a803bc45e82b08e6bde0b2a7
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Wed Nov 4 16:18:06 2009 -0800
+
+ XQuartz: Don't weed out duplicates in generated keymap
+
+ There seems to be an issue in the 1.5+ server where shift-space does not
+ produce a space when 'keycode 57 = space' but it does when 'keycode 57 = space
+ space'
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
+ (cherry picked from commit 069fc6ce0a0e7f2c418e11941568ffcc52b6b331)
+
+commit dfb0c502946853a5a4b39a3e9814e8d576749d69
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Wed Nov 4 13:34:20 2009 -0800
+
+ XQuartz: Controller thread launches clients
+
+ This avoids a memory leak due to no active auto-release pool on the server thread.
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
+ (cherry picked from commit 6d6e8fb27f00f0c3128cef624b39a60aa754fdc8)
+
+commit 2d55b842b8cda6a0292269304c9d86ff90dec40f
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Nov 6 14:38:22 2009 +1000
+
+ xserver 1.7.1.901
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 4fe904f2d50d4a7cc68ab6056483b6d8b4178539
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Nov 5 11:42:34 2009 -0800
+
+ Enable XF86PM on all Solaris platforms, not just x86/x64
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit f7b375bd141d0cf1e3add5443a5838dd8f554ef6)
+
+commit f0dc842b1487edeb6c058cdb92995e2a4673028c
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Nov 5 11:42:33 2009 -0800
+
+ Use $(MAKE) instead of "make" to build Solaris inline assembly
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit f77262513ea17401092479e17ad20fc0eb91ffb5)
+
+commit 05d6672a1b551916e832d24920a97b6eed8fa026
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Wed Nov 4 15:35:37 2009 +0200
+
+ EXA: Preserve pPixmap->devPrivate.ptr in exaPixmapIsOffscreen_driver
+
+ It crash the server when the drawable is 32 bit and the framebuffer is 16.
+
+ This is pretty much a copy-past from commit 8e873185.
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 964040764387d89ef64324cfbee31872ee6ce41c)
+
+commit 269202982d4a3ab8bb31caa0fd72088d61eba66c
+Author: Rami Ylimaki <ext-rami.ylimaki@nokia.com>
+Date: Wed Nov 4 15:59:30 2009 +0200
+
+ dix: Fixes a memory leak when a cursor resource is released.
+
+ Just open and close a client that creates cursors in order to
+ reproduce. In the problem case bits->refcnt is -1 and therefore
+ bits->devPrivates is never released.
+
+ Signed-off-by: Rami Ylimaki <ext-rami.ylimaki@nokia.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 0573042cddb6f9942e408687a16c6842e62a8bfa)
+
+commit ade4636c7e9cb8f9a0b03168f47d5383af9cbdaf
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Tue Oct 27 18:00:48 2009 -0700
+
+ dix: Properly detect if the other device is frozen
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
+ (cherry picked from commit 7897b6c2d41bccb72c19418674c3526ecce29515)
+
+commit ccbf949abb05111ad1ba3a359a621e9d7a1ffbf7
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Tue Nov 3 16:35:27 2009 -0800
+
+ XQuartz: Run xmodmap after programatically updating the keymap.
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
+ Signed-off-by: Martin Otte <otte@duke.edu>
+ (cherry picked from commit 5e79976c13c5b94b12392b493846ca26be11750b)
+
+commit 9e9ff04320ef9036b6746923188a4fbd83c44158
+Author: Maarten Maathuis <madman2003@gmail.com>
+Date: Sun Nov 1 22:08:40 2009 +0100
+
+ exa: remove some outdated comment
+
+ - This comment is still in exa_driver.c and there it makes sense.
+
+ Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
+ Acked-by: Michel Dänzer <michel@daenzer.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 412c56ef3332d09efbd861e41c3e985f44729729)
+
+commit 30572be7c795146bc4f6f2b8445feee30b5d6bfe
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Sep 21 10:23:16 2009 -0400
+
+ EDID: Extend the HDTV hack to handle "1368x769"
+
+ Hate televisions so much.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ (cherry picked from commit ec98d7fc78efefcf9fc61492529157c0d289c3f2)
+
+commit 9c87ede1d621bd7d69be81bdfdd2b18d47c68983
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Oct 28 15:44:37 2009 -0400
+
+ modes: Fix duplicate detection, and do it more consistently
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ (cherry picked from commit 7c0803f555782dbf451b7c79112d7deae02e5c9f)
+
+commit f61376b1365b558cf4d05e370cbea807ae168b27
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Oct 26 15:10:30 2009 -0400
+
+ modes: De-duplicate a clock range check.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ (cherry picked from commit ba2d39dd5428cb5922b797a1d4ea45b859412b40)
+
+commit 263d2b05d6d8be15737a8d6c18071eb94d667b42
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Oct 26 14:49:57 2009 -0400
+
+ EDID: Fix interlaced detailed timings to be frame size, not field size
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ (cherry picked from commit 25236d19e6ef07fcb2c71569f1b7b0c12810834a)
+
+commit 4caa7982efd7b40c53d8b37e41ce9155e2dd1a56
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Wed Oct 28 17:48:19 2009 -0700
+
+ Suppress certain GCC warnings in auto-generated code.
+
+ - Don't warn for references to deprecated functions in xorg_symbols.
+ - Ignore functions generated by gl_apitemp.py that are never used.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit fab74d1081270fb8f1d231e6e10d10aa33e164da)
+
+commit 6ca6283bce5e0d272ec2b416f1ab230ec8719fdd
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Wed Oct 28 17:48:18 2009 -0700
+
+ Don't cast double to int: use default conversions or explicitly round.
+
+ GCC warns about casting a double return value to int.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 239435875d6a92ed31731b500a992a3af0943594)
+
+commit ebbac195508c9941a9349f48867aff1b0dd827b1
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Wed Oct 28 17:48:17 2009 -0700
+
+ Suppress GCC warnings like "the address of `u1' will always evaluate as `true'".
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit e8c48fd8f7aab54327b0091cd17c60235ae27168)
+
+commit 171dc59ec52cda3d73bbb3ed8091904c124011bb
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Thu Oct 29 00:40:48 2009 +0600
+
+ kdrive: Grab evdev mouse/keyboard devices when X server is active
+
+ Input events are directed to both vt and input devices by default.
+ Unless input devices are grabbed, keyboard events fill it vt buffers
+ and cause spontaneous wakeups in kernel tty layer when buffers are full.
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 662594aeff9d1767316f08600949c73ac5060d18)
+
+commit 9ed5acec417f683102c0f52138a5d52131604c3c
+Author: Tormod Volden <lists.tormod@gmail.com>
+Date: Wed Oct 28 23:10:43 2009 +0100
+
+ xfree86: Fix description of DDC_QUIRK_DETAILED_USE_MAXIMUM_SIZE
+
+ The message ending up in the log is misleading as to what the quirk
+ actually does: It ignores the sizes in the detailed timings and
+ replaces them with the display "Max Image Size".
+
+ Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 757c11630d5999ad13dcac79191429badc92a3a6)
+
+commit 9db4c77956d3d1598955e777ce6607fe7901a395
+Author: Hans Nieser <hnsr@xs4all.nl>
+Date: Wed Oct 28 06:59:40 2009 +0100
+
+ Xinput: allow non-integer values again for Constant- and AdaptiveDeceleration
+
+ This was initially fixed by commit 3932a848572f4eaf8b7f1d91d9b74aeafab069a2
+ but then (presumably not intentionally) undone by commit
+ 1d54479cb3c8b4f75b7564f8b5e1c5da940b20f4 .
+
+ Signed-off-by: Hans Nieser <hnsr@xs4all.nl>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 55f4c80a4c891b355a99e6a05978ca945397c5cc)
+
+commit 6e2f5912b6ab54a5d78c7dfddc558e0bed08e270
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Fri Oct 23 19:32:42 2009 +0100
+
+ dmx: Correctly compute DMXGetScreenAttributes reply length
+
+ Correctly allow for excess length of DMXGetScreenAttributes reply
+ over standard 32 byte reply in addition to the displayName string
+ when computing the length of reply
+
+ http://bugs.freedesktop.org/show_bug.cgi?id=24685
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 50a5c32430a5267f2a05656d2417f9a8a44d8b97)
+
+commit 48329b2c5c7e3ffa1e9230fd712aec2cd7c2e620
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Oct 23 10:35:57 2009 +1000
+
+ xserver 1.7.1
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit da6c66dbc5d7b4760b5c3901b32fc5100ede4e0c
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Oct 23 10:04:57 2009 +0900
+
+ DRI2: Report the correct extension minor version
+
+ Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 9a2f6135bfb0f12ec28f304c97917d2f7c64db05)
+
+commit fb5db61be2cecbd364b2a4566899573af099c50c
+Author: Marcin Baczyński <marbacz@gmail.com>
+Date: Thu Oct 22 14:43:25 2009 +0200
+
+ Kill compilation warnings.
+
+ Signed-off-by: Marcin Baczyński <marbacz@gmail.com>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit d886008c96cd16f735f54dace070cb00b23c6f44)
+
+commit 5085340be6e9ed1cbd80fc9d4bf8920161e70f64
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Oct 22 17:29:01 2009 -0400
+
+ dix: Fix up colormap fixup.
+
+ FindClientResourcesByType() will walk all colormaps on all screens; we
+ only want to fix up the current screen. Otherwise, screens > 0 will
+ have the visual pointers for their colormaps pointing off into space.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ (cherry picked from commit 15b30fde179cba3877182cd51b0f870ef29ffaee)
+
+commit 23ca41f4c3a9cc54116b759615456a0496919f24
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Tue Oct 20 12:57:05 2009 +0100
+
+ Resolve an inconsistency between libX11 and Xserver over GetModifierMapping
+
+ libX11 ModMap.c believes that GetModifierMapping can never return an error
+
+ Xserver devices.c believes that GetModifierMapping can return an error if
+ the ModMap couldn't be generated
+
+ According to the protocol document I have, libX11 is right, so adjust the
+ server to send back an empty modmap if one couldn't be made...
+
+ http://bugs.freedesktop.org/show_bug.cgi?id=24621
+
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 909df9beb3ddd02632f36ae682537280a6a8e5b4)
+
+commit 4b9979ae19ff9e9bcc7ede01b20c13d954272de1
+Merge: d6d3620 4549953
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Oct 22 13:31:21 2009 +1000
+
+ Merge branch 'server-1.7-branch' of git://anongit.freedesktop.org/~ewalsh/xserver into server-1.7-nominations
+
+commit 4549953327c31b377ad9183119b66f007fc5b698
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date: Wed Oct 21 21:59:01 2009 -0400
+
+ Don't print a failure message when XACE denies an input event delivery.
+
+ A denial is normal and the behavior should be to drop the event.
+ Having the log message creates excessive log spam.
+
+ Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
+ (cherry picked from commit d4fe55c98c28055191faeba92f43f30fb47cc43a)
+
+commit 4cf085ce926e10b7a4aa0ae672f23efc1e0525a2
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date: Thu Oct 15 13:51:34 2009 -0400
+
+ xselinux: Note something in the log if disabled by boolean.
+
+ Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
+
+commit 53c14303770ecd39534a73dbed90e4e8fd75423a
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date: Wed Oct 14 20:33:53 2009 -0400
+
+ xselinux: Use the now-exported IsPointerDevice() instead of a copy.
+
+ Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
+
+commit 951a16c51e8f62e83c84100f6e2eec09ec8b101a
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date: Wed Oct 14 20:32:28 2009 -0400
+
+ dix: Export IsPointerDevice() and IsKeyboardDevice().
+
+ Makes the functions available to extmod for extensions to call.
+
+ Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
+ (cherry picked from commit 0ae1632be045bfbb288bb57190c830f94247460f)
+
+commit f874af7a85c4d56d4a7dbb5dc460832f294b358b
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date: Thu Oct 15 17:32:21 2009 -0400
+
+ xselinux: Allow SetWindowCreateContext to be used for pixmaps as well.
+
+ Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
+
+commit 5560f270c8c28cdae2ed84aca165724487399ece
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date: Tue Sep 22 13:31:49 2009 -0700
+
+ xselinux: switch from x_device to separate x_pointer and x_keyboard classes.
+
+ This will allow separate controls over pointer and keyboard without having
+ to relabel the devices to separate types.
+
+ [Backport to 1.7]
+
+ Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
+ (cherry picked from commit 6c2ae5fec552366e11ad64a27626eb5dec4becf0)
+
+commit 4814532133e6c57f2656e8363ec051edd312f26c
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date: Tue Sep 22 13:13:03 2009 -0700
+
+ xace: Relax permissions on XkbGetState from Read to Getattr.
+
+ This request is used to get the current keyboard group and is called from
+ GTK. It does not return an actual keymap (aside from modifiers) so it
+ should be safe to relax the permission on it. However it does return
+ button state information which should be controlled through a separate
+ pointer Read check.
+
+ Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
+ (cherry picked from commit c4ffce4dc84a0a9d134a59b7e7765c99ed767e53)
+
+commit c1a861eedf2e3b0d11896adaab72b013a885af5a
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date: Tue Sep 15 19:41:04 2009 -0400
+
+ xselinux: Stop special-casing QueryPointer access checks.
+
+ XACE has been changed to not return BadAccess on device read failures.
+ Thus, no need for this workaround code.
+
+ [Backport to 1.7]
+
+ Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
+ (cherry-picked from commit 0ff28319906eeb3f236acd72201c416ce01f2c6e)
+
+commit 7d3f8ce505e45c888c4f309011144d212623f0f0
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date: Tue Sep 15 19:29:34 2009 -0400
+
+ xace: Fake return values on denials in input polling requests.
+
+ Instead of returning BadAccess when "read" permission is denied
+ on a device, falsify the device state (buttons down, keys pressed).
+ This is nicer to applications, but may still have undesired side
+ effects. The long-term solution is not to use these requests in
+ event-driven code!
+
+ Requests affected: QueryPointer, QueryKeymap, XiQueryDevice.
+
+ Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
+ (cherry picked from commit 8502c06e19a4c00bf1311f54f9a365ee9e026e97)
+
+commit d6d3620faf23ce9adc2b91a1255f16344fc9894e
+Author: Lee Leahu <freedesktop-bugs@dyweni.com>
+Date: Mon Oct 19 15:43:59 2009 -0500
+
+ dmxDestroyWindow() - must call the X's native DetroyWindow()
+
+ Don't really know why this section was disabled, but without it,
+ certain pPicture resources do not get free'd until later in the
+ FreeClientResources() process after the screen has been free'd -
+ resulting in seg fault.
+
+ With this patch, all resources normally free'd using vanilla X are
+ now also being freed correctly by Xdmx.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=24576
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit f713f447a2110718dfc091380699362d76f0cd6c)
+
+commit d1da013b323a1131d561e85af4488c6e3dbf2dba
+Author: Lee Leahu <freedesktop-bugs@dyweni.com>
+Date: Sat Oct 17 00:45:44 2009 -0500
+
+ dmx: when setting up device axis, use the correct counter number
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 664a8e37fd83141974b772980f680b94e48b4f87)
+
+commit c16f3ae484e4b0438d0fdf504c6344a7985cb1df
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Sep 24 11:25:28 2009 +1000
+
+ kdrive: silence tslib compiler warnings
+
+ tslib.c: In function 'TslibInit':
+ tslib.c:157: warning: unused variable 'tsDev'
+ tslib.c:156: warning: unused variable 'inputent'
+ tslib.c:155: warning: unused variable 'inputdir'
+ tslib.c:154: warning: unused variable 'i'
+ tslib.c:154: warning: unused variable 'fd'
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit e08d8a2b043e5be821c5e8b2dbf37b09102b5d01)
+
+commit e644e322c78d83e445daa64dc3f2f596b2b64016
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Oct 21 16:46:55 2009 +0900
+
+ Fix 'distcheck' to use host xkb files but install to build dir
+
+ 'make distcheck' needs to read xkb files and write out compiled
+ versions as a part of the 'make check' phase. This patch passes
+ suitable options to the configure stage of the distcheck process to
+ read xkb files from the system location and write them to the
+ distcheck _inst directory.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 08e7f62faf72540cb3a6f1023024c145f7fa1a23)
+
+commit 55d3a77eb99c67ed05140f03e3fc4bf24011df35
+Author: Colin Harrison <colin.harrison@virgin.net>
+Date: Fri Sep 25 17:49:59 2009 +0100
+
+ Xming: Remove unused X-boxed icon resource
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ (cherry picked from commit 78c87bdad1feab91c2a39e01513b4b0826665f06)
+
+ Squashed-into this commit:
+
+ Fix make dist after 78c87bdad1feab91c2a39e01513b4b0826665f06
+
+ Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 63f4bf39170eb2262617ef2dc95fd6d337b9dad5)
+
+commit 75e52c777c095abbd13a096dbda885019a0bc5ce
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Fri Oct 2 19:20:24 2009 -0700
+
+ XQuartz: Fix a possible minor memory leak
+ (cherry picked from commit 24e640e1fa6cfb3917ba90dcdabf1fadddff20aa)
+
+commit 31c6fc76733490117c75697d28b7dfb25cc4537c
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Mon Sep 28 23:01:59 2009 -0700
+
+ XQuartz: Remove the redundant xquartz_resetenv_display
+ unsetenv(DISPLAY) takes care of this for us anyway
+ (cherry picked from commit d2263645d839c9edeedea0835d26f1f41b37f70e)
+ (cherry picked from commit f3223c71cfc638e695981e527517d48ea00d124d)
+
+commit 37b5f41ccea3473b830cc0c4afb5d609e47004cb
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 19 11:48:05 2009 +1000
+
+ xserver 1.7.0.902
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 37f857eb4cd30c6499a2735f59ddec87d1b7de57
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 19 11:50:56 2009 +1000
+
+ Revert "Xming: Remove unused X-boxed icon resource"
+
+ Breaks make dist.
+ make[2]: *** No rule to make target `X-boxed.ico', needed by `distdir'. Stop.
+
+ This reverts commit 2969eaa88c4422fedf1b069e6fe055904b233db2.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 650ac84a0cf62c139fa6254fb7a44157d551e8e3
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Oct 16 22:29:26 2009 -0700
+
+ Fix segfault when -extension XKEYBOARD is passed on the command line
+
+ Users should be told they can't disable XKB or XInput via error messages,
+ not core dumps.
+
+ Reported by T`2 on #xorg irc
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 2bd71a6db241924bd17ac9dd4aa38e7e563ee5c1)
+
+commit a8bfbd81b8aaac31b87d15257273d82174912b37
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Oct 15 13:50:36 2009 +1000
+
+ kdrive: fix Xfake build by removing the old keysym stuff
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Acked-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit a32b2420d85f076282721afe005e85fff7d9837e)
+
+commit 64faf44f36b09780737c06781dadcf8fcbcaf836
+Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+Date: Thu Oct 15 01:53:42 2009 -0500
+
+ Remove duplicates from Xfake_LDADD
+
+ KDRIVE_LIBS already contains the libs in XSERVER_LIBS, so linking against
+ both leads to multiple-definition errors when linking on Cygwin.
+
+ Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit a2f27b97900f335cd5f6a3e5bf8fa1d0ec9eb9ac)
+
+commit 4b419c1651bbe7fbd3e87c3d71ba9fe642672ca2
+Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+Date: Thu Oct 15 01:53:41 2009 -0500
+
+ Fix XWIN_LIBS definition
+
+ Move XWIN_LIBS from XWIN=auto conditional to XWIN=yes conditional,
+ otherwise the build breaks if an explicit --enable-xwin is passed to
+ configure.
+
+ Also remove obsolete library values from the definition.
+
+ Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit ed4c6bc79a797830895ad6c3601318b2d1c4bdcb)
+
+commit 7d5282dd597eb9353ca7a7697604d81228254d4a
+Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+Date: Thu Oct 15 01:53:40 2009 -0500
+
+ Install SDK pkg-config and aclocal files only if XORG
+
+ Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit bcd0c02cfd0707b5f8b1ca91dfbe4412df2c643e)
+
+commit 1b88e4eb2e605fd1d3adffaf38dc40be6a28970d
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Tue Jul 21 02:23:21 2009 +0100
+
+ Cygwin/X: Make -logverbose affect the verbosity of logging to the log file
+
+ Make -logverbose affect the verbosity of logging to the log file, not just the
+ verbosity of logging to the console
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+ (cherry picked from commit 1b0dfd8dee639870725d3bd9b70c3bd589d09e5a)
+
+commit 2969eaa88c4422fedf1b069e6fe055904b233db2
+Author: Colin Harrison <colin.harrison@virgin.net>
+Date: Fri Sep 25 17:49:59 2009 +0100
+
+ Xming: Remove unused X-boxed icon resource
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ (cherry picked from commit 78c87bdad1feab91c2a39e01513b4b0826665f06)
+
+commit 92253b0f2028c6c243be5f444b59568b0c15ae1f
+Author: Colin Harrison <colin.harrison@virgin.net>
+Date: Fri Sep 25 17:46:40 2009 +0100
+
+ Xming: update .rc file
+
+ Remove the obsolete DISCARDABLE flag in the .rc file
+ Replace the obsolete DIALOG resource with DIALOGEX in the .rc file
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ (cherry picked from commit fdf7f7e95c852734c620f58df408a324902172cf)
+
+commit 237bc0c2558bdda5c7ec44cbc86a65af21344ba2
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Sat Oct 3 13:07:23 2009 +0100
+
+ Cygwin/X: Don't build rootless extension code unless we need it
+
+ Only try to build rootless extension code if we really need it (i.e. mwextwm mode is enabled)
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ (cherry picked from commit 5ddfd9d0898629627e8ab10e65ea2e082be3af37)
+
+commit c163126f06720a4bca1d073a2fb6d138ca6f0f00
+Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+Date: Tue Oct 13 20:14:58 2009 -0500
+
+ dolt: add Cygwin to supported platforms
+
+ Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 25344ba7f7845654364d62bf15322b3b79465bd9)
+
+commit 07229cd6da6a9b7acedb994275fed5b512fe48b1
+Author: Matt Turner <mattst88@gmail.com>
+Date: Tue Oct 13 20:42:14 2009 -0400
+
+ [alpha] assume we have __NR_pciconfig_iobase
+
+ The code path if we didn't have support has been broken since before we
+ switched to git.
+
+ The pciconfig_iobase syscall has been supported since 2000.
+
+ Signed-off-by: Matt Turner <mattst88@gmail.com>
+ (cherry picked from commit 5e762f0e2f203b5121a3de3b9af3c8981b31a77f)
+
+commit 13c5e2fe9c7ce82dfdc026a392327b115d8c6a15
+Author: Matt Turner <mattst88@gmail.com>
+Date: Tue Oct 13 20:40:59 2009 -0400
+
+ [alpha] don't return from void functions
+
+ Signed-off-by: Matt Turner <mattst88@gmail.com>
+ (cherry picked from commit 46785c04bca16f495af3ed8d685aee939a1a8f39)
+
+commit fff0b2013ad40c6116e92a9c5e233da4a34e6943
+Author: Michael Cree <mcree@orcon.net.nz>
+Date: Wed Oct 7 18:33:29 2009 -0400
+
+ Fix undefined symbols on alpha
+
+ Signed-off-by: Matt Turner <mattst88@gmail.com>
+ (cherry picked from commit 34eddbbb73bb16395dba0818247909c1b4bee4c2)
+
+commit a08186fe59f003fc9e1edceb1d95d2e316766e2a
+Author: Matt Turner <mattst88@gmail.com>
+Date: Tue Oct 6 20:58:30 2009 -0400
+
+ Fix breakage on alpha caused by c7680befe5ae
+
+ Pinpointed by by Michael Cree.
+
+ Commit c7680befe5ae removed Jensen support, but at the same time broke
+ support for dense memory systems.
+
+ Signed-off-by: Matt Turner <mattst88@gmail.com>
+ (cherry picked from commit 9625f6d328d6f516520930227b218979309938bc)
+
+commit e116bebb1324c5cdb806a70683ca747321c536b0
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Oct 13 13:15:05 2009 +1000
+
+ dix: extend IsPointerDevice check to valuator-only devices.
+
+ A device with valuators but no keys is definitely a pointer device and needs
+ to be attached to the VCP. Otherwise, the class copying happens on the VCK
+ and the VCP isn't updated with the events that are to be sent through it.
+ This addresses the trigger for #24441, not the actual issue.
+ Jury is still out on valuator+key devices.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 72f5874434c0c015b671c492c1318f35f1793668)
+
+commit f6cb78e476132b201334655f0015a2c727434fbf
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Tue Oct 13 12:54:56 2009 -0700
+
+ Rootless: src drawable window can now be NULL
+
+ Fix a possible crash when pSrc->pDrawable is NULL.
+
Reply to: