summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-07-05xf86: Don't crash when switching modes through RandR without owning the VT.Pierre-Loup A. Griffais1-2/+2
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. 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> (cherry picked from commit 41bdb6c003cca3ef0ff88d9c7de318115bab1ba2) Signed-off-by: Julien Cristau <jcristau@debian.org>
2010-06-17exa: fix ExaCheckCopyNtoN for exa_classic when source = destÉric Piel1-1/+2
In case you want to copy a region with source = dest, you have the same pixmap as source and dest. At the end of exaPixmapIsOffscreen_classic() the devPrivate.ptr is reset to NULL (look at the sources). Now this is what happens in ExaCheckCopyNtoN: exaPrepareAccess( pDst ); Calls IsOffscreen() sets devPrivate.ptr to NULL sets up devPrivate.ptr to real pointer Everything OK exaPrepareAccess( pSrc ); Calls IsOffscreen() sets devPrivate.ptr to NULL BAILS OUT CAUSE OF NESTED OPERATION SINCE DST EQUALS SRC We end up with devPrivate.ptr as NULL, and that is clearly wrong. In particular this fixes a segfault when using the psb driver (bug 28077) 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)
2010-06-03Fix null pointer dereference in xf86_reload_cursors().Cyril Brulebois1-1/+1
Upon resume, X may try to dereference a null pointer, which has been reported in Debian bug #507916 (http://bugs.debian.org/507916). Jim Paris came up with a patch which solves the problem for him. Here's a (hopefully) fixed version of his patch (without the typo). Cc: Jim Paris <jim@jtan.com> 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)
2010-05-18xfree86: dga needs to use the master keyboard state (#27573)Peter Hutterer1-1/+3
GetPairedDevice() may not always return the keyboard, resulting in a null-pointer dereference when accessing the XKB state. For floating devices, the GetMaster() returns the device itself. X.Org Bug 27573 <http://bugs.freedesktop.org/show_bug.cgi?id=27573> 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)
2010-05-17XQuartz: Don't use deltaXY for determining pointer location on scroll eventsJeremy Huddleston1-11/+20
<rdar://problem/7989690> Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Edward Moy <emoy@apple.com> (cherry picked from commit ecfeabec8d0dcfe286fb893047f1fe1a7ea9f8f5)
2010-05-17XQuartz: Don't trust deltaXY for middle mouse clicks.Jeremy Huddleston1-1/+4
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> (cherry picked from commit a911292c85f7069d2caabcb677ed716a04227526)
2010-05-15XQuartz: add new localization files to EXTRA_DISTJulien Cristau1-0/+4
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> (cherry picked from commit 72758287f79a4f1aa8fa388f20947042e3e14693)
2010-05-15dix: make DeviceEvent coordinates signed for Xinerama. #24986Chris Humbert1-2/+2
With Xinerama enabled, event coordinates are relative to Screen 0, so they can be negative. The new DeviceEvent's coordinates are of type uint16_t, making screens above and to the left of Screen 0 unusable. X.Org Bug 24986 <https://bugs.freedesktop.org/show_bug.cgi?id=24986> 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)
2010-05-04xserver 1.7.7xorg-server-1.7.7Peter Hutterer1-2/+2
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-05-04Xext: only update the sprite on pointer events.Peter Hutterer1-1/+5
A call to miPointerUpdateSprite for the XTEST keyboard may result in a NULL pointer dereference in miDCPutUpCursor() when the save buffer is NULL. XTS test case: Xlib 11 KeymapNotify Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit af170a4ab76d33254dd4e54a33bb410fa1624739)
2010-05-02XQuartz GLX: Change around includes for better compatability with different ↵Jeremy Huddleston2-1/+4
OS versions Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 0efd7b8d82a48793341e27d4c224986e0971687c)
2010-05-02rootless: Add some sanity checking to miPaintWindowJeremy Huddleston1-0/+3
This avoids painting the root window when it isn't actually drawable. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 7b506fdc840aebed6b5acb91437a2cb620b5bddc)
2010-05-02rootless: Remove an unneeded commentJeremy Huddleston1-4/+0
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 4d3789c9b3fbe6aad32fcacd964353b612640f27)
2010-05-02x-list.c: null-returning function malloc() was called without checkingOliver McFadden1-0/+1
Signed-off-by: Oliver McFadden <oliver.mcfadden@nokia.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 048d15192af39ba5111882d18a957b6ff4e34cad)
2010-04-22EXA: Check sys_ptr isn't NULL before passing it to the UploadToScreen hook.Michel Dänzer1-2/+3
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=27380 . 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)
2010-04-21Revert "mi: don't thrash resources when displaying the software cursor ↵Peter Hutterer1-111/+159
across screens" This commit leads to a segfault on the very first XTS test case. Backtrace: 0: /opt/xorg/bin/Xorg (xorg_backtrace+0x3b) [0x80a33db] 1: /opt/xorg/bin/Xorg (0x8048000+0x62a75) [0x80aaa75] 2: (vdso) (__kernel_rt_sigreturn+0x0) [0x5d140c] 3: /lib/libc.so.6 (0x9bb000+0x73579) [0xa2e579] 4: /lib/libc.so.6 (realloc+0xe0) [0xa2e830] 5: /opt/xorg/bin/Xorg (Xrealloc+0x33) [0x80a3f33] 6: /opt/xorg/bin/Xorg (0x8048000+0x1ab79) [0x8062b79] 7: /opt/xorg/bin/Xorg (0x8048000+0x1ac4e) [0x8062c4e] 8: /opt/xorg/bin/Xorg (RegisterExtensionNames+0x2ce) [0x8062fbe] 9: /opt/xorg/bin/Xorg (AddExtension+0x19a) [0x807bd7a] 10: /opt/xorg//lib/xorg/modules/extensions/libextmod.so (0x728000+0x1169a) [0x73969a] 11: /opt/xorg/bin/Xorg (InitExtensions+0x85) [0x80c0eb5] 12: /opt/xorg/bin/Xorg (0x8048000+0x1a51d) [0x806251d] 13: /lib/libc.so.6 (__libc_start_main+0xe6) [0x9d1bb6] 14: /opt/xorg/bin/Xorg (0x8048000+0x1a2a1) [0x80622a1] Segmentation fault at address 0x10b2d5f8 valgrind output: ==5069== Invalid read of size 4 ==5069== at 0x80F928D: FreePicture (picture.c:1531) ==5069== by 0x818DDEF: miDCDeviceCleanup (midispcur.c:867) ==5069== by 0x81B97F0: miSpriteDeviceCursorCleanup (misprite.c:968) ==5069== by 0x80995FA: miPointerDeviceCleanup (mipointer.c:292) ==5069== by 0x807973E: CloseDevice (devices.c:840) ==5069== by 0x80799B6: CloseDownDevices (devices.c:933) ==5069== by 0x8062705: main (main.c:309) ==5069== Address 0x4cce844 is 12 bytes inside a block of size 84 free'd ==5069== at 0x40057F6: free (vg_replace_malloc.c:325) ==5069== by 0x80A3DE0: Xfree (utils.c:1154) ==5069== by 0x80F9332: FreePicture (picture.c:1576) ==5069== by 0x80FBB4B: PictureDestroyWindow (picture.c:69) ==5069== by 0x810B1A3: damageDestroyWindow (damage.c:1840) ==5069== by 0x80864F1: FreeWindowResources (window.c:846) ==5069== by 0x8086812: DeleteWindow (window.c:925) ==5069== by 0x806B53E: FreeClientResources (resource.c:806) ==5069== by 0x806B60F: FreeAllResources (resource.c:823) ==5069== by 0x80626E4: main (main.c:299) ==5069== ==5069== Invalid write of size 4 ==5069== at 0x80F9295: FreePicture (picture.c:1531) ==5069== by 0x818DDEF: miDCDeviceCleanup (midispcur.c:867) ==5069== by 0x81B97F0: miSpriteDeviceCursorCleanup (misprite.c:968) ==5069== by 0x80995FA: miPointerDeviceCleanup (mipointer.c:292) ==5069== by 0x807973E: CloseDevice (devices.c:840) ==5069== by 0x80799B6: CloseDownDevices (devices.c:933) ==5069== by 0x8062705: main (main.c:309) ==5069== Address 0x4cce844 is 12 bytes inside a block of size 84 free'd ==5069== at 0x40057F6: free (vg_replace_malloc.c:325) ==5069== by 0x80A3DE0: Xfree (utils.c:1154) ==5069== by 0x80F9332: FreePicture (picture.c:1576) ==5069== by 0x80FBB4B: PictureDestroyWindow (picture.c:69) ==5069== by 0x810B1A3: damageDestroyWindow (damage.c:1840) ==5069== by 0x80864F1: FreeWindowResources (window.c:846) ==5069== by 0x8086812: DeleteWindow (window.c:925) ==5069== by 0x806B53E: FreeClientResources (resource.c:806) ==5069== by 0x806B60F: FreeAllResources (resource.c:823) ==5069== by 0x80626E4: main (main.c:299) XTS test case: Xproto pAllocColor This reverts commit 00b8b7ad61b6f818271fb4d1e383113170309d72. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-04-21xserver 1.7.6.902xorg-server-1.7.6.902Peter Hutterer1-2/+2
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-04-21dix: Fix crash in DeliverGrabbedEvents.Peter Hutterer1-1/+1
If both devices are synchronously grabbed, first with a GrabPointer, then with a GrabKeyboard (GrabModeSync on both), sync.other of each device points to the grab of the respective other device. If the keyboard is then thawed through a AllowSome request, the VCK's sync.other is reset to NULL. Subsequently, an event on the VCP would crash the server when dereferencing sync.other on the VCP. The check's purpose is to compare if the other device is grabbed by the same client, which should be checked by accessing (dev->deviceGrab->grab->resource). A check of the server-1.3 sources confirms that. XTS test case: Xlib13 XAllowEvents 20. 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)
2010-04-19exa: handle pixmap create/destroy in lower layersCyril Brulebois7-162/+137
- Pixmaps that are created during a fallback are automatically prepared access. - During the fallback accelerated ops are blocked to prevent new/scratch gc's from triggering accelerated ops on mapped pixmaps. - A few cases of incorrect wrapping (on the top level pointer instead of between damage and (w)fb) have been removed. Signed-off-by: Maarten Maathuis <madman2003@gmail.com> Acked-by: Michel Dänzer <michel@daenzer.net> Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 342f3689d17256c92cbfee079d24501d27aa1153) Conflicts: exa/exa_mixed.c Debian bug#576816 <http://bugs.debian.org/576816> Tested-by: Arthur Marsh <arthur.marsh@internode.on.net> Signed-off-by: Cyril Brulebois <kibi@debian.org> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-04-16XGE: don't register an extension eventJulien Cristau2-15/+1
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>
2010-04-16vfb: add a name and type to the pointer and keyboardJulien Cristau1-0/+6
Fixes a crash in XIQueryDevice which calls strlen on a NULL pointer. #0 strlen () at ../sysdeps/x86_64/strlen.S:31 #1 0x00000000004c16ed in SizeDeviceInfo (dev=0x969bd0) at ../../Xi/xiquerydevice.c:204 #2 0x00000000004c1a01 in ProcXIQueryDevice (client=0xa57510) at ../../Xi/xiquerydevice.c:98 Debian bug#575905 <http://bugs.debian.org/575905> Reported-by: "Bernhard R. Link" <brlink@debian.org> 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) Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-04-16mi: don't thrash resources when displaying the software cursor across screensPierre-Loup A. Griffais1-159/+111
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: 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) Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-04-16dix: fix cursor screen check for xinerama setups.Tim Yamin1-1/+5
The de-duplication of CheckPhysLimits 942eae6868b8b0f343b6a added a condition that is invalid for a Xinerama setup. pScreen is invalid for the Xinerama case, so comparing it to anything is a bad idea. 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) Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-04-15XQuartz GLX: Don't let garbage enter our pixel requestJeremy Huddleston1-1/+1
https://bugs.freedesktop.org/show_bug.cgi?id=27654 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 5b0faf355465c9f21ad96e0ed266fbdbc29efb5b)
2010-04-15XQuartz: Fix possible NULL dereference in ListenOnOpenFDJeremy Huddleston1-2/+3
<rdar://problem/7862319> Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Marc Majka <majka@apple.com> (cherry picked from commit fe7778e58e099d353689755ed2f5aa440569ebe3)
2010-04-15XQuartz: Localization updateJeremy Huddleston73-1177/+4563
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 206531f75cd41c034e89fdfbc75ab0910682eef8)
2010-04-12XQuartz: Add a GUI preference for the Alt / Mode_switch toggleJeremy Huddleston3-1084/+712
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Kevin Van Vechten <kvv@apple.com> (cherry picked from commit 59edde7c28db2d3174a5813a0af334e4ead2082f)
2010-04-12XQuartz: Customize the NSDefaults id in the man file.Jeremy Huddleston2-19/+21
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Kevin Van Vechten <kvv@apple.com> (cherry picked from commit 5600f7f001529b3afdee95546aec212a70d6a5b2)
2010-04-12XQuartz: Add a defaults option to toggle Alt / Mode_switchJeremy Huddleston9-64/+104
See option_sends_alt in Xquartz(1) Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Kevin Van Vechten <kvv@apple.com> (cherry picked from commit 840d12c7a6ac6a974da185045215ce944a61fab6)
2010-04-12XQuartz: Blacklist some oddball legacy Mac keycodes that break wineJeremy Huddleston1-20/+41
http://xquartz.macosforge.org/trac/ticket/295 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Kevin Van Vechten <kvv@apple.com> (cherry picked from commit d6f160510a50d4c4eaa48c9c69a5ddda0d50052c)
2010-04-12xserver 1.7.6.901xorg-server-1.7.6.901Peter Hutterer1-2/+2
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-04-09xfree86: die gracefully in the vga arbiter if AddScreen failsTiago Vignatti1-0/+2
vga arbiter will be locked in one device while AbortDDX will call LeaveVT routines from the other device. Fail! 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 b9ad452ec92a7dcbed680acb3f3b8ec29fa660df) Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-04-09dix: if owner-events is true for passive grabs, add the window mask (#25400)Peter Hutterer1-0/+36
A client requesting a GrabModeSync button grab, owner-events true, with only the ButtonRelease mask set would never receive the press event even if the grab window had the ButtonPress mask set. The protocol requires that if owner-events is true, then the delivery mask is the combination of the grab mask + the window event mask. X.Org Bug 25400 <http://bugs.freedesktop.org/show_bug.cgi?id=25400> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Tested-by: Jim Ramsay <i.am@jimramsay.com> Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 1c612acca8568fcdf9761d23f112adaf4d496f1b) Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-04-09Xext: Fix cursor reference counting hazard.Michel Dänzer1-1/+1
Make sure the reference count of the new cursor is increased before the old one is decreased, otherwise bad things will happen if they're one and the same and the reference count is 1 initially. Not sure this can actually happen here, but better safe than sorry. Signed-off-by: Michel Dänzer <daenzer@vmware.com> Reviewed-by: Roland Scheidegger <sroland@vmware.com> Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 3083c5d0c4386cdd7083b7a83ac72fdad2f1e61e) Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-04-09kdrive: Bump evdev maxKeycodeMikhail Gusarov1-1/+1
There are keycodes > 193 in evdev, e.g. KEY_WIMAX which is 246 . Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Adam Jackson <ajax@nwnk.net> Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit e086b99c1f5ce351b578de7cd9f616bc79d6cf64) Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-04-09configure: Always define XINPUT.Peter Hutterer1-0/+1
This define was removed in e251c9e75afdc "Remove all traces of #ifdef XINPUT and the matching bits from the configure.ac". Drivers that support multiple server versions and still check for ifdef XINPUT now always build without XINPUT support if they're calling XORG_DRIVER_CHECK_EXT(XINPUT, inputproto). Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> (cherry picked from commit 6389405b56d2221d8a7b80c4bb3bd3b4e1a29bab) Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-04-09XKB: Fix garbage initializationJeremy Huddleston1-1/+1
XkbEnableDisableControls set extra garbage bits on the xkbControlsNotify changedControls mask because it was uninitialized on the stack. Found by clang Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 8311cd5f89ca6781842bb24671b8122cdf8be148) Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-04-09dix: be more verbose when we run out of opcodesPaulo Ricardo Zanoni1-1/+4
If we run out of opcodes, nothing is print on the log, making the problem hard to debug. In the current Xserver, if you enable some extensions like multibuffer (+2 events) and use nvidia binary driver (+5 events) you can run out of opcode numbers. Signed-off-by: Paulo Ricardo Zanoni <pzanoni@mandriva.com> 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) Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-04-09Don't keep a pointer to a possibly freed cursor when changing screens, ↵Pierre-Loup A. Griffais1-0/+1
preventing a crash in xf86CursorEnableDisableFBAccess() trying to restore it. 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>
2010-04-07dix: EventToCore needs to copy the root window too.Peter Hutterer2-1/+4
This value isn't actually set for normal events but it saves us some work for the record extension support. 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 b4baab90c0d98bef98d485682d4a69a327a380d6) Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-03-29XQuartz: Re-query dixScreenOrigins as the value could've changed.Jeremy Huddleston1-2/+5
Fix a regression in 9c9c3a85b094a3c7b2763a572715d710325091aa Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Acked-by: Adam Jackson <ajax@redhat.com> (cherry picked from commit 28a5f14b4089dccb8045cc4fdc923542a73dd22d)
2010-03-29XQuartz: Workaround weird key data reported on some layoutsJeremy Huddleston1-1/+4
This should make 'Unicode Hex Input' work as an input layout. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Acked-by: Adam Jackson <ajax@redhat.com> (cherry picked from commit 339207be6f184cc783076fc7e2cc12f92f57f2ba)
2010-03-25hw/xfree86: move reference counting out of the UseHWCursor[ARGB] functionsRoland Scheidegger1-0/+6
The problem is that the xf86_use_hw_cursor(_argb) functions may get this correctly now, some drivers will replace these generic versions with their own functions. It is pretty insane to expect them to do reference counting of the cursor (as an example, look at driver/xf86-video-vmware to see how that looks like as a workaround). There are even places in xserver itself which replace these two functions. The segfaults if no reference counting is done are caused because the reference count of the cursor reached zero, hence the cursor was freed, however xf86CursorEnableDisableFBAccess() brought it back to life from the dead (from the SavedCursor). This patch hence adds reference counting in xf86CursorSetCursor. As per Michel Daenzer's suggestion, also free the cursor upon xf86CursorCloseScreen. In theory with this it should be possible to remove the reference counting in the UseHwCursor functions I think, though it should also be safe to keep them. Signed-off-by: Roland Scheidegger <sroland@vmware.com> Reviewed-by: Michel Dänzer <michel@daenzer.net> Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 67a8c659f25218904bae64aac6e98e326c90330b)
2010-03-25Fix typos in the swap functionsTomas Carnecky1-4/+4
This should fix bug #3539. Signed-off-by: Tomas Carnecky <tom@dbservice.com> Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 0c2fde5c8ad6e94b4ed1588aa93256a2b64f74d9)
2010-03-24Fix crash when all glyphs of a given depth are freed, but not all glyphsetsPeter Harris1-0/+3
This is how the crash can be triggered with only two clients on the system: Client A: (already running) Client B: Connect Client B: CreateGlyphSet(depthN) Client A: Disconnect Server: free globalGlyphs(depthN) Client B: AddGlyphs(depthN) Server: SEGV This crash was introduced with the FindGlyphsByHash function in 516b96387b0e57b524a37a96da22dbeeeb041712. Before that revision, ResizeGlyphSet was always called before FindGlyphRef, which would re-create globalGlyphs(depthN) if necessary. X.Org Bug 20718 <http://bugs.freedesktop.org/show_bug.cgi?id=20718> Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Peter Harris <pharris@opentext.com> Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 185185eeb44a277c324be0f58a4b4a469b56b69b)
2010-03-22XQuartz: Constrain the pointer to the updated display bounds on display ↵Jeremy Huddleston1-2/+11
reconfigure. http://xquartz.macosforge.org/trac/ticket/346 (cherry picked from commit ed31d50b5f7f25e4db986711699704e615b8afcb)
2010-03-20XQuartz: pbproxy: Make standalone xpbproxy respect the launchd prefixJeremy Huddleston2-4/+6
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org> (cherry picked from commit 38215cc43e4c012588c7a50344b8fe368d1252cc)
2010-03-20XQuartz: xpbproxy: Cleanup xpbproxy threadingJeremy Huddleston5-99/+80
Confine xpbproxy to a single thread Runs inside its own CFRunLoop Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org> (cherry picked from commit 69869d79f4c21eb385ff3c64bac649d93c7dd2ad)
2010-03-20XQuartz: Minor cleanupJeremy Huddleston1-7/+7
Move RandRInit to where it will need to be (not yet implemented) Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 7da4f9df9c6490e3e604c170415d5af2d8c8ff29)
2010-03-20XQuartz: GLX: Fix Availability for Tiger ppc workaroundJeremy Huddleston1-1/+1
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org> (cherry picked from commit 88baffc25a193c7c7154a94a687e7cb0f8b180ba)
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 21:23:15 +0000