summaryrefslogtreecommitdiff
path: root/xserver/ChangeLog
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2010-12-05 15:36:12 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2010-12-05 15:36:12 +0000
commita90ee792d96752ad1b71b9ada922fa6afe478c99 (patch)
tree6143b00f7646951d23dfe2a4fe2992ca40b77069 /xserver/ChangeLog
parentbc97d4ecc0aa9e1b823565b07282f848700bd11a (diff)
Upgrade to xorg-server 1.9.2.
Tested by ajacoutot@, krw@, shadchin@ and jasper@ on various configurations including multihead with both zaphod and xrandr.
Diffstat (limited to 'xserver/ChangeLog')
-rw-r--r--xserver/ChangeLog7352
1 files changed, 6606 insertions, 746 deletions
diff --git a/xserver/ChangeLog b/xserver/ChangeLog
index 4fe2ab1be..3a79c2e38 100644
--- a/xserver/ChangeLog
+++ b/xserver/ChangeLog
@@ -1,27 +1,2302 @@
-commit 4f9df125750ac8df0f58fdc44a3a29c3371ce6b6
+commit e3769c20d5f656f76e2c475a722db97c58089260
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sat Oct 30 19:49:42 2010 -0700
+
+ Bump version to 1.9.2
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit e0ab016d85f828a78cb53ee9bcb171535de6032e
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sat Oct 30 19:48:22 2010 -0700
+
+ Revert "rootless: Remove ROOTLESS_WORKAROUND"
+
+ Christof Wolf has reported a regression that seems to be caused by
+ this change, so reverting the change in the 1.9 branch. We'll
+ investigate a proper fix in master for 1.10.
+
+ This reverts commit c89f0521044083a11d538ebfeaabee6fc7fb9a03.
+
+commit 6e1f78bddfb854933206f9f5fd8d1dfc66ba8820
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Fri Oct 22 20:18:38 2010 -0700
+
+ Bump version to 1.9.1
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 4dd316f25261707620cd4c52e2987b93627ff260
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Fri Oct 15 11:08:42 2010 -0700
+
+ Bump version to 1.9.0.902 (1.9.1 rc2)
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 712853fbcbc644575d791fa48fbd5757cd850f1d
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Wed Oct 13 17:34:31 2010 +0100
+
+ event_size is currently never assigned to in mieqProcessInputEvents().
+
+ event_size is never assigned to in mieqProcessInputEvents(), so realloc()
+ is always called. This is benign, but I'm guessing not intended.
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit da4eebe58ec81e2297cc1773af1fb622fb392bbd)
+
+commit efeb2ebd7e307224a735469ff89a3a6af4cf143b
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Oct 5 11:24:28 2010 -0400
+
+ vbe: Fix copying the mode info block
+
+ Just use memcpy, seriously.
+
+ Reviewed-by: Rémi Cardona <remi@gentoo.org>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 853d7ebfa3e2d281d92890a39010ff5787a00ffd)
+
+commit e5b19f14eac609e3c315e14e20ca1935de8de0e3
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Tue Oct 12 17:42:55 2010 -0700
+
+ Revert "dix: don't create core motion events for non-x/y valuators."
+
+ Reverting due to fallout discussed in bug #30267. See:
+ https://bugs.freedesktop.org/show_bug.cgi?id=30267
+
+ This reverts commit d4ef63f602325a9920dc1cbf64e3969dfa394d5f.
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 8ab87dc7ff48d4db8e5f95a74df627dac9c53c0a
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Fri Oct 1 13:37:49 2010 -0700
+
+ Bump version to 1.9.0.901 (1.9.1 rc1)
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 5fb1780d6a44c7fca5143e5f456259499ddb0852
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Fri Oct 1 14:05:03 2010 -0700
+
+ test: Fix make distcheck when not building unit tests
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 4d2542a16bd955ae448cc2cb160d1e0f2d9c291b
+Merge: 5b64f85 560e425
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Thu Sep 30 00:19:24 2010 -0700
+
+ Merge remote branch 'ajax/server-1.9-xfree86' into server-1.9-branch
+
+commit 5b64f85b1b34d42f581db617ce3f3f7b12e6cdf8
+Author: Tobias Droste <tdroste@gmx.de>
+Date: Wed Sep 29 22:51:48 2010 +0200
+
+ randr: set error numbers of resource types in RRExtenstionInit() (V2)
+
+ Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=30367
+
+ Currently the ddx calls xf86RandR12Init()
+ (-> RRScreenInit()
+ -> RRInit()
+ -> RRModeInit()
+ -> RRCrtcInit()
+ -> RROutputInit())
+ before RRExtensionInit() is called. This causes RRErrorBase
+ being 0 while setting resource type error values (resource types:
+ RROutput, RRMode and RRCrtc). The fix moves the setting of error
+ values to own functions which are called in RRExtensionInit()
+ to get the right RRErrorBase.
+
+ V2: With header file
+
+ Signed-off-by: Tobias Droste <tdroste@gmx.de>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit c7e4222c9a27094ce4fc2831ac92acbb7b21fb1a)
+
+commit 560e4254997df26b6abaa93ca2f59bcf7f68d551
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Sep 27 17:06:46 2010 -0400
+
+ xfree86: Add 18bpp support
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 9df4fb0adf66fb82f0c007897d79af0f54a6dad9)
+
+commit 5ae0c0cdb29dd35e0c10e6429e0df59f064a5c73
+Author: Macpaul Lin <macpaul@andestech.com>
+Date: Tue Sep 21 15:13:34 2010 +0800
+
+ xfree86: nds32: add nds32 support for compiler related mmio codes
+
+ Add nds32 support for compiler related mmio codes.
+ It includes byte-swap or non-swap operations.
+
+ Signed-off-by: Macpaul Lin <macpaul@andestech.com>
+ Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 58bd317e29f4abf7f950891339d2a6a78ddf7903)
+
+commit dfef37797c79d767d156a356ad7ea69316d4f693
+Author: Macpaul Lin <macpaul@andestech.com>
+Date: Tue Sep 21 15:13:33 2010 +0800
+
+ xfree86: nds32: add nds32 support for compiler specific codes
+
+ Add nds32 definitions and related assembly codes to compiler header files.
+
+ Signed-off-by: Macpaul Lin <macpaul@andestech.com>
+ Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 28e6de66b42062a885ba38416387f2dbc15707fd)
+
+commit 7c016917b0fb5ab06f04f48914f78591482abb12
+Author: Macpaul Lin <macpaul@andestech.com>
+Date: Tue Sep 21 15:13:32 2010 +0800
+
+ xfree86: nds32: add nds32 definition for vgaHW support.
+
+ Add __nds32__ definitions for vgaHW support.
+
+ Signed-off-by: Macpaul Lin <macpaul@andestech.com>
+ Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 2b24b2bd859a4b4b8ccaf3b7d1b529dcda2d3b94)
+
+commit 8d6e2e9906fb0389db2b777d9d8bc2373f537f88
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Jul 23 14:48:32 2010 +1000
+
+ xfree86: fix compiler warning about implicied decl of DuplicateModule.
+
+ ../../../../hw/xfree86/common/xf86Xinput.c: In function ‘xf86AllocateInput’:
+ ../../../../hw/xfree86/common/xf86Xinput.c:722: warning: implicit
+ declaration of function ‘DuplicateModule’
+ ../../../../hw/xfree86/common/xf86Xinput.c:722: warning: nested extern
+ declaration of ‘DuplicateModule’
+ ../../../../hw/xfree86/common/xf86Xinput.c:722: warning: assignment makes
+ pointer from integer without a cast
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+ (cherry picked from commit 3cc5e4422430e9ca44615f3e63feccd2e5729046)
+
+commit 223794505e64ab5aa215f4847822d66cd6f3450f
+Author: Jesse Adkins <jesserayadkins@gmail.com>
+Date: Wed Aug 4 09:21:31 2010 +0000
+
+ xfree86: Fix leaks in OpenConfigFile and OpenConfigDir
+
+ [mattst88: fixed whitespace and a missing semicolon]
+
+ Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
+ Signed-off-by: Matt Turner <mattst88@gmail.com>
+ (cherry picked from commit 18b62e0479f15e965611880ada6e0195367df025)
+
+commit 6a0b4051972a4fa6f1a3b22ec1ae54bd1849bc9f
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Tue Aug 3 12:51:51 2010 -0700
+
+ XQuartz: RandR: Refactor legacy mode-switching to be better integrated with RandR
+
+ Adds three new functions
+ void QuartzRandRSetFakeRootless (void);
+ void QuartzRandRSetFakeFullscreen (void);
+ void QuartzRandRToggleFullscreen (void);
+
+ The first two are identical to requesting the fake modes from a RandR client
+ The third responds to cmd-alt-a to leave fullscreen or RandR.
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+ (cherry picked from commit c45bea0c044ad37bedb42209f7e6ea8b587999f0)
+
+commit abfb3c7994ee4459d2de93083e4d5ba388095d55
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Mon Jul 26 23:34:49 2010 -0700
+
+ XQuartz: RandR: Don't change the rootless preference when changing RandR mode
+
+ Also renames a bunch of other variables for better consistency.
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+ (cherry picked from commit 229323a19b06f80d9b03f487e598b933b9b31d87)
+
+commit 92b3dc67eef47db336674cf55ced4af40a6c29d7
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Mon Jul 26 11:45:59 2010 -0700
+
+ XQuartz: RandR: Better handle switching betwen RandR modes that share CG modes
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+ (cherry picked from commit 721edc69c3597578d3e7f711769ff0195af6068a)
+
+commit 0402a4409641598427c7d3385aa006964ae0b75a
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Mon Jul 26 01:17:12 2010 -0700
+
+ XQuartz: RandR: Respond better to resolution changes made outside X
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+ (cherry picked from commit 026a47e21226b64eb9a7624ada3d74c3fe5fa763)
+
+commit e540c517a831a256a6e76a8c2b92629fe87aa8df
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sun Jul 25 22:25:49 2010 -0700
+
+ XQuartz: RandR: Use deprecated CG APIs only on Leopard and earlier
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+ (cherry picked from commit 59cd93f48a3a0a34781d4a94a3cd05a575e2d4ba)
+
+commit e4918634ab166b72d9d44663d69443e13f153fd7
+Author: Jan Hauffa <hauffa@in.tum.de>
+Date: Fri Jul 16 17:56:44 2010 +0200
+
+ XQuartz: RandR: Remove FAKE_RANDR code.
+
+ Signed-off-by: Jan Hauffa <hauffa@in.tum.de>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+ (cherry picked from commit 629c3f473b7415069a87ef4717ec3d701978dc48)
+
+commit b374b9e68a8d8f18a8220e90a98d983ec4068938
+Author: Jan Hauffa <hauffa@in.tum.de>
+Date: Fri Jul 16 17:54:55 2010 +0200
+
+ XQuartz: RandR: Toggle rootless mode on XRandR mode switch.
+
+ Report a fake screen mode that corresponds to the screen mode at startup of the
+ server excluding the height of the menu bar. If a client requests this mode,
+ rootless mode is enabled. In all other modes, the root window is shown.
+
+ Signed-off-by: Jan Hauffa <hauffa@in.tum.de>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+ (cherry picked from commit 97b5f5306437bfd13390485fc7a58a363c261ec9)
+
+commit 29e9c25efb3e006b22019575fdb9ec1cc958c096
+Author: Jan Hauffa <hauffa@in.tum.de>
+Date: Fri Jul 16 17:18:03 2010 +0200
+
+ XQuartz: RandR: Implement basic RandR functionality.
+
+ Querying and changing of resolution and refresh rate is supported,
+ rotation is not implemented yet.
+
+ Signed-off-by: Jan Hauffa <hauffa@in.tum.de>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+ (cherry picked from commit 2d411472c2915614bdeb8fdc15d19dae4621444d)
+
+commit f939ab0175e1662f5df664449cba5d72fa1dbe1c
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Sep 27 17:30:13 2010 +0100
+
+ modes: Beware the driver switching root pixmaps
+
+ Program received signal SIGSEGV, Segmentation fault.
+ 0x080d4a2d in xf86RandR12ScreenSetSize (pScreen=0x8dca3a0, width=800,
+ height=600, mmWidth=210, mmHeight=157)
+ at ../../../../hw/xfree86/modes/xf86RandR12.c:731
+ 731 ../../../../hw/xfree86/modes/xf86RandR12.c: No such file or directory.
+ in ../../../../hw/xfree86/modes/xf86RandR12.c
+ (gdb) bt full
+ height=600, mmWidth=210, mmHeight=157)
+ at ../../../../hw/xfree86/modes/xf86RandR12.c:731
+ randrp = 0x8dcae68
+ pScrn = 0x8dbeb28
+ config = <value optimized out>
+ pRoot = 0x8e08e30
+ pScrnPix = 0xb6d12008
+ ret = 1
+ c = <value optimized out>
+ mmWidth=210, mmHeight=157) at ../../randr/rrscreen.c:185
+ No locals.
+ at ../../randr/rrscreen.c:307
+ pWin = 0x8e08e30
+ pScreen = 0x8dca3a0
+ i = <value optimized out>
+ rc = 0
+ ../../randr/randr.c:485
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+ Cc: Julien Cristau <jcristau@debian.org>
+ Tested-by: Julien Cristau <jcristau@debian.org>
+ Cc: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit fdabcec57ae0fdc9910060609bb0848552c1db4d)
+
+commit 3ea7d271c8847a3135442ea24b8d5ff81d5e20b7
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Fri Aug 27 10:20:29 2010 -0700
+
+ os: Return BadLength instead of disconnecting BigReq clients (#4565)
+
+ If a client sends a big request that's too big (i.e. bigger than
+ maxBigRequestSize << 2 bytes), the server just disconnects it. This makes the
+ client receive SIGPIPE the next time it tries to send something.
+
+ The X Test Suite sends requests that are too big when the test specifies the
+ TOO_LONG test type. When the client receives SIGPIPE, XTS marks it as
+ UNRESOLVED, which counts as a failure.
+
+ Instead, remember how long the request is supposed to be and then return that
+ size. Dispatch() checks the length and sends BadLength to the client. Then,
+ whenever oci->ignoreBytes is nonzero, ignore the data read instead of trying to
+ process it as a request.
+
+ Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit cf88363db0ebb42df7cc286b85d30d7898aea840)
+
+commit 3b687814a5b999305042775a2bddc3c10706f6da
+Author: Kristian Høgsberg <krh@bitplanet.net>
+Date: Thu Sep 23 09:04:11 2010 -0400
+
+ glx: Fix use after free in DrawableGone
+
+ (note that nearly identical patches were proposed by Kristian and Chris)
+
+ Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+ Reported-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+ Tested-by: Chris Wilson <chris@chris-wilson.co.uk>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 2f0abd7d690c3bcce2a80c093a0880f43e56d8cb)
+
+commit 57d454758994312b8572a753501dd1e5c89b4f7e
+Author: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Thu Sep 2 10:53:28 2010 +0200
+
+ linux: Don't lose console events on non-evdev drivers (#29969)
+
+ The drain_console() function will race with new keyboard events being added
+ by the hardware causing the server to lose keyboard events if the console fd
+ is used for input.
+
+ Only use the drain_console() when AllowEmptyInput is off which is the best
+ indicator we have for whether the keyboard driver will be used. This patch
+ will only fix the bug when hotplugging is disabled.
+ What we really need is a way to figure out either whether we're _not_ using
+ the keyboard driver (not predictable) or a way for the keyboard driver to
+ disable drain_console().
+
+ X.Org Bug 29969 <http://bugs.freedesktop.org/show_bug.cgi?id=29969>
+
+ Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 71972c2534d490284d3d42b456c2f34b964b2894)
+
+commit 918cb214ab4240be4772a141d1209c0ff5dfd63b
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Aug 23 08:35:01 2010 +1000
+
+ xfree86: Check for existence of button class before dereferencing it.
+
+ The Irxon Super Mini Bluetooth Wireless Keyboard for PC/PDA/Cell Phones
+ keyboards have axes but not buttons. The evdev driver doesn't set up a
+ button class for these keyboards and a motion event handled by
+ DGAProcessPointerEvent dereferences the dev->button NULL pointer, causing a
+ server crash.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit e00e2e7b68fbc932269d607ac5dc2c441d07ad9d)
+
+commit 5a29cb126de577a2a0a41e10d9af13091a73d334
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Aug 24 13:46:35 2010 +1000
+
+ dix: don't set time to CurrentTime in DeviceChangedEvents.
+
+ CurrentTime is used by clients to skip setting the time, but not by the
+ server.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 86560b5d05f14bdf04d21b3457a66c0d5045db9c)
+
+commit 72e3e6f4a7690f70a6b5f7689633cdea859535e1
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Aug 23 13:20:09 2010 +1000
+
+ dix: fix crash when removing devices on a buttonless MD pointer (#29669)
+
+ If the master does not have a button class, recalculating the number of
+ buttons required for this master dereferences a NULL pointer. Guard against
+ this, if the master pointer doesn't have a button class, it doesn't need to
+ update it's number of buttons.
+
+ Reproducible:
+ Two devices on the same master, device NB with axes but no buttons, device
+ A+B with axes and button .
+ If NB was the last one to send an event through the master when A+B is
+ removed from the server, master->button is NULL and leads to the above
+ NULL-pointer dereference.
+
+ X.Org Bug 29669 <http://bugs.freedesktop.org/show_bug.cgi?id=29669>
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit ff055506f0cbb852bed17acb9f9bbf1d715a854e)
+
+commit 0f3a0ab1f01ec5314ccb0bfb932c49f8c61b9866
+Author: Chase Douglas <chase.douglas@ubuntu.com>
+Date: Wed Sep 1 14:45:34 2010 +1000
+
+ Fix udev population of Bluetooth input device product IDs
+
+ The udev device_added function takes the vendor and model IDs of added
+ devices and converts them into an attribute that can be matched for by
+ an InputClass configuration using MatchUSBID. Currently, the udev
+ mechanism works for USB devices, but fails to work properly for
+ Bluetooth devices. The product IDs of the event node are actually the
+ IDs of the Bluetooth receiver instead of the device.
+
+ This patch reads the product ID from the PRODUCT property of the parent
+ of the added device. This tag is set correctly for both USB and
+ Bluetooth input devices. The following devices have been tested by
+ specifying individual InputClass sections in xorg.conf:
+
+ * Apple Keyboard (Bluetooth)
+ * Apple Magic Trackpad (Bluetooth)
+ * Apple Magic Mouse (Bluetooth)
+ * Microsoft Bluetooth Notebook Mouse 5000 (Bluetooth)
+ * Microsoft IntelliMouse Optical (USB)
+ * N-Trig Touchscreen (USB)
+ * Wacom Bamboo Touch (USB)
+
+ 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 7925e8945649d4af237e6c3c5593b895a461bd1e)
+
+commit a0040f9870c78fd1f7e7ac81555cb783c152e287
+Author: Jesse Adkins <jesserayadkins@gmail.com>
+Date: Wed Aug 25 13:48:29 2010 -0700
+
+ xfree86: Document terminate not mapped by default (bug 25083)
+
+ Document that terminate is not mapped to Ctrl+Alt+Backspace by default, to help alleviate some confusion.
+
+ Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 4a12aecac670debd0dafb17c245fccb93eea2d60)
+
+commit 34b11fcd90258a70c02a04a13598b4a4af2c2974
+Author: David Ge <davidqge@gmail.com>
+Date: Thu Aug 19 00:33:57 2010 -0500
+
+ xkb: Fix RedirectKey didn't send any event.
+
+ Xorg.log shows error: Valuators reported for non-valuator device.
+ This is caused by uninitialized valuators.mask in _XkbFilterRedirectKey(),
+ which trigger the error in UpdateDeviceState().
+
+ Signed-off-by: David Ge <davidqge@gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit a90052ba8697e217b0dc68057d7b9202ae8797db)
+
+commit 0062d94cafcea5a2fea6224904188d1435c1983f
+Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
+Date: Mon Jul 26 15:31:03 2010 +0300
+
+ xkb: Check if AddResource failed
+
+ Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit b5c9953bbf4ffd11f1a70d058c6d3feb2bd1bca8)
+
+commit eecf91150d4c17fe73913fd6c24064c0394fb40e
+Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
+Date: Thu Jul 22 15:11:27 2010 +0300
+
+ xkb: Fix memory leak in error path
+
+ map is allocated but not freed if reply length and data don't match.
+
+ Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit adc0697cfcfba295a15d7a307125093cbccd637f)
+
+commit b912c08ffa09ec9d7c55db7df1df622dd4b6ab64
+Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
+Date: Thu Jul 22 11:33:33 2010 +0300
+
+ xkb: Fix memory leak if opening file fails
+
+ If fopen fails pointer in buf would be overwriten with a new pointer.
+
+ Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 1223340644744c0b38aa85f5956eb5ab7c696517)
+
+commit d4ef63f602325a9920dc1cbf64e3969dfa394d5f
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Aug 17 12:08:52 2010 +1000
+
+ dix: don't create core motion events for non-x/y valuators.
+
+ Devices that send motion events with valuators other than x/y get core
+ motion events with unchanged x/y coordinates. This confuses some
+ applications.
+
+ If the DeviceEvent does not have the x/y valuators set, return BadMatch on
+ core conversion, thus skipping the event altogether.
+
+ Reported-by: Bartosz Brachaczek <b.brachaczek@gmail.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Tested-by: Bartosz Brachaczek <b.brachaczek@gmail.com>
+ (cherry picked from commit de8be07cc0a8163b6ef04455706fd5ca2cebe587)
+
+commit d0ca4826d6dca7c43965e4606a31e90091207412
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sat Sep 11 14:25:21 2010 -0700
+
+ XQuartz: Localization updates
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+ (cherry picked from commit 0a3e6b0345a96aae278dd776c00b5a7c7ccf65af)
+
+commit c89f0521044083a11d538ebfeaabee6fc7fb9a03
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sun Aug 15 20:07:28 2010 -0700
+
+ rootless: Remove ROOTLESS_WORKAROUND
+
+ This was already removed for XWin (20701522be803fe47e921fcf059dadf64c7f287d)
+ with no reported side effects. XQuartz seems to be behaving ok without it as
+ well. While this possibly brings back bug #1168, we don't have any reproduction
+ steps for that issue, and if it crops up again, we should fix it a real way
+ rather than this hokey workaround which doesn't even work for COMPOSITE.
+
+ This effectively reverts the following two changes:
+ b2135e589baeb2ea26da50b9167feaea23bcce3c
+ d7fef52254126aa5897a5c58faeda1f61d5b13d8
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+ Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ (cherry picked from commit 4e09a69c5b1f3c8d6f2f92ec24aaab3a1119940c)
+
+commit e615acf06feabd4de695d1237aa3891957428999
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date: Mon Aug 30 16:37:05 2010 -0400
+
+ Add screens to the PRIVATE_XSELINUX set.
+
+ The SELinux extension does store a security label in the screen
+ devPrivates. Fixes crash caused by overwriting another private.
+
+ Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
+ Reported-by: Justin Mattock <justinmattock@gmail.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 9a1a4ccbe026f34beca5db3b2243874906961b49)
+
+commit ad62b2400907bf856ece615197066aad02503716
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date: Mon Aug 23 16:04:03 2010 -0400
+
+ Fix property and selection devPrivate allocation.
+
+ Selection objects were not being allocated with privates, and both
+ objects had a stray statement that zeroed out the devPrivates field.
+
+ Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
+ Reported-by: Justin Mattock <justinmattock@gmail.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 9ef6241c2382bfc555284a4985f6d1e37d750d6f)
+
+commit 79ee78de9de49d0cab03401662baa476a18e53b8
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Aug 20 17:32:27 2010 -0700
+
+ xserver 1.9.0
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 3e56efcfb63677cd8574e1e435e61d96f79ea536
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Aug 20 10:01:48 2010 -0700
+
+ fb: make isClipped always reject negative coordinates (bug 11503)
+
+ A window with either dimension > 32767 can be positioned such that
+ coordinates > 32767 are visible on the screen. Attempts to draw to
+ those pixels will generate coordinates wrapped around to negative
+ values.
+
+ The optimized clipping macro, 'isClipped', in fbbits.h, computes
+ clipping in window space rather than screen space using int16 values,
+ and so it too has coordinates wrapped around to negative values and
+ hence ends up accepting the wrapped drawing coordinates.
+
+ Two possible fixes for this problem
+
+ 1) Detect wrapped region coordinates and clip those to 32767.
+ 2) Detect negative incoming coordinates and reject those
+
+ This patch takes the second approach as it is much shorter, simply
+ detecting when either X or Y incoming coordinate is negative, which
+ can never be 'within' any drawable.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 951605b4660290044fb238bcf1d6d9e498567e8c
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Aug 20 13:51:04 2010 +0100
+
+ edid: Adjust rounding of max_clock
+
+ A simple hack to accommodate various EDID who have detailed modes that
+ exceed the EDID's max pixel clock. The pixel clock is only defined in
+ units of 10MHz and often appears as the maximum pixel code of the
+ detailed modes, rounded to the nearest 10MHz. Adjusting the max_clock to
+ include an extra 5MHz prevents the parser from rejecting the detailed
+ modes.
+
+ The kernel uses the same fuzz and by including it in X we can use the
+ same modes in X as for the console.
+
+ Fixes:
+
+ Bug 23833 - X uses different refresh rate to that set by kernel module
+ https://bugs.freedesktop.org/show_bug.cgi?id=23833
+
+ In the future, we will want to try harder to keep the KMS modes but at
+ the same time we need to apply the restrictions as specified by the
+ user's configuration, and need to fill in modes for fullscreen games on
+ fixed-mode panels.
+
+ Reported-and-tested-by: Fabio Pedretti <fabio.ped@libero.it>
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+ Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 7e581780603d6b15291d032efdeeca77f969e0ba
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Jun 24 12:24:58 2010 +0100
+
+ glx: Prevent NULL context deref in __glXGetDrawable() (bug 29184)
+
+ During a SwapBuffers request, we may end up querying an unknown drawable
+ outside of an active context, and so need to report this error prior to
+ attempting to dereference the NULL context.
+
+ Also fixes:
+
+ [Bug 29184] glXSwapBuffers with no GLX context crashes X.
+ https://bugs.freedesktop.org/show_bug.cgi?id=29184
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+ Cc: Kristian Høgsberg <krh@bitplanet.net>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 5725849a1b427cd4a72b84e57f211edb35838718
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Jun 28 18:08:50 2010 -0400
+
+ render: Bounds check for nglyphs in ProcRenderAddGlyphs (#28801)
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit fc091936e2bddbbab9c9a501edc5a5f08388617e
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Aug 16 14:18:45 2010 +1000
+
+ dix: copy the valuators passed into GPE/GKVE/GProxE.
+
+ GPE and friends modify the valuators array passed in. Which means any driver
+ using e.g. xf86PostButtonEventP(..., valuators) twice to emulate a button
+ click will provide garbage data on the second run.
+
+ This is currently affecting the wacom driver, xf86PostButtonEventP() with
+ valuators is required to have input events with device-specific axis values.
+ Passing the same valuators in twice, once with press, once with release,
+ will see the valuators modified in the first call and garbage submitted in
+ the next one.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 6e3e559e9fa63069a10eb834a6dab9a4cfc140ee
+Author: Keith Packard <keithp@keithp.com>
+Date: Sun Aug 15 20:53:20 2010 -0700
+
+ dix: reset pScreen->root to NULL when root window is deleted.
+
+ From: Dave Airlie <airlied@linux.ie>
+
+ We were seeing a crash in the FreeAllResources codepath,
+ running valgrind revealed this,
+
+ ==12536== Invalid read of size 4
+ ==12536== at 0x810BCAB: DeliverPropertyEvent (rrproperty.c:33)
+ ==12536== by 0x80958A4: TraverseTree (window.c:227)
+ ==12536== by 0x809593E: WalkTree (window.c:255)
+ ==12536== by 0x810BC66: RRDeliverPropertyEvent (rrproperty.c:53)
+ ==12536== by 0x810BD5D: RRDeleteProperty.clone.0 (rrproperty.c:76)
+ ==12536== by 0x810BD98: RRDeleteAllOutputProperties (rrproperty.c:88)
+ ==12536== by 0x810A36E: RROutputDestroyResource (rroutput.c:407)
+ ==12536== by 0x808DF4E: FreeClientResources (resource.c:859)
+ ==12536== by 0x808E005: FreeAllResources (resource.c:876)
+ ==12536== by 0x8062300: main (main.c:305)
+ ==12536== Address 0x46ba8ac is 4 bytes inside a block of size 164 free'd
+ ==12536== at 0x40057F6: free (vg_replace_malloc.c:325)
+ ==12536== by 0x8087F1F: _dixFreeObjectWithPrivates (privates.c:357)
+ ==12536== by 0x809832A: DeleteWindow (window.c:926)
+ ==12536== by 0x808DF4E: FreeClientResources (resource.c:859)
+ ==12536== by 0x808E005: FreeAllResources (resource.c:876)
+ ==12536== by 0x8062300: main (main.c:305)
+
+ Its a use after free on the root window, since we have already deleted it
+ at this point. This patch checks if the window we are destroying is the root
+ window and resets the pointer to NULL if it is.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+ Tested-by: Dave Airlie <airlied@redhat.com>
+
+commit 5d1d9d9ae39fab2ee2ac085f9776f82768828dc8
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sun Aug 1 11:41:58 2010 -0700
+
+ XQuartz: xpr: Bail on errors during unlock and destroy
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit ee7fd8fc58d9fadfbb92302ddea224537f068538
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sun Aug 1 11:39:14 2010 -0700
+
+ XQuartz: UpdateScreen at the end of SetRootless
+
+ This will ensure that pRoot is unlocked after the miPaintWindow
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 4fc4cab98d454afbfd0d2f48548b5b481e8e7c82
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Thu Jul 29 14:49:10 2010 -0700
+
+ XQuartz: Make application switching work better for the no-spaces case
+
+ We still have the issue with not raising the frontmost window for the case
+ when spaces is enabled, and the AppleSpacesSwitchOnActivate preference is
+ disabled.
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit e5bc62a03289f956c54c4699edf47f7ff237b5be
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sun Jul 25 22:29:11 2010 -0700
+
+ XQuartz: Ignore kXquartzToggleFullscreen when rootless
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 71af1f71c0492c365707c6b3810f94642ff39352
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Aug 12 23:01:59 2010 -0700
+
+ Bump to version 1.8.99.906 (1.9 RC6)
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 0af322858e86665ee43f065741318e69c2755510
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Aug 12 22:56:36 2010 -0700
+
+ Silence GCC warning about uninitialized lastSlave variable
+
+ Not an actual bug, but gcc can't tell that this variable cannot be
+ used without being initialized
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit b5cf9c5090d15a50b105470900823f2d398d4bd2
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Aug 12 00:09:01 2010 -0700
+
+ Stop checking or calling PtrCtrlProcs
+
+ None of them do anything useful now that pointer acceleration is
+ entirely handled in the server. (Does not completely nuke yet,
+ since that would be an API/ABI break.)
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit bce12f2956f23c0ee53f7f6485dba631293a0931
+Author: Jesse Adkins <jesserayadkins@gmail.com>
+Date: Wed Aug 4 23:39:14 2010 -0700
+
+ xfree86: parser: Never use constant strings for driver names (fixes #17438)
+
+ When the parser sees the "keyboard" driver, it automatically (and
+ silently) replaces it with the constant string "kbd".
+ Everybody else uses malloc'd memory for the driver name, so input
+ device closure assumes it can use free.
+ Free val.str, so this crash doesn't turn into a memory leak. Whew.
+
+ Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 619ca32202cd22f2a408586cbc906b8bbaeb9358
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Jul 28 15:08:27 2010 +1000
+
+ Xi: reset the unused classes pointer after copying
+
+ After copying the unused_classes into the device, reset the original
+ pointer. Otherwise we have two pointers pointing to the same field and both
+ get freed on device removal.
+
+ Some classes already have this behaviour since 51c8fd69.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 1a172f3297369a72865232c382abfc14281102a4
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Jul 23 13:24:34 2010 +1000
+
+ xkb: if the button isn't down, don't fake an event.
+
+ If the button we're about to fake isn't down (or up), don't fake a release
+ (or press) event for it. Behaviour is the same as before, this just saves
+ a few cycles.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 651c36e95ec0ac60d3fb98966df4218712ae78c2
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Jul 23 11:46:30 2010 +1000
+
+ xkb: post-fix PointerKeys button events with a DeviceChangedEvent.
+
+ commit 14327858391ebe929b806efb53ad79e789361883
+ xkb: release XTEST pointer buttons on physical releases. (#28808)
+ revealed a bug with the XTEST/PointerKeys interaction.
+
+ Events resulting from PointerKeys are injected into the event processing
+ stream, not appended to the event queue. The events generated for the fake
+ button press include a DeviceChangedEvent (DCE), a raw button event and the
+ button event itself. The DCE causes the master to switch classes to the
+ attached XTEST pointer device.
+
+ Once the fake button is processed, normal event processing continues with
+ events in the EQ. The master still contains the XTEST classes, causing some
+ events to be dropped if e.g. the number of valuators of the event in the
+ queue exceeds the XTEST device's number of valuators.
+
+ Example: the EQ contains the following events, processed one-by-one, left to
+ right.
+
+ [DCE (dev)][Btn down][Btn up][Motion][Motion][...]
+ ^ XkbFakeDeviceButton injects [DCE (XTEST)][Btn up]
+
+ Thus the event sequence processed looks like this:
+
+ [DCE (dev)][Btn down][Btn up][DCE (XTEST)][Btn up][Motion][Motion][...]
+
+ The first DCE causes the master to switch to the device. The button up event
+ injects a DCE to the XTEST device, causing the following Motion events to be
+ processed with the master still being on XTEST classes.
+
+ This patch post-fixes the injected event sequence with a DCE to restore the
+ classes of the original slave device, resulting in an event sequence like
+ this:
+ [DCE (dev)][Btn down][Btn up][DCE (XTEST)][Btn up][DCE (dev)][Motion][Motion]
+
+ Note that this is a simplified description. The event sequence injected by
+ the PointerKeys code is injected for the master device only and the matching
+ slave device that caused the injection has already finished processing on
+ the slave. Furthermore, the injection happens as part of the the XKB layer,
+ before the unwrapping of the processInputProc takes us into the DIX where
+ the DCE is actually handled.
+
+ Bug reproducible with a device that reports more than 2 valuators. Simply
+ cause button releases on the device and wait for a "too many valuators"
+ warning message.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Acked-by: Daniel Stone <daniel@fooishbar.org>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 6dae7f3792611aace1df0cca63bf50c50d93de43
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Aug 10 19:30:20 2010 +0100
+
+ xace: Invalid reference to out-of-scope data.
+
+ The callback data passed by reference to the hook was allocated on stack
+ within the scope of the case statement. The compiler is free to reuse
+ any of that stack space whilst making the function call so we may end up
+ passing garbage into the callback.
+
+ References:
+
+ Bug 18451 - Xorg server 1.5.2 SEGV during XFixesGetCursorImage()
+ https://bugs.freedesktop.org/show_bug.cgi?id=18451
+
+ v2: Drop the unrelated hunk that snuck in when ammending the commit
+ message.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit fbd02046797185715e1a120d52e410ec78fc365f
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Thu Aug 5 15:19:20 2010 +0100
+
+ Cygwin/X: Fix glxWinCreateDrawable() for API change
+
+ Commit 9de0e31746d5f0d9d39d11c94ec3cbc04a9935fc changed the signature
+ of __GLXScreen's createDrawable method.
+
+ Update the glxWinCreateDrawable() function in XWin's GLX provider
+ appropriately.
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Tested-by: Colin Harrison <colin.harrison@virgin.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit ff70848e623920779d20f35d47e9e1f34157de47
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri May 21 09:01:43 2010 -0700
+
+ Don't let alpha maps recurse in fb. Bug 23581.
+
+ Recursive alpha maps (where one picture's alpha map is set to a
+ picture with an external alpha map) would be all fine and dandy,
+ except for the case where the client constructs a loop. Detecting this
+ case when setting the alpha map values would be difficult as any time
+ an alpha map is set, the server would have to check for the looping
+ case.
+
+ Instead, a far simpler fix is to simply disallow recursive alpha maps
+ in the rendering code, the Render spec is ambiguous in this area and
+ allows us to to ignore the recursive case.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 70a94c5b7a42adc0995bf774c44587a0778be0d0
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Tue Aug 3 19:49:10 2010 +0100
+
+ rootless: fix uninitialized private key assert in non-rootless modes in Cygwin/X
+
+ IsFramedWindow() is called from miPaintWindow() if the server has
+ been built with ROOTLESS defined, irrespective of if RootlessInit()
+ has ever been called, or not.
+
+ Add a check to IsFramedWindow() to check if rootlessWindowPrivateKey
+ has been registered (as a proxy for checking if the rootless extension
+ has been initialized) so we don't go on to try to use that key,
+ triggering an assert.
+
+ This bug exposes what appears to be a difference in opinion about
+ the rootless extension between XQuartz and XWin. XQuartz always
+ initializes the rootless extension, whereas XWin offers several modes
+ of operation, and the rootless extension is only used for one of them
+
+ That probably means that the all code under compile time guard for
+ ROOTLESS should be carefully checked that it doesn't also need to be
+ under a run-time guard
+
+ (I've reviewed the other ROOTLESS blocks in dix/events.c and
+ dix/window.c and they look ok -- keithp)
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 3ab6cd31cbdf8095b2948034fce5fb645422d8da
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Aug 9 15:20:20 2010 -0400
+
+ fonts: Fix refcounting for asynchronous font operations (#3040)
+
+ When doing Xinerama, we'll dispatch font ops across all backend screens.
+ If using a font server (such that some operations can sleep), we'll put
+ the client to sleep once for each screen, but only wake up once, because
+ we're trying to keep track of the sleep count in _each_ screen's
+ closure.
+
+ Instead, just ask the core whether the client is already asleep.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 35c0dbe4b0a6ab790f4271325b8a0b16894daa8b
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Aug 8 10:03:08 2010 -0400
+
+ doc: add missing .gitignore for Xserver-DTrace
+
+ The dtrace doc was recently added in commit
+ 9c171d4aee695ab66e6db1ab92539557bd368cfa
+
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 05c4fe83fdc20b838fd59658478278dc31a55eb9
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Jul 30 17:43:24 2010 -0700
+
+ Check HAVE_XMLTO_TEXT before trying to use xmlto to make text files
+
+ Reported-by: Matt Turner <mattst88@gmail.com>
+ Tested-by: Gaetan Nadon <memsize@videotron.ca>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit a6fb7829ed9bf26c4c2a02c6ed075fb1b17f7b2a
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Mon Jul 26 19:55:27 2010 -0700
+
+ Xserver-spec: Update ChangeGC prototype, add ChangeGCXIDs
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+
+commit a817271d461e2f95dd7dc62cd1c7d123ce92f555
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Jul 22 23:57:57 2010 -0700
+
+ Update Xserver-spec for new devPrivates API
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Patrick E. Kane <pekane52@gmail.com>
+
+commit 40d598a4f84091db743ceef4d60752bb910c3e56
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Jul 22 23:57:02 2010 -0700
+
+ Correct function name in dixRegisterPrivateKey comments
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Patrick E. Kane <pekane52@gmail.com>
+
+commit 8d7b7a0d71e0b89321b3341b781bc8845386def6
+Author: Kristian Høgsberg <krh@bitplanet.net>
+Date: Thu Jul 29 20:36:25 2010 -0400
+
+ Set DamageSetReportAfterOp to true for the damage extension
+
+ Change the damage extension reporter to queue up events after we chain
+ to the wrapped functions. Damage events are typically sent out after
+ the rendering happens anyway, since we submit batch buffers from the
+ flush callback chain and then flush client io buffers. Compositing
+ managers relie on this order, and there is no way we could reliably
+ provide damage events to clients before the rendering happens anyway.
+
+ By queueing up the damage events before the rendering happens, there's
+ a risk that the client io buffer may overflow and send the damage
+ events to the client before the driver has even seen the rendering
+ request. Reporting damage events after the rendering fixes this
+ corner case and better corresponds with how we expect this to work.
+
+ Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit c65f610e12f9df168d5639534ed3c2bd40afffc8
+Author: Kristian Høgsberg <krh@bitplanet.net>
+Date: Thu Jul 29 18:52:35 2010 -0400
+
+ Always call the flush callback chain when we flush client buffers
+
+ We were missing the callback in a couple of places. Drivers may use
+ the flush callback to submit batched up rendering before events (for
+ example, damage events) are sent out, to ensure that the rendering
+ has been queued when the client receives the event.
+
+ Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 7e0575baf14ec4a89492fd2780f9ab5b9244afbd
+Author: Matt Turner <mattst88@gmail.com>
+Date: Tue Jul 27 23:32:36 2010 -0400
+
+ ddc: Fix memory leak in GetEDID_DDC1
+
+ Mark argument to DDC_checksum as const too.
+
+ Signed-off-by: Matt Turner <mattst88@gmail.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 750d4e82a0c1161292d24216bcff200cd6647611
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Thu Jul 29 11:39:40 2010 -0700
+
+ XQuartz: xpbproxy: Don't take down the whole server on an IO error
+
+ Calls pthread_exit to prevent _XIOError from calling exit()
+
+ This fixes http://xquartz.macosforge.org/trac/ticket/421
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 98f90145d786695ecbc02a667c6ffe7c619dc67e
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Wed Jul 28 18:08:02 2010 -0700
+
+ XQuartz: GLX: Don't mangle __GLXDrawable's pDraw
+
+ We were incorrectly NULLing out pDraw in __GLXDrawable instead of ours in
+ __GLXAquaDrawable. (we should refactor to eliminate this redundancy later)
+
+ This was causing http://xquartz.macosforge.org/trac/ticket/426
+ This was benign until commit f0006aa58f6cf7552a239e169ff6e7e4fda532f4
+ The root cause of this change was fed7ccc481ad1caaa518cafe944c2327a5d0b6c65
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 9c171d4aee695ab66e6db1ab92539557bd368cfa
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Jun 25 16:52:42 2010 -0700
+
+ Add documentation of the Xserver DTrace probes
+
+ Mostly pulled together from posts to my blog and the docs posted
+ at http://people.freedesktop.org/~alanc/dtrace/ and converted to
+ DocBook.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Patrick E. Kane <pekane52@gmail.com>
+
+commit 6b912b08ce65072b2401167fbf2150b99c0ca6b0
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Jun 19 23:56:20 2010 -0700
+
+ Add name argument to CreateNewResourceType documentation
+
+ Reflects API change made in commit 895f40792a during Xorg 1.8 development
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Patrick E. Kane <pekane52@gmail.com>
+
+commit 44c9350d72b3eda982c642feb45d6648afc626cf
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Jun 19 23:40:37 2010 -0700
+
+ Use DocBook stylesheets from xorg-sgml-doctools if they're available
+
+ Bumps minimum xorg-macros requirement from 1.6 to 1.10
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Patrick E. Kane <pekane52@gmail.com>
+
+commit 9fbbff3c0456f1969d45cc957d3260723caf62d7
+Merge: 95756f4 9ac8e20
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Jul 21 11:56:39 2010 -0700
+
+ Merge remote branch 'whot/for-keith'
+
+commit 9ac8e206ffe1016a8bc203261ade6c763a8a4f86
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Jul 15 15:46:15 2010 +1000
+
+ xkb: use GetMaster instead of dev->u.master.
+
+ Devices that are both pointers and keyboards are not affected by keyboard
+ changes as their master device is a master pointer, not a master keyboard.
+ Use GetMaster() instead to ensure devices that are attached to the paired
+ master pointer device will still be update.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+
+commit c54f81ba7a58faf37a612bd9a45276bb2922b5d8
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Jul 15 13:24:14 2010 +1000
+
+ dix: hack around enter/leave event issues for grabbed devices (#27804)
+
+ The current core enter/leave does not cater for device grabs during
+ enter/leave events. If a window W contains a pointer P1 and a client grabs a
+ pointer P2, this pointer will not generate enter/leave events inside this
+ window.
+
+ Hack around this by forcing grabbed devices to always send enter/leave
+ events.
+
+ X.Org Bug 27804 <http://bugs.freedesktop.org/show_bug.cgi?id=27804>
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 95756f410c65a6510a797e94a792b959d45cdb9e
+Author: Jan Hauffa <hauffa@in.tum.de>
+Date: Sat Jul 17 12:18:39 2010 -0700
+
+ rootless: Adjust the frame size of the native root window in RootlessResizeWindow
+
+ If the native root window isn't resized as well, we will likely crash the
+ next time we draw to the root. On OS X, this can be seen by:
+
+ 1) Put the display preferences in the menu bar and set X11's preferences so you
+ can access the menu bar in fullscreen mode
+ 2) Set the resolution of your screen lower than normal.
+ 3) Start X11 in fullscreen mode. The root window will cover the screen as
+ expected.
+ 4) Use the menu bar to increase the resolution of the display. The root
+ window will now cover the old area and not the full screen, but
+ 'xwininfo -root' will report the full width.
+ 5) Run 'xsetroot -solid red', and we have the crash you mention above.
+
+ Leaving/entering fullscreen after #4 will fix the problem. This is because the
+ WINREC is erased when we leave fullscreen mode and it is recreated upon
+ re-entry:
+
+ RootlessUpdateRooted(FALSE)
+ RootlessDisableRoot(screenInfo.screens[0])
+ RootlessDestroyFrame (pRoot, winRec);
+ RootlessUpdateRooted(TRUE)
+ RootlessEnableRoot(screenInfo.screens[0])
+ RootlessEnsureFrame(screenInfo.screens[0]->pRoot)
+ creates a new WINREC...
+
+ Signed-off-by: Jan Hauffa <hauffa@in.tum.de>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+ Acked-By: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit a2c13f0d6548310e3cd115cf486d3e43edf23dcc
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Jul 14 12:57:29 2010 -0700
+
+ Bump to version 1.8.99.905 (1.9 RC5)
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 0fc02c0bf92f694889589e3648acc08d4684de37
+Merge: 0540c46 9d8ec71
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Jul 13 15:05:36 2010 -0700
+
+ Merge remote branch 'jeremyhu/master'
+
+commit 0540c46066f938ad5611c56081cfcd8457a9b718
+Author: Michel Dänzer <daenzer@vmware.com>
+Date: Tue Jul 13 14:56:53 2010 +0200
+
+ EXA: Finish access to pixmap if it's prepared at destruction time.
+
+ Previously we assumed every pixmap destroyed during a software fallback was
+ also created during a software fallback and had access prepared, but that's
+ not always true.
+
+ Fixes a server abort
+ Reported-by: 邓逸昕 <bupt.dengyixin@gmail.com>
+
+ Signed-off-by: Michel Dänzer <daenzer@vmware.com>
+ Acked-by: Maarten Maathuis <madman2003@gmail.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit d75e8146c414bfd512ba5dbd4a83acb334bbe19b
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Jul 12 16:01:34 2010 -0700
+
+ Unwrap/rewrap EnterVT/LeaveVT completely, Fixes 28998
+
+ Because some EnterVT code needs to remove it self from the
+ call chain, we need to fix all of the wrappers to correctly
+ unwrap/rewrap during the call chain. This is a follow-on to the fix
+ for bug 27114 in commit 68a9ee8370e6f9b38218376ac92d5130a5b0ef1e.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Tested-by: Jesse Barnes <jesse.barnes@intel.com>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+ Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+
+commit 9d8ec712a67ce71ea7408f0626cda7e0fa7c3bac
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Tue Jul 13 08:56:36 2010 -0700
+
+ XQuartz: Bump bundle version to 2.6.0 for xorg-server-1.9.0 and X11R7.6
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit b2b9c458a46e9a41c3c76ffe83a2b580a41d0e90
+Author: Jan Hauffa <hauffa@in.tum.de>
+Date: Wed Jun 16 09:25:41 2010 -0700
+
+ XQuartz: Remove some dead code.
+
+ Signed-off-by: Jan Hauffa <hauffa@in.tum.de>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 648d189548530fa23d97d1e8737f89d297f1c443
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Tue Jul 13 08:25:27 2010 -0700
+
+ XQuartz: Avoid a crash when mistakenly free()ing in QuartzSetCursor on some configs
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 3209b094a3b1466b579e8020e12a4f3fa78a5f3f
+Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Fri Jul 9 10:36:56 2010 -0700
+
+ DRI2: re-allocate DRI2 drawable if pixmap serial changes
+
+ If a pixmap header is modified or the drawable serial changes, some
+ aspects of the drawable are likely to have changed so we should
+ re-allocate the corresponding DRI2 drawable in that case. This is one
+ way of catching when the root window pixmap changes through xrandr.
+
+ Fixes bug https://bugs.freedesktop.org/show_bug.cgi?id=28365.
+
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
+ Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 02b11509b25686ff7bd567ecb78a435701edc4c2
+Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Fri Jul 9 10:36:12 2010 -0700
+
+ miModifyPixmapHeader: always update serialNumber
+
+ We should update the serial number even if we just change a single field.
+
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
+ Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 2307ab5bc9365ebbe04568edb7c7620a23689b70
+Merge: c65280c fd4f505
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Jul 6 23:54:54 2010 -0400
+
+ Merge remote branch 'whot/for-keith'
+
+commit fd4f5059f08165a726071dc9f1ca877038292f6f
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Jul 6 09:19:09 2010 +1000
+
+ dix: purge leftover manual key down bit setting.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+
+commit a1afe172559aff010e886cfc2a7a922d4a06c697
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Jul 6 09:16:42 2010 +1000
+
+ dix: add aux. functions for button_is_down, set_button_down, set_button_up.
+
+ Same as the matching key functions. Buttons, like keys, can have two states
+ for down/up - one posted, one processed. Posted is set during event
+ generation (usually in the signal handler). Processed is set during event
+ processing when the event queue is emptied and events are being delivered to
+ the client.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+
+commit 32473d6bf38c95b2d6d5ddbf583a1e801c6605e4
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Jul 6 08:56:12 2010 +1000
+
+ dix: use BitIsOn/SetBit/ClearBit macros for set_key_down helpers.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+
+commit c18442908080c9833dfd6bb2ff367945d1892421
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Jul 5 16:47:57 2010 +1000
+
+ Xi: use set_key_up/down instead of manual bit handling.
+
+ We have the wrappers, use them.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 10442ce02b5be7f82b373bee1939e2b523e291d9
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Jul 5 16:54:48 2010 +1000
+
+ dix: treat flags as flags, not as value in key_is_down.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+
+commit b46ffd25d3f211e91c67bc618ecbd58257939388
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Jul 2 15:25:14 2010 +1000
+
+ mi: rename miPointerMoved to miPointerMoveNoEvent.
+
+ Having miPointerMove and miPointerMoved is confusing, especially since both
+ do the same thing bar the event delivery. Also, miPointerMove calls
+ miPointerMoved which indicates some confusion in the temporal alignment of
+ cause and effect.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit dbd621705a5211540b353af81c4af83c297b74dc
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Jul 2 14:22:03 2010 +1000
+
+ mi: De-duplicate some code in mipointer.c
+
+ miPointerMoved already has the same code.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit c65280ce8df4836bd7424a90482e8aa00ab6f447
+Author: Robert Hooker <sarvatt@ubuntu.com>
+Date: Sat Jun 12 20:23:09 2010 -0400
+
+ Increase advertised RENDER protocol minor version to 11
+
+ Support for the blend mode operators was added in
+ 0ce42adbf4cff9e7f049d9fc79d588ece5936177
+ and the requirement was bumped but when things were split off into
+ include/protocol-versions.h it defined it to 10. render uses
+ the lower of the client and server advertised versions so it's not
+ using the new blend mode operators.
+
+ Signed-off-by: Robert Hooker <sarvatt@ubuntu.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 9f0b193acdc29e491b6245390cf9f53b5222e6d3
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Jul 1 09:13:43 2010 -0400
+
+ miDbe window priv priv is pre-allocated, don't use dixSetPrivate (bug 28639)
+
+ miDbeInit pre-allocates space in each DBE window private private for a
+ MiDbeWindowPrivPrivRec. miDbeAllocBackBufferName used the
+ pre-allocated space correctly (simply fetching it instead of
+ allocating a new piece of memory). However, it then called
+ dixSetPrivate anyways, which isn't necessary, and (in the new
+ dixPrivate world) causes an assert failure.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Tested-by: Magnus Kessler <Magnus.Kessler@gmx.net>
+ Reviewed-by: Magnus Kessler <Magnus.Kessler@gmx.net>
+
+commit a94cb400d15b8c78dc04148cbd8db8e5ec8364b5
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Jul 1 09:11:36 2010 -0400
+
+ Delete unused miDbe screen private private datatype
+
+ MiDbeScreenPrivPrivRec is not used in the server. Remove it, along
+ with the MI_DBE_SCREEN_PRIV_PRIV macro that tried to use it.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Magnus.Kessler <Magnus.Kessler@gmx.net>
+
+commit f0fcffe55f280add5e4db2f5e9198a48c6f1b015
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Jun 3 19:00:54 2010 -0700
+
+ Update the sprite immediately when moving it with MouseKeys
+
+ Fix for OpenSolaris bug 6949755: Mouse Keys are ununusable
+ and possibly https://bugs.freedesktop.org/show_bug.cgi?id=24856
+
+ Ensures waitForUpdate is False before calling SetCursorPosition.
+ Normally waitForUpdate is False when SilkenMouse is active, True
+ when it's not. When it's True, the mouse cursor position on
+ screen is not updated immediately.
+
+ This is more critical on Solaris, since we disabled SigIO, thus in turn
+ disable SilkenMouse, due to the SSE2 vs. signal handler issues described in
+ Sun bugs 6849925, 6859428, and 6879897.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 3d9079b898c432a87f9b95c1f39a85f660bf0858
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Jun 3 19:00:53 2010 -0700
+
+ Add API to update setting of waitForUpdate screen private in miPointer
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 69b2b5c85ec079ef49f84722daa5f148cedc2e1b
+Merge: b90faa7 1432785
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Jul 1 23:46:53 2010 -0400
+
+ Merge remote branch 'whot/for-keith'
+
+commit b90faa71567c4461b28515756ba5c1e6286dda16
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Jul 1 23:46:27 2010 -0400
+
+ Revert "xkb: merge lockedPtrButtons state from all attached SDs."
+
+ Preparing to merge Peter's branch.
+
+ This reverts commit 6052710670953b43b4fff5d101b727163fcb1187.
+
+commit 9fb0785449b287ba1998e08613b3c2102ec24842
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Jul 1 23:45:50 2010 -0400
+
+ Revert "Revert "dix: use the event mask of the grab for TryClientEvents.""
+
+ Preparing to merge Peter's branch.
+
+ This reverts commit 018c878e9495b21146c8f38617fdd1bf6d8cc73b.
+
+commit 48cac27870992f6bde2c48429ff03c0a7606d5c1
+Author: James Jones <jajones@nvidia.com>
+Date: Fri Jun 18 17:28:15 2010 -0700
+
+ Cast void* to pointer* to appease some compilers.
+
+ When this privates.h is included in C++ builds, the compiler
+ complains about implicitly casting void* to void**. This small
+ patch fixes that up.
+
+ Signed-off-by: James Jones <jajones@nvidia.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 14327858391ebe929b806efb53ad79e789361883
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Jul 1 12:44:57 2010 +1000
+
+ xkb: release XTEST pointer buttons on physical releases. (#28808)
+
+ If a button release event is posted for the MD pointer, post a release event
+ through the matching XTEST device. This way, a client who posts a button
+ press through the XTEST extension cannot inadvertedly lock the button.
+
+ This behaviour is required for historical reasons, until server 1.7 the core
+ pointer would release a button press on physical events, regardless of the
+ XTEST state. Clients seem to rely on this behaviour, causing seemingly stuck
+ grabs.
+
+ The merged behaviour is kept for multiple keyboard PointerKey events, if two
+ physical keyboards hold the button down as a result of PointerKey actions,
+ the button is not released until the last keyboard releases the button.
+
+ X.Org Bug 28808 <http://bugs.freedesktop.org/show_bug.cgi?id=28808>
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit a71dbc03e65cf7b0654a6eca93ce0bf6a1711ffa
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Jul 1 08:27:05 2010 -0400
+
+ Bump to version 1.8.99.904 (1.9 RC4)
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 5ea497fc32202ff19c2b7d8ef4eba08889108a87
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Tue Jun 29 16:08:02 2010 +0300
+
+ xfree86: configure: remove vendor and card name matching rules
+
+ Although vendor and board naming are used to create the configure file, the
+ server doesn't actually use it when fetching such file and probing devices.
+
+ Reported-by: Richard Barnette <jrbarnette@chromium.org>
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
+ Tested-by: Richard Barnette <jrbarnette@chromium.org>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 90fd9e40b59e69333d250a795998f44dc3a5dc0c
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Tue Jun 29 16:08:01 2010 +0300
+
+ xfree86: pci: remove superfluous vendor and card name logging
+
+ X server suffers in startup time when relying on the pciaccess's linear search
+ to fetch vendor and video device name from PCI ID file (when existent). Such
+ names are only used to write the log, which may be superfluous. This
+ information often is provided by the drivers or likewise users can get the it
+ using external tools like lspci or scanpci.
+
+ This patch remove the references of those functions from X start up.
+
+ Reported-by: Richard Barnette <jrbarnette@chromium.org>
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Tested-by: Richard Barnette <jrbarnette@chromium.org>
+ Reviewed-by: James Cloos <cloos@jhcloos.com>
+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 339f62b1bfadb0ee77d67e351f4e30f5d5e9625f
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Jun 29 15:24:51 2010 +1000
+
+ xkb: emulate PointerKeys events only on the master device.
+
+ This patch replicates the behaviour for button events. Only generate a
+ PointerKeys motion event on the master device, not on the slave device.
+ Fixes the current issue of PointerKey motion events generating key events as
+ well.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 69ac909878ef80bb74c4a9ca4150eda66debd754
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Jun 29 12:12:53 2010 +1000
+
+ xkb: merge lockedPtrButtons state from all attached SDs.
+
+ Problem:
+ lockedPtrButtons keeps the state of the buttons locked by a PointerKeys button
+ press. Unconditionally clearing the bits may cause stuck buttons in this
+ sequence of events:
+
+ 1. type Shift + NumLock to enable PointerKeys
+ 2. type 0/Ins on keypad to emulate Button 1 press
+ → button1 press event to client
+ 3. press and release button 1 on physical mouse
+ → button1 release event to client
+
+ Button 1 on the MD is now stuck and cannot be released.
+
+ Cause:
+ XKB PointerKeys button events are posted through the XTEST pointer device.
+ Once a press is generated, the XTEST device's button is down. The DIX merges
+ the button state of all attached SDs, hence the MD will have a button down
+ while the XTEST device has a button down.
+
+ PointerKey button events are only generated on the master device to avoid
+ duplicate events (see XkbFakeDeviceButton()). If the MD has the
+ lockedPtrButtons bit cleared by a release event on a physical device, no
+ such event is generated when a keyboard device triggers the PointerKey
+ ButtonRelease trigger. Since the event - if generated - is posted through
+ the XTEST pointer device, lack of a generated ButtonRelease event on the
+ XTEST pointer device means the button is never released, resulting in the
+ stuck button observed above.
+
+ Solution:
+ This patch merges the MD's lockedPtrButtons with the one of all attached
+ slave devices on release events. Thus, as long as one attached keyboard has
+ a lockedPtrButtons bit set, this bit is kept in the MD. Once a PointerKey
+ button is released on all keyboards, the matching release event is emulated
+ from the MD through the XTEST pointer device, thus also releasing the button
+ in the DIX.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 09645864f5a52882eee51c801b3e610d683e7147
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Jun 29 13:49:27 2010 +1000
+
+ xkb: Mark switch case fallthrough with comment.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit c7330ecb5d28d7a92d24feb289f7f1812ce055a4
Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu Jul 1 14:42:18 2010 +1000
+Date: Wed Jun 30 13:23:14 2010 +1000
+
+ dix: fix up erroneous error message.
+
+ (WW) Device 'device name' has 36 axes, only using first 36.
+ does seem a bit silly.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit dbf249ec6638f0a8dfa4c2286099845aafc8ac88
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Jun 29 10:43:51 2010 +1000
+
+ xkb: remove now obsolete comment.
+
+ Looks like nothing broke from removing the hardcoded CoreProcessPointerEvent
+ call. Whoop. Di. Doo.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit f028e70ca714f6956e41754f132cb9b8a1e8db63
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Jun 30 08:33:55 2010 -0700
+
+ Initialize dev privates before using any
+
+ Initializing the dev privates code after allocating the server client
+ dev privates would cause the memory leak check to fire at server
+ startup or reset.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Acked-by: Daniel Stone <daniel@fooishbar.org>
+
+commit 433d0851cd3e61d841ff374ee0a0f052d5907029
+Author: Julien Cristau <jcristau@debian.org>
+Date: Fri Jun 25 11:34:44 2010 +0100
+
+ Xephyr: fix Xv adaptor capability tests
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 9626eedebf620559652ffb1fefa82b5d659e57be
+Author: Julien Cristau <jcristau@debian.org>
+Date: Thu Jun 24 18:45:11 2010 +0100
+
+ configure: bail if Xephyr was requested but its dependencies are missing
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
- xserver 1.8.2
+commit e6531ae9d5bdd37775e921268366fb76056e22d5
+Author: Julien Cristau <jcristau@debian.org>
+Date: Thu Jun 24 18:45:10 2010 +0100
+
+ Xephyr: fix memory leak in XF86DRIOpenConnection
+
+ The allocated bus id string was not being freed.
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 390a8466dd1914f4786b811ff8454f6e0c4b6b04
+Author: Ville Syrjälä <ville.syrjala@nokia.com>
+Date: Mon Jun 28 23:26:48 2010 +0300
+
+ xfree86/modes: Allow the driver to specify initial rotation
+
+ When the "Rotate" option isn't specified allow the driver to specify
+ the initial rotation mode. This way the driver can choose to retain
+ the same settings that were used by software that was used prior to
+ starting X.
+
+ Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 6052710670953b43b4fff5d101b727163fcb1187
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Jun 30 08:21:04 2010 -0700
+
+ xkb: merge lockedPtrButtons state from all attached SDs.
+
+ Problem:
+ lockedPtrButtons keeps the state of the buttons locked by a PointerKeys button
+ press. Unconditionally clearing the bits may cause stuck buttons in this
+ sequence of events:
+
+ 1. type Shift + NumLock to enable PointerKeys
+ 2. type 0/Ins on keypad to emulate Button 1 press
+ → button1 press event to client
+ 3. press and release button 1 on physical mouse
+ → button1 release event to client
+
+ Button 1 on the MD is now stuck and cannot be released.
+
+ Cause:
+ XKB PointerKeys button events are posted through the XTEST pointer device.
+ Once a press is generated, the XTEST device's button is down. The DIX merges
+ the button state of all attached SDs, hence the MD will have a button down
+ while the XTEST device has a button down.
+
+ PointerKey button events are only generated on the master device to avoid
+ duplicate events (see XkbFakeDeviceButton()). If the MD has the
+ lockedPtrButtons bit cleared by a release event on a physical device, no
+ such event is generated when a keyboard device triggers the PointerKey
+ ButtonRelease trigger. Since the event - if generated - is posted through
+ the XTEST pointer device, lack of a generated ButtonRelease event on the
+ XTEST pointer device means the button is never released, resulting in the
+ stuck button observed above.
+
+ Solution:
+ This patch merges the MD's lockedPtrButtons with the one of all attached
+ slave devices on release events. Thus, as long as one attached keyboard has
+ a lockedPtrButtons bit set, this bit is kept in the MD. Once a PointerKey
+ button is released on all keyboards, the matching release event is emulated
+ from the MD through the XTEST pointer device, thus also releasing the button
+ in the DIX.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 28e33ae6f69f716ece5d68e63fc52557236c5f6e
+Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Wed Jun 30 07:59:04 2010 -0700
+
+ OS support: fix writeable client vs IgnoreClient behavior
+
+ When ResetCurrentRequest is called, or IgnoreClient is called when a
+ client has input pending, IgnoredClientsWithInput will be set. However,
+ a subsequent IgnoreClient request will clear the client fd from that fd
+ set, potentially causing the client to hang.
+
+ So add an Ignore/Attend count, and only apply the ignore logic on the
+ first ignore and the attend logic on the last attend. This is
+ consistent with the comments for these functions; callers must pair
+ them.
+
+ Fixes https://bugs.freedesktop.org/show_bug.cgi?id=27035.
+
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+ Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
-commit 2ae159bad4178bd0d0b4664b895e085835396ffc
+commit 018c878e9495b21146c8f38617fdd1bf6d8cc73b
Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon Jun 21 11:41:22 2010 +1000
+Date: Fri Jun 25 09:48:10 2010 +1000
- xserver 1.8.1.902
+ Revert "dix: use the event mask of the grab for TryClientEvents."
+
+ Behaviour of earlier X servers was to deliver the ButtonPress event
+ unconditionally, regardless of the actual event mask being set. Thus, a
+ GrabButton event will always deliver the button press event, a GrabKey
+ always the key press event, etc. Same goes for XI and XI2.
+
+ Reproducible with a simple client requesting a button grab in the form of:
+ XGrabButton(dpy, AnyButton, AnyModifier, win, True, ButtonReleaseMask,
+ GrabModeAsync, GrabModeAsync, None, None);
+
+ On servers before MPX/XI2, the client will receive a button press and
+ release event. On current servers, the client receives only the release.
+ Clients that expect the press event to be delivered unconditionally may
+ leave the user with a stuck grab.
+
+ XTS test results for XGrabButton are identical with and without this patch.
+
+ This reverts commit 48585bd1e3e98db0f3df1ecc68022510216e00cc.
+
+ Conflicts:
+
+ dix/events.c
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
-commit 600bdf0350f538e7baa6b48f37f77c905e6fd17d
-Merge: cc9f680 5986030
+commit 1884db430a5680e37e94726dff46686e2218d525
Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon Jun 21 11:34:35 2010 +1000
+Date: Thu Jun 24 12:52:53 2010 +1000
+
+ Revert "dix: use the event mask of the grab for TryClientEvents."
+
+ Behaviour of earlier X servers was to deliver the ButtonPress event
+ unconditionally, regardless of the actual event mask being set. This is
+ documented in the protocol:
+ "This request establishes a passive grab. In the future, the pointer is
+ actively grabbed as described in GrabPointer, the last-pointer-grab time is
+ set to the time at which the button was pressed (as transmitted in the
+ ButtonPress event), and the ButtonPress event is reported if all of the
+ following conditions are true:
+ <list of conditions, event mask is not one of them>"
+
+ Thus, a GrabButton event will always deliver the button press event, a
+ GrabKey always the key press event, etc. Same goes for XI and XI2.
+
+ Reproducible with a simple client requesting a button grab in the form of:
+ XGrabButton(dpy, AnyButton, AnyModifier, win, True, ButtonReleaseMask,
+ GrabModeAsync, GrabModeAsync, None, None);
+
+ On servers before MPX/XI2, the client will receive a button press and
+ release event. On current servers, the client receives only the release.
+ Clients that expect the press event to be delivered unconditionally.
+
+ XTS Xlib13 XGrabButton 5/39 now passes.
+
+ This reverts commit 48585bd1e3e98db0f3df1ecc68022510216e00cc.
+ Effectively reverts commit 1c612acca8568fcdf9761d23f112adaf4d496f1b as well,
+ the code introduced with 1c612 is not needed anymore.
+
+ Conflicts:
+
+ dix/events.c
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Acked-by: Daniel Stone <daniel@fooishbar.org>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 3b3c77b87070ddcdbb2acb114a81628485e7a129
+Author: Tiago Vignatti <tiago.vignatti@Nokia.com>
+Date: Wed Jun 23 15:18:04 2010 +0300
+
+ configure: don't check xfont always for each server
+
+ It's already defined inside REQUIRED_LIBS and all DDX are getting it already.
+ No semantical changes.
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 75536ee80595c79bba95a1fb6844126ee08486d4
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Wed Jun 23 15:18:03 2010 +0300
+
+ dix: use one single function to register fpe fonts
+
+ X server doesn't need to understand fpe internals, so use
+ register_fpe_functions from libXfont.
+
+ It's required to get new version of libXfont, therefore adjust it to be passed
+ to autoconf.
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit a68a101a730df7f73421555e381a50b074607c5e
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Jun 22 12:13:26 2010 -0700
+
+ Bump to 1.8.99.903 -- 1.9 RC3
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 2c0159d21788b16607e6ebe4571b57fe78545c2a
+Author: Kristian Høgsberg <krh@bitplanet.net>
+Date: Mon Jun 14 09:25:22 2010 -0400
+
+ list.h: Fix list_for_each_entry_safe()
+
+ Can't use next as a macro argument since we're accessing the .next field
+ of struct list.
+
+ Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit e2918b67395a48397bf7db545584cc2d4f4e7ccf
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Jun 22 12:11:20 2010 -0700
+
+ Revert "mi: Remove unused overlay support"
+
+ This reverts commit 9120e58556014e514eef9dfe43cdea4b74dc66ae.
+
+ Whoops, please revert this patch -- overlay is in use in nvidia drivers,
+ and it's too late in release cycle to remove it.
+
+ I feel really sorry that I kept this patch in my tree. I will submit
+ another one, removing only XAA overlay hooks which are not used at all.
+
+commit 7673451ade46ebacfdfc02a5190149210198fdd8
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Jun 22 11:49:30 2010 -0700
+
+ Bump to 1.8.99.902 -- 1.9 RC2
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 8b65f2edb407521e0ac0e207e5d5358986bd46da
+Author: Rami Ylimäki <ext-rami.ylimaki@nokia.com>
+Date: Tue Jun 22 14:57:20 2010 +0300
+
+ record: Prevent a crash on recording client disconnect.
+
+ Execute the following steps to reproduce the issue.
+
+ 1. Run at least two recording clients simultaneously.
+ $ cnee --record --request-range 1-127 &
+ $ cnee --record --request-range 1-127 &
+ 2. Kill the recording clients.
+ $ killall cnee
+ 3. Give X server something to do so that the clients are closed.
+ $ xinput list
+ $ xinput list
+
+ As a result RecordUninstallHooks accesses NullClient, because
+ RecordAClientStateChange doesn't clean the recording clients up
+ properly.
+
+ Fix RecordUninstallHooks to fail locally on an assertion instead of
+ much later in privates code, if NullClient is still accessed because
+ of some other bug. Fix RecordAClientStateChange to iterate through all
+ contexts so that modifications of the iterated array during iteration
+ don't cause contexts to be skipped.
+
+ Signed-off-by: Rami Ylimäki <ext-rami.ylimaki@nokia.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 660f6ab5494a728c3ca7ba00c305e9ff06c8ecb2
+Author: Simon Farnsworth <simon.farnsworth@onelan.com>
+Date: Tue Jun 22 10:13:30 2010 +0100
+
+ Don't crash when asked if a client that has disconnected was local
+
+ ProcDRI2Dispatch uses LocalClient to determine if it's safe to respond
+ to a client that has made DRI2 requests which aren't sensible for
+ remote clients (anything but version). When the client has disappeared
+ mid-request stream (e.g. as a result of a kill -9, or a client-side
+ bug), LocalClient causes the X server to follow suit, as
+ ((OsCommPtr)client->osPrivate)->trans_conn is NULL at this point.
+
+ The simple and obvious fix is to just return "not local" when
+ trans_conn is NULL, which fixes the crash I was seeing; however Keith
+ Packard pointed out that just checking trans_conn isn't enough;
+ quoting Keith:
+
+ "This looks almost right to me -- I reviewed the os code to see when
+ _XSERVTransClose is called (which is what frees the trans_conn data) and
+ found that every place which called that immediately set trans_conn to
+ NULL, except for the call in CloseDownFileDescriptor which is only
+ called from CloseDownConnection and which is immediately followed by
+ freeing the OsCommRec and setting client->osPrivate to NULL. So, I'd
+ suggest checking client->osPrivate in addition to the above check."
+
+ Signed-off-by: Simon Farnsworth <simon.farnsworth@onelan.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 82d41ada993d8cbdcdfea878d1a5b031afe4e593
+Author: Dave Airlie <airlied@redhat.com>
+Date: Mon Jun 21 16:33:55 2010 +1000
+
+ composite: fix freeing of old pixmap until after move/resize/cbw (bug 28345)
+
+ The fixes for the composite reallocation failure, were freeing the oldpixmap
+ straight after reallocating the new one, however this led to some wierd
+ effects in e16 compositing, and I think in a few other places. This patch
+ moves the freeing of the pixmap into the post wrapped stage. I'm not sure if
+ we are actually better off breaking ABI and adding another callback from the
+ ConfigureWindow to composite to make sure the old pixmap is always freed,
+ but this should be satisfactory as we should always hit one of the freeing
+ paths or else its a bug in the DIX.
+
+ bug: https://bugs.freedesktop.org/show_bug.cgi?id=28435
+
+ Reported-by: Andrew Randrianasulu <randrik@mail.ru>
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit c6bc52cb6663138d1273447cb7661fa6e958f539
+Author: Dave Airlie <airlied@redhat.com>
+Date: Mon Jun 21 14:08:50 2010 +1000
+
+ dri2: avoid crash with old dri drivers.
+
+ I built latest server and copied over a mesa 7.8 dri2 driver to use with it,
+ and it crashed in here starting compiz. Looks like we need to validate the
+ flush extension is registered before calling invalidate.
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+ Reviewed-by: Michel Dänzer <michel@daenzer.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 80d1a548d6ce73c2ff097536c1bc7044bf74965d
+Author: Dave Airlie <airlied@redhat.com>
+Date: Mon Jun 21 10:05:08 2010 +1000
+
+ rotation: fix cursor and overlap of one pixel.
+
+ Commit 77c7a64e8885696665556c9fbcb3cffb552e367a was introduced to fix
+ a cursor off by one on Intel hw, however it also move the whole crtc
+ into an off by one position and you could see gnom-eshell overlapping.
+
+ This commit reverts that and instead fixes the cursor hotspot
+ translation to work like pixman does. We add 0.5 to the cursor vector
+ before translating, and floor the value afterwards.
+
+ Thanks to Soeren (ssp) for pointing out where the real problem was
+ after explaning how pixman translates points.
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 32c706c4ffd7433dbfc79dba8785b1510d2f053f
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Jun 20 20:37:26 2010 -0400
+
+ config: declare xserver private dependencies in xorg-server.pc
+
+ Any module (drivers) depending on xserver also depends on some of the
+ server private dependencies. Any driver including xf86.h depends on
+ xext, kbproto, inputproto and randr.
+
+ These dependencies are in separate packages, so anything can happen,
+ removal, wrong version, etc... and the driver fails during compilation.
+ Having the private dependencies declared will ensure all packages the
+ server depends on are present and at the correct version.
+
+ Currently each module attempts to check for server dependencies with
+ various degrees of accuracy. With this patch, the driver will only need
+ to check for its own explicit dependencies.
+
+ Now that xproto is included in Requires.private it is removed from Requires.
+ All the cflags from both Requires and Requires.private are returned
+ to caller to pkg-config.
+
+ Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 37734ba79ca3a9bad1c1e29d89710c8f9c299210
+Author: Colin Harrison <colin.harrison@virgin.net>
+Date: Wed Jun 16 18:07:04 2010 +0100
+
+ XWin: Fixes for devPrivates API change
+
+ Fix some typos in devPrivates API changes in XWin code.
+ Move allocation of private keys as it's no longer valid to do them during OsVendorInit()
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
- Merge branch 'dri2-backports' into server-1.8-branch
+commit f7dae972aac28c5792566e997c40254e787d246a
+Author: Ville Syrjälä <ville.syrjala@nokia.com>
+Date: Tue Jun 15 23:25:34 2010 +0300
-commit cc9f6806ac0d45e122c24c0e99c1db70a6d5ca12
+ xv: Don't send port notify when SetPortAttribute fails
+
+ Currently a port notify event is sent even if SetPortAttribute
+ fails. Furthermore the value field in the event will contain the
+ value that was specified in the failed request. So any client
+ interested in the actual value of the attribute will have to
+ double check the current value with GetPortAttribute after
+ receiving a port notify event.
+
+ Fix the problem by sending port notifications only when
+ SetPortAttribute succeeds.
+
+ Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit c20166739603f86888f28ca2c65f5cf474d0d8c9
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Sat Jun 12 01:05:07 2010 +0700
+
+ os: Remove unused dev_tty_from_init variable
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+
+commit 2e15f1903dac8473285ad2937c079a08cf7c5d31
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Sat Jun 12 00:53:38 2010 +0700
+
+ os: Remove unused pread/pwrite/lockit functions
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+
+commit 9120e58556014e514eef9dfe43cdea4b74dc66ae
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Sat Jun 12 00:30:27 2010 +0700
+
+ mi: Remove unused overlay support
+
+ The only reference to it in server and drivers is in XAA overlay code which
+ would segfault as no miInitOverlay is called ever. No segfaults were observed
+ "in wild", so XAA overlay is probably also unused.
+
+ XAA code is modified to act as if miOverlayCopyUnderlay always returned false,
+ because XAACopyWindow8_32 could only set doUnderlay to true if it's called from
+ miOverlayMoveWindow or miOverlayResizeWindow, which can only be called if
+ miInitOverlay has hooked those functions, and no driver (on fd.o) or server code
+ calls that.
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+
+commit 91b5aadbdfd9d05ca1ffdeb443e602ecdba1e04d
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Fri Jun 11 20:20:00 2010 +0700
+
+ mi: do not use X11/extensions/shape.h header from libXext
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Tested-by: Dan Nicholson <dbn.lists@gmail.com>
+
+commit b8615d592700b7be319c04cc0563fdeb5a266534
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Jun 12 08:19:16 2010 -0700
+
+ Don't coredump on "X -showopts" (bug 25874)
+
+ Don't try walking the xf86ConfigLayout.screens table if it's empty
+ https://bugs.freedesktop.org/show_bug.cgi?id=25874
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 32fd57509c3e06f63ac6b0ad607767fd2b688e5a
+Author: Rami Ylimäki <ext-rami.ylimaki@nokia.com>
+Date: Fri Jun 18 12:40:58 2010 +0300
+
+ record: Register client private to prevent crash.
+
+ Running the following command causes an assertion to fail:
+ cnee --record --request-range 1-127
+
+ 3 in dixGetPrivateAddr at ../../include/privates.h:122
+ 4 in dixGetPrivate at ../../include/privates.h:137
+ 5 in dixLookupPrivate at ../../include/privates.h:167
+ 6 in RecordInstallHooks at ../../record/record.c:911
+ 7 in ProcRecordEnableContext at ../../record/record.c:2377
+ 8 in ProcRecordDispatch at ../../record/record.c:2571
+ 9 in Dispatch at ../../dix/dispatch.c:432
+ 10 in main at ../../dix/main.c:289
+
+ Signed-off-by: Rami Ylimäki <ext-rami.ylimaki@nokia.com>
+ Reviewed-by: Oliver McFadden <oliver.mcfadden@nokia.com>
+ Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 75beadd766fed7b12a76e59e57c244e297c2d2cb
Author: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Date: Sun Jun 13 18:05:26 2010 +0200
@@ -42,9 +2317,8 @@ Date: Sun Jun 13 18:05:26 2010 +0200
Signed-off-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit 75beadd766fed7b12a76e59e57c244e297c2d2cb)
-commit 557301d5c7631e84ad769e6f40a3172a3fdd2369
+commit 868bf3de478fac0080d525137fc728c551c78ea6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 15 13:22:20 2010 +1000
@@ -53,8 +2327,66 @@ Date: Tue Jun 15 13:22:20 2010 +1000
Yay for readability.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
+
+commit db0d3d4e573c93a8af43499682ed788c7bd0d70d
+Author: Xiaoyang Yu (Max) <max.a.yu@intel.com>
+Date: Fri Jun 4 17:17:53 2010 +0800
+
+ Re-enabled Xnest fix for focus in + modifier bug.
+
+ * See https://bugs.freedesktop.org/show_bug.cgi?id=3030
+
+ Signed-off-by: Xiaoyang Yu (Max) <max.a.yu@intel.com>
+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+
+ This takes the xnest way of working around this (see
+ 5904ef2ccd6056b187ca76f104c21e2d686bfc1d "xnest: restore
+ xnestUpdateModifierState") and copies it to Xephyr.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 505724c5f3e4fc1475fa54f20d08c0c06fb32443
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Jun 7 16:28:34 2010 -0700
+
+ In DRI2Connect, check to see if DRI2 has been initialized (bug 28424)
+
+ This prevents DRI2GetScreen from being invoked with an uninitialized
+ private key which would cause an assert failure.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Tested-by: David Ronis <David.Ronis@McGill.CA>
+
+commit 68a9ee8370e6f9b38218376ac92d5130a5b0ef1e
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri May 7 22:56:04 2010 -0700
+
+ Clean up RandR12 bits on screen close (bug 27114)
+
+ When resetting the server, pScrn->EnterVT must be unwrapped or the
+ next server generation will end up wrapping the wrapper and causing an
+ infinite recursion on EnterVT.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Tested-by: Michael Stapelberg <michael+freedesktop@stapelberg.de>
+
+commit d5ab717768524c8552b81607aaeffb447ab268ee
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Jun 10 19:21:18 2010 -0700
+
+ Bump to 1.8.99.901 -- 1.9 RC1
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit a41d6e9bffbe56cfa1c3b84388a3d9f5a982f1a9
+Merge: 7e8f100 f4190fe
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Jun 11 10:08:13 2010 -0700
+
+ Merge remote branch 'dottedmag/for-keithp'
-commit e50f84d69811baea04ef559d846e4588c4bc4c8e
+commit 7e8f1001217326cc451974bacf25275420c4bb4e
Author: Éric Piel <E.A.B.Piel@tudelft.nl>
Date: Fri Jun 11 09:16:32 2010 -0700
@@ -85,9 +2417,201 @@ Date: Fri Jun 11 09:16:32 2010 -0700
Signed-off-by: Éric Piel <eric.piel@tremplin-utc.net>
Reviewed-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit 7e8f1001217326cc451974bacf25275420c4bb4e)
-commit 75c1ba8b4fd0cbf5a6eb41fefc4ec728790589df
+commit f4190feb25ecc3d8278decc8bf28a5ef0e568942
+Author: Matt Turner <mattst88@gmail.com>
+Date: Thu Jun 10 04:08:54 2010 +0700
+
+ Remove more superfluous if(p) checks around free(p)
+
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Matt Turner <mattst88@gmail.com>
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+
+commit 89bd05106e5823fc5cfca9abf082729f2444363b
+Author: Matt Turner <mattst88@gmail.com>
+Date: Fri Jun 4 21:09:35 2010 -0400
+
+ record: move free() to after last use of pContext
+
+ No functional change, since free doesn't change the value of the pointer
+ passed to it, but it makes this code less confusing.
+
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+ Signed-off-by: Matt Turner <mattst88@gmail.com>
+
+commit a54a766dfb39fb3df671045878ac706215d83cef
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Mon Jun 7 03:19:03 2010 +0700
+
+ xkb: replace xstrdup with strdup in Win32System
+
+ The only caller of Win32System is XkbDDXCompileKeymapByNames. Add allocation
+ check there to avoid passing NULL pointers to various functions down the code.
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 6e7417c342b0624e3f3c5686bb43026786423692
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Fri Jun 4 17:05:35 2010 +0700
+
+ config: Replace xstrdup with strdup in add_option()
+
+ All callers of add_option pass string literal as "key" argument
+ except one, where non-NULL condition is guarded by if().
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit e4570f5db5157f4233454c938733a2a0d6a1cb8f
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Fri Jun 4 17:01:42 2010 +0700
+
+ xfree86: Get rid of xstrdup when argument is definitely non-NULL
+
+ ditto for XFree86
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 416d228481d71204cf9bfad3ab4773abc4757f79
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Fri Jun 4 17:01:25 2010 +0700
+
+ xquartz: Get rid of xstrdup when argument is definitely non-NULL
+
+ ditto for XQuartz
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit eea286f2b9e4b1acf2b1c9800f5a4bc7c3fa968d
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Fri Jun 4 17:01:05 2010 +0700
+
+ xwin: Get rid of xstrdup when argument is definitely non-NULL
+
+ ditto for XWin
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit dd45b7d74696cd4fe9545852640a3c2e66a808fd
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Fri Jun 4 17:00:46 2010 +0700
+
+ kdrive: Get rid of xstrdup when argument is definitely non-NULL
+
+ ditto for Kdrive
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 16158366954d945db6263f6de505fc02ee03c6cd
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Fri Jun 4 17:00:15 2010 +0700
+
+ dmx: Get rid of xstrdup when argument is definitely non-NULL
+
+ ditto for DMX
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 6592db6bb526f0c43b4c7b55859c629709e039b4
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Fri Jun 4 16:58:58 2010 +0700
+
+ Get rid of xstrdup when argument is definitely non-NULL
+
+ Replace xstrdup with strdup when either constant string is
+ being duplicated or argument is guarded by conditionals and
+ obviously can't be NULL
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 620ca54aaa0b363fcf68cec1bd6c37e68c988352
+Merge: fd69234 8ff9b50
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Jun 10 19:18:53 2010 -0700
+
+ Merge remote branch 'alanc/master'
+
+commit fd69234db004e98c663f5c6c4360d2cecaa8a4df
+Author: Keith Packard <keithp@keithp.com>
+Date: Sun Jun 6 15:21:28 2010 -0700
+
+ Ignore RandR timestamps harder
+
+ Checking timestamps in post 1.1 randr requests was never a good idea,
+ let's ignore them and just make the configuration changes.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Acked-by: Chase Douglas <chase.douglas@canonical.com>
+
+commit a8ec9eca850f2a7ad4c5cf31c1c011c120688496
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Jun 7 13:39:11 2010 -0700
+
+ Fix a couple more possible errors with input-only windows
+
+ Using type == DRAWABLE_WINDOW to differentiate between pixmaps and
+ windows isn't sufficient as input-only windows will end up in the
+ pixmap case. This patch changes a few more code paths to use
+ WindowDrawable instead.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+
+commit 8ff9b502cfce3828f7855ffba7949d6ebee34031
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Jun 4 08:44:02 2010 -0700
+
+ Solaris: avoid memory leak if AGPIOC_INFO ioctl fails
+
+ Move malloc after ioctl, so we don't have to worry about free'ing the
+ memory if the ioctl fails.
+
+ [ This bug was found by the Parfait bug checking tool.
+ For more information see http://research.sun.com/projects/parfait ]
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+
+commit c5eb5d69e5183860185a05cfcce16af635cab9aa
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Jun 3 19:28:43 2010 -0700
+
+ Record some additional library dependencies in xf86 modules
+
+ Helps with symbol resolution when building with -z defs
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+
+commit 1c08a37e0eb4746e8974eb7a70ca4b7b84712963
+Author: Sam Lau <sam.lau@oracle.com>
+Date: Thu Jun 3 19:17:14 2010 -0700
+
+ SecurityResource should not segfault when client owning resource has exited
+
+ Fixes OpenSolaris bug 6949754:
+ Xorg crashes when the magnifier is enabled at gdm login greeter window.
+ http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6949754
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
+
+commit 07a093add0b7e40c4d9b9b59273e3ff9e14a88a7
+Merge: 84190d2 dc61448
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Jun 10 18:39:10 2010 -0700
+
+ Merge remote branch 'whot/for-keith'
+
+commit dc614484f93b67e8b62dbb1bb2fd247fe5a4c850
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 10 12:21:36 2010 +1000
@@ -118,11 +2642,167 @@ Date: Thu Jun 10 12:21:36 2010 +1000
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
- (cherry picked from commit dc614484f93b67e8b62dbb1bb2fd247fe5a4c850)
-commit 421f5dfdd8b566dc07b4606f0edec487b3ead3d9
+commit 7805e45284264b4cd286eece02e85426896e9f7b
Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Fri Jun 11 11:08:31 2010 +1000
+Date: Thu Jun 10 14:31:48 2010 +1000
+
+ config: remove redundant DBUS API define, require dbus-1 >= 1.0
+
+ It's still being pulled in by the HAL CFLAGS but the requirement to define
+ this was dropped from DBus pre 1.0 (November 2006).
+ This means we require dbus 1.0 now.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+ Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+
+commit 66b21b2f455a1dfbc92f7caa571dcff3f3765808
+Author: Dan Nicholson <dbn.lists@gmail.com>
+Date: Mon Jun 7 20:39:58 2010 -0700
+
+ xfree86: Match devices based on current driver setting
+
+ Often we want to apply a driver specific option to a set of devices and
+ don't care how the driver was selected for that device. The MatchDriver
+ entry can be used to match the current driver string:
+
+ MatchDriver "evdev|mouse"
+ Option "Emulate3Buttons" "yes"
+
+ The driver string is a case sensitive match.
+
+ Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit a71bdff47d4cc80da6ceeb548db1dcc8e8b59702
+Author: Dan Nicholson <dbn.lists@gmail.com>
+Date: Mon Jun 7 20:39:57 2010 -0700
+
+ xfree86: Allow multiple InputClass Match* entries for && matching
+
+ Currently when there multiple InputClass entries of the same type, only
+ the last entry is used and the previous ones are ignored. Instead,
+ multiple entries are used to create multiple matching conditions.
+
+ For instance, an InputClass with
+
+ MatchProduct "foo"
+ MatchProduct "bar"
+
+ will require that the device's product name contain both foo and bar.
+ This provides a complement to the || style matching when an entry is
+ split using the "|" token.
+
+ The xorg.conf man page has added an example to hopefully clarify the two
+ types of compound matches.
+
+ Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 842625928632ae767b0689fcdb5103c1779a4c91
+Author: Dan Nicholson <dbn.lists@gmail.com>
+Date: Mon Jun 7 20:39:56 2010 -0700
+
+ config: Script to convert HAL fdi settings to InputClass sections
+
+ In the new world of udev and InputClass, x11_* settings from HAL fdi
+ files will not be honored. This script converts those settings into
+ valid InputClass sections that can be dropped into xorg.conf.d.
+
+ Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 87a1507da7e7788232d74285ef377b67b70e0fa4
+Author: Dan Nicholson <dbn.lists@gmail.com>
+Date: Thu Jun 10 06:15:41 2010 -0700
+
+ xfree86: Match devices based on USB ID
+
+ Sometimes the vendor and product names aren't specific enough to target
+ a USB device, so expose the numeric codes in the ID. A MatchUSBID entry
+ has been added that supports shell pattern matching when fnmatch(3) is
+ available. For example:
+
+ MatchUSBID "046d:*"
+
+ The IDs are stored in lowercase hex separated by a ':' like "lsusb" or
+ "lspci -n".
+
+ Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 645679c1523eee7028f3244cee57936b93326a2a
+Author: Dan Nicholson <dbn.lists@gmail.com>
+Date: Thu Jun 10 06:11:10 2010 -0700
+
+ xfree86: Match devices based on PnP ID
+
+ Serial input devices lack properties such as product or vendor name. This
+ makes matching InputClass sections difficult. Add a MatchPnPID entry to
+ test against the PnP ID of the device. The entry supports a shell pattern
+ match on platforms that support fnmatch(3). For example:
+
+ MatchPnPID "WACf*"
+
+ A match type for non-path pattern matching, match_pattern, has been added.
+ The difference between this and match_path_pattern is the FNM_PATHNAME
+ flag in fnmatch(3).
+
+ Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 84190d20954ef7888e4d96832c2a4b3225b4dfa2
+Merge: 4172aa1 5e1ef1f
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Jun 10 13:36:35 2010 -0700
+
+ Merge remote branch 'jeremyhu/master'
+
+commit 4172aa137c1b9b6f2a25c320d847af1f5ac56fba
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Jun 10 07:15:49 2010 -0700
+
+ dri2: Only deal with output windows and pixmaps.
+
+ This reverts commit fdb081b430ddffb495aa5b05bcc4cf10882ff4b2
+ "dri2: Deal with input-only windows by using WindowDrawable()"
+ and replaces it as follows:
+
+ Reject the creation of a DRI2 drawable for UNDRAWABLE_WINDOW (input-only
+ windows) and DRAWABLE_BUFFER (whatever those are) drawables and only look up
+ privates for the supported drawable types.
+
+ The rest of the the code can continue pretending there's only output windows
+ and pixmaps, which are the only kinds of drawables relevant for DRI2.
+
+ Fixes server crash with GLX compositing managers such as compiz or kwin, due
+ to looking up a window private for a pixmap and getting a bogus pointer.
+
+ Signed-off-by: Michel Dänzer <daenzer@vmware.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 353e32d3712f3a883a796ba562ec9fb5a8354837
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sun Jun 6 06:42:11 2010 -0700
+
+ glxdriswrast bugfix: configure swapgc, not gc.
+
+ I got this wrong in e2929db7b737413cf93fbebdf4d15abdfebff05c.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Cc: Kristian Høgsberg <krh@bitplanet.net>
+ Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit b3548612c7943011f79a910f9a59bb975984d8a6
+Author: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
+Date: Sat Jun 5 13:09:28 2010 +0200
DRI2: Don't return junk reply instead of blocking in glXWaitForSbcOML()
@@ -140,15 +2820,615 @@ Date: Fri Jun 11 11:08:31 2010 +1000
Signed-off-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit b3548612c7943011f79a910f9a59bb975984d8a6)
+
+commit 7287ef9e6cf953066e4a092cca9d0e4a279172bf
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Sun Jun 6 21:18:40 2010 +0700
+
+ Remove unnecessary parentheses around return values in functions
+
+ This patch was generated by the following Perl code:
+
+ perl -i -pe 's/([^_])return\s*\(\s*([^(]+?)\s*\)s*;(\s+(\n))?/$1return $2;$4/g;'
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit d1b4beecbc16448282dcc825dd5c354e96e48eca
+Author: Dan Nicholson <dbn.lists@gmail.com>
+Date: Mon Jun 7 20:39:53 2010 -0700
+
+ xfree86: Add MatchOS InputClass entry for operating system matching
- Conflicts:
+ Allow InputClass sections to match against the running operating system
+ to narrow the application of rules. An example where this could be used
+ is to specify that the default input driver on Linux is evdev while it's
+ mouse/kbd everywhere else.
+
+ The operating system name is the same as `uname -s`, and matching is
+ case-insensitive.
+
+ Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 9b30fa9f8fedb7ddb5672f93ed1a154d13578c47
+Author: Dan Nicholson <dbn.lists@gmail.com>
+Date: Mon Jun 7 20:39:52 2010 -0700
+
+ xfree86: Refactor InputClass matching code
+
+ InputClassMatches was starting to get a little hairy with all the loops
+ over the tokenized match strings. This adds code, but makes it easier to
+ read and add new matches.
+
+ Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
+ Reviewed-by: Jamey Sharp <jamey at minilop.net>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit d09bc8f8e5bb92899f7c90eab6b0907920c7d643
+Author: Dan Nicholson <dbn.lists@gmail.com>
+Date: Mon Jun 7 20:39:51 2010 -0700
+
+ xfree86: Constify InputClass functions
+
+ Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 61c35d8ac4b6423caf2dcecb4ff25baaaaa14b1c
+Author: Dan Nicholson <dbn.lists@gmail.com>
+Date: Mon Jun 7 20:39:50 2010 -0700
+
+ config/hal: Missing newline in log message
+
+ Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 697c5b010d7f6df0ec9cae6352b125c4cbdbaad3
+Author: Dan Nicholson <dbn.lists@gmail.com>
+Date: Mon Jun 7 20:39:49 2010 -0700
+
+ config/udev: Add verbose info when fetching udev properties
+
+ Give the user a chance to see why their input devices are being ignored,
+ even if they have to start the server with -logverbose.
+
+ Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 94547b2d1448232ae316c228d65482cc0b646ac2
+Author: Dan Nicholson <dbn.lists@gmail.com>
+Date: Mon Jun 7 20:39:48 2010 -0700
+
+ config/hal: don't leak the input.tags property
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 5e1ef1f4dde4615498c1c5e7a4e422c3b3432fe8
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Tue Jun 8 13:01:10 2010 -0700
+
+ XQuartz: Add more sanity checking around string manipulation for xmodmap
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 0be81f9a163f2838448caee41b2dda274d73391a
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sun Jun 6 16:31:19 2010 -0700
+
+ XQuartz: Fix build regression from faeebead7bfcc78535757ca7acc1faf7554c03b7
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit b3a7b229e1e1f212bdd185af5443311091824005
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Jun 7 21:49:43 2010 -0700
+
+ Make DRI_SCREEN_PRIV just return NULL when DRI isn't initialized
+
+ The code relied upon the previous devPrivate implementation which
+ offered this convenience.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit f7af00e9f0e0e1d854b0e882378c032518ab71ca
+Author: Ben Skeggs <bskeggs@redhat.com>
+Date: Mon Jun 7 10:21:18 2010 +1000
+
+ randr: prevent an unnecessary screen resize with multiple displays
+
+ crtc->{x,y} is always 0 when xf86DefaultScreenLimits() is called, so we
+ calculate too small an area for the initial framebuffer and force a resize
+ to happen.
+
+ This commit fixes the code to use desired{X,Y} instead, which contains the
+ initial output positions.
+
+ Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 8e97e5f9425639ad0a084150d0b232cad417595d
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Jun 7 14:23:47 2010 -0700
+
+ If XTest is always required, then eliminate the XTest devPrivate
+
+ The internals of XTest are used by Xi and Xkb, and both Xi and Xkb are
+ always required, so it makes little sense to have XTest place data in
+ a devPrivate, especially a devPrivate which is only available when the
+ XTest extension is enabled.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit fdb081b430ddffb495aa5b05bcc4cf10882ff4b2
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Jun 7 00:54:18 2010 -0700
+
+ dri2: Deal with input-only windows by using WindowDrawable()
+
+ Input only windows aren't DRAWABLE_WINDOW, but casting them to a
+ PixmapPtr is a bit harsh, and unlikely to get the appropriate privates
+ structure. use WindowDrawable instead which checks for both
+ input-output and input-only windows.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Tested-by: Eric Anholt <eric@anholt.net>
+
+commit bc26665661565918af484ccd17caad951010df60
+Author: Keith Packard <keithp@keithp.com>
+Date: Sun Jun 6 20:45:53 2010 -0700
+
+ Initialize private keys in test suite
+
+ Make sure all of the private keys used by the test code are
+ initialized before being used.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Tested-by: Robert Hooker <sarvatt@ubuntu.com>
+
+commit f03be727d647183a2176355ad0ac9a6735067be9
+Author: Keith Packard <keithp@keithp.com>
+Date: Sun Jun 6 16:04:42 2010 -0700
+
+ Place glyph privates at correct location within the allocate storage
+
+ A glyph allocation consists of :
+
+ GlyphRec
+ numScreens * PicturePtr
+ glyph privates
+
+ Tell the dix private bits to start past the picture pointers.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 67b824a81bb8254827023de351a4a094031f0e94
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Sun Jun 6 20:37:07 2010 +0700
+
+ randr: Make deletion of output properties more robust
+
+ Previously there was two branches of code with small discrepancies between them
+ (especially prop->valid_values field was not free(3)ed). Extract the common
+ routine and fix double-free prop->valid_values in RRDestroyOutputProperty by
+ the way.
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+
+commit 0a4d8cbdcd7b25313fb29ccdb498044af95f7de6
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Sun Jun 6 15:28:30 2010 +0700
+
+ Remove more superfluous if(p) checks around free(p)
+
+ This patch has been generated by the following Coccinelle semantic patch:
+
+ @@
+ expression E;
+ @@
+
+ -if(E) { free(E); }
+ +free(E);
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
+ Reviewed-by: Matt Turner <mattst88@gmail.com>
+
+commit 5a0fc0ad21d562612676ef88ef2d533b2391810a
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Fri Jun 4 15:35:31 2010 +0700
+
+ Replace deprecated bzero with memset
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Marcin Baczyński <marbacz@gmail.com>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Matt Turner <mattst88@gmail.com>
+
+commit f9810ba914877b379cb36f1b9755f7923ceca14c
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Fri Jun 4 14:26:31 2010 +0700
+
+ xkb: Remove superfluous if(x) x = realloc(x, sz); else x = malloc(sz); logic
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Marcin Baczyński <marbacz@gmail.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Matt Turner <mattst88@gmail.com>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+
+commit 77ea20895ca1d163e14c6b767d8c287c94ba3114
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Fri Jun 4 14:22:06 2010 +0700
+
+ xkb: Remove superfluous if(p) checks around free(p)
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+
+commit 5d4e2c594059ffb536c8e506c2623320d3c6a787
+Merge: eacc421 793dd39
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Jun 5 22:20:28 2010 -0700
+
+ Merge remote branch 'jamey/for-keith'
+
+commit 793dd399468ff3ba22ffa9c62fa54fc87261fbe7
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Tue May 25 15:08:38 2010 -0700
+
+ dmx: Split glx scalar swap variables from array swap variables.
+
+ This makes hw/dmx/glxProxy/unpack.h more closely resemble glx/unpack.h,
+ and fixes the "unused variable 'swapEnd'" and "unused variable 'swapPC'"
+ warnings.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit eacc42132ed0f1e8f4a4d65a4b6637ab06f7e2aa
+Author: Kim Woelders <kim@woelders.dk>
+Date: Fri Jun 4 20:20:47 2010 +0200
+
+ dix: Remove test for obsolete NO_XINERAMA_PORT macro.
+
+ Signed-off-by: Kim Woelders <kim@woelders.dk>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit a0fe6987b55b5326157b50e169b8d6b9ae26a1ae
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sat Jun 5 20:55:29 2010 -0700
+
+ Clean up after removal of screen parameters from region macros.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 424b593c7872a703d3d0c942b7e8acc0770eb023
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Jun 5 21:34:51 2010 -0700
+
+ Damage pixmap private key was being mis-registered as a picture key
+
+ This would cause all kinds of fun, in particular Xnest would crash at startup.
+
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 9c121ae45ae1d2ebd892c45e1631716ef5e7d649
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Jun 5 21:34:27 2010 -0700
+
+ Register Xnest colormap screen private key
+
+ This key is used to store the currently installed colormap and must be
+ registered before we can use it.
+
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit df534d05208436e9ca8c9b42acff3fbe240e3ec4
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Jun 5 21:24:54 2010 -0700
+
+ Make GetPictureScreenIfSet check if Render is running
+
+ This macro originally checked to see if the Render screen private
+ index had been allocated. When the privates were changed the first
+ time, there wasn't any need to check as dixLookupPrivate would simply
+ return NULL in that case. Now that we care, check to see if the key
+ has been initialized before asking for the value.
+
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit e7fc8b32e41e10c057d2787fcc377296be67f2e9
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Jun 5 21:08:01 2010 -0700
+
+ Move the shadow screen private key initialization to shadowSetup
+
+ Some users of the shadow code don't call shadowInit, just shadowSetup
+ and so make sure the key is initialized there.
+
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 6bd5f0d75bca727c4686b20eee166c8cae472ba2
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Jun 5 21:07:15 2010 -0700
+
+ Fix exa_priv.h declarations of privates
+
+ exa_priv.h exposes the privates to the rest of the exa code, and yet
+ the declarations of the privates wasn't fixed when the exa.c versions were.
+
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 6b306f43384e5c2143197e746a5a39c4ebb2583c
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Jun 5 20:58:04 2010 -0700
+
+ kdrive: Xv code uses shared screen private instead of kdrive-specific private
+
+ When doing the devPrivate API conversion, I missed this as there was
+ also a local private key which wasn't ever used.
+
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit ab07e2b8ededaa2193fc199a8c09623d84032280
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Apr 30 19:38:48 2010 -0700
+
+ Allocate per-screen device/cursor-bits private keys in midispcur
+
+ midispcur was abusing the CursorScreenKey to index the cursor_bits
+ privates, it also had a MAXSCREENS array of keys to index device
+ privates. Switch both of these to the new dixCreatePrivateKey API and
+ store a pointer to that in the screen private.
- hw/xfree86/dri2/dri2ext.c
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+
+commit 34db537907c6cb2635dbefdce7dcfcae90f7c902
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Apr 30 19:36:33 2010 -0700
+
+ Add dixCreatePrivateKey API
+
+ Keys need to persist through server reset so that the private system
+ can be cleaned up in dixResetPrivates. In particular, this means that
+ keys cannot live in objects freed at reset time. This API provides
+ suitable object lifetime by having the privates code free the key in
+ the reset path.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+
+commit 495fc3eb2d6c98bde82ae1278f89fcf131fd9bf8
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Apr 30 19:38:38 2010 -0700
+
+ Change devPrivates implementation.
+
+ Each key now declares which object type it belongs to, this permits
+ keys for different types to share the same offset within the allocated
+ privates. As a special case for XSELinux, a key may be allocated as
+ PRIVATE_XSELINUX which will allow it to continue to be used across the
+ relevant object types.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
-commit f85552aa452d5f575fee9f6031a33ca79bdc3cc8
+commit faeebead7bfcc78535757ca7acc1faf7554c03b7
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Apr 26 17:22:21 2010 -0700
+
+ Change the devPrivates API to require dixRegisterPrivateKey
+
+ This patch only changes the API, not the implementation of the
+ devPrivates infrastructure. This will permit a new devPrivates
+ implementation to be layed into the server without requiring
+ simultaneous changes in every devPrivates user.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Tested-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+
+commit c865a24401f06bcf1347d8b41f736a066ab25693
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Apr 30 22:05:27 2010 -0700
+
+ Create separate private key for midispcur cursor bits
+
+ The CursorScreenKey array is supposed to be used by the DDX for cursor
+ private data, but midispcur was abusing it to hold cursor bits private
+ information. Create a separate set of privates for the dispcur cursor
+ bits information.
+
+ This also renames the device private index and macros to better
+ reflect their usage:
+
+ miDCSpriteKey -> miDCDeviceKey
+ MIDCBUFFER -> miGetDCDevice
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+
+commit 431781a921251d54782f0a4f194bbef1fabd1380
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat May 15 14:52:39 2010 -0700
+
+ Remove dixRegisterPrivateOffset; hard-code devPrivates offsets instead
+
+ For predefined resource types, the offset of the devPrivates field was
+ already kept in a constant table. The only non-predefined type needing
+ this treatment was dbeDrawableResType, which is just a magic alias for
+ RT_PIXMAP.
+
+ This patch special-cases looking up RC_DRAWABLE offsets and uses the
+ table directly for everything else.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+
+commit 7ef612de784daaed09ba13f4615c10714614033f
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri May 21 12:35:29 2010 -0700
+
+ Add REGION_ macros for source compatibility with existing drivers.
+
+ This makes the region code changes source compatible with existing
+ code, although none of them are used within the server source itself.
+
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 965cade6ee7c226f850e806cb2e910793d1536f9
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri May 21 12:18:22 2010 -0700
+
+ Change region implementation from macros to inline functions.
+
+ This makes all of the previous macros into inline functions and also
+ turns all of the direct calls to pixman region code into inline
+ functions as well.
+
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 2dc138922b7588515d5f2447e4b9dcdc0bef15e0
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri May 21 15:05:48 2010 -0700
+
+ Rename region macros to eliminate screen argument
+
+ This is a combination of a huge mechanical patch and a few small
+ fixups required to finish the job. They were reviewed separately, but
+ because the server does not build without both pieces, I've merged
+ them together at this time.
+
+ The mechanical changes were performed by running the included
+ 'fix-region' script over the whole tree:
+
+ $ git ls-files | grep -v '^fix-' | xargs ./fix-region
+
+ And then, the white space errors in the resulting patch were fixed
+ using the provided fix-patch-whitespace script.
+
+ $ sh ./fix-patch-whitespace
+
+ Thanks to Jamey Sharp for the mighty fine sed-generating sed script.
+
+ The hand-done changes involve removing functions from dix/region.c
+ that duplicate inline functions in include/regionstr.h, along with
+ their declarations in regionstr.h, mi.h and mispans.h.
+
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit d17e726e89ef644310de77b960b715c2d11088da
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat May 22 00:09:47 2010 -0700
+
+ Move mi/miregion.c to dix/region.c
+
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 9b6f5f549dfe4c20e3cb3c2ef7095ab47abaca3b
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri May 21 11:14:59 2010 -0700
+
+ Change region implementation names to eliminate the 'mi' prefix
+
+ This prepares the file to be moved from mi to dix. This patch
+ was done mechanically with the included scripts 'fix-miregion' run over
+ the entire X server and 'fix-miregion-private' run over
+ include/regionstr.h and mi/miregion.c.
+
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 1768e51976ae8949d999309bd2384ccad72deecd
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sat Jun 5 15:58:21 2010 -0700
+
+ rootless: Fix SetShape regression
+
+ This fixes a regression in miext/rootless from 643cb6e87c10ab554c03ada81930001a8ebcc909
+
+ Found-by: tinderbox
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+ Reviewed-by: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 6b4af3b7925978cd79f717761f1b6f33bd8dfbaf
+Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
+Date: Fri Jun 4 16:27:28 2010 +0300
+
+ configure: Check for libsha1.pc
+
+ xserver fails to detect libsha1. Problem is that configure checks for
+ sha1.pc when libsha1 provides libsha1.pc.
+
+ Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit d163266692235261e1e0cfa6b900f54e6ec63de5
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Jun 3 18:59:04 2010 -0700
+
+ Stop searching for XF86Config files
+
+ xorg.conf has been used since the X11R6.7 release in April 2004.
+ 6 years has been a generous transition period for users to
+ "mv XF86Config xorg.conf" and for distros to update their
+ configuration tools and packages.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: James Cloos <cloos@jhcloos.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 01c75522b6ed15e979347acd38e234e2cb9006c3
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Jun 3 18:59:03 2010 -0700
+
+ Stop searching for XF86Config files
+
+ xorg.conf has been used since the X11R6.7 release in April 2004.
+ 6 years has been a generous transition period for users to
+ "mv XF86Config xorg.conf" and for distros to update their
+ configuration tools and packages.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: James Cloos <cloos@jhcloos.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 7f19a7a6e90a4fd7b7ec0256974f62e575218541
Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Fri Jun 11 10:12:52 2010 +1000
+Date: Fri Jun 4 14:15:04 2010 +1000
xkb: fix invalid memory writes in _XkbCopyGeom.
@@ -181,13 +3461,323 @@ Date: Fri Jun 11 10:12:52 2010 +1000
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by-and-apologised-for: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit 7f19a7a6e90a4fd7b7ec0256974f62e575218541)
+
+commit 959a1eaf1c15a691141f1b0dc53757fe9b6e9b13
+Author: Dave Airlie <airlied@redhat.com>
+Date: Fri Jun 4 11:09:46 2010 +1000
+
+ composite: use config notify hook to do pixmap resize.
- Conflicts:
+ Since reallocating the backing pixmap can fail, we need to try and do
+ it before any other side effects of reconfiguring the window happen.
- xkb/xkbUtils.c
+ This changes the ConfigNotify hook to return status, and moves the
+ composite window reconfiguration wrappers to ConfigNotify. They all
+ basically did the same thing, so we can drop the MoveWindow,
+ ResizeWindow, ChangeBorderWidth wrappers, and allow ConfigNotify to do
+ all the work. If reallocation fails we fail before we send any
+ confiureNotify events, or enter the area we can't recover from.
+
+ The only place we now enforce 32k limits are in EXA/UXA/fb, so drivers
+ that don't use this should probably deal with it in their pixmap
+ allocate if they don't already.
+
+ This also breaks ABI, so we need an alternate fix for older servers,
+ working on the X server makes me realise why I'm a kernel hacker.
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 0f12e86e600522768f5f64eafc1230526e700ab7
+Merge: aa7c09f f114f54
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Jun 3 15:09:32 2010 -0700
+
+ Merge remote branch 'jamey/for-keith'
+
+commit f114f54986aca1add4c8808a05d9692e289547e7
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Fri Apr 23 19:33:49 2010 -0700
+
+ Accumulate graphics exposures incrementally in PanoramiXCopyArea/Plane.
+
+ This fuses two loops in each function, eliminating an intermediate
+ MAXSCREENS-sized array from each.
+
+ Aside from being more efficient, I believe this is equivalent to the
+ previous implementation, since
+ - each per-screen GC has the graphicsExposures flag set the same way,
+ and
+ - the REGION_* macros ignore their screen argument.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Tested-by: Tiago Vignatti <tiago.vignatti@nokia.com> (i686 GNU/Linux)
+
+commit a7c7ebe4b3a0df1a4d1ffe3c690cfb21470f103d
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sat May 22 21:13:48 2010 -0700
+
+ Delete XineramaScreenRegions cache.
+
+ Every screen region consists of a single rectangle, so initializing a
+ stack-allocated region for each screen on-demand does no heap allocation
+ and is fast.
+
+ This eliminates a MAXSCREENS-sized array.
+
+ The REGION_UNINIT calls are no-ops since no boxes are actually allocated
+ for a single-rectangle region, but it seemed wiser to include them.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Tested-by: Tiago Vignatti <tiago.vignatti@nokia.com> (i686 GNU/Linux)
+
+commit a0456da339fa9b3c3e6fead060338ee7348d6460
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sun May 23 12:57:52 2010 -0700
+
+ XineramaSetCursorPosition: use screen bounds directly, not POINT_IN_REGION.
+
+ This hides a MAXSCREENS-sized array as an implementation detail of
+ panoramiX.c rather than an exported global.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Tested-by: Tiago Vignatti <tiago.vignatti@nokia.com> (i686 GNU/Linux)
+
+commit a83cff9f4d622b069c96a68b4e87a669bf1f6446
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sun May 23 10:11:47 2010 -0700
+
+ Move each screen's x/y origin into ScreenRec.
+
+ Many references to the dixScreenOrigins array already had the
+ corresponding screen pointer handy, which meant they usually looked like
+ "dixScreenOrigins[pScreen->myNum]". Adding a field to ScreenRec instead
+ of keeping this information in a parallel array simplifies those
+ expressions, and eliminates a MAXSCREENS-sized array.
+
+ Since dix declared the dixScreenOrigins array, I figure allocating a
+ screen private for these values is overkill.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Tested-by: Tiago Vignatti <tiago.vignatti@nokia.com> (i686 GNU/Linux)
-commit 83460a94985faafcf7cd09456e833f381f0e13bc
+commit 217ccaa5a341018457f468a774c035c0df47d918
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sun May 23 11:05:01 2010 -0700
+
+ Delete panoramiXdataPtr: it's redundant.
+
+ This eliminates a dynamically-allocated MAXSCREENS-sized array.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Tested-by: Tiago Vignatti <tiago.vignatti@nokia.com> (i686 GNU/Linux)
+
+commit e7fae9ecc42ab5e73b89117722dbf4117d928f9a
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sat May 22 00:26:28 2010 -0700
+
+ Move each screen's root-window pointer into ScreenRec.
+
+ Many references to the WindowTable array already had the corresponding
+ screen pointer handy, which meant they usually looked like
+ "WindowTable[pScreen->myNum]". Adding a field to ScreenRec instead of
+ keeping this information in a parallel array simplifies those
+ expressions, and eliminates a MAXSCREENS-sized array.
+
+ Since dix uses this data, a screen private entry isn't appropriate.
+
+ xf86-video-dummy currently uses WindowTable, so it needs to be updated
+ to reflect this change.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Tested-by: Tiago Vignatti <tiago.vignatti@nokia.com> (i686 GNU/Linux)
+
+commit 80b5d3a3264d2c5167e5ac85a3b04af0f89cece1
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Fri May 21 23:13:51 2010 -0700
+
+ Move each screen's screensaver data into ScreenRec.
+
+ Most references to the savedScreenInfo array already had the
+ corresponding screen pointer handy, which meant they usually looked like
+ "savedScreenInfo[pScreen->myNum]". Adding a field to ScreenRec instead
+ of keeping this information in a parallel array simplifies those
+ expressions, and eliminates a MAXSCREENS-sized array.
+
+ Since dix uses this data, a screen private entry isn't appropriate.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Tested-by: Tiago Vignatti <tiago.vignatti@nokia.com> (i686 GNU/Linux)
+
+commit 5030540d6cd2aa9bbd4ecb7f4487616f9ef0140a
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Thu May 27 11:50:52 2010 -0700
+
+ midispcur: Add comment explaining why pRootPicture must not be freed.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Cc: Peter Hutterer <peter.hutterer@who-t.net>
+ Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit f308cbea8c9fa5c5c6705bc301178b167de450d5
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Mon May 24 18:41:54 2010 -0700
+
+ mi: Delete unused flicker-free MoveCursor code.
+
+ It's been commented-out for three and a half years and nobody seems to
+ be missing it enough to resurrect it.
+
+ Besides deleting code that is untested and therefore buggy, this saves a
+ little memory for each pointer device on each screen.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit d1bad1b59f24ab4dcf2d1ce1c5d4f42b5fa40bc1
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Tue May 25 14:25:07 2010 -0700
+
+ dmx: Fix XSetExtensionErrorHandler calls to agree on constness.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit aa7c09f7d04d59852b850b2b6993f4cbdc7ec940
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Jun 2 14:31:56 2010 -0700
+
+ Install fbdevhw module in normal module directory instead of linux/
+
+ Since we no longer support OS-independent custom elfloader modules,
+ we don't need to put the OS-dependent modules into os-specific subdirs
+ any more.
+
+ We do however still need to install the stubs version of this module
+ on non-Linux platforms, since a number of drivers link to functions
+ in it, even when built on non-Linux platforms.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Michel Dänzer <michel@daenzer.net>
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit b13d7a8e09c8e3eb5003420c3c0484431e5a052b
+Merge: f0ab726 dcceb90
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Jun 3 07:01:26 2010 -0700
+
+ Merge remote branch 'vignatti/for-keith'
+
+commit dcceb90b1dccbbf5793f6ba1ed857013b71dafbc
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Wed May 19 11:45:46 2010 +0200
+
+ xext: delete wrong source reference from fontcache
+
+ This should go away in 0b45ba48.
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+
+commit c043de3261b6e14f2446b2cd9d62dde5860d4720
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Mon May 3 12:37:25 2010 +0200
+
+ configure: sha1: check libsha1 using pkg-config instead
+
+ Previously the code was using AC_CHECK_LIB, guaranteeing whether the library
+ is correct by tracking sha1_begin function. This paranoic checking is not
+ necessary given there's only one libsha1 in the market, which surely contains
+ such function.
+
+ Moreover, this patch now improves a bit the sha1 implementation checking
+ behavior using pkg-config to find the right flags that needs to link against.
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+
+commit f0ab726d8966cab4e50154c216d577db79328d77
+Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
+Date: Wed Apr 21 11:07:47 2010 +0300
+
+ DRI2: Use single error path in initialization
+
+ Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
+ Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
+
+commit 6eef70dc56bcc1e3047e4e488bcd6ae62c8ffac6
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Fri Jan 22 18:34:36 2010 +0200
+
+ DRI2: Allow building without libdrm
+
+ Some drivers use DRI protocol but implement their own kernel rendering
+ manager. For these drivers, libdrm becomes useless. --disable-libdrm
+ configure parameter can be used to disable libdrm support in dri2.
+
+ To provide ABI/API compatibility for libdrm based drivers, libdrm call
+ is wrapped in ifdef.
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
+ Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
+
+commit cdcb575664d3d60b662c542e782de83a047165c9
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Fri Jan 22 17:58:17 2010 +0200
+
+ DRI2: add AuthMagic hook for driver side support
+
+ With this new hook, drmAuthMagic becomes useless and should be deprecated.
+ You might want to implement AuthMagic on driver side instead.
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
+ Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
+
+commit 643cb6e87c10ab554c03ada81930001a8ebcc909
+Author: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
+Date: Thu May 27 09:11:50 2010 -0700
+
+ Only deal with input code when changing the input shape.
+
+ Propagate the shape kind all the way to SetShape to avoid performing non-input
+ operations such as revalidating the tree and generating exposures when only
+ changing a window's input shape.
+
+ Signed-off-by: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
+ Acked-by: Aaron Plattner<aplattner@nvidia.com>
+ Reviewed-by: Daniel Stone<daniel@fooishbar.org>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit d90f2cd98a97e6534792d3867b3fba70d850b706
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu May 27 13:26:23 2010 +0100
+
+ xfree86: Unbreak autoconfig following 0abf065e38c4
+
+ The move of the PCI device id probing into a separate file neglected to
+ return the number of found devices, and so the PCI devices were being
+ overwritten by the default entries for vesa and fbdev.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+ Cc: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Cc: Alex Deucher <alexdeucher@gmail.com>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 1304b8b27cb12c803c4f51f04cb6f9d508b82c69
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri May 28 09:35:54 2010 -0700
@@ -208,9 +3798,8 @@ Date: Fri May 28 09:35:54 2010 -0700
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit 1304b8b27cb12c803c4f51f04cb6f9d508b82c69)
-commit 14dc68c2655ea033d102ebfc2cb6a368fc0c330f
+commit 91a6359caf24d94343ff76f43ea7b7fc3223203d
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jun 3 12:16:40 2010 +1000
@@ -221,9 +3810,8 @@ Date: Thu Jun 3 12:16:40 2010 +1000
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit 91a6359caf24d94343ff76f43ea7b7fc3223203d)
-commit 1f6de991d0b44bf1412dc58067fae551f6aac5d1
+commit 968a79dcf5e17ac3963953ef56b8f94dbd75323b
Author: Nicolas George <nicolas.george@normalesup.org>
Date: Wed Jun 2 13:40:51 2010 +0200
@@ -235,9 +3823,292 @@ Date: Wed Jun 2 13:40:51 2010 +0200
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit 968a79dcf5e17ac3963953ef56b8f94dbd75323b)
-commit b1e338df929bc7ef68524e66d5ff8d85af84b0e6
+commit 108b766c31b57fb1955d34d85673a235c7f743aa
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu May 20 11:04:53 2010 +1000
+
+ xfree86: initialize InputAttributes to NULL in the autoconfig code.
+
+ Reported-by: Jamey Sharp <jamey@minilop.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+
+commit 151659f9636088fd70bc5586de97bf43ee706180
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon May 24 16:24:03 2010 +1000
+
+ test: fix up InputAttributes helper function test.
+
+ Just some extra clarification as pointed out by Dan Nicholson,
+ and that memcpy should have been a memcmp.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
+
+commit 6cccf0131c8464d8838cae2200730873d7dd9e45
+Author: Peter Korsgaard <peter.korsgaard@barco.com>
+Date: Tue May 25 11:03:28 2010 +0200
+
+ dix: add 3x3 transformation matrix xinput property for multi-head handling
+
+ For absolute input devices (E.G. touchscreens) in multi-head setups,
+ we need a way to bind the device to an randr output. This adds the
+ infrastructure to the server to allow us to do so.
+
+ positionSprite() scales input coordinates to the dimensions of the shared
+ (total) screen frame buffer, so to restrict motion to an output we need to
+ scale/rotate/translate device coordinates to a subset of the frame buffer
+ before passing them on to positionSprite.
+
+ This is done here using a 3x3 transformation matrix, which is applied to
+ the device coordinates using homogeneous coordinates, E.G.:
+
+ [ c0 c1 c2 ] [ x ]
+ [ c3 c4 c5 ] * [ y ]
+ [ c6 c7 c8 ] [ 1 ]
+
+ Notice: As input devices have varying input ranges, the coordinates are
+ first scaled to the [0..1] range for generality, and afterwards scaled
+ back up.
+
+ E.G. for a dual head setup (using same resolution) next to each other, you
+ would want to scale the X coordinates of the touchscreen connected to the
+ both heads by 50%, and translate (offset) the coordinates of the rightmost
+ head by 50%, or in matrix form:
+
+ left: right:
+ [ 0.5 0 0 ] [ 0.5 0 0.5 ]
+ [ 0 1 0 ] [ 0 1 0 ]
+ [ 0 0 1 ] [ 0 0 0 ]
+
+ Which can be done using xinput:
+
+ xinput set-prop <left> --type=float "Coordinate Transformation Matrix" \
+ 0.5 0 0 0 1 0 0 0 1
+
+ xinput set-prop <right> --type=float "Coordinate Transformation Matrix" \
+ 0.5 0 0.5 0 1 0 0 0 1
+
+ Likewise more complication setups involving more heads, rotation or
+ different resolution can be handled.
+
+ Signed-off-by: Peter Korsgaard <peter.korsgaard@barco.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit e4582d9e5c8649347742a13eae68cf27005296fc
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu May 27 10:42:54 2010 -0400
+
+ xfree86: bump ABI_XINPUT_VERSION to 11.
+
+ commit c2d0b3b437b7ce6ce975f2ead4d8bb8295ef0ddc
+ "xfree86: store the InputAttributes in the input device."
+ introduced the new API. Bump the input version so drivers can handle this
+ appropriately.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit cd0ef0b6a2f9c6bfeda98684569da922792d3feb
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Tue May 25 14:30:22 2010 -0700
+
+ dmx: Delete unused ChangeKeyboardDevice/ChangePointerDevice.
+
+ Daniel Stone deleted the API for these in 2006, in commit
+ 96e32805d12fc36f0fa0926dbfb0dd8a5cadb739.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 70454864917f534483fa049e067b5646df61c88a
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Fri May 14 12:31:44 2010 -0700
+
+ Ignore build products in the server's test suite.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Cc: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 8bb88379d95356384e233225bfda6abfd71389b4
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Tue May 25 15:52:18 2010 -0700
+
+ dmx: Remove dead __glXDispSwap_DrawArraysEXT definition.
+
+ Eric Anholt made the corresponding fix in glx/render2swap.c in commit
+ 49d38ab2328c409b2a98465b52677af057121513.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
+
+commit c97a3ade5a8718b063292c73a31aac2196fe2452
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Tue May 25 15:17:30 2010 -0700
+
+ dmx: Delete unused local variables.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 3c3d099fc10c63d746f90c08043d45180d6a7226
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Tue May 25 13:44:32 2010 -0700
+
+ dmx: Xfree -> free
+
+ Mikhail fixed the corresponding Xallocs, but missed these uses of Xfree
+ in commit 3f3ff971ecff9936cebafc813af9193b97bba89c.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 01ca6400d949a873c0bb5de7e0dbf138e8a7949b
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Tue May 25 14:02:34 2010 -0700
+
+ Xephyr: Fix Xcalloc deprecation warnings.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 34df659687ad3936ab03d19ce8fdb21f385c2e8a
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Tue May 25 11:51:32 2010 -0700
+
+ xfree86/int10/helper_mem: Fix log message.
+
+ Three years ago in commit f62beb6f3609e8b6e61325ac89017590811bbd07 ajax
+ deleted the code that could have set this format string to anything
+ else, so just use the format string literal. This makes GCC happy since
+ it can check the argument types, which, by the way, weren't correct
+ since this format string doesn't need any arguments.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
+ Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+
+commit 0a98d9e6cec7c611a3c56f97d4ddc0c546975c55
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Tue May 25 10:30:58 2010 -0700
+
+ xf86bigfont: Silence compiler warning by initializing pDesc.
+
+ Access to pDesc was always guarded by (nCharInfos > 0), so the code
+ wasn't actually buggy, but this makes it clear that it's correct.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
+
+commit 4e9d3e413245e7c01c2ff3c0f130b8967754131b
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed May 26 07:54:35 2010 -0700
+
+ Revert "Add a "flags" field to DeleteInputDeviceRequest."
+
+ Peter wants to get a larger patch sequence put together and I didn't
+ read past the commit message to see the 'don't take this patch
+ please'.
+
+ This reverts commit 531ff40301975519af7b20109c17d296312d3f2b.
+
+commit 531ff40301975519af7b20109c17d296312d3f2b
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu May 20 18:07:12 2010 +1000
+
+ Add a "flags" field to DeleteInputDeviceRequest.
+
+ Some input drivers need to implement an internal hotplugging scheme for
+ dependent devices to provide multiple X devices off one kernel device file.
+ Such dependent devices can be added with NewInputDeviceRequest() but they are
+ not removed when the config backend calls DeleteInputDeviceRequest(),
+ leaving the original device to clean up.
+
+ Example of the wacom driver:
+
+ config/udev calls NewInputDeviceRequest("stylus")
+
+ wacom PreInit calls
+ NewInputDeviceRequest("eraser")
+ NewInputDeviceRequest("pad")
+ NewInputDeviceRequest("cursor")
+ PreInit finishes.
+
+ When the device is removed, the config backend only calls
+ DeleteInputDeviceRequest for "stylus". The driver needs to call
+ DeleteInputDeviceRequest for the dependent devices eraser, pad and cursor to
+ clean up properly.
+ However, when the server terminates, DeleteInputDeviceRequest is called for
+ all devices - the driver must not remove the dependent devices to avoid
+ double-frees. There is no method for the driver to detect why a device is
+ being removed, leading to elaborate guesswork and some amount of wishful
+ thinking.
+
+ Though the input driver's UnInit already supports flags, they are unused.
+ This patch uses the flags to supply information where the
+ DeleteInputDeviceRequest request originates from, allowing a driver to
+ selectively call DeleteInputDeviceRequest when necessary.
+
+ Also bumps XINPUT ABI.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit c2d0b3b437b7ce6ce975f2ead4d8bb8295ef0ddc
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue May 25 17:15:32 2010 +1000
+
+ xfree86: store the InputAttributes in the input device.
+
+ InputAttributes largely decide which configuration values get merged from
+ the xorg.conf.d snippets. While they are available in the config backend,
+ they are not available for any other callers of NewInputDeviceRequest().
+
+ Drivers implementing driver-side hotplugging do not have access to these
+ attributes and cannot have xorg.conf.d snippets specific to dependent
+ devices. For example, the following case cannot work right now:
+
+ Section "InputClass"
+ MatchProduct "Wacom"
+ Option "PressCurve" "0 0 100 100"
+ ...
+ EndSection
+
+ Section "InputClass"
+ MatchProduct "Wacom"
+ MatchProduct "eraser"
+ Option "PressCurve" "10 10 50 50"
+ ...
+ EndSection
+
+ The second section is not triggered, as the wacom driver cannot supply the
+ InputAttributes to NewInputDeviceRequest().
+
+ Add the attributes to the IDevRec and merge them into the InputInfoRec to
+ make them accessible in the driver. This changes the ABI for input drivers.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 86303a338ad563d0b986a3c052104301c310c4ac
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue May 25 17:12:34 2010 +1000
+
+ dix: add helper functions to duplicate and free InputAttributes.
+
+ No special memory handling is used to give drivers the maximum flexibility
+ with the data. Drivers should be able to call realloc on the product string
+ if needed and perform similar operations.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit bf78e11839f8278020b604672ff7c3d194232be9
Author: Jamey Sharp <jamey@minilop.net>
Date: Mon May 24 09:15:32 2010 -0700
@@ -255,9 +4126,8 @@ Date: Mon May 24 09:15:32 2010 -0700
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
- (cherry picked from commit bf78e11839f8278020b604672ff7c3d194232be9)
-commit 3ad3592820a8beeb724575fb7ae7f3e2f3560030
+commit bf9b64eefbadbf299d3b841c1890bfcaef5aab1b
Author: Jamey Sharp <jamey@minilop.net>
Date: Mon May 24 09:14:27 2010 -0700
@@ -265,111 +4135,154 @@ Date: Mon May 24 09:14:27 2010 -0700
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
- (cherry picked from commit bf9b64eefbadbf299d3b841c1890bfcaef5aab1b)
-commit 598603021f6c4fa64161366177e93de67511bc2e
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Wed Jun 2 11:13:17 2010 +1000
+commit b11465a6ecdc2b8373e6fc8af427edc4602bcaa1
+Merge: 7c085ae 0abf065
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon May 24 22:18:31 2010 -0700
- dri2: Take an XID for tracking the DRI2 drawable
+ Merge remote branch 'vignatti/bus-cleanup-take2'
+
+commit 7c085aebfedeb621a6fbeb3f09f4fcc640452044
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Mon May 24 11:45:42 2010 -0700
+
+ xfixes: Remove the invisible cursor sprite, using NullCursor instead.
- Some pixmaps (window pixmaps and scratch pixmaps) don't have the
- drawable->id set and thus DRI2 gets confused when using that field
- for looking up the DRI2 drawable. Go back to using privates for getting
- at the DRI2 drawable from a DrawablePtr. We need to keep the resource
- tracking in place so we can remove the DRI2 drawable when the X resource
- it was created for goes away. Additionally, we also now track the DRI2
- drawable using a client XID so we can reclaim the DRI2 drawable even if
- the client goes before the drawable and doesn't destroy the DRI2 drawable.
+ Oliver McFadden reports that the invisible cursor sprite caused damage
+ events and thus unnecessary redrawing, so removing it improves
+ performance when using software cursor sprites, especially on those
+ devices where you do not want a visible cursor: touchscreen tablets,
+ embedded devices, etc.
- Tested-by: Owen W. Taylor <otaylor@fishsoup.net>
- Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
- (cherry picked from commit 9de0e31746d5f0d9d39d11c94ec3cbc04a9935fc)
+ For the xfree86 DDX, if hardware cursors are used, the driver is
+ required to provide a HideCursor function, which will be called instead
+ of trying to set a null cursor. I think software cursors are already
+ safe. The other DDXes also look safe.
- Conflicts:
+ As far as I can tell, there's no reason to realize a null cursor. I
+ think everything that handles null cursors doesn't rely on any setup in
+ RealizeCursor, and treats them as empty cursors.
+
+ Xnest assumes that if a cursor is created, it will be realized before it
+ is freed, which didn't happen if the invisible cursor was never used in
+ a server generation. So this fixes a segfault in Xnest as well.
- hw/xfree86/dri2/dri2.c
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Cc: Oliver McFadden <oliver.mcfadden@nokia.com>
+ Signed-off-by: Oliver McFadden <oliver.mcfadden@nokia.com>
+ Tested-by: Oliver McFadden <oliver.mcfadden@nokia.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
-commit 7faff42deb4b5a71504377375eba95c3cac2e013
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Wed Jun 2 11:11:21 2010 +1000
+commit 0abf065e38c4c48917054eb3e39e12bd20e6e8ec
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Thu May 20 19:24:47 2010 +0300
- Revert "Revert "DRI2: Track DRI2 drawables as resources, not privates""
+ xfree86: move all pci code from auto configurator into a meaningful location
- This reverts commit c394b17266301d363a9e234f58f8015f74e01307. Follow-up
- patch should fix the reason this was reverted in the first place.
+ This patch creates the private xf86PciMatchDriver hook, which goes inside pci
+ code to match the drivers found in the system.
- Conflicts:
+ Now there's no direct references to PCI inside xf86AutoConfig.c anymore.
- hw/xfree86/dri2/dri2.c
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
-commit 95f56176255d5b689b06793d9cbeed36c6a46227
-Author: Kristian Høgsberg <krh@bitplanet.net>
-Date: Sat May 1 13:15:00 2010 -0400
+commit 0ceac6f64f5ad9bc2ac4b19be2dd245ffba78b05
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Thu May 20 18:23:24 2010 +0300
- list.h: Add list_for_each_entry_safe()
+ xfree86: no need to check for the configuration case when matching devices
- Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
- Reviewed-by: Adam Jackson <ajax@redhat.com>
- (cherry picked from commit 32381363cd8f43aeb741bad70bcf96a287dac0c9)
+ xf86MatchDevice will never be called in configuration time.
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
-commit 44521bb9d03a0b7af10f89c98e51bd4109fec327
-Author: Kristian Høgsberg <krh@bitplanet.net>
-Date: Sat May 1 13:13:54 2010 -0400
+commit b0eef1101815b08da2d375af7bec2be3136cf713
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Thu May 20 18:19:14 2010 +0300
- glxdri2: Hard-code the extension version we need
+ xfree86: organize and group all pci related stuff inside xf86.h
- If we use the #define'd version from dri_interface.h, the server will
- require at least that version of the extension. If we're compiling against
- a dri_interface.h with a newer version we don't really require, glxdri2
- will require a too high version of the extension.
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
+
+commit 47df5a489ea69a68e753367423bfbe8830521f4e
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Thu May 20 17:39:59 2010 +0300
+
+ xfree86: remove BUS_ISA type given we don't support anymore
- The right approach is to just hard-code the version we need instead of
- using the #defines.
+ Should go together within commit df14682a.
- Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
- Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
- Reviewed-by: Adam Jackson <ajax@redhat.com>
- (cherry picked from commit 4a8a615d01b9ed18c272414bd11dc2fc661727e5)
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
-commit a847cc9bce744cab72637d62bc6bd45237bd3de5
-Author: Kristian Høgsberg <krh@bitplanet.net>
-Date: Sat May 1 13:07:46 2010 -0400
+commit 9d000a5509e0a356ee33ad08e4dc967a2ef8cbe0
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Thu May 20 16:52:37 2010 +0300
- dix: Update element count in FreeResource*()
+ xfree86: remove all kind of bus and PCI dependency from the common helper file
- FreeResource() keeps clientTable[cid].elements up to date with the
- number of resources allocated to the client. The other free
- resource functions (FreeResourceByType(),
- FreeClientNeverRetainResources() and FreeClientResources()) don't
- maintain this invariant.
+ Move all PCI procedures from xf86Helper.c to a more meaningful place (namely
+ xf86pciBus.c). xf86Helper.c is free of PCI code now.
- Typically, the only consequence is that the element count is too high
- and we end up allocating the hash table bigger than necessary. However,
- FreeResource() also relies on the element count to restart the search if
- the list of resources has been changed during a resource destruction
- callback. Since FreeResourceByType() doesn't update the count, if we call
- that from a resource destruction callback from FreeResource(), the
- loop isn't restarted and we end up following an invalid next pointer.
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
+
+commit 610009cf39984f2f5e818a221b626f7af10bd90e
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Tue May 18 20:54:28 2010 +0300
+
+ xfree86: bus: remove useless field from EntityRec
- Furthermore, LookupClientResourceComplex() and
- FreeClientNeverRetainResources() don't use the element count to detect
- if a callback deleted a resource and may end up following an invalid
- next pointer if the resource system is called into recursively.
+ RAC is the champion of remaining trash for sure!
- Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit 6d7ba5e0fcb5d1bce6bb213dec009f3a0f802d26)
-commit b65c5be170835db2282192381ef411997e61a6f1
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Wed Jun 2 09:27:33 2010 +1000
+commit 95889a569feabd3f803afb92950d067bd76e7397
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Tue May 18 20:48:35 2010 +0300
- xserver 1.8.1.901
+ xfree86: bus: delete useless xf86FindPrimaryDevice
- Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ This function had a wrong name and was just logging the primary device. No one
+ cares about it honestly.
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
+
+commit f6865909485d7d282c8131a2ae306143ad51ba2b
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Tue May 18 19:39:31 2010 +0300
+
+ xfree86: bus: remove unused headers
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
+
+commit 111b1fff1ca69724a8350c4375089c312329c378
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Tue May 18 19:35:10 2010 +0300
+
+ xfree86: bus: remove unused pci macros
+
+ Should be gone in commits 3c03d9f1 and a9d7d659a respectively.
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
+
+commit 2ffffb4daf6161e6a22d81442ecf6209acc9e975
+Merge: b5e0f6d d530608
+Author: Keith Packard <keithp@keithp.com>
+Date: Sun May 23 23:22:08 2010 -0700
+
+ Merge remote branch 'alanc/docs'
-commit 1b71e0a8b9e915c806f6c3596b6ee5913d62fdc3
+commit b5e0f6d8f45c5b24eb50b305c66fa80c783ef488
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 24 12:25:15 2010 +1000
@@ -381,16 +4294,45 @@ Date: Mon May 24 12:25:15 2010 +1000
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit b5e0f6d8f45c5b24eb50b305c66fa80c783ef488)
-commit f7a2da6df80044bf2d92b0bee94a13f7d76960ad
-Merge: 2ab11e0 354e4ce
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue May 25 15:52:53 2010 +1000
+commit d5306084b57583c670c56ce9e7d3c78cca7aa07b
+Author: Brice Goglin <bgoglin@debian.org>
+Date: Sat May 22 20:29:02 2010 +0200
+
+ Remove obsolete reference to README.DRI in xorg.conf.man
+
+ Signed-off-by: Brice Goglin <Brice.Goglin@ens-lyon.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
- Merge branch 'server-1.8-branch' of git://people.freedesktop.org/~alanc/xserver into server-1.8-branch
+commit 89dd7d2b6fe18f32c2f9336c3d8cd9f35490e5ae
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat May 22 10:33:04 2010 -0700
+
+ Remove ancient documentation of IBM RapidAccess keyboard hack
+
+ Keyboard setup belongs in drivers, not in a document no one sees
+ because we don't even install it.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
+
+commit 480fcdf0335abae0ee544b022c7985211eee462f
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat May 22 10:29:47 2010 -0700
+
+ Remove completely out-of-date README.DRI
+
+ The license only allows distribution of verbatim copies, so we can't
+ update it, even to correct the incorrect address to send updates to.
+
+ The Mesa & DRI web pages are much better sources of current information
+ anyway.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
-commit 354e4ce3774d6b7f0c571f426bd2db1c8ab272ea
+commit 1805c74d9b0ed46802481bcd6beea5feeb60212c
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat May 22 10:29:00 2010 -0700
@@ -398,9 +4340,105 @@ Date: Sat May 22 10:29:00 2010 -0700
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
- (cherry picked from commit 1805c74d9b0ed46802481bcd6beea5feeb60212c)
-commit 9a71d21cc27c7b0d35bae9d6dc4eed591dea99a4
+commit 5939e39a641773a36c22104e1184143678dca7a2
+Author: Dave Airlie <airlied@redhat.com>
+Date: Mon May 24 09:31:51 2010 +1000
+
+ xf86: allow for no outputs connected at startup operation.
+
+ When nothing is connected at startup and we canGrow, allow the server to start with a 1024x768 framebuffer, and when the drivers send hotplug events this will expand to the correct size dynamically.
+
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit b9f48d60bc0c839bd323c582231e8e7e2b810af6
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Wed May 19 10:44:33 2010 -0700
+
+ Device init: Don't crash when CreateGC fails.
+
+ ActivateDevice was ignoring errors from DeviceCursorInitialize, so
+ cursor-related calls failed later. Jeremy Huddleston saw that crash in
+ miPointerConstrainCursor, while with Xvfb I saw it in
+ miSpriteRealizeCursor.
+
+ miDCDeviceCleanup frees any non-NULL GCs. miDCDeviceInitialize calls
+ Cleanup on any failure, but if it failed early then some of the pointers
+ in the miDCBufferPtr were garbage. Switch from malloc to calloc to
+ ensure everything's initialized safely first.
+
+ With these two fixes, if CreateGC fails then the server gracefully fails
+ in FatalError instead of segfaulting.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Cc: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit c51534961e1bb4c68ff881758862d2f85f572ce7
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat May 22 11:11:48 2010 -0700
+
+ xorg-server.pc Requires: xproto >= 7.0.17
+
+ Since the headers we export in the SDK use the _X_NORETURN #define
+ introduced in xproto 7.0.17, drivers built with the SDK will also
+ need to have at least that version of xproto installed.
+
+ I considered exporting the version from configure.ac, but decided not
+ to since the minimum required to build the X server may not always
+ be the same as the minimum required to build drivers (for instance,
+ if the X server used a new #define in its .c files or internal headers,
+ but didn't export it in any of the SDK headers).
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit e90f20eed394de2200aba42bd61fd31c1067ac33
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Fri May 21 22:16:50 2010 -0700
+
+ Declare functions that unconditionally call FatalError as _X_NORETURN.
+
+ For AtomError, this should fix a clang warning; in the other cases it's
+ just good documentation.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Cc: Jeremy Huddleston <jeremyhu@apple.com>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 9d31d5b639c2a6ab8b1a80a0e2f0ee2c4f8cddd3
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon May 10 11:48:31 2010 -0400
+
+ vfb: Remove dead variable and header file
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit d8cbcbc01d1355d55c1c0af64f7f7f61629f6c61
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Fri May 21 11:12:26 2010 -0700
+
+ doPolyText: forget about FontChange's XID after looking up pFont.
+
+ As of e2929db7b737413cf93fbebdf4d15abdfebff05c, doPolyText uses pFont
+ consistently rather than looking it up again from the saved XID.
+
+ clang noticed that "oldfid = fid" could run when fid hadn't been
+ initialized yet.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+ Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 989db930d739483759087b13b8d9a043299feafb
Author: Aaron Zang <Aaron.Zang@Sun.COM>
Date: Thu May 20 17:56:28 2010 -0700
@@ -417,9 +4455,18 @@ Date: Thu May 20 17:56:28 2010 -0700
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit 989db930d739483759087b13b8d9a043299feafb)
-commit a8d40f61bf42a55fbd4fcd6468c94cb595e490cc
+commit 98553e52a14b97a03aef8dc4fc0300b3f4c2c4b5
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu May 20 17:56:27 2010 -0700
+
+ vbe.h: Use __attribute__((packed)) on Sun cc 5.9 & later as well as gcc
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 7b09335a46f9428141811230c69eef7968531359
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu May 20 17:56:26 2010 -0700
@@ -436,9 +4483,8 @@ Date: Thu May 20 17:56:26 2010 -0700
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit 7b09335a46f9428141811230c69eef7968531359)
-commit 2ab11e09734dec4f119166fa6512eb25b4572e48
+commit cf4f3d051858aadedd6e333bb317a1daa3987ad7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 21 13:30:25 2010 +1000
@@ -450,249 +4496,585 @@ Date: Fri May 21 13:30:25 2010 +1000
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit cf4f3d051858aadedd6e333bb317a1daa3987ad7)
-commit 869d37721425d219c50962b694c3326407d1d2e6
+commit 5754e66044571d549c295b7c9e02ce3348dbe3c7
Author: Jamey Sharp <jamey@minilop.net>
-Date: Wed May 19 10:44:33 2010 -0700
+Date: Thu May 20 10:46:43 2010 -0700
- Device init: Don't crash when CreateGC fails.
+ Replace screen->rgf scratch GC flags with a bit in each GC.
- ActivateDevice was ignoring errors from DeviceCursorInitialize, so
- cursor-related calls failed later. Jeremy Huddleston saw that crash in
- miPointerConstrainCursor, while with Xvfb I saw it in
- miSpriteRealizeCursor.
+ This eliminates a poorly-named, poorly-documented field from the
+ ScreenRec, using a previously-unused flag bit in each GC instead.
- miDCDeviceCleanup frees any non-NULL GCs. miDCDeviceInitialize calls
- Cleanup on any failure, but if it failed early then some of the pointers
- in the miDCBufferPtr were garbage. Switch from malloc to calloc to
- ensure everything's initialized safely first.
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Cc: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 5a7275d78a2f1c20ed5bb7b228cf370c4ada22c9
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu May 20 13:57:02 2010 -0700
+
+ Find windows GL wrapper files in $(srcdir) instead of .
- With these two fixes, if CreateGC fails then the server gracefully fails
- in FatalError instead of segfaulting.
+ This fixes 'make distcheck' for me.
- Signed-off-by: Jamey Sharp <jamey@minilop.net>
- Cc: Peter Hutterer <peter.hutterer@who-t.net>
- Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+
+commit 1197a87b5638037cc48084fba4eec9d3b599e900
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu May 20 13:40:24 2010 -0700
+
+ winpriv.h was moved from hw/xwin to hw/xwin/glx in November
+
+ hw/xwin/Makefile.am was referencing this instead of hw/xwin/glx/Makefile.am
- (cherry-picked from commit b9f48d60bc0c839bd323c582231e8e7e2b810af6)
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
-commit a8de0866130df62c2b1e4653e028a0fe365e0e3a
-Author: Jesse Barnes <jbarnes@virtuousgeek.org>
-Date: Tue Mar 23 09:47:08 2010 -0700
+commit 1cad520f3f1d9d520422e3e4d5d8f4ea85a212a4
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Mon May 17 20:35:10 2010 -0700
- GLX/DRI2: expose swap control extensions if DDX support is present
+ XFree86 Design doc: Convert LinuxDoc ``quotes'' to DocBook <quote> tags
- Export DDX swap control status from the DRI2 module and check for it in
- GLX when initializing extensions.
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Tested-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 8367913be3305be4f03d095615d3885107094427
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri May 14 22:05:50 2010 -0700
+
+ XFree86 Design doc: Explain this version covers the current Xorg release
- Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
- Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
- (cherry picked from commit 165a4a9c7de0fcc6ef6a6421736b412ccb35965e)
+ Update the title & preface to explain that while this was originally
+ the XFree86 4.0 design, we've changed a lot since forking.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Tested-by: Gaetan Nadon <memsize@videotron.ca>
-commit b24856626e1836657ebf35ad4c61984e0a407c5b
-Author: Jesse Barnes <jbarnes@virtuousgeek.org>
-Date: Mon Mar 8 15:10:47 2010 -0800
+commit 78fe4be4c43db1f07a30e8a6c9a17f81c1082d76
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Mon May 17 20:27:10 2010 -0700
- DRI2: prevent swap wakes from waking MSC waiters
+ Show Xserver release/version date in DIX & DDX docs
- If a few swaps were queued leading to a throttle related block on the
- client, and then the client submitted an MSC wait, one of the previous
- swap wakeups could have caused the MSC wait to complete early. Add a
- flag for this to prevent a swap wake from prematurely waking an MSC
- waiter.
+ Uses a fake absolute path to the entity definition files so that
+ the xmlto --searchpath will work for finding the actual path
- Reported-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
- Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
- Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
- (cherry picked from commit 5933b0abc6a76aaea84aa534df89900cd795c888)
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+ Tested-by: Gaetan Nadon <memsize@videotron.ca>
-commit 5c54e7fa004532d595160a815177dda467b3cc9c
-Author: Jesse Barnes <jbarnes@virtuousgeek.org>
-Date: Mon Mar 8 12:41:25 2010 -0800
+commit 2bdc73bcf41ff0c10e70ecc15fc8b8333af6db65
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri May 14 15:33:46 2010 -0700
- DRI2: handle swapsPending better
+ Move Xserver-spec.xml from xorg-docs to doc/xml
- Avoid a potential swapsPending underflow by incrementing it before
- ScheduleSwap, which may complete it immediately. And be sure to
- decrement it again in case the schedule failed.
+ Allows keeping it in sync with the sources it documents, and to be
+ released with them
- Reported-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
- Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
- Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
- (cherry picked from commit b00d435ddf2e9817e33bfd5f7e9b905442dc23c7)
+ Requires the previous patch to convert the Xserver tree from
+ LinuxDoc to DocBook for SGML/XML documents.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Rémi Cardona <remi@gentoo.org>
+ Tested-by: Gaetan Nadon <memsize@videotron.ca>
-commit fcd76ddfc59de6a1d37ca2aa6e6e91cb8d814744
-Author: Jesse Barnes <jbarnes@virtuousgeek.org>
-Date: Mon Mar 8 12:39:54 2010 -0800
+commit fc6ebe1e1d3057378f61f992549a98e67a04dc6c
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri May 14 14:56:09 2010 -0700
- DRI2: throttle swaps at submission time too
+ Convert LinuxDoc documents to DocBook/XML
- We need to throttle swaps here in addition to when the context is made
- current to avoid causing problems with clients that just swap.
- Throttling here also ensures our swaps get ordered as long as we block
- the client occasionally.
+ Only the markup/formatting is changed - the contents should still
+ be wildly out of date for now.
- Reported-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
- Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
- Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
- (cherry picked from commit 0294ff2a5cadddc8fcc77ba9a851f979f0b91fc3)
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Rémi Cardona <remi@gentoo.org>
+ Tested-by: Gaetan Nadon <memsize@videotron.ca>
-commit c7e9e36fd3cdb889704d3b0e1333653d06ef9069
-Author: Jesse Barnes <jbarnes@virtuousgeek.org>
-Date: Mon Mar 8 12:38:37 2010 -0800
+commit ebd745ced89b2a2d9f6b4dcbd9f5f7e7f3b35451
+Author: Simon Farnsworth <simon.farnsworth@onelan.com>
+Date: Thu May 20 09:58:38 2010 +0100
- DRI2: advertise lowest supported DRI2 protocol version
+ Add documentation for the new DefaultModes option
- Update our supported DRI2 protocol version as each driver does
- DRI2ScreenInit, since depending on available kernel features, each DDX
- may support different callbacks and therefore protocol.
+ This patch adds documentation for the DefaultModes monitor option
+ added in the previous patch.
- Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
- Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
- (cherry picked from commit db1c7cb604167baf49e61be4c09ccf7b592c4af3)
+ Signed-off-by: Simon Farnsworth <simon.farnsworth@onelan.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
-commit 20708781d43501f116b4161c1cc96b0eb39e96b1
-Author: Jesse Barnes <jbarnes@virtuousgeek.org>
-Date: Fri Mar 5 09:49:03 2010 -0800
+commit cfc629148891be317ba60f2495abcda485780191
+Author: Simon Farnsworth <simon.farnsworth@onelan.com>
+Date: Thu May 20 09:58:37 2010 +0100
- DRI2: handle swap_interval of 0 correctly
+ Add configuration option to disable default modes on an output
- A 0 swap interval means that swaps shouldn't be sync'd to vblank, so
- just complete the swap immediately in that case.
+ Setting 'Option "DefaultModes" "No"' in an output will guarantee that
+ X will omit the default modes, just picking up modes from the
+ configuration file and modes provided by the output.
- Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
- Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
- (cherry picked from commit 87ca6320f26eb3129e3c19056e1d8fa5c1784723)
+ Signed-off-by: Simon Farnsworth <simon.farnsworth@onelan.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
-commit 73fe4a0952b5c8aea90bce6f758546c13d0754b5
-Author: Jesse Barnes <jbarnes@virtuousgeek.org>
-Date: Fri Mar 5 09:15:24 2010 -0800
+commit a1c2bdb6ab7a4f374844f80e83620b155991e817
+Author: Michel Dänzer <daenzer@vmware.com>
+Date: Thu May 20 10:13:06 2010 +0200
- DRI2: drawable lifetime fixes
+ EXA: Wrap Glyphs even without Composite acceleration.
- Handle drawable destruction and lifetime correctly.
+ In order to avoid migration ping-pong when accumulating glyphs in a mask
+ picture.
- Check whether the drawable priv is valid in DRI2SwapInterval(),
- DRI2WaitSBC() and DRI2WaitMSC(); it may have gone away, so be sure to
- check it before using it.
+ Signed-off-by: Michel Dänzer <daenzer@vmware.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 00581d4a42e2a0e7652834973645a4a9ed59cf93
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Fri May 14 19:31:56 2010 +0300
+
+ configure: force new xproto version dependency
- If more than 1 outstanding swap is queued, we may complete several after
- an app has exited. If we free it after the first one completes and the
- refcount reaches 0, we'll crash the server on subsequent completions.
- So delay freeing until all swaps complete and remove the error message
- as this is a normal occurence. To do this properly, we must also avoid
- destroying drawables in DRI2DestroyDrawable() if a swap or wait event is
- pending.
+ commit bca85e2e127a8a23e3a2debcfeb3ae07cd3c66ac introduced it.
- And finally, make sure we free drawables in DRI2WaitMSCComplete() if
- necessary (i.e. if the refcount has reached 0 and this MSC was the last
- pending event on the object).
+ Use the version that includes _X_NORETURN
- Reported-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
- Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
- Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
- (cherry picked from commit 8476d99231cb725c090305d60f1c1c889d25c8dc)
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
-commit 23d78005b06b15f7b68fc4eed7e325ad29d0880a
-Author: Jesse Barnes <jbarnes@virtuousgeek.org>
-Date: Thu Mar 4 10:31:59 2010 -0800
+commit 103507af0c0ce7d7482a67163249864af36a2374
+Merge: 8bd8d81 99fcf65
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed May 19 22:27:53 2010 -0700
- DRI2: fix swapbuffers handling of SBC and target MSC
+ Merge remote branch 'vignatti/bus-cleanup'
+
+commit 8bd8d81dc473bf72ea108b1896a55e32defa02e2
+Merge: c620a1c 66d5ecc
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed May 19 22:27:20 2010 -0700
+
+ Merge remote branch 'vignatti/animcursor-state-fix'
+
+commit c620a1c0a4ca564e778cce019dd30046c6969956
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu May 20 10:26:56 2010 +1000
+
+ xfree86: fix typo in optionTypeToSting.
- Returns expected SBC after completion of swap to caller, as required by
- OML_sync_control spec, instead of the last_swap_target value.
+ Because we don't want anyone to get hurt.
- Passes target_msc, divisor, remainder, correctly for
- glXSwapBuffersMscOML() call, while retaining old behaviour for simple
- glXSwapBuffers() call.
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+ Reviewed-by: Matt Turner <mattst88@gmail.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 8b6c1809c09f832051327d86e1a25dc0ec5cc878
+Merge: d88ba77 c38552d
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed May 19 12:58:02 2010 -0700
+
+ Merge remote branch 'jamey/for-keith'
+
+commit c38552d115e3bc71ad6179a8ad0d68778e943793
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sat Apr 24 23:56:36 2010 -0700
+
+ Add typed resource-lookup errors for non-core resource types.
- An OML swap can have a 0 target_msc, which just means it needs to
- satisfy the divisor/remainder equation. Pass this down to the driver as
- needed so we can support it.
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit e291c561821ae86b7dd74269d5cd29bc31703962
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sat Apr 24 23:26:40 2010 -0700
+
+ Return an appropriately-typed error from dixLookupResourceByType.
- Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
- Signed-off-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
- (cherry picked from commit b180e43977710b56ccfd6780f204ddcc952987a1)
+ Rather than always returning BadValue, associate an error status like
+ BadWindow with a resource type like RT_WINDOW, and return the
+ appropriate one for the requested type.
+
+ This patch only touches the core protocol resource types. Others still
+ return BadValue and need to be mapped appropriately.
+
+ dixLookupResourceByType can now return BadImplementation, if the caller
+ asked for a resource type that has not been allocated in the server.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
-commit a56178402ede82ed3ffd81439b2efc4a39f2779e
-Author: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
-Date: Sun Feb 21 05:26:00 2010 +0100
+commit 90e612dcbe370da095d317fac62c80ac2447fa0b
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sat May 15 15:51:32 2010 -0700
- DRI2WaitSbc(): Fixes for correct semantic of glXWaitForSbcOML()
+ Use WriteEventsToClient rather than TryClientEvents where possible.
- Added implementation for case target_sbc == 0. In that case, the
- function shall schedule a wait until all pending swaps for the drawable
- have completed.
+ If filter is NoEventMask (aka CantBeFiltered), grab is null, and the
+ first event is not in the set of "critical events", then TryClientEvents
+ simply calls WriteEventsToClient. In that case, it returns 0 for fake or
+ dead clients, and 1 otherwise. Inline for this special case.
- Fix for non-blocking case. Old implementation returned random,
- uninitialized values for (ust,msc,sbc) if it returned immediately
- without scheduling a wait due to sbc >= target_sbc.
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 8033fb6c9792820a82fbdff6a14ff8a7a141ba74
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sat May 15 13:12:44 2010 -0700
+
+ Set event sequence number in WriteEventsToClient instead of at callers.
- Now if function doesn't schedule a wait, but returns immediately,
- it returns the (ust,msc,sbc) of the most recently completed swap,
- i.e., the UST and MSC corresponding to the time when the returned
- current SBC was reached.
+ TryClientEvents already did this; this commit just moves the assignment
+ one level down so that no event source has to worry about sequence
+ numbers.
- Signed-off-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
- (cherry picked from commit 751e8c09d34df4b41e8d8384a3ec1bf5cb8ca028)
+ ...No event source, that is, except XKB, which inexplicably calls
+ WriteToClient directly for several events.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
-commit a9b70da1afe7361955a19d34bb5e9b94dc156889
-Author: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
-Date: Sun Feb 21 05:25:59 2010 +0100
+commit 4b9600a4167427a8fe88bca9b738c9a99cac9469
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sat May 15 12:31:34 2010 -0700
- DRI2: Fix glitches in DRI2SwapComplete() and DRI2WakeupClient()
+ Make WriteEventsToClient/WriteToClient no-op on fake or dead clients.
- DRI2SwapComplete(): Increment pPriv->swap_count++; before calling
- into callback for INTEL_swap_events extension, so the swap event
- contains the current SBC after swap completion instead of the
- previous one.
+ This matches the test in TryClientEvents, and is a superset of tests
+ done by the callers of these functions. The consequence of forgetting
+ these tests is a server crash, so they're always desirable. In my
+ opinion, it's better to not require the callers to remember to do these
+ checks.
- DRI2WakeupClient: Check for pPriv->target_sbc <= pPriv->swap_count,
- had wrong comparison pPriv->target_sbc >= pPriv->swap_count for
- unblocking of clients of DRI2WaitSBC().
+ For callers that don't do very much work before calling WriteToClient or
+ WriteEventsToClient, I've removed the redundant checks.
- Signed-off-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
- (cherry picked from commit 0de4974b90b10fa6a447cdf980b4a114c6c9e5a8)
+ hw/xquartz/xpr/appledri.c has an interesting case: While its check for
+ "client == NULL" appears redundant with the test in WriteEventsToClient,
+ it dereferences client to get the sequence number.
+
+ Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=27497
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Cc: Chris Wilson <chris@chris-wilson.co.uk>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
-commit 96a12314ae41a2edec67d388c1c4770bd099d9ec
-Author: Jesse Barnes <jbarnes@virtuousgeek.org>
-Date: Thu Mar 4 09:54:15 2010 -0800
+commit ee9cd2df4a5af66c6b7073563785b8aef61fcdb8
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sat May 15 13:37:34 2010 -0700
- DRI2: make target_sbc signed
+ xv: TryClientEvents already checks client and sets sequenceNumber.
- We need to track invalid targets as well as 0 targets, so just make it
- signed so our comparisons work like they should.
+ So don't bother doing those steps again.
- Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
- Reported-by: Kristian Høgsberg <krh@bitplanet.net>
- Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
- (cherry picked from commit 4c8ec49826a46eb3b36c69d2ad3f82320c179c38)
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
-commit 18dc5d1f15fe0df7e836b057d34c4ca596e31e8f
-Author: Jesse Barnes <jbarnes@virtuousgeek.org>
-Date: Thu Mar 4 09:19:13 2010 -0800
+commit e1e7deefb59cfdd82c9de46a7ca241d42436b2f8
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Tue May 18 16:49:21 2010 -0700
- DRI2: fixup handling of last_swap_target
+ mi/misprite.c: Delete unused private lookups.
- We need to initialize the swap target, which is passed to the driver to
- schedule events. Rather than using -1 to indicate that the field is
- uninitialized, just make sure we initialize it at drawable creation
- time.
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 936b09f2a3e31afe41050c00736bbb6b812c7003
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Tue May 18 16:48:08 2010 -0700
+
+ Replace miSpriteCursorFuncRec with direct calls to midispcur.c.
- Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
- Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
- (cherry picked from commit c4d54816f2ee4883d8f9bcf4595474fb58c95146)
+ Nobody wraps the mi software-cursor sprite rendering implementations.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 66d5ecc5fd36e21715531a39ac83dc2b6b988a7e
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Tue May 18 13:53:29 2010 +0300
+
+ render: set anim cursor state for pointer enabled devices only
+
+ The structure containing the state of animated cursor was amended within
+ SpriteInfoRec, removing all previously privates logic to keep such state.
+
+ API change: It was removed MAXDEVICES dependency \o/
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 99fcf655bdc96f7e5b2249b05da51ba4fc9190c7
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Sun May 2 22:34:44 2010 +0300
+
+ xfree86: remove PCI dependency from InitOutput
+
+ All functions that touch PCI and BUS were moved to their own files, organizing
+ the mess inside the InitOutput. Now, inside InitOutput, mostly accesses to
+ buses are coordinated by the new xf86BusConfig.
+
+ Two PCI probe functions just changed the name and a procedure to receive the
+ isolate devices parameters was created also, named xf86PciIsolateDevice.
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 0dd299864a133d478e4635bd1cd305b67fc3964d
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Sun May 2 21:33:26 2010 +0300
+
+ xfree86: remove xf86EnableAccess
+
+ It's RAC remnant. This was substituted by xf86VGAarbiter{Lock, Unlock}
+ mechanism.
+
+ It's an API break, but the few drivers using it were covered already with
+ macros to avoid problems.
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit f28515b5f774b83e0481acbcdda2f682738079b9
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Sun May 2 21:24:46 2010 +0300
+
+ xfree86: bus: remove SetSIGIOForState and simplify the code
+
+ Also removed some dumb debug messages.
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 211ca67e4d8d00b20a74a78304a61d4dbea62706
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Sun May 2 21:16:23 2010 +0300
+
+ xfree86: bus: fb drivers might want to use vga arbitration either
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 2464eb7d56407422e033ab3b94634ba802a119d5
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Sun May 2 21:14:53 2010 +0300
+
+ xfree86: bus: simplify entity related hooks
+
+ Remove some out dated commentaries either.
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 971768e6884f20981652da09a1617c51a760fb86
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Fri May 7 15:25:48 2010 +0300
+
+ xfree86: bus: enable declaration of sparc function as its code usage
+
+ The code in xf86sbusBus.c seems too OS-specific to be usable on OpenBSD.
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit a70ec0d136bbb9efb6f4e683d7ebcea00375083b
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Sun May 2 20:48:01 2010 +0300
+
+ xfree86: bus: rework xf86PostProbe logic and remove useless log info
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 2f7d630a1ee446711288af69711d57ea3054b594
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Sun May 2 20:29:11 2010 +0300
+
+ xfree86: bus: reuse already assigned variable when fb driver claimed
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 964f29bb80c1bb05508a27969c3ac34cbf072ee9
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Sun May 2 20:14:40 2010 +0300
+
+ xfree86: bus: fix Enter/Leave accesses behaviour
+
+ Okay, seems we're not using extensively such hooks in fact. But fix the
+ expected behaviour at least.
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit b37462b4da7c389ec7bbcfd800e5f88bded79330
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Sun May 2 19:53:37 2010 +0300
-commit 0d9d1e114322878fb50503f69b308b25a812dfb1
-Merge: 4b7ff07 7be5527
+ xfree86: remove unused xf86AccessInit()
+
+ The function was only initializing the boolean xf86ResAccessEnter, which
+ couldn't get any other value in the life of the server.
+
+ The only possible, though suspicious, code was in xf86AccessLeave(), which
+ could be triggered if AbortDDX is called before xf86AccessInit(). Even so,
+ such change is safety because no driver would have configured any entity leave
+ procedure at this point.
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit d88ba7721d2d3b58cdc664fd4c23a3c5e2a5f909
Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue May 18 14:46:42 2010 +1000
+Date: Tue May 18 11:12:49 2010 +1000
+
+ xfree86: Add option parsing for percent options.
+
+ In some cases, an option of "50%" would be preferable over fixed value
+ configuration - especially if the actual values are autoprobed.
+ Add a new set of functions to parse percent values from configurations.
+
+ The percent value parsing differs slightly - if the option is not to marked
+ as used (e.g. xf86CheckPercentOption()), no warning is emitted to the log
+ file if the value is not a percent value. This allows double-options (either
+ as % or as absolute number) without warnings.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 673eb707ce6737284c4886265ba149c5587a74e2
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sat May 15 12:06:25 2010 -0700
+
+ SyncSendAlarmNotifyEvents: check the correct client's clientGone flag.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit c3ba199aa643e59abd30170c53fbb4e03077c377
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Tue Apr 27 16:27:55 2010 +0300
+
+ render: remove unused animcursor fields from private rec
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 9db63e4766bde07ebc375c4390bcc5c854b46ac3
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Tue Apr 27 16:18:50 2010 +0300
+
+ render: removed unused macro from animcursor
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit cba9942f7716b12c329616a9994c5bce857617fa
+Author: Kristian Høgsberg <krh@bitplanet.net>
+Date: Mon May 17 17:40:30 2010 -0400
+
+ dri2: Fix NULL check in allocation error handling
+
+ 1461b31e40a3e44f6327199d23cf2ab70d8f5176 tests to see if the allocation
+ of buffer[i] failed after i has been incremented, causing it to look
+ at the wrong pointer.
+
+ Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
+ Tested-by: Eric Anholt <eric@anholt.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 27cec0a0501369a68031c048e691bda4c7095f72
+Author: Julien Cristau <jcristau@debian.org>
+Date: Mon May 17 19:23:44 2010 +0200
+
+ Fix build without XACE
+
+ dix/colormap.c and dix/gc.c now dereference a ClientPtr, so they need to
+ include dixstruct.h. Regression introduced by commit
+ 11c69880c7c48ef9e755c4e09fadef7a629d7bc7.
+
+ Reported-by: Robert Hooker <sarvatt@ubuntu.com>
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 5a387cf6d248e3cb3337a938200ed5a09fc1d8cb
+Author: Julien Cristau <jcristau@debian.org>
+Date: Sun May 16 21:29:02 2010 +0200
+
+ Only link Xorg with libconfig.la
+
+ Other DDXs don't use input hotplugging since config_init was moved to
+ the DDX in commit d33adcdf03c69407d151e732fa0cf9947151eb19, so there's
+ no need to link this in.
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 37f0b45dbe4ea52bc127720207c7157b2b803ac0
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sun May 16 10:14:02 2010 -0700
+
+ XQuartz: Fix a build failure on Tiger
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit ecfeabec8d0dcfe286fb893047f1fe1a7ea9f8f5
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sun May 16 10:03:13 2010 -0700
+
+ XQuartz: Don't use deltaXY for determining pointer location on scroll events
+
+ <rdar://problem/7989690>
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+ Reviewed-by: Edward Moy <emoy@apple.com>
+
+commit a911292c85f7069d2caabcb677ed716a04227526
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sat May 15 10:53:09 2010 -0700
+
+ XQuartz: Don't trust deltaXY for middle mouse clicks.
+
+ The middle mouse clicks return erroneous values after returning from
+ Fast User Switching.
+
+ <rdar://problem/7979468>
+ http://xquartz.macosforge.org/trac/ticket/389
+
+ Signed-off-by: Martin Otte <otte@duke.edu>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+ Reviewed-by: Edward Moy <emoy@apple.com>
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 345eb171264325d73ea2c50ba8c692cf589c2a9b
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat May 1 01:41:19 2010 -0700
- Merge branch 'server-1.8-branch' of git://people.freedesktop.org/~jeremyhu/xserver into server-1.8-branch
+ Remove dbe screen private privates.
+
+ Each DBE Screen private structure could have nested privates. Oddly,
+ no code ever used them.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
-commit 4b7ff07db28ea5302a1965496d1fd71a9d99780e
+commit 87ea5760f86eb60840e6e2c10012915952df5377
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 10 11:46:25 2010 -0700
@@ -703,9 +5085,23 @@ Date: Mon May 10 11:46:25 2010 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
- (cherry picked from commit 87ea5760f86eb60840e6e2c10012915952df5377)
-commit e789c860a682454fc86032e88b618f255409c33a
+commit 03f7e92a6cbfe58db08ce840283f9809695c70e7
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Mon May 10 13:44:30 2010 -0700
+
+ Update list of supported platforms in configure.ac error message
+
+ Adds DragonFly BSD, OpenSolaris, & GNU Hurd.
+ Drops MacOS X, since this is in the section specific to the Xorg/XFree86 DDX.
+ (Matches the OS patterns the configure script checks for.)
+
+ Also uses m4 macros to fix the spacing/formatting of the resulting message.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Acked-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit e42a29d269fadc11e065c63ee369e3165196f2d7
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Apr 29 18:45:34 2010 -0700
@@ -725,9 +5121,8 @@ Date: Thu Apr 29 18:45:34 2010 -0700
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
- (cherry picked from commit e42a29d269fadc11e065c63ee369e3165196f2d7)
-commit 3b6d2b0026f5c37eaeb50441eb2392b9cde962e8
+commit c6613cfc26e76b296e620640bf33e756eb4ae178
Author: Jamey Sharp <jamey@minilop.net>
Date: Fri May 14 10:36:13 2010 -0700
@@ -740,9 +5135,573 @@ Date: Fri May 14 10:36:13 2010 -0700
Cc: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit c6613cfc26e76b296e620640bf33e756eb4ae178)
-commit 3a3edb2c3d63a3849a95c7911612b57c9af6a341
+commit 1461b31e40a3e44f6327199d23cf2ab70d8f5176
+Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
+Date: Fri May 14 16:25:43 2010 +0300
+
+ dri2: Fix xserver crash if dri2 buffer allocation fails.
+
+ If driver fails to allocate memory for dri2 buffer server would crash
+ in send_buffers_reply.
+
+ Solution is to handle the allocation failure and return BadAlloc to
+ client.
+
+ Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
+ Reviewed-by: Michel Dänzer <michel@daenzer.net>
+ Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit f87002cb7d8729b1da4cbefe7653f4cfd3a2d956
+Merge: a4fbc0f 890f536
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri May 14 11:46:29 2010 -0700
+
+ Merge remote branch 'jamey/for-keith'
+
+commit 890f536f8d66f08e7d6a5685659eef4001a8757d
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Fri May 14 00:18:14 2010 -0700
+
+ Bugfix for "Pre-validate ChangeGC XIDs": off-by-one in loop index.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Tested-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit a4fbc0fedafda6df98f647173a2deccb86ef0479
+Author: Oliver McFadden <oliver.mcfadden@nokia.com>
+Date: Fri May 14 07:49:31 2010 +0300
+
+ scrnintstr.h: removed unused PaintWindow function pointers.
+
+ Please note this patch breaks the ABI.
+
+ Signed-off-by: Oliver McFadden <oliver.mcfadden@nokia.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 71296885b0bb946e7ab986169f5b872952c221a0
+Author: Oliver McFadden <oliver.mcfadden@nokia.com>
+Date: Thu May 13 07:12:43 2010 +0300
+
+ mi: removed unused PointerNonInterestBox functions.
+
+ Please note this patch breaks the ABI.
+
+ Signed-off-by: Oliver McFadden <oliver.mcfadden@nokia.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 795432d4a92ed5b9fa4d9163e73c8e4fe4c74534
+Merge: f2a0c32 92ed75a
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu May 13 18:22:49 2010 -0700
+
+ Merge remote branch 'jamey/cleanups'
+
+commit 92ed75ac59e2d3af149cddb962efd05fc8487750
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Mon May 10 20:22:05 2010 -0700
+
+ Eliminate boilerplate around client->noClientException.
+
+ Just let Dispatch() check for a noClientException, rather than making
+ every single dispatch procedure take care of it.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+
+commit 11c69880c7c48ef9e755c4e09fadef7a629d7bc7
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sat May 8 22:16:32 2010 -0700
+
+ Quit using clientErrorValue in dix/colormap.c.
+
+ And that's it! No more clientErrorValue kludge.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit a3d948ddbb54b9e831e67f22d5031922a3c44107
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Thu May 6 12:35:52 2010 -0700
+
+ clientErrorValue is never used outside dix. Stop importing it.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 653e4878c4cc03613172a93ad4800e1eacc98f17
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sat May 8 19:18:11 2010 -0700
+
+ Quit using clientErrorValue in dix/gc.c.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 5193f25ea33eed31d6a75cdc1a86427c23d8033c
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sat May 8 19:08:47 2010 -0700
+
+ Define GCAllBits as the union of all valid CreateGC masks.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 6a84cd943430cfc9df55c83aef6a7f8dea6dbb94
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Fri May 7 19:38:05 2010 -0700
+
+ Replace dixChangeGC with calls directly to the right variant.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 2d7eb4a19b773d0406c0c2e018a7da97f3565fd5
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Fri May 7 18:11:36 2010 -0700
+
+ Pre-validate ChangeGC XIDs.
+
+ In order to execute a wire-level ChangeGC request, we need to look up
+ the resources named by any XIDs in the value-list. Various places in the
+ server already have pointers to the resources they want to set into the
+ GC, though, so over time the interface has evolved to accept either XIDs
+ or pointers, with several different function call signatures used in
+ different eras.
+
+ This patch makes the existing code require pointers to resources rather
+ than XIDs, and adds a simple wrapper that looks up any XIDs. The old
+ dixChangeGC API is preserved by delegating to whichever implementation
+ is appropriate.
+
+ This affects error-handling: If any of the XIDs are invalid, then the GC
+ is unchanged, and its ChangeGC callback is not invoked. This change is
+ allowed by the protocol spec, which says, "The order in which components
+ are verified and altered is server-dependent. If an error is generated,
+ a subset of the components may have been altered."
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit e2929db7b737413cf93fbebdf4d15abdfebff05c
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sat May 8 14:10:51 2010 -0700
+
+ dixChangeGC callers: Use ChangeGCVal instead of XID almost everywhere.
+
+ The exceptions are ProcChangeGC and CreateGC.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 95728ca09d45afc84c8d1828c09c6b6725f1a58d
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sat May 8 09:25:34 2010 -0700
+
+ Don't statically allocate the ChangeGC parameter array.
+
+ Because that's insane.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit bff8525f8483304d5f93e83e36b47209381da721
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sat May 8 12:06:50 2010 -0700
+
+ Simplify miFillPolyHelper and miLineArc.
+
+ Both functions compute a set of spans and either fill them immediately
+ or accumulate them into a caller-provided buffer.
+
+ Computing the spans used only the miTranslate and lineWidth fields of
+ pGC, and neither could have been changed by the initial
+ ChangeGC/ValidateGC pair, so it's safe to compute the spans first.
+
+ Then both functions consume the spans the same way, so factor that into
+ a new fillSpans function.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 83f7ec97279405958aed86c6a57704a460c3bfba
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sat May 8 13:38:00 2010 -0700
+
+ miwideline: Factor out span buffer allocation.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit f2a0c324e37c9fa3eb9087adbf963addb7f21d88
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu May 13 10:33:39 2010 -0700
+
+ Remove devPrivates init and delete callback lists.
+
+ XSELinux was the only consumer of these interfaces and it no longer
+ needs them.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+
+commit c9e7ca4404803fe44d4684e0bb2ca2ee10fd4bb3
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date: Wed May 12 20:25:30 2010 -0400
+
+ xselinux: Remove use of devPrivates init/free callbacks.
+
+ Commit eb9210097efea81065c301e5b6b4da7a566deb4a removed the
+ sidget/sidput calls which were the major reason for using the
+ callbacks. The remaining operations can be skipped or worked
+ around.
+
+ Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit bca85e2e127a8a23e3a2debcfeb3ae07cd3c66ac
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Thu May 13 08:32:00 2010 -0700
+
+ Use _X_ATTRIBUTE_PRINTF _X_DEPRECATED _X_NORETURN
+
+ Use the values from xproto rather than duplicating the effort
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 421606a8ef447d10c2ee0986f20e752056a47675
+Author: Kristian Høgsberg <krh@bitplanet.net>
+Date: Tue May 11 10:52:18 2010 -0400
+
+ dri2: Send out event when auxillary buffers are invalidated
+
+ This lets the DRI2 clients rely on the server to notify them when they
+ need to get new buffers. Without this, OpenGL clients poll the server
+ in glViewport() which can be a performance problems and also isn't
+ completely correct behaviour.
+
+ We bump the DRI2 protocol minor to indicate the availability of the
+ event, which the DRI2 clients can use to avoid polling. This speeds up
+ various piglit and oglc test cases as well as real applications.
+
+ Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit f281db9a5e400c822e03a19937247baa20ecc213
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed May 12 23:57:58 2010 -0700
+
+ Remove ResNoAvoid definition, missed in the RAC removal
+
+ ResNoAvoid is #defined to ResBios, but ResBios was removed
+ from xf86str.h in 4b42448a2388d40f257774fbffdccaea87bd0347
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 315041762313598aad90df84226e2d2def4a0fc9
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sat May 8 18:55:55 2010 -0700
+
+ CreateGC: Pass current client on to ChangeGC.
+
+ Otherwise we can't check that the XIDs this GC is being initialized with
+ are accessible to this client.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Cc: Eamon Walsh <ewalsh@tycho.nsa.gov>
+ Reviewed-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
+
+commit 04bad1b8a118a83064316d6e4327234aee19361e
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Thu May 6 21:56:10 2010 -0700
+
+ Kill ChangeGC in favor of dixChangeGC.
+
+ This doesn't change any behavior, but it isn't clear whether NullClient
+ is correct in all cases. As ajax says,
+
+ > For most of these changes, I think it's correct to use NullClient,
+ > since they are server-initiated changes and should not fail for (eg)
+ > xace reasons. ... At any rate, you're certainly not changing any
+ > semantics by leaving them all as NullClient, so this patch can't be
+ > more wrong than before.
+
+ The call in CreateGC is particularly questionable.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 65cedf39054cf3a1e695e84ac228cce9e8d48097
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Thu May 6 21:39:43 2010 -0700
+
+ Kill DoChangeGC in favor of dixChangeGC.
+
+ This doesn't change any behavior, but it isn't clear whether NullClient
+ is correct in all cases. As ajax says,
+
+ > For most of these changes, I think it's correct to use NullClient,
+ > since they are server-initiated changes and should not fail for (eg)
+ > xace reasons. ... At any rate, you're certainly not changing any
+ > semantics by leaving them all as NullClient, so this patch can't be
+ > more wrong than before.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit afcbbd6dfea51c5b0adca0d720edc02ba0c2dc16
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sat May 8 15:19:03 2010 -0700
+
+ doPolyText needs UseAccess to each font, not ReadAccess.
+
+ In commit 42d6112ec21949a336ee8b34469f2695273ee2d6, Eamon changed
+ dixChangeGC to require DixUseAccess on any GCFont XID. I think
+ doPolyText needs to require the same level of access. Otherwise
+ dixChangeGC could fail when it does the same lookup, which doPolyText
+ doesn't check for.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Cc: Eamon Walsh <ewalsh@tycho.nsa.gov>
+ Reviewed-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
+
+commit 59857ee5da5f1f3f4900292581b9586477513211
+Merge: 21ceae9 432cbbe
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed May 12 16:48:08 2010 -0700
+
+ Merge remote branch 'dottedmag/for-keithp'
+
+commit 432cbbec194e47bf2a117c9302146e786c8a4ee1
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Thu May 13 03:51:00 2010 +0700
+
+ Misc coding style cleanup
+
+ Use a[b] instead of *(a+b), fix whitespace.
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 816b79dd061e9839cec94a4986a7820b70ca8a7f
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Thu May 13 03:45:21 2010 +0700
+
+ Remove useless casts
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 63a647abd51f44226cbd16aa04ebc57d07463c6d
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Thu May 13 03:44:12 2010 +0700
+
+ Fix code style: extra whitespace before ()
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 28211c443c693a1ca3db5740d0128274a3eef723
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Thu May 13 03:43:04 2010 +0700
+
+ Fix warning: it's safe to pass atom strings > XA_LAST_PREDEFINED to free(3)
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 8b5326aa98eba201dd78aea3dd7114e1a084489b
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Wed May 12 20:27:02 2010 +0000
+
+ Mark OsAbort as noreturn function to make gcc happier.
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Matt Turner <mattst88@gmail.com>
+
+commit 868e372a73b377705217e0379bc6e00f36c4d8e5
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Thu May 13 01:59:06 2010 +0700
+
+ Introduce X_NORETURN macro defined as __attribute__((noreturn)) for gcc
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Matt Turner <mattst88@gmail.com>
+
+commit 5a8e2f2745ae1f74501cd3f42614a1ed2cf974f2
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Wed May 12 18:54:51 2010 +0000
+
+ Do not jump through the hoops to deallocate xkbbasedirflag variable
+
+ Fixes gcc warning as well.
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Matt Turner <mattst88@gmail.com>
+
+commit ff2b4cf8329b1678adafcda02e5d47a072550d47
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Thu May 13 01:51:37 2010 +0700
+
+ Turn sprintf argument into literaral string, shutting up gcc warning
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Matt Turner <mattst88@gmail.com>
+
+commit f62ba192c285b1e49bf299f03fc0b763680afaaf
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Thu May 13 01:47:26 2010 +0700
+
+ Do not use deprecated Xalloc function
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Matt Turner <mattst88@gmail.com>
+
+commit 21ceae9002c6364deb3d074cf2da7d3864cf6879
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Tue May 11 10:24:00 2010 -0700
+
+ SetFontPath: set client->errorValue on failure.
+
+ Previously the callers were only setting errorValue on Success, when
+ it's ignored, and leaving it alone on failure, when it's sent to the
+ client.
+
+ Since SetFontPath takes the ClientPtr, let it set client->errorValue
+ instead of letting the callers continue to get it wrong.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 801162919d1c625d950a5d105ae4b3487ebc30a7
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Thu May 6 01:55:36 2010 +0700
+
+ Removed outdated comments obsoleted by documentation in headers
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 4d55c8c4ffcb5d6c6500b462a41ace8e2359151d
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Thu May 6 01:54:13 2010 +0700
+
+ Use lowercase variant of XNFalloc and Xstrdup
+
+ Using one variant of function/macro makes it easier to fix the code
+ later.
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 3f3ff971ecff9936cebafc813af9193b97bba89c
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Thu May 6 01:44:06 2010 +0700
+
+ Replace X-allocation functions with their C89 counterparts
+
+ The only remaining X-functions used in server are XNF*, the rest is converted to
+ plain alloc/calloc/realloc/free/strdup.
+
+ X* functions are still exported from server and x* macros are still defined in
+ header file, so both ABI and API are not affected by this change.
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 96c7ab27c383ec767f62a7a11e5fd76f86363fbc
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Thu May 6 00:28:25 2010 +0700
+
+ Deprecate allocation functions which are plain wrappers for C stdlib
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit a5dba0f5caefce236ebd5f71948e5a659bea58e4
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Thu May 6 00:27:47 2010 +0700
+
+ Document allocation functions, noting deviations from C library
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit e983848ab44b0769f97f6207f1aa8b4f127be6a9
+Author: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Thu May 6 00:16:24 2010 +0700
+
+ Clean {X,XNF}{alloc,calloc,realloc,free,strdup} from pre-C89 baggage
+
+ C89 guarantees alignment of pointers returned from malloc/calloc/realloc, so
+ stop fiddling with alignment manually and just pass the arguments to library
+ functions.
+
+ Also convert silent error when negative size is passed into function into
+ warning in log file.
+
+ Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 4f0006c2203abe0b7660c5068d6afe236f9bd2a4
+Author: Kristian Høgsberg <krh@bitplanet.net>
+Date: Mon May 10 08:36:02 2010 -0400
+
+ dri2: Copy front to fake front in swapbuffer
+
+ If we don't have a fake front, nothing will happen. The fix was extracted
+ from a bigger patch from Francisco Jerez.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=27305
+ Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
+ Reviewed-by: Pauli Nieminen <suokkos@gmail.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit ba1f1f9d9e48226f1ef6b3222a8d92fc969d6560
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Tue May 11 09:49:34 2010 -0700
+
+ XQuartz GL: Fix __glXAquaScreenCreateDrawable prototype
+
+ Fixes regression introduced in 9de0e31746d5f0d9d39d11c94ec3cbc04a9935fc
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 286935c6f4965a6b09de1fb9e579a00afa14082a
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue May 11 09:08:40 2010 -0700
+
+ Remember drawable ID used to find damage target for use in events. Bug 5730.
+
+ Using Composite, window pixmaps are given names in the client resource
+ namespace and yet may not have any XID recorded in the drawable
+ structure. As such, we need to remember the XID used to lookup the
+ pixmap in the resource database so that we can report the correct XID
+ back to the client in damage events.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 3df22b293c1f1d27e7ce16662744c578d35b5aba
+Merge: fa6c701 9de0e31
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue May 11 08:38:44 2010 -0700
+
+ Merge remote branch 'krh/dri2-resource-fixes'
+
+commit fa6c7012572093a82c9389682977efff85590719
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Mar 1 02:11:36 2010 +0100
@@ -758,9 +5717,81 @@ Date: Mon Mar 1 02:11:36 2010 +0100
Signed-off-by: Cyril Brulebois <kibi@debian.org>
Reviewed-By: Matthias Hopf <mhopf@suse.de>
Signed-off-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit fa6c7012572093a82c9389682977efff85590719)
-commit 6bb86db2eb6e27e06bd2270429a76008af2dcd94
+commit 9de0e31746d5f0d9d39d11c94ec3cbc04a9935fc
+Author: Kristian Høgsberg <krh@bitplanet.net>
+Date: Thu Apr 29 16:36:10 2010 -0400
+
+ dri2: Take an XID for tracking the DRI2 drawable
+
+ Some pixmaps (window pixmaps and scratch pixmaps) don't have the
+ drawable->id set and thus DRI2 gets confused when using that field
+ for looking up the DRI2 drawable. Go back to using privates for getting
+ at the DRI2 drawable from a DrawablePtr. We need to keep the resource
+ tracking in place so we can remove the DRI2 drawable when the X resource
+ it was created for goes away. Additionally, we also now track the DRI2
+ drawable using a client XID so we can reclaim the DRI2 drawable even if
+ the client goes before the drawable and doesn't destroy the DRI2 drawable.
+
+ Tested-by: Owen W. Taylor <otaylor@fishsoup.net>
+ Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
+
+commit 32381363cd8f43aeb741bad70bcf96a287dac0c9
+Author: Kristian Høgsberg <krh@bitplanet.net>
+Date: Sat May 1 13:15:00 2010 -0400
+
+ list.h: Add list_for_each_entry_safe()
+
+ Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 4a8a615d01b9ed18c272414bd11dc2fc661727e5
+Author: Kristian Høgsberg <krh@bitplanet.net>
+Date: Sat May 1 13:13:54 2010 -0400
+
+ glxdri2: Hard-code the extension version we need
+
+ If we use the #define'd version from dri_interface.h, the server will
+ require at least that version of the extension. If we're compiling against
+ a dri_interface.h with a newer version we don't really require, glxdri2
+ will require a too high version of the extension.
+
+ The right approach is to just hard-code the version we need instead of
+ using the #defines.
+
+ Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
+ Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 6d7ba5e0fcb5d1bce6bb213dec009f3a0f802d26
+Author: Kristian Høgsberg <krh@bitplanet.net>
+Date: Sat May 1 13:07:46 2010 -0400
+
+ dix: Update element count in FreeResource*()
+
+ FreeResource() keeps clientTable[cid].elements up to date with the
+ number of resources allocated to the client. The other free
+ resource functions (FreeResourceByType(),
+ FreeClientNeverRetainResources() and FreeClientResources()) don't
+ maintain this invariant.
+
+ Typically, the only consequence is that the element count is too high
+ and we end up allocating the hash table bigger than necessary. However,
+ FreeResource() also relies on the element count to restart the search if
+ the list of resources has been changed during a resource destruction
+ callback. Since FreeResourceByType() doesn't update the count, if we call
+ that from a resource destruction callback from FreeResource(), the
+ loop isn't restarted and we end up following an invalid next pointer.
+
+ Furthermore, LookupClientResourceComplex() and
+ FreeClientNeverRetainResources() don't use the element count to detect
+ if a callback deleted a resource and may end up following an invalid
+ next pointer if the resource system is called into recursively.
+
+ Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 10de9e8ee37265a35ceeceb2007d711da70d4f2d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Apr 16 16:35:22 2010 +1000
@@ -775,9 +5806,8 @@ Date: Fri Apr 16 16:35:22 2010 +1000
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Tested-by: Ben Hutchings <ben@decadent.org.uk>
- (cherry picked from commit 10de9e8ee37265a35ceeceb2007d711da70d4f2d)
-commit fd562d11d6cbde2b227e524ae2a9ce4e347b944b
+commit 758b8614477b53dc3de2b884fec5ccaf8a736432
Author: David James <davidjames@google.com>
Date: Mon May 10 14:00:49 2010 -0700
@@ -793,9 +5823,24 @@ Date: Mon May 10 14:00:49 2010 -0700
Signed-off-by: David James <davidjames@google.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit 758b8614477b53dc3de2b884fec5ccaf8a736432)
-commit 4bcc0448b42b06ec133886ccb4f029b57b6f2b3e
+commit 95074538cce93abc1739a4d9dd78b0500fb8fec9
+Merge: c079977 2160ff5
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon May 10 13:49:33 2010 -0700
+
+ Merge remote branch 'jamey/for-keith'
+
+commit 2160ff5240d7e11bdc6cec8859fd1f10395c8edd
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Fri May 7 20:00:40 2010 -0700
+
+ Simplify error-handling in dixChangeGC.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 4080cd42fde8b4c693eab7557581af2622479109
Author: Jamey Sharp <jamey@minilop.net>
Date: Sat May 8 09:41:46 2010 -0700
@@ -810,9 +5855,28 @@ Date: Sat May 8 09:41:46 2010 -0700
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
- (cherry picked from commit 4080cd42fde8b4c693eab7557581af2622479109)
-commit c1e6e7ea968f86f61fd1bfdf4764c57be2a93605
+commit ccdaecc5471cc2d56b1702eeed4280bb4d58c515
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sat May 8 12:26:47 2010 -0700
+
+ Move AppendSpanGroup from miwideline.h to miwideline.c.
+
+ Also make it stop being a macro.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 4272d6722c0f65bdfafc95e91cc2fdb8f6bd072e
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sat May 8 12:18:37 2010 -0700
+
+ Expand macros that are used only in miFillPolyHelper.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit c0799779dffeef8cef228bdc57aa6c8b323e7485
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 26 17:22:12 2010 -0700
@@ -821,9 +5885,78 @@ Date: Mon Apr 26 17:22:12 2010 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Matt Turner <mattst88@gmail.com>
- (cherry picked from commit c0799779dffeef8cef228bdc57aa6c8b323e7485)
-commit de3275537db09065510ca2a697cbbe184da9f207
+commit 946f664b6ab421f69df3dc3213b14b085424c9e4
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu May 6 17:58:29 2010 -0400
+
+ mi: Delete wide ellipse arc cache
+
+ This does make wide ellipses slower, by a factor of twoish:
+
+ 946000.0 521000.0 ( 0.55) 10-pixel wide ellipse
+ 98300.0 49900.0 ( 0.51) 100-pixel wide ellipse
+ 17700.0 9310.0 ( 0.53) 500-pixel wide ellipse
+ 16900.0 7980.0 ( 0.47) 100-pixel wide dashed ellipse
+ 16100.0 5370.0 ( 0.33) 100-pixel wide double-dashed ellipse
+
+ But no one cares, and it's a modest size win:
+
+ text data bss dec hex filename
+ 1773824 69552 59288 1902664 1d0848 hw/vfb/Xvfb.before
+ 1773112 69552 58648 1901312 1d0300 hw/vfb/Xvfb
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 580b99bb8af4ea093953c2b885bd4272aaf02baf
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Thu May 6 11:00:39 2010 -0700
+
+ Return BadPicture, not BadPixmap, if alpha-map is invalid.
+
+ I believe this is what was intended.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit c677fc611b124c44adfcfb95718798105f26357b
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Thu May 6 11:00:38 2010 -0700
+
+ VERIFY_PICTURE always returns BadPicture. Don't bother specifying.
+
+ Same goes for VERIFY_ALPHA, VERIFY_XIN_PICTURE, and VERIFY_XIN_ALPHA.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 35761d5f811406bc0b6a68c1b02bdb699142745c
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Thu May 6 11:00:37 2010 -0700
+
+ Introduce dixLookupFontable for "FONT or GC" parameters.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 2eab697adba4b1858a530750e9a35fba79a7bf26
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri May 7 09:32:34 2010 -0700
+
+ Constify function prototypes in auth & xdmcp code
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Tested-by: Gaetan Nadon <memsize@videotron.ca>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit e2e2747f40c4b9e23dba38ea656d4c082e83a794
Author: Matthias Hopf <mhopf@suse.de>
Date: Fri May 7 18:46:30 2010 +0200
@@ -834,9 +5967,18 @@ Date: Fri May 7 18:46:30 2010 +0200
Signed-off-by: Matthias Hopf <mhopf@suse.de>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit e2e2747f40c4b9e23dba38ea656d4c082e83a794)
-commit 80547b14a85e4c44631e8b2dc3cd67ccfda7fb43
+commit 626f97688a89dbc5da80390d822d21b1a737de0e
+Author: Adam Tkac <atkac@redhat.com>
+Date: Fri May 7 17:02:03 2010 +1000
+
+ Export XkbCopyDeviceKeymap from Xorg, it is needed by VNC.
+
+ Signed-off-by: Adam Tkac <atkac@redhat.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 21ed660f30a3f96c787ab00a16499e0fb034b2ad
Author: Chris Humbert <freedesktop@mahadri.com>
Date: Fri May 7 17:02:43 2010 +1000
@@ -851,9 +5993,8 @@ Date: Fri May 7 17:02:43 2010 +1000
Signed-off-by: Chris Humbert <freedesktop@mahadri.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit 21ed660f30a3f96c787ab00a16499e0fb034b2ad)
-commit 331e9720b5c05e43b8343d5c71d821dee0463c3e
+commit 9802839d35aaf788790f1d0e8300db4693a70096
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 7 16:22:12 2010 +1000
@@ -871,9 +6012,20 @@ Date: Fri May 7 16:22:12 2010 +1000
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit 9802839d35aaf788790f1d0e8300db4693a70096)
-commit dee99e6925c8e51263398bd2c8fb70289dae748c
+commit 72758287f79a4f1aa8fa388f20947042e3e14693
+Author: Julien Cristau <jcristau@debian.org>
+Date: Tue May 4 15:15:02 2010 +0200
+
+ XQuartz: add new localization files to EXTRA_DIST
+
+ commit 206531f75cd41c034e89fdfbc75ab0910682eef8 added localization files
+ for ar, add them to the Makefile.
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit a3f5d30ba61e70b3de8b48754dea32715ba93c40
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 30 16:10:32 2010 -0700
@@ -887,11 +6039,8 @@ Date: Fri Apr 30 16:10:32 2010 -0700
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit a3f5d30ba61e70b3de8b48754dea32715ba93c40)
-
- Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-commit ede10681c4f9d835fa8af115e349e2fd9feeb697
+commit cdeb2c23f80ced961fe205125547e16905885534
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 30 12:18:09 2010 -0700
@@ -902,164 +6051,307 @@ Date: Fri Apr 30 12:18:09 2010 -0700
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit cdeb2c23f80ced961fe205125547e16905885534)
-commit 7be55271d090d9c837ee7e1c43c09c76961a7173
+commit a80b1f888f2f7674a715d512ab950eeadee20448
+Merge: 4971099 0efd7b8
+Author: Keith Packard <keithp@keithp.com>
+Date: Sun May 2 16:35:17 2010 -0700
+
+ Merge remote branch 'jeremyhu/master'
+
+commit 0efd7b8d82a48793341e27d4c224986e0971687c
Author: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Sun May 16 10:14:02 2010 -0700
+Date: Tue Apr 27 13:14:47 2010 -0700
- XQuartz: Fix a build failure on Tiger
+ XQuartz GLX: Change around includes for better compatability with different OS versions
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
- (cherry picked from commit 37f0b45dbe4ea52bc127720207c7157b2b803ac0)
-commit d415f36b8e40d7df94da8910f370fb28004046cf
+commit 7b506fdc840aebed6b5acb91437a2cb620b5bddc
Author: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Sun May 16 10:03:13 2010 -0700
+Date: Wed Apr 21 08:38:53 2010 -0700
- XQuartz: Don't use deltaXY for determining pointer location on scroll events
+ rootless: Add some sanity checking to miPaintWindow
- <rdar://problem/7989690>
+ This avoids painting the root window when it isn't actually drawable.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
- Reviewed-by: Edward Moy <emoy@apple.com>
- (cherry picked from commit ecfeabec8d0dcfe286fb893047f1fe1a7ea9f8f5)
-commit aad87519b8bd6983a28d537eec4fb15570da73b5
+commit 4d3789c9b3fbe6aad32fcacd964353b612640f27
Author: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Sat May 15 10:53:09 2010 -0700
+Date: Sun Apr 18 01:22:27 2010 -0700
- XQuartz: Don't trust deltaXY for middle mouse clicks.
-
- The middle mouse clicks return erroneous values after returning from
- Fast User Switching.
+ rootless: Remove an unneeded comment
- <rdar://problem/7979468>
- http://xquartz.macosforge.org/trac/ticket/389
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 048d15192af39ba5111882d18a957b6ff4e34cad
+Author: Oliver McFadden <oliver.mcfadden@nokia.com>
+Date: Thu Apr 22 10:29:44 2010 +0300
+
+ x-list.c: null-returning function malloc() was called without checking
- Signed-off-by: Martin Otte <otte@duke.edu>
+ Signed-off-by: Oliver McFadden <oliver.mcfadden@nokia.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
- Reviewed-by: Edward Moy <emoy@apple.com>
- Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
- (cherry picked from commit a911292c85f7069d2caabcb677ed716a04227526)
-commit afd730f57fa1cd3e10ac47666bd6739016d60d55
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue May 11 13:55:55 2010 +1000
+commit 4971099860e8e6d7817ada92e2636cb435fd002d
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Sun May 2 19:14:39 2010 +0300
- xserver 1.8.1
+ dix: wrap variables with #ifdef when panoramix is not used
- Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ this shut up some warnings.
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
-commit 3ffde1e403666b8c84ce34d46caef6e19b87cf51
-Author: Adam Tkac <atkac@redhat.com>
-Date: Fri May 7 17:02:03 2010 +1000
+commit 40858960c02a7694b0e1b72e2a986805580ff6f1
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Apr 29 12:24:51 2010 -0700
- Export XkbCopyDeviceKeymap from Xorg, it is needed by VNC.
+ Delete loop with no effect from GlyphUninit
- Signed-off-by: Adam Tkac <atkac@redhat.com>
- Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit 626f97688a89dbc5da80390d822d21b1a737de0e)
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
-commit 7e1f1ed5e99917f65b998eae0202c6c0a51e6819
-Author: Julien Cristau <jcristau@debian.org>
-Date: Tue May 4 15:15:02 2010 +0200
+commit 65e961fcc1da0f1e6c1c477701b2eeb36955ed24
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Apr 29 12:24:49 2010 -0700
- XQuartz: add new localization files to EXTRA_DIST
+ Replace some input devPrivates with regular struct fields
- commit 206531f75cd41c034e89fdfbc75ab0910682eef8 added localization files
- for ar, add them to the Makefile.
+ In the process, fixes a memory leak in CloseDevice, and an unchecked
+ memory allocation in InitializePredictableAccelerationProperties.
- Signed-off-by: Julien Cristau <jcristau@debian.org>
- Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
- (cherry picked from commit 72758287f79a4f1aa8fa388f20947042e3e14693)
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
-commit 7af94a816cd89eaf2777b6c38ba8b1d2a8965d65
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue May 4 08:16:21 2010 +1000
+commit 998e982b775073da59412dce8ce609ea2ad7967c
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Apr 29 12:24:48 2010 -0700
- xserver 1.8.0.902
+ Move callback definitions to their own file
- Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Needed as the privates stuff uses the callbacks before they would have
+ been defined in dix.h
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+
+commit 7dde50c649089b03650d6497079a690feea65e22
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Apr 29 12:24:47 2010 -0700
+
+ Move X_DEPRECATED to misc.h so it can be used outside resource.h
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+
+commit 5623908aeef70e5083f3b49986c7547ed044fedd
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Wed Apr 28 12:37:08 2010 -0700
+
+ dix: Improve documentation of the DIX private data functions.
+
+ The functions exported by the devPrivates code were poorly documented. I tried
+ to spruce it up a little.
+
+ Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
+ Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 986d46144b183a36b4e98aed95eca0c55a8b4251
+Merge: a974c8e b5b8f91
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Apr 30 12:40:53 2010 -0700
+
+ Merge remote branch 'jamey/for-keith'
+
+ Conflicts:
+ hw/xfree86/common/xf86xv.c
+
+commit a974c8e7cba40c8d7d1b91e07de8c414627b71a2
+Merge: 6581bc4 02e8622
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Apr 30 12:33:00 2010 -0700
+
+ Merge remote branch 'whot/for-keith'
+
+commit 6581bc4591746c906d97f8b868f946c47bc6d756
+Merge: 0e91e19 d073e51
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Apr 30 12:29:52 2010 -0700
+
+ Merge remote branch 'yselkowitz/master'
+
+commit 0e91e19f783d21198fc2e210203e0f10040a9cd0
+Merge: 81a081c edbc56c
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Apr 30 12:27:51 2010 -0700
-commit d57d14d039ecbdbe1c960e0b0b5d029f6dfa4000
+ Merge remote branch 'vignatti/for-keith'
+
+commit 02e86221b851e5423a95782aa7e297ea051022ca
Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue May 4 08:14:39 2010 +1000
+Date: Thu Apr 29 09:48:37 2010 +1000
- mi: don't thrash resources when displaying the software cursor across screens
+ xfree86: a missing input driver is not an error.
- This changes the DC layer to maintain a persistent set of GCs/pixmaps/pictures
- for each pScreen instead of failing to thrash between them when changing
- screens.
+ We call NIDR on all devices that make it through the config backend.
+ Including some that have no driver assigned to them (/dev/input/mouse0 for
+ example). Those ones then simply get ignored by NIDR, but this should not be
+ noted as an error in the log file.
+
+ X_INFO is sufficient, and it may just prevent some bugreports.
- Signed-off-by: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
- Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit 518f3b189b6c8aa28b62837d14309fd06163ccbb)
+ Acked-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+
+commit 81a081c1f0cb55df94cb10495aa7ad71cd5a9afb
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Sat Nov 7 19:28:18 2009 +0000
+
+ Cygwin/X: AIGLX using native WGL
- Conflicts:
+ A rewrite of the XWin DDX AIGLX code to actually make it do something useful again
- mi/midispcur.c
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 262c2c9031ea60cbe738ed80ddb7faa1b888d137
+Author: Rami Ylimäki <ext-rami.ylimaki@nokia.com>
+Date: Tue Apr 27 14:04:47 2010 +0300
+
+ test: Fix linking of wrapped functions in XI2 tests.
+
+ Running "make check" will lead to build problems in
+ scratchbox. Building the first test that wraps dixLookupWindow fails
+ because symbol __real_dixLookupWindow can't be resolved. Defining
+ wrapping options as linker options instead of compiler options makes
+ everything build nicely in scratchbox.
+ Signed-off-by: Rami Ylimäki <ext-rami.ylimaki@nokia.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-commit 2f5b5bc8f4c70dab99dd616064219de5c7fbf244
-Author: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
-Date: Wed Apr 21 18:11:05 2010 -0700
+commit ffaae7c0c69a51a53a76146c79f3630ae197a443
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Apr 26 20:11:31 2010 -0700
- xf86: Don't crash when switching modes through RandR without owning the VT.
+ Remove mibank support
- While VT-switched, FB access is disabled and should remain so. Trying to switch
- modes in that state would re-enable it, potentially causing crashes if trying
- to access it before the driver has recovered from the mode switch.
+ Banked framebuffers are so 1990. As of 7.4 the only drivers remaining
+ that used this were chips, neomagic, trident, and vesa. vesa only used
+ it when not using shadowfb, which is broadly undesirable anyway, and no
+ longer uses it at all as of 2.3.0. neomagic never used it by default,
+ and support for it is gone in git master. The other two effectively
+ only ever used it for ISA chips; since ISA support is now gone from
+ the server, they have been modified to only compile mibank support when
+ ISA support is available.
- Signed-off-by: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
- Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit 41bdb6c003cca3ef0ff88d9c7de318115bab1ba2)
-commit 7317dc45bcf2cac0b8313a2703ae7b0bff2f1cd8
-Author: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Tue Apr 27 13:14:47 2010 -0700
+commit b5b8f91b82d7b150c926dd3fecee6c3aafff6e39
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Thu Apr 22 21:35:17 2010 -0700
- XQuartz GLX: Change around includes for better compatability with different OS versions
+ xfree86: use screen privates for Xv offscreen images.
- Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
- (cherry picked from commit 0efd7b8d82a48793341e27d4c224986e0971687c)
+ This replaces a globally-allocated array that depended on MAXSCREENS.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
-commit c0d92b4268094acde2cda548e96c7299dfd393dc
-Author: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Wed Apr 21 08:38:53 2010 -0700
+commit a1c2acfe798c57e5be7e5f6c111a6ce91400487a
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Wed Apr 21 18:05:45 2010 -0700
- rootless: Add some sanity checking to miPaintWindow
+ xfree86: use screen privates for exclusive DGA clients.
- This avoids painting the root window when it isn't actually drawable.
+ Most DGA requests allow at most one client to be using DGA on each
+ screen. Instead of keeping track of the current client in a
+ MAXSCREEN-sized array, track it in a per-screen private.
- Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
- (cherry picked from commit 7b506fdc840aebed6b5acb91437a2cb620b5bddc)
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
-commit 11698f7b86a67c1c79a0abbf162b47bc0917f2fb
-Author: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Sun Apr 18 01:22:27 2010 -0700
+commit f9e3a2955d2ca73604c68fc9d51405581b832edb
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Mon Apr 26 18:23:27 2010 -0700
- rootless: Remove an unneeded comment
+ Make Xvfb independent of MAXSCREENS.
- Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
- (cherry picked from commit 4d3789c9b3fbe6aad32fcacd964353b612640f27)
+ If a -screen option specifies a screen number higher than any previously
+ specified, reallocate the vfb-private array of screen-info structs.
+
+ If built with a DIX that still has a MAXSCREENS limit, asking for too
+ many screens won't be detected until InitOutput calls AddScreen.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
-commit 523a036bfc8d801b2827633baa92fb588500a6e4
-Author: Oliver McFadden <oliver.mcfadden@nokia.com>
-Date: Thu Apr 22 10:29:44 2010 +0300
+commit 20e84b0b44e8b3b40a3ecab5b2e64a27de247b16
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Mon Apr 26 18:09:23 2010 -0700
- x-list.c: null-returning function malloc() was called without checking
+ Xvfb: Simplify screen option processing.
- Signed-off-by: Oliver McFadden <oliver.mcfadden@nokia.com>
- Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
- (cherry picked from commit 048d15192af39ba5111882d18a957b6ff4e34cad)
+ Inspired by Jon Turney's "Xwin: Simplify screen option processing"
+ patch, which does something similar for the Xwin server.
+
+ Besides making the code more readable, this eliminates most of Xvfb's
+ references to MAXSCREENS.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+
+commit eeb84547556b943af2acff207e034823205c7dfe
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Mon Apr 26 18:04:25 2010 -0700
+
+ Delete redundant scrnum field from Xvfb private screen-info struct.
+
+ The screen number can be inferred from the position in the vfbScreens
+ array, and it was only used in two places, so it was hardly important.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
-commit adcff144cfd21a6381e7ff970711e6524fc4479e
+commit da0217891904bc48d5f0b7ea5c62c8ea0e9b95f9
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Wed Apr 21 22:26:28 2010 -0700
+
+ Track screens' installed colormaps as screen privates.
+
+ Several DDXes allow each screen to have at most one (or in some cases,
+ exactly one) installed colormap. These all use the same pattern: Declare
+ a global-lifetime array of MAXSCREENS ColormapPtrs, and index it by
+ screen number. This patch converts most of those to use screen privates
+ instead.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+
+commit 22c4300ee25a20e1f815e46225bf0de9cfd6748f
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Wed Oct 7 09:00:02 2009 -0700
+
+ Simplify XineramifyXv.
+
+ The structure of the adaptor-matching algorithm was obscured by trying
+ to use "continue" and "break" as the only control-flow primitives. It's
+ a lot more clear if you add "return" to that set.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit af170a4ab76d33254dd4e54a33bb410fa1624739
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 21 15:51:20 2010 +1000
@@ -1071,9 +6363,8 @@ Date: Wed Apr 21 15:51:20 2010 +1000
XTS test case: Xlib 11 KeymapNotify
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit af170a4ab76d33254dd4e54a33bb410fa1624739)
-commit 5958ded6f839e61a3e27d38a912468f38b41ba33
+commit bac1c5f1be4588b2b1eb646ee98a5442e1b767d5
Author: Dirk Wallenstein <halsmit@t-online.de>
Date: Sat Apr 17 21:36:23 2010 +0200
@@ -1087,44 +6378,112 @@ Date: Sat Apr 17 21:36:23 2010 +0200
Signed-off-by: Dirk Wallenstein <halsmit@t-online.de>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit bac1c5f1be4588b2b1eb646ee98a5442e1b767d5)
-commit c61bceee7a507f84770a4d7a0eced8faa2d48393
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu Apr 29 09:48:37 2010 +1000
+commit 3f63db89191701139d45332ca80b9d6eb327c773
+Merge: 41bdb6c 54e51de
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Apr 26 20:18:13 2010 -0700
- xfree86: a missing input driver is not an error.
+ Merge remote branch 'jamey/for-keith'
+
+commit 41bdb6c003cca3ef0ff88d9c7de318115bab1ba2
+Author: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
+Date: Wed Apr 21 18:11:05 2010 -0700
+
+ xf86: Don't crash when switching modes through RandR without owning the VT.
- We call NIDR on all devices that make it through the config backend.
- Including some that have no driver assigned to them (/dev/input/mouse0 for
- example). Those ones then simply get ignored by NIDR, but this should not be
- noted as an error in the log file.
+ While VT-switched, FB access is disabled and should remain so. Trying to switch
+ modes in that state would re-enable it, potentially causing crashes if trying
+ to access it before the driver has recovered from the mode switch.
- X_INFO is sufficient, and it may just prevent some bugreports.
+ Signed-off-by: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 2a763c9023b8bc978b32eaa56d2c625b6f2badee
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Feb 15 16:54:35 2010 -0500
+
+ dix: Default DPMS timeout values to match screensaver values
- Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- Acked-by: Julien Cristau <jcristau@debian.org>
- Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
- (cherry picked from commit 02e86221b851e5423a95782aa7e297ea051022ca)
+ These have the same default, but if you specify something different with
+ -s on the command line, only the screensaver time is changed. As DPMS
+ is usually what's desired, change it to match.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
-commit 799dbb8bbab0db5c4ecb5ad8b68d1669d74abf74
-Author: Rami Ylimäki <ext-rami.ylimaki@nokia.com>
-Date: Tue Apr 27 14:04:47 2010 +0300
+commit 518f3b189b6c8aa28b62837d14309fd06163ccbb
+Author: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
+Date: Wed Apr 21 16:46:17 2010 -0700
- test: Fix linking of wrapped functions in XI2 tests.
+ mi: don't thrash resources when displaying the software cursor across screens
- Running "make check" will lead to build problems in
- scratchbox. Building the first test that wraps dixLookupWindow fails
- because symbol __real_dixLookupWindow can't be resolved. Defining
- wrapping options as linker options instead of compiler options makes
- everything build nicely in scratchbox.
+ This changes the DC layer to maintain a persistent set of GCs/pixmaps/pictures
+ for each pScreen instead of failing to thrash between them when changing
+ screens.
- Signed-off-by: Rami Ylimäki <ext-rami.ylimaki@nokia.com>
+ Signed-off-by: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit 262c2c9031ea60cbe738ed80ddb7faa1b888d137)
+ Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 54e51de8cd950b3f5b30e72cf1d604f54f619f0e
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sat Apr 24 23:07:47 2010 -0700
+
+ ProcGrabButton: remove redundant error check.
+
+ If dixLookupResourceByType did not return Success, it will have set the
+ pointer to NULL, so the second if will always be true.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 7e573b5ccd2c759f74ebb84d3a5a23da6b88ec6d
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Mon Apr 26 15:05:06 2010 -0700
+
+ Kill unused/useless macros in panoramiX.h: BREAK_IF, IF_RETURN, FORCE_ROOT
+
+ This header doesn't seem to be used outside the server tree, so I don't
+ think anything was depending on these except what I've fixed in this
+ patch.
+
+ FORCE_ROOT is not used anywhere, and never has been in all the history
+ that's in git. ajax removed its FORCE_WIN and FORCE_CMAP companions
+ three years ago, in 04b87d6dfae02e4ecdb5216d12c6cdafd1e8c2b4.
+
+ BREAK_IF and IF_RETURN expanded to exactly the keywords in their names,
+ which is silly. They were rarely used and served only to make callers
+ inconsistent with the idioms used elsewhere in the server.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Matt Turner <mattst88@gmail.com>
+
+commit e372cc58e02391c3e8e82ac03f73fbe8b1f7d49c
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Wed Oct 7 11:06:34 2009 -0700
+
+ Boolean-or short-circuits, so (a || (!a && ...)) is redundant. Simplify.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+ Reviewed-by: Matt Turner <mattst88@gmail.com>
+
+commit 25d1c6cd37cc4079adf7c4bad8d10678fb08b409
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Apr 26 11:04:38 2010 -0700
+
+ Exa screen private has SavedSourceValidate, not SourceValidate
+
+ Need to check the right field to see if there is a wrapped
+ SourceValidate function.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
-commit 6fbb51466ca2345e185f68e5eb990e087f4c8239
+commit d073e51beeed2e702fa5c7534b1345360bc302f2
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Mon Apr 26 11:39:19 2010 -0500
@@ -1137,9 +6496,8 @@ Date: Mon Apr 26 11:39:19 2010 -0500
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
- (cherry picked from commit d073e51beeed2e702fa5c7534b1345360bc302f2)
-commit ecab2625860463c53dd15cb2f1b3beaf31d2e2ea
+commit 57409af1267f48457f93134922f2450518182e09
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Wed Apr 14 13:18:28 2010 -0500
@@ -1150,9 +6508,8 @@ Date: Wed Apr 14 13:18:28 2010 -0500
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
- (cherry picked from commit 57409af1267f48457f93134922f2450518182e09)
-commit 4c7a032eddebf7366549dd889004cb2e13f2fe3f
+commit 0d8fe2fe5c37659147cbecac793183c62fc6818a
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Tue Apr 13 13:32:51 2010 -0500
@@ -1166,9 +6523,8 @@ Date: Tue Apr 13 13:32:51 2010 -0500
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Acked-by: Julien Cristau <jcristau@debian.org>
- (cherry picked from commit 0d8fe2fe5c37659147cbecac793183c62fc6818a)
-commit 5fd534f5b3f557541e9580731e5ec0826f50720f
+commit 65a2c09549d2372c23b155addff428177708c910
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu Apr 8 21:55:45 2010 -0500
@@ -1185,9 +6541,8 @@ Date: Thu Apr 8 21:55:45 2010 -0500
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit 65a2c09549d2372c23b155addff428177708c910)
-commit 308d103110b49cd4f078bafda0e61d7e916ccbec
+commit 6e0d847c273ab89323883a05f806f449180e3669
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu Mar 25 03:37:09 2010 -0500
@@ -1198,9 +6553,8 @@ Date: Thu Mar 25 03:37:09 2010 -0500
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: Gaetan Nadon <memsize@videotron.ca>
- (cherry picked from commit 6e0d847c273ab89323883a05f806f449180e3669)
-commit d4956adef6e4ed7f019835e2638becfafecbafdd
+commit 04b7d529c09af2c842cf020d5b26080e1ffd88d6
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu Mar 25 03:36:25 2010 -0500
@@ -1208,9 +6562,8 @@ Date: Thu Mar 25 03:36:25 2010 -0500
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Acked-by: Gaetan Nadon <memsize@videotron.ca>
- (cherry picked from commit 04b7d529c09af2c842cf020d5b26080e1ffd88d6)
-commit 593aacfa0d7dd7fa656cc787fa06ffb6bbf07042
+commit 39e5108c78e0802833a8e9ea7f29d042738625ba
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu Mar 25 03:35:36 2010 -0500
@@ -1218,9 +6571,8 @@ Date: Thu Mar 25 03:35:36 2010 -0500
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Acked-by: Gaetan Nadon <memsize@videotron.ca>
- (cherry picked from commit 39e5108c78e0802833a8e9ea7f29d042738625ba)
-commit d86e8abc4324b3b98c54c5d42ff69635f59edeb8
+commit 3ba2ce5d1054c99354686aeb373247f1b9debf79
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu Mar 25 03:33:55 2010 -0500
@@ -1232,9 +6584,8 @@ Date: Thu Mar 25 03:33:55 2010 -0500
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
- (cherry picked from commit 3ba2ce5d1054c99354686aeb373247f1b9debf79)
-commit 35e5406d15fe94bf222030c4a859ae607c8697ae
+commit 40972576b606237d5d42abc13d846163e264a4ac
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Tue Mar 23 04:47:27 2010 -0500
@@ -1248,23 +6599,36 @@ Date: Tue Mar 23 04:47:27 2010 -0500
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
- (cherry picked from commit 40972576b606237d5d42abc13d846163e264a4ac)
-commit 88ba993aaf3f810c6dfc1fb113d5d075eeb390b4
-Author: Keith Packard <keithp@keithp.com>
-Date: Mon Apr 26 11:04:38 2010 -0700
+commit b557571dbff3d9a615e03cad904d46b8af9153a0
+Author: Jerome Glisse <jglisse@redhat.com>
+Date: Mon Apr 26 16:01:48 2010 +0200
- Exa screen private has SavedSourceValidate, not SourceValidate
+ exa: avoid calling non existent SourceValidate callback
- Need to check the right field to see if there is a wrapped
- SourceValidate function.
+ In unaccel path we were unconditionaly calling the SourceValidate
+ callback but in some case it could be NULL. Check if we have a
+ valid callback before calling it.
+ Signed-off-by: Jerome Glisse <jglisse@redhat.com>
+ Acked-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit 25d1c6cd37cc4079adf7c4bad8d10678fb08b409)
-commit 02e07e7e234f8e74b41148ba05e05b3446c7732a
+commit 0e6e75b04eaca311962390533acc03d0ac5ece83
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Apr 26 09:14:22 2010 -0700
+
+ Revert "exa: avoid calling non existent SourceValidate callback"
+
+ This reverts commit daa6f9308fa57e41210f78d92dbdb3f1c8eae6ad.
+
+ This one checked pScreen->SourceValidate instead of
+ pExaScr->SourceValidate which would cause a segfault when
+ pExaScr->SourceValidate was NULL.
+
+commit daa6f9308fa57e41210f78d92dbdb3f1c8eae6ad
Author: Jerome Glisse <jglisse@redhat.com>
-Date: Mon Apr 26 16:01:48 2010 +0200
+Date: Mon Apr 26 15:55:26 2010 +0200
exa: avoid calling non existent SourceValidate callback
@@ -1275,45 +6639,177 @@ Date: Mon Apr 26 16:01:48 2010 +0200
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Acked-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit b557571dbff3d9a615e03cad904d46b8af9153a0)
-commit c394b17266301d363a9e234f58f8015f74e01307
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue Apr 27 17:53:22 2010 +1000
+commit edbc56c088462844f6445f5e6d7cbcfc58a207dc
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Mon Apr 26 14:49:25 2010 +0300
- Revert "DRI2: Track DRI2 drawables as resources, not privates"
+ include: remove couple of unused structures fields and bump ABI
- This change breaks GLX compositing managers.
- See Bug 27767 <https://bugs.freedesktop.org/show_bug.cgi?id=27767>
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+
+commit 4f8dc1109dcdfa973466a038c16c07da5f6c16b4
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Thu Apr 22 15:43:11 2010 +0300
+
+ dix and others: remove unused arraySize field from ScreenInfo
- This reverts commit 0c499f2ee4ae2b7dc424009abb336fc81a8a2853.
+ Bizarre. This seems to never be used before. I left the field in ScreenInfo,
+ with another name. So, stop looking at it.
- Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
-commit 65e84507b48546443fd0f67bc3263903d116bf62
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue Apr 27 14:08:58 2010 +1000
+commit 64fd39f2f0ffbbdc2d5929047d260263d0962141
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Thu Apr 22 15:48:48 2010 +0300
- xserver 1.8.0.901
+ xfree86: no need to assign numScreens again
- Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ numScreens is always being assigned to 0 in dix for any server generation.
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
-commit 5d757096fc72233a9ff520149ec7cfd1ced457d8
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Fri Apr 23 13:42:34 2010 +1000
+commit a7d398e545a4be5491248d5ccb303aa03ee1594f
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Fri Apr 16 18:13:50 2010 +0100
- Xvfb: Usage message typo fix.
+ Xwin: make screens structures run-time adjustable
+
+ Change g_ScreenInfo, an array of winScreenInfo elements, from a
+ static array of MAXSCREENS elements, to a dynamically allocated one
+
+ Fix up the validation that -screen option screen numbers are
+ contiguous from zero (which possibly didn't work correctly before
+ anyhow)
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Jamey Sharp<jamey@minilop.net>
+ Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+
+commit d8454ae488cfc073cd6010c9a08d53855a0c2612
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Mon Apr 12 20:18:13 2010 +0100
+
+ Xwin: Simplify screen option processing
+
+ Use an instance of the XWin DDX-specific screen info structure to hold
+ the current default values, to simplify greatly the code for applying
+ options to all screens and remove all those loops over MAXSCREENS screens
+ in the command line option processing
+
+ Use g_iNumScreens for tracking the current initialized screen count
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+
+commit b61870595ba4df06006d24ed8c07cfe781bce1b7
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Thu Apr 22 20:20:48 2010 +0300
+
+ xfree86: track screens' installed colormaps as screen privates
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+
+commit a94f5455c71363d5047668ee093901b9e1645cf1
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Thu Apr 22 20:20:43 2010 +0300
+
+ mi: track screens' installed colormaps as screen privates
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+
+commit a2c716eaf6b3a4ce75382394636a0a890b5dcfe0
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Thu Apr 22 07:34:04 2010 +0200
+
+ fb: track screens' installed colormaps as screen privates.
+
+ Several DDXes allow each screen to have at most one (or in some cases,
+ exactly one) installed colormap. These all use the same pattern: Declare
+ a global-lifetime array of MAXSCREENS ColormapPtrs, and index it by
+ screen number. This patch converts most of those to use screen privates
+ instead.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+
+commit e055bef055b6c726e9f3ef91a83585d13c80651d
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Thu Apr 22 06:08:29 2010 +0200
+
+ xfree86: use screen privates for exclusive DGA clients
+ Most DGA requests allow at most one client to be using DGA on each screen.
+ Instead of keeping track of the current client in a MAXSCREEN-sized array,
+ track it in a per-screen private.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+
+commit 7c9733d063acee04735a0e75d62e508fe4ea1163
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Fri Apr 23 06:41:00 2010 +0200
+
+ xfree86: use screen privates for Xv offscreen images.
+
+ This replaces a globally-allocated array that depended on MAXSCREENS.
+
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+ Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+
+commit 35d208125fa0ec78e8d694adc52886b977e789cf
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Wed Apr 21 18:28:13 2010 +0300
+
+ xfree86: fix not reached code in fi1236 driver from i2c
+
+ This issue was introduced in the first dump of the code in 2004. I haven't
+ check what's the correct fix for it so I simply kept the behaviour of someone
+ calling this and removed the unreachable code.
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit 0782894b5702adcf6f4a90861793b717f3856fa5)
+
+commit 7ac6a6b7d0dfc5e021270b2898accd3425aa008a
+Merge: 0782894 f7ef6fd
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Apr 21 16:07:38 2010 -0700
+
+ Merge remote branch 'vignatti/for-keith'
Conflicts:
+ exa/exa.c
- hw/vfb/InitOutput.c
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 0782894b5702adcf6f4a90861793b717f3856fa5
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Apr 21 16:00:28 2010 -0700
+
+ Xvfb: Usage message typo fix.
- Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
-commit feb39870e0d2c5917c8da1951c721f6f72cb4d39
+commit ee3412b8702072c3a0b006bd20dd3bc7071d721c
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Apr 21 15:58:23 2010 -0700
+
+ Restore some unused win32 debug code accidentally removed with unifdef
+
+ unifdef found some code covered by
+
+ which it decided to remove. This patch simply restores that in case
+ someone wants it back.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit e3d2a7a613366c26e5316cf582d9a8c6c6692b0a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 21 11:47:24 2010 +1000
@@ -1386,88 +6882,192 @@ Date: Wed Apr 21 11:47:24 2010 +1000
This reverts commit 00b8b7ad61b6f818271fb4d1e383113170309d72.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
-commit 5455df65207aa367531f5a3c35d39cb6c390e5de
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Wed Apr 14 09:48:53 2010 +1000
+commit f7ef6fd9a1a1f48603df2796fe7c904c25a81077
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Tue Apr 20 15:56:58 2010 +0300
- xkb: purge unneeded includes from ddxDevBtn.c
+ xfree86: fix not reached code in tty code
- Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+ CLEARRTS_SUPPORT cannot be triggered at all. Notice that mouse driver manual
+ page states the support for it though.
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit b36eeb713a349961a6be8a6dd183ded6d27f9974
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Tue Apr 20 16:26:02 2010 +0300
+
+ xkb: check for NULL pointer before dereferences it in XkbWriteXKBSymbols
+
+ move srv assignment to before it's being used. Also, check for xkb being nil.
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 471f350c99b2e7c5a9045eef5ebff65cd2ddb7c5
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Mon Apr 19 20:34:30 2010 +0300
+
+ exa: don't need to check for NULL pointer if we already assumed it has a value
+
+ the alternative would be to check ps in the beginning of the function.
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Acked-by: Michel Dänzer <michel@daenzer.net>
+
+commit 96784f4fcb6c2fb82f6d1abbd28ea1e189e4e6f5
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Mon Apr 19 20:46:12 2010 +0300
+
+ xkb: check for NULL pointer before dereferences it in XkbAddClientResource
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
- (cherry picked from commit da4e2e382828d7ba460766709368ec6214b286dd)
-commit 72664a84e0f700fc51737b76bfd89b1d3b9cbdce
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue Apr 13 14:44:59 2010 +1000
+commit 057c147541bde6f0cbe22ca069b43a97ddc95baf
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Fri Apr 16 18:01:41 2010 +0300
- xkb: use GPE for XKB fake motion events.
+ Xi: check for NULL pointer before dereferences it in ListButtonInfo
- Section 4.6.1 of the XKB spec says that "the initial event always moves the
- cursor the distance specified in the action [...]", so skip the
- POINTER_ACCELERATE flag for GPE, it would cause double-acceleration.
+ Both dev and dev->button are already used before their checking were being
+ performed. So check on the beginning.
- Potential regression - GPE expects the coordinates to be either relative or
- both. XKB in theory allows for x to be relative and y to be absolute (or
- vice versa). Let's pretend that scenario has no users.
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+
+commit 7f457351d2a09013cd57fcb2f95c0d6f56bfaccb
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Mon Apr 19 20:18:51 2010 +0300
+
+ xfree86: check for NULL pointer before dereferences it in parser code
- Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- Reviewed-by: Simon Thum <simon.thum@gmx.de>
- Reviewed-by: Daniel Stone <daniel@fooishbar.org>
- (cherry picked from commit f4106c02318fcc4b534224df5b95a58aff555fb4)
+ Seems to be harmless. Meh.
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
-commit 3e76abe1c16ff45f25de8f20c3aaf3268dff10c8
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Wed Apr 14 10:51:41 2010 +1000
+commit d948dcd9555c81ccb378054383ef8da464202bdf
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Fri Apr 16 17:08:09 2010 +0300
- xkb: Guard against SIGIO updates during PointerKeys.
+ Xi: fix not reached code in XSendExtensionEvent
- In theory, an event coming in during GPE could reset our lastSlave, leading
- to rather interesting events lateron.
+ Error was introduced in 31a7994a. I.e., broken since 2007. I guess nobody uses
+ XSendExtensionEvent.
- Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- Reviewed-by: Simon Thum <simon.thum@gmx.de>
- Reviewed-by: Daniel Stone <daniel@fooishbar.org>
- (cherry picked from commit 6c42c8c356be305dc7f3f92ad8d58675da8c2f07)
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
-commit 37c3d2aef089a8bb45adecb4f0372c47b62e0bb7
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue Apr 13 14:41:07 2010 +1000
+commit f491b0aa5b86a5242fc4e04218202bbb52d0af39
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Fri Apr 16 16:47:33 2010 +0300
- xkb: Post PointerKeys through the XTEST device.
+ xfree86: fix not reached code in parser
- Posting an event through a master device may cause pointer jumps once
- lastSlave == master, caused by double scaling. To avoid this, post the fake
- event generated by XKB through the XTEST device instead.
+ ...because Error is a macro that returns NULL.
- Fedora bug #560356 <https://bugzilla.redhat.com/560356>
- Tested-by: Andrew McNabb
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+
+commit 099946a3ac94ff5e575e9edcecd26cf9f346b241
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Fri Apr 16 18:35:55 2010 +0300
+
+ mi: check for NULL pointer before dereferences it in miPointerSetPosition
- Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- Reviewed-by: Daniel Stone <daniel@fooishbar.org>
- (cherry picked from commit 108457dff816569453a2d88cd72595fa7eb02479)
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
-commit a9c978bb9723ec7c291074ff75423623c8bf7209
-Author: Benjamin Tissoires <tissoire@cena.fr>
-Date: Wed Apr 14 17:27:51 2010 +0200
+commit 49835eec0c996ad95a01f0fe340336b6b60e51aa
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Fri Apr 16 17:50:43 2010 +0300
- xf86ScaleAxis: support for high resolution devices
+ exa: check for NULL pointer before dereferences it
- High resolution devices was generating integer overflow.
- For instance the wacom Cintiq 21UX has an axis value up to
- 87000. Thus the term (dSx * (Cx - Rxlow)) is greater than
- MAX_INT32.
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Acked-by: Michel Dänzer <michel@daenzer.net>
+ Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+
+commit 996c115deb558e8e9490ea773528b8e96650df53
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Thu Mar 25 18:17:54 2010 +0200
+
+ configure: remove unused builtin font macro from autoconf file
- Using 64bits integer avoids such problem.
+ This should be removed together with 49b93df8.
- Signed-off-by: Philippe Ribet <ribet@cena.fr>
- Signed-off-by: Benjamin Tissoires <tissoire@cena.fr>
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+
+commit 0ba82562eeba8bf3bcd00b6e3ff28ce5b2c8df3c
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Tue Mar 30 19:10:36 2010 +0300
+
+ Death to Multibuffer extension
+
+ The rationale behind is because no sane application will use this when we have
+ modern APIs such DRI2. Besides, as a fact, xfree86 server has already
+ deprecated this extension in 1998:
+
+ http://www.xfree86.org/3.3.6/isc7.html
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 28b7b2b8d02d975480080865f0dddebcaa2f7968
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Apr 19 09:26:10 2010 -0700
+
+ unifdef -B -DRENDER to always include RENDER code
+
+ This patch was created with:
+
+ git ls-files '*.[ch]' | while read f; do unifdef -B -DRENDER -o $f $f; done
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit b3ab978df861c08298f57529e3db980489055c35
+Merge: a92b2c2 0ad022a
+Author: Keith Packard <keithp@keithp.com>
+Date: Sun Apr 18 22:01:40 2010 -0700
+
+ Merge remote branch 'whot/for-keith'
+
+commit 0ad022a729bafa56cc7b5d241f567444a34514ad
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Apr 14 10:54:29 2010 +1000
+
+ xkb: rename XkbFakeDeviceButton and XkbFakeDeviceMotion, move into xkbActions.c
+
+ The name XkbDDXFakeDeviceButton and XkbDDXFakeDeviceMotion is somewhat
+ misleading, there's no DDX involved in the game at all anymore.
+
+ This removes XkbFakeDeviceMotion and XkbFakeDeviceButton from the API where
+ it arguably shouldn't have been in the first place.
+
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit a780e5b3638a0ff81301fc68aca15b47ba0befb7)
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+ Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+
+commit da4e2e382828d7ba460766709368ec6214b286dd
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Apr 14 09:48:53 2010 +1000
-commit 6ab87eb04cf24619c17c1fa05daaeebb481a6a50
+ xkb: purge unneeded includes from ddxDevBtn.c
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+ Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+
+commit a92b2c2c8dd1e86ee852168146f01bdf72bfe2d0
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Fri Apr 16 05:55:35 2010 -0400
@@ -1482,7 +7082,7 @@ Date: Fri Apr 16 05:55:35 2010 -0400
https://bugs.freedesktop.org/show_bug.cgi?id=26394
Signed-off-by: Keith Packard <keithp@keithp.com>
-commit 0c499f2ee4ae2b7dc424009abb336fc81a8a2853
+commit 1da1f33f2dd5b437dd56cd9f5d6782de4ad5a1bc
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Fri Apr 16 05:55:34 2010 -0400
@@ -1497,12 +7097,10 @@ Date: Fri Apr 16 05:55:34 2010 -0400
https://bugs.freedesktop.org/show_bug.cgi?id=26394
- [Ported to 1.8 branch by ajax@redhat.com]
-
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
-commit 0460a76b9ae25fe26f683f0cbff1e4157287cf56
+commit 22da7aa9d743deee198aaf6df5d370a446db9763
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Fri Apr 16 05:55:33 2010 -0400
@@ -1517,9 +7115,8 @@ Date: Fri Apr 16 05:55:33 2010 -0400
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit 22da7aa9d743deee198aaf6df5d370a446db9763)
-commit 86ca6baee221fc691c7828b078008314ac989864
+commit f0006aa58f6cf7552a239e169ff6e7e4fda532f4
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Fri Apr 16 05:55:32 2010 -0400
@@ -1533,9 +7130,80 @@ Date: Fri Apr 16 05:55:32 2010 -0400
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit f0006aa58f6cf7552a239e169ff6e7e4fda532f4)
-commit 7d5e6012df237c0d9d4741ca275751bc49f731ed
+commit f4106c02318fcc4b534224df5b95a58aff555fb4
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Apr 13 14:44:59 2010 +1000
+
+ xkb: use GPE for XKB fake motion events.
+
+ Section 4.6.1 of the XKB spec says that "the initial event always moves the
+ cursor the distance specified in the action [...]", so skip the
+ POINTER_ACCELERATE flag for GPE, it would cause double-acceleration.
+
+ Potential regression - GPE expects the coordinates to be either relative or
+ both. XKB in theory allows for x to be relative and y to be absolute (or
+ vice versa). Let's pretend that scenario has no users.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Simon Thum <simon.thum@gmx.de>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+
+commit 6c42c8c356be305dc7f3f92ad8d58675da8c2f07
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Apr 14 10:51:41 2010 +1000
+
+ xkb: Guard against SIGIO updates during PointerKeys.
+
+ In theory, an event coming in during GPE could reset our lastSlave, leading
+ to rather interesting events lateron.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Simon Thum <simon.thum@gmx.de>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+
+commit 108457dff816569453a2d88cd72595fa7eb02479
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Apr 13 14:41:07 2010 +1000
+
+ xkb: Post PointerKeys through the XTEST device.
+
+ Posting an event through a master device may cause pointer jumps once
+ lastSlave == master, caused by double scaling. To avoid this, post the fake
+ event generated by XKB through the XTEST device instead.
+
+ Fedora bug #560356 <https://bugzilla.redhat.com/560356>
+ Tested-by: Andrew McNabb
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+
+commit a780e5b3638a0ff81301fc68aca15b47ba0befb7
+Author: Benjamin Tissoires <tissoire@cena.fr>
+Date: Wed Apr 14 17:27:51 2010 +0200
+
+ xf86ScaleAxis: support for high resolution devices
+
+ High resolution devices was generating integer overflow.
+ For instance the wacom Cintiq 21UX has an axis value up to
+ 87000. Thus the term (dSx * (Cx - Rxlow)) is greater than
+ MAX_INT32.
+
+ Using 64bits integer avoids such problem.
+
+ Signed-off-by: Philippe Ribet <ribet@cena.fr>
+ Signed-off-by: Benjamin Tissoires <tissoire@cena.fr>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit e424d5812300e82de375d83dc0b490a76d865016
+Merge: 5b0faf3 0e7703f
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Apr 15 15:01:34 2010 -0700
+
+ Merge remote branch 'whot/for-keith'
+
+commit 0e7703f9b1927328954a2fc87aac6be244819329
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Apr 13 22:28:36 2010 +0200
@@ -1555,9 +7223,8 @@ Date: Tue Apr 13 22:28:36 2010 +0200
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit 0e7703f9b1927328954a2fc87aac6be244819329)
-commit 0e6c08655cdb240b5de42a7559cfd3ef60a85118
+commit 2f29b163bbdebe384c24f781bb97b446959e8f4c
Author: Adam Tkac <atkac@redhat.com>
Date: Mon Mar 22 14:52:29 2010 +0100
@@ -1570,9 +7237,8 @@ Date: Mon Mar 22 14:52:29 2010 +0100
Signed-off-by: Adam Tkac <atkac@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit 2f29b163bbdebe384c24f781bb97b446959e8f4c)
-commit 8ab76efb14ba7010c2762120fc7784e3f8bd7d11
+commit 241b53b77750b5eea6759e79b23be4ff270a3d1f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Mar 23 14:35:56 2010 +1000
@@ -1585,9 +7251,8 @@ Date: Tue Mar 23 14:35:56 2010 +1000
X.Org Bug 26843 <http://bugs.freedesktop.org/show_bug.cgi?id=26843>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit 241b53b77750b5eea6759e79b23be4ff270a3d1f)
-commit 049a36cd402da9219e60221f5671f94a8f8f687f
+commit 00b8b7ad61b6f818271fb4d1e383113170309d72
Author: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
Date: Wed Apr 7 13:52:47 2010 -0700
@@ -1600,9 +7265,8 @@ Date: Wed Apr 7 13:52:47 2010 -0700
Signed-off-by: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit 00b8b7ad61b6f818271fb4d1e383113170309d72)
-commit 59ee696aa1232698ab0fc22ffffe4e6f438bf764
+commit 5f31e2196179f8db3170d65a17d8ad40da1acb0d
Author: Tim Yamin <plasm@roo.me.uk>
Date: Mon Mar 8 12:45:15 2010 +1000
@@ -1615,9 +7279,37 @@ Date: Mon Mar 8 12:45:15 2010 +1000
Signed-off-by: Tim Yamin <plasm@roo.me.uk>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit 5f31e2196179f8db3170d65a17d8ad40da1acb0d)
-commit 19b1fa1b5ff615f8711ad95f28663895707a3970
+commit 5b0faf355465c9f21ad96e0ed266fbdbc29efb5b
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Thu Apr 15 10:55:53 2010 -0700
+
+ XQuartz GLX: Don't let garbage enter our pixel request
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=27654
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit fe7778e58e099d353689755ed2f5aa440569ebe3
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Wed Apr 14 09:06:04 2010 -0700
+
+ XQuartz: Fix possible NULL dereference in ListenOnOpenFD
+
+ <rdar://problem/7862319>
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+ Reviewed-by: Marc Majka <majka@apple.com>
+
+commit 206531f75cd41c034e89fdfbc75ab0910682eef8
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Tue Apr 13 14:33:49 2010 -0700
+
+ XQuartz: Localization update
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 9ddbb03fa56aa73c3f417d8ee6433e45b94445b3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 14 17:43:22 2010 +1000
@@ -1640,9 +7332,8 @@ Date: Wed Apr 14 17:43:22 2010 +1000
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit 9ddbb03fa56aa73c3f417d8ee6433e45b94445b3)
-commit 1ae61e0c406bbb454ca24aebd0f61148fe04e60c
+commit 7b6517526631a65891b806bca30be8f49955d0a8
Author: Michel Dänzer <daenzer@vmware.com>
Date: Wed Apr 14 19:28:37 2010 +0200
@@ -1653,73 +7344,52 @@ Date: Wed Apr 14 19:28:37 2010 +0200
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit 7b6517526631a65891b806bca30be8f49955d0a8)
-
-commit dbc093ec10a3b734f99e13d4c43f273e6d9b6a39
-Author: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Thu Apr 15 10:55:53 2010 -0700
-
- XQuartz GLX: Don't let garbage enter our pixel request
-
- https://bugs.freedesktop.org/show_bug.cgi?id=27654
-
- Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
- (cherry picked from commit 5b0faf355465c9f21ad96e0ed266fbdbc29efb5b)
-commit 19ff17fce901afcc6c9be29509e28e53a5d71530
-Author: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Wed Apr 14 09:06:04 2010 -0700
+commit fc5d76740851725e3788c68e14474a012a205892
+Author: Julien Cristau <jcristau@debian.org>
+Date: Tue Apr 6 11:51:53 2010 +0200
- XQuartz: Fix possible NULL dereference in ListenOnOpenFD
+ XGE: don't register an extension event
- <rdar://problem/7862319>
+ The GenericEvent is a core event, we never send an extension event, so
+ don't reserve an id for one.
- Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
- Reviewed-by: Marc Majka <majka@apple.com>
- (cherry picked from commit fe7778e58e099d353689755ed2f5aa440569ebe3)
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
-commit 84f49c8570a1e4db81a81864b92226fa93435b16
-Author: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Tue Apr 13 14:33:49 2010 -0700
+commit 0b676acd47e0d6a675df374b42ddb200deab5d06
+Author: Julien Cristau <jcristau@debian.org>
+Date: Tue Apr 13 11:45:41 2010 +0200
- XQuartz: Localization update
+ Bump version in configure.ac
- Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
- (cherry picked from commit 206531f75cd41c034e89fdfbc75ab0910682eef8)
+ Signed-off-by: Keith Packard <keithp@keithp.com>
-commit d0e9583fa803a219bb993dc81c6f2abc83e65e81
-Author: Dan Nicholson <dbn.lists@gmail.com>
-Date: Tue Feb 16 08:11:41 2010 -0800
+commit 1760d2bef9f5b248cb2332f6ebf0220eb02bab42
+Author: Kristian Høgsberg <krh@bitplanet.net>
+Date: Fri Apr 9 10:58:48 2010 -0400
- xfree86: Fix priority ordering for ignoring input classes
+ glx: Set the pbuffer bit for dri2 fbconfigs
- Commit 8736d112afb0dd61dfdaadd6378eafd200b2ef5f changed the priority
- ordering of the InputClass option merging to be "last match wins". This
- fixes the handling of Option "Ignore" to follow that logic.
+ They've been implemented for a while, but we never advertised them. All we
+ need to do is set the GLX_PBUFFER_BIT in the drawable type fbconfig
+ field when we're using DRI2.
- Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
- Reviewed-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit adbbc661080ba4efdb764c154d40c4d2fe718e16)
+ https://bugs.freedesktop.org/show_bug.cgi?id=26581
- Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
+ Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
-commit 9157b0ad4d016ebc7dd22dc4b50d20fd0c609044
-Author: Julien Cristau <jcristau@debian.org>
-Date: Tue Apr 6 11:51:53 2010 +0200
+commit ab60975fe28cb135b4183c57b7f50d3615921c1f
+Merge: adbbc66 59edde7
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Apr 12 21:40:41 2010 -0700
- XGE: don't register an extension event
-
- The GenericEvent is a core event, we never send an extension event, so
- don't reserve an id for one.
-
- Signed-off-by: Julien Cristau <jcristau@debian.org>
- Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
- Signed-off-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit fc5d76740851725e3788c68e14474a012a205892)
-
- Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Merge remote branch 'jeremyhu/master'
-commit 88f275a748766422a9a56dcdb692970afc56c59c
+commit 59edde7c28db2d3174a5813a0af334e4ead2082f
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Apr 9 16:19:43 2010 -0700
@@ -1727,9 +7397,8 @@ Date: Fri Apr 9 16:19:43 2010 -0700
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Kevin Van Vechten <kvv@apple.com>
- (cherry picked from commit 59edde7c28db2d3174a5813a0af334e4ead2082f)
-commit f20f1d57a514fe4b767b383c5369f1f79f2b1262
+commit 5600f7f001529b3afdee95546aec212a70d6a5b2
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Apr 9 13:33:06 2010 -0700
@@ -1737,9 +7406,8 @@ Date: Fri Apr 9 13:33:06 2010 -0700
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Kevin Van Vechten <kvv@apple.com>
- (cherry picked from commit 5600f7f001529b3afdee95546aec212a70d6a5b2)
-commit de13a627f34ca5c882b6f2f84ba0d17b9044daeb
+commit 840d12c7a6ac6a974da185045215ce944a61fab6
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Apr 9 13:29:34 2010 -0700
@@ -1749,9 +7417,8 @@ Date: Fri Apr 9 13:29:34 2010 -0700
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Kevin Van Vechten <kvv@apple.com>
- (cherry picked from commit 840d12c7a6ac6a974da185045215ce944a61fab6)
-commit 0e97ac0b3036aa500bee16aa1de22ee7c6cbd522
+commit d6f160510a50d4c4eaa48c9c69a5ddda0d50052c
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon Apr 5 16:54:22 2010 -0700
@@ -1760,65 +7427,29 @@ Date: Mon Apr 5 16:54:22 2010 -0700
http://xquartz.macosforge.org/trac/ticket/295
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
- (cherry picked from commit 1ac34213137cbcbdfcf4a07708e9af6ce0dbfb4a)
-
-commit 11afa5e56e9561d214b0a4c13ed60bc2d106fbbb
-Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
-Date: Wed Feb 24 15:17:42 2010 -0600
-
- Cygwin/X: Add configure option for WindowsWM
-
- WindowsWM support is still experimental, and uses the Rootless extension
- which currently breaks the simultaneous build of the other DDXs (see
- commit b3415187e92960cbff784108b5a3a8d130dc34c5). So we disable it by
- default for now; once the latter issue is fixed we can make this 'auto'.
-
- Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
- (cherry picked from commit c983f40fe4f30311f31a9df699cdc888709251d0)
-
-commit 76e548d09195de750a532ee568171b931c1216fe
-Author: Jon TURNEY <jon.turney@dronecode.org.uk>
-Date: Thu Feb 18 14:19:21 2010 -0600
-
- Don't enable ROOTLESS_WORKAROUND, it breaks composite
-
- This possibly brings back whatever the bug is in
- http://bugs.freedesktop.org/show_bug.cgi?id=1168 for
- -rootless mode, but since we don't have reproduction
- steps for that, I can't test that...
-
- Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
- Tested-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
- Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
- (cherry picked from commit 20701522be803fe47e921fcf059dadf64c7f287d)
+ Reviewed-by: Kevin Van Vechten <kvv@apple.com>
-commit 4f2489bdf36ac4d6a340e2a327798a1da394573a
-Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
-Date: Wed Mar 24 00:08:23 2010 -0500
+commit adbbc661080ba4efdb764c154d40c4d2fe718e16
+Author: Dan Nicholson <dbn.lists@gmail.com>
+Date: Tue Feb 16 08:11:41 2010 -0800
- Cygwin/X: Disable unsupported extensions in configure
+ xfree86: Fix priority ordering for ignoring input classes
- Several extensions are not supported by XWin, some of which are enabled
- by default in configure. We forcefully disable these early on so that
- configure will succeed without arguments and without the corresponding
- proto installed.
+ Commit 8736d112afb0dd61dfdaadd6378eafd200b2ef5f changed the priority
+ ordering of the InputClass option merging to be "last match wins". This
+ fixes the handling of Option "Ignore" to follow that logic.
- Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
- (cherry picked from commit 95c9947f6244d37592958b70760bd1ac885b625a)
+ Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
-commit f121ce4d22ff23f16cc374c9a125d3815765bb0c
-Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
-Date: Mon Mar 22 12:47:52 2010 -0500
+commit d7c98c1c81ae272f66edb05fde20f4c616604add
+Merge: 82cf3a4 03ccbd2
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Apr 7 22:25:51 2010 -0700
- Disable setuid configure test on Cygwin
-
- Only Xorg is installed setuid, so there is no need to run this configure
- test on Cygwin.
-
- Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
- (cherry picked from commit 24c9d48cd6999f1e90f9f0e2bbfebd8e95d314d8)
+ Merge remote branch 'whot/for-keith'
-commit b12f6142f356a72af64665e753c5a4e61b2a6ec1
+commit 03ccbd2579948d11e5f16f88cdf68a55f57c9d26
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 8 13:47:26 2010 +1000
@@ -1828,11 +7459,8 @@ Date: Thu Apr 8 13:47:26 2010 +1000
potential users to them.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit 03ccbd2579948d11e5f16f88cdf68a55f57c9d26)
-
- Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-commit 3e2ab9139b12b1239eebcbb6c6a23e7284dd7b44
+commit d4dd3d0085f8eaca8c989aaeace1a1a24c5ebf49
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Sat Apr 3 09:33:51 2010 -0700
@@ -1843,11 +7471,8 @@ Date: Sat Apr 3 09:33:51 2010 -0700
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit d4dd3d0085f8eaca8c989aaeace1a1a24c5ebf49)
-
- Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-commit 59f96734633fce3c2bee62bce860aed33033ce3e
+commit 95f01bdfee8241371675f0089170fa6b2908d815
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Sat Apr 3 10:08:25 2010 -0700
@@ -1869,11 +7494,8 @@ Date: Sat Apr 3 10:08:25 2010 -0700
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit 95f01bdfee8241371675f0089170fa6b2908d815)
-
- Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-commit 0c4a358eae0e77f389380bbbf39d4419f2dd6dcd
+commit a1bae63dc634a5a79861eab128c63506081f7ed9
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Sat Apr 3 09:33:49 2010 -0700
@@ -1890,11 +7512,8 @@ Date: Sat Apr 3 09:33:49 2010 -0700
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit a1bae63dc634a5a79861eab128c63506081f7ed9)
-
- Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-commit a4516965de447332794ee0afb9503c351fff6fe8
+commit 2ac33888a9a5766aaf88bc92a8bd1d489873524c
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Sat Apr 3 09:33:48 2010 -0700
@@ -1904,11 +7523,8 @@ Date: Sat Apr 3 09:33:48 2010 -0700
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit 2ac33888a9a5766aaf88bc92a8bd1d489873524c)
-
- Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-commit eb07b8606f9a1349baf8114bb36dc2712e5d3419
+commit 2460e921d18fd264e6f6374be0908f4100442650
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Sat Apr 3 09:33:47 2010 -0700
@@ -1919,11 +7535,8 @@ Date: Sat Apr 3 09:33:47 2010 -0700
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit 2460e921d18fd264e6f6374be0908f4100442650)
-
- Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-commit ad6c5e450cacee3777e7c541d4841ee580339a5d
+commit c8a608cb6ce8f9c86258c1ab49084f691fa9cc51
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 7 10:04:38 2010 +1000
@@ -1937,11 +7550,8 @@ Date: Wed Apr 7 10:04:38 2010 +1000
Acked-by: Julien Cristau <jcristau@debian.org>
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Acked-by: James Cloos <cloos@jhcloos.com>
- (cherry picked from commit c8a608cb6ce8f9c86258c1ab49084f691fa9cc51)
-
- Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-commit c01250576ffadcd6c4591978b78da878d91ec11c
+commit 6b09f66d8c6ebcee70382b5cca1ba82b68f20afa
Author: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
Date: Fri Apr 2 12:48:21 2010 -0700
@@ -1949,27 +7559,29 @@ Date: Fri Apr 2 12:48:21 2010 -0700
Signed-off-by: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit 6b09f66d8c6ebcee70382b5cca1ba82b68f20afa)
-
- Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-commit 50ddc4af59f41a1c96088c1e22a4917b21aaf098
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date: Mon Apr 5 19:12:22 2010 -0400
+commit 82cf3a4ae01811917f7903d6f62ba9b7132adf7e
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Apr 6 15:52:18 2010 -0700
- doc: specify 1.6.1 as the minimum version for doxygen.
+ Convert x86emu fixed size int typedefs to use stdint types
- Older versions generate filenames that are different from
- the ones listed in the Makefile.
+ Fixes x86emu builds when using non-gnu compilers now that u64 is required
- Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
- Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
- Signed-off-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit 6150595bdbacde13bb4f9aba81b15435089bee94)
+ Before this fix, the u64 type would not be defined, causing
+ x86emu/sys.c to fail to build:
+ "sys.c", line 102: syntax error before or at: ldq_u
+ "sys.c", line 102: syntax error before or at: *
- Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Since Keith requested using <stdint.h>, converted all the x86emu
+ typedefs to use the stdint types.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Acked-by: Matt Turner <mattst88@gmail.com>
+ Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
-commit a68b0e27b6c60921c97f61daa2d9d723e0a5d98f
+commit a9fe7cfa77ccee64d68732dc3f37d35cbfc27a65
Author: Paulo Ricardo Zanoni <pzanoni@mandriva.com>
Date: Thu Mar 11 14:28:18 2010 -0300
@@ -1984,32 +7596,85 @@ Date: Thu Mar 11 14:28:18 2010 -0300
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit a9fe7cfa77ccee64d68732dc3f37d35cbfc27a65)
+
+commit 6150595bdbacde13bb4f9aba81b15435089bee94
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Apr 5 19:12:22 2010 -0400
+
+ doc: specify 1.6.1 as the minimum version for doxygen.
- Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Older versions generate filenames that are different from
+ the ones listed in the Makefile.
+
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
-commit 5201d3c230e52c9d1ba90ab1712307541e024a6b
-Author: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Thu Apr 8 14:01:21 2010 -0700
+commit cbda58c963af5bb9c4643e9017dd4eec589ceff3
+Merge: a7698a6 c983f40
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Apr 7 15:51:38 2010 -0700
- Convert x86emu fixed size int typedefs to use stdint types
+ Merge remote branch 'yselkowitz/master'
+
+commit a7698a677682a32960b885c22fdba2add70f4658
+Merge: 495cec7 165a4a9
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Apr 6 12:36:15 2010 -0700
+
+ Merge remote branch 'jbarnes/master'
+
+commit c983f40fe4f30311f31a9df699cdc888709251d0
+Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+Date: Wed Feb 24 15:17:42 2010 -0600
+
+ Cygwin/X: Add configure option for WindowsWM
- Fixes x86emu builds when using non-gnu compilers now that u64 is required
+ WindowsWM support is still experimental, and uses the Rootless extension
+ which currently breaks the simultaneous build of the other DDXs (see
+ commit b3415187e92960cbff784108b5a3a8d130dc34c5). So we disable it by
+ default for now; once the latter issue is fixed we can make this 'auto'.
- Before this fix, the u64 type would not be defined, causing
- x86emu/sys.c to fail to build:
- "sys.c", line 102: syntax error before or at: ldq_u
- "sys.c", line 102: syntax error before or at: *
+ Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+
+commit 20701522be803fe47e921fcf059dadf64c7f287d
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Thu Feb 18 14:19:21 2010 -0600
+
+ Don't enable ROOTLESS_WORKAROUND, it breaks composite
- Since Keith requested using <stdint.h>, converted all the x86emu
- typedefs to use the stdint types.
+ This possibly brings back whatever the bug is in
+ http://bugs.freedesktop.org/show_bug.cgi?id=1168 for
+ -rootless mode, but since we don't have reproduction
+ steps for that, I can't test that...
- Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
- Acked-by: Matt Turner <mattst88@gmail.com>
- Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
- Signed-off-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit 82cf3a4ae01811917f7903d6f62ba9b7132adf7e)
- Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Tested-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+ Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+
+commit 95c9947f6244d37592958b70760bd1ac885b625a
+Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+Date: Wed Mar 24 00:08:23 2010 -0500
+
+ Cygwin/X: Disable unsupported extensions in configure
+
+ Several extensions are not supported by XWin, some of which are enabled
+ by default in configure. We forcefully disable these early on so that
+ configure will succeed without arguments and without the corresponding
+ proto installed.
+
+ Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+
+commit 24c9d48cd6999f1e90f9f0e2bbfebd8e95d314d8
+Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+Date: Mon Mar 22 12:47:52 2010 -0500
+
+ Disable setuid configure test on Cygwin
+
+ Only Xorg is installed setuid, so there is no need to run this configure
+ test on Cygwin.
+
+ Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
commit 495cec794dad95ed0c79048f3c410ad23e7d5ea4
Author: Keith Packard <keithp@keithp.com>
@@ -2113,6 +7778,201 @@ Date: Mon Mar 29 11:44:07 2010 -0700
Merge remote branch 'whot/for-keith'
+commit 165a4a9c7de0fcc6ef6a6421736b412ccb35965e
+Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Tue Mar 23 09:47:08 2010 -0700
+
+ GLX/DRI2: expose swap control extensions if DDX support is present
+
+ Export DDX swap control status from the DRI2 module and check for it in
+ GLX when initializing extensions.
+
+ Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
+ Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+
+commit 5933b0abc6a76aaea84aa534df89900cd795c888
+Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Mon Mar 8 15:10:47 2010 -0800
+
+ DRI2: prevent swap wakes from waking MSC waiters
+
+ If a few swaps were queued leading to a throttle related block on the
+ client, and then the client submitted an MSC wait, one of the previous
+ swap wakeups could have caused the MSC wait to complete early. Add a
+ flag for this to prevent a swap wake from prematurely waking an MSC
+ waiter.
+
+ Reported-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
+ Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
+ Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+
+commit b00d435ddf2e9817e33bfd5f7e9b905442dc23c7
+Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Mon Mar 8 12:41:25 2010 -0800
+
+ DRI2: handle swapsPending better
+
+ Avoid a potential swapsPending underflow by incrementing it before
+ ScheduleSwap, which may complete it immediately. And be sure to
+ decrement it again in case the schedule failed.
+
+ Reported-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
+ Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
+ Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+
+commit 0294ff2a5cadddc8fcc77ba9a851f979f0b91fc3
+Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Mon Mar 8 12:39:54 2010 -0800
+
+ DRI2: throttle swaps at submission time too
+
+ We need to throttle swaps here in addition to when the context is made
+ current to avoid causing problems with clients that just swap.
+ Throttling here also ensures our swaps get ordered as long as we block
+ the client occasionally.
+
+ Reported-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
+ Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
+ Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+
+commit db1c7cb604167baf49e61be4c09ccf7b592c4af3
+Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Mon Mar 8 12:38:37 2010 -0800
+
+ DRI2: advertise lowest supported DRI2 protocol version
+
+ Update our supported DRI2 protocol version as each driver does
+ DRI2ScreenInit, since depending on available kernel features, each DDX
+ may support different callbacks and therefore protocol.
+
+ Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
+ Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+
+commit 87ca6320f26eb3129e3c19056e1d8fa5c1784723
+Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Fri Mar 5 09:49:03 2010 -0800
+
+ DRI2: handle swap_interval of 0 correctly
+
+ A 0 swap interval means that swaps shouldn't be sync'd to vblank, so
+ just complete the swap immediately in that case.
+
+ Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
+ Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+
+commit 8476d99231cb725c090305d60f1c1c889d25c8dc
+Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Fri Mar 5 09:15:24 2010 -0800
+
+ DRI2: drawable lifetime fixes
+
+ Handle drawable destruction and lifetime correctly.
+
+ Check whether the drawable priv is valid in DRI2SwapInterval(),
+ DRI2WaitSBC() and DRI2WaitMSC(); it may have gone away, so be sure to
+ check it before using it.
+
+ If more than 1 outstanding swap is queued, we may complete several after
+ an app has exited. If we free it after the first one completes and the
+ refcount reaches 0, we'll crash the server on subsequent completions.
+ So delay freeing until all swaps complete and remove the error message
+ as this is a normal occurence. To do this properly, we must also avoid
+ destroying drawables in DRI2DestroyDrawable() if a swap or wait event is
+ pending.
+
+ And finally, make sure we free drawables in DRI2WaitMSCComplete() if
+ necessary (i.e. if the refcount has reached 0 and this MSC was the last
+ pending event on the object).
+
+ Reported-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
+ Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
+ Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+
+commit b180e43977710b56ccfd6780f204ddcc952987a1
+Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Thu Mar 4 10:31:59 2010 -0800
+
+ DRI2: fix swapbuffers handling of SBC and target MSC
+
+ Returns expected SBC after completion of swap to caller, as required by
+ OML_sync_control spec, instead of the last_swap_target value.
+
+ Passes target_msc, divisor, remainder, correctly for
+ glXSwapBuffersMscOML() call, while retaining old behaviour for simple
+ glXSwapBuffers() call.
+
+ An OML swap can have a 0 target_msc, which just means it needs to
+ satisfy the divisor/remainder equation. Pass this down to the driver as
+ needed so we can support it.
+
+ Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+ Signed-off-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
+
+commit 751e8c09d34df4b41e8d8384a3ec1bf5cb8ca028
+Author: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
+Date: Sun Feb 21 05:26:00 2010 +0100
+
+ DRI2WaitSbc(): Fixes for correct semantic of glXWaitForSbcOML()
+
+ Added implementation for case target_sbc == 0. In that case, the
+ function shall schedule a wait until all pending swaps for the drawable
+ have completed.
+
+ Fix for non-blocking case. Old implementation returned random,
+ uninitialized values for (ust,msc,sbc) if it returned immediately
+ without scheduling a wait due to sbc >= target_sbc.
+
+ Now if function doesn't schedule a wait, but returns immediately,
+ it returns the (ust,msc,sbc) of the most recently completed swap,
+ i.e., the UST and MSC corresponding to the time when the returned
+ current SBC was reached.
+
+ Signed-off-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
+
+commit 0de4974b90b10fa6a447cdf980b4a114c6c9e5a8
+Author: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
+Date: Sun Feb 21 05:25:59 2010 +0100
+
+ DRI2: Fix glitches in DRI2SwapComplete() and DRI2WakeupClient()
+
+ DRI2SwapComplete(): Increment pPriv->swap_count++; before calling
+ into callback for INTEL_swap_events extension, so the swap event
+ contains the current SBC after swap completion instead of the
+ previous one.
+
+ DRI2WakeupClient: Check for pPriv->target_sbc <= pPriv->swap_count,
+ had wrong comparison pPriv->target_sbc >= pPriv->swap_count for
+ unblocking of clients of DRI2WaitSBC().
+
+ Signed-off-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
+
+commit 4c8ec49826a46eb3b36c69d2ad3f82320c179c38
+Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Thu Mar 4 09:54:15 2010 -0800
+
+ DRI2: make target_sbc signed
+
+ We need to track invalid targets as well as 0 targets, so just make it
+ signed so our comparisons work like they should.
+
+ Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
+ Reported-by: Kristian Høgsberg <krh@bitplanet.net>
+ Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+
+commit c4d54816f2ee4883d8f9bcf4595474fb58c95146
+Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Thu Mar 4 09:19:13 2010 -0800
+
+ DRI2: fixup handling of last_swap_target
+
+ We need to initialize the swap target, which is passed to the driver to
+ schedule events. Rather than using -1 to indicate that the field is
+ uninitialized, just make sure we initialize it at drawable creation
+ time.
+
+ Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
+ Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+
commit 28a5f14b4089dccb8045cc4fdc923542a73dd22d
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Mar 28 13:46:23 2010 -0700
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 03:09:03 +0000