summaryrefslogtreecommitdiff
path: root/hw/xquartz
AgeCommit message (Collapse)AuthorFilesLines
2010-12-03XQuartz: RandR: Fix mode changing for multi-monitor configurations.Jeremy Huddleston1-10/+13
This just fixes the regression whereby we couldn't switch between the legacy fullscreen mode and rootless on multi-monitor configurations. This was happening because ref wasn't being set in these cases (since we don't ever actually change CG modes), so we failed a CFEqual. Setting the references fixes this regression and places us one step closer to more mode RandR mode switching in multi-monitor configurations. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 714b68d9e5bf624a6703f168e0f7dc980e88e8c0)
2010-12-03XQuartz: Cleanup some compiler warningsJeremy Huddleston1-1/+1
Mark __crashreporter_info__ as __attribute__((__used__)) Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 14f00449eb81771c01fffcdaf3dd697cdf4e41de)
2010-12-03XQuartz: Disable the Mac OS X screensaver when in full screen modeJeremy Huddleston1-0/+37
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit ca431371a23a2b9ad36c1d64e11ea41d5e4e5f04)
2010-11-26XQuartz: Localization UpdatesJeremy Huddleston20-141/+164
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 97b9bb1e2cebbb769ef347455d9c7979d19de99f)
2010-11-26XQuartz: Remove existing localization files on install to avoid conflictsJeremy Huddleston1-1/+2
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit f9fbafa1a07f951e89f208bf4928a0bf37b67cfe)
2010-11-26XQuartz dri: Don't check CoreGraphics versionJeremy Huddleston1-112/+0
The version check is hackish, and I highly doubt anyone using this code is on a version of OS X that predates this support (10.2 has support for it). Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 6eed13ad5998ba80296bba2bb3f89928ee51194a)
2010-11-15XQuartz: Don't use bashism in uninstall-hookJeremy Huddleston1-1/+3
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-11-13XQuartz: Fix make distcheckJeremy Huddleston1-1/+1
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-09-28XQuartz: RandR: Refactor legacy mode-switching to be better integrated with ↵Jeremy Huddleston6-147/+234
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)
2010-09-28XQuartz: RandR: Don't change the rootless preference when changing RandR modeJeremy Huddleston15-115/+124
Also renames a bunch of other variables for better consistency. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 229323a19b06f80d9b03f487e598b933b9b31d87)
2010-09-28XQuartz: RandR: Better handle switching betwen RandR modes that share CG modesJeremy Huddleston2-37/+123
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 721edc69c3597578d3e7f711769ff0195af6068a)
2010-09-28XQuartz: RandR: Respond better to resolution changes made outside XJeremy Huddleston5-93/+135
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 026a47e21226b64eb9a7624ada3d74c3fe5fa763)
2010-09-28XQuartz: RandR: Use deprecated CG APIs only on Leopard and earlierJeremy Huddleston2-5/+11
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 59cd93f48a3a0a34781d4a94a3cd05a575e2d4ba)
2010-09-28XQuartz: RandR: Remove FAKE_RANDR code.Jan Hauffa3-62/+1
Signed-off-by: Jan Hauffa <hauffa@in.tum.de> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 629c3f473b7415069a87ef4717ec3d701978dc48)
2010-09-28XQuartz: RandR: Toggle rootless mode on XRandR mode switch.Jan Hauffa2-28/+72
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)
2010-09-28XQuartz: RandR: Implement basic RandR functionality.Jan Hauffa7-80/+469
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)
2010-09-16XQuartz: Localization updatesJeremy Huddleston59-17613/+11764
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 0a3e6b0345a96aae278dd776c00b5a7c7ccf65af)
2010-08-12XQuartz: xpr: Bail on errors during unlock and destroyJeremy Huddleston1-2/+8
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-08-12XQuartz: UpdateScreen at the end of SetRootlessJeremy Huddleston1-1/+3
This will ensure that pRoot is unlocked after the miPaintWindow Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-08-12XQuartz: Make application switching work better for the no-spaces caseJeremy Huddleston2-8/+22
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>
2010-08-12XQuartz: Ignore kXquartzToggleFullscreen when rootlessJeremy Huddleston1-2/+2
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-07-29XQuartz: xpbproxy: Don't take down the whole server on an IO errorJeremy Huddleston1-0/+2
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>
2010-07-28XQuartz: GLX: Don't mangle __GLXDrawable's pDrawJeremy Huddleston1-3/+2
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>
2010-07-13XQuartz: Bump bundle version to 2.6.0 for xorg-server-1.9.0 and X11R7.6Jeremy Huddleston1-2/+2
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-07-13XQuartz: Remove some dead code.Jan Hauffa3-30/+0
Signed-off-by: Jan Hauffa <hauffa@in.tum.de> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-07-13XQuartz: Avoid a crash when mistakenly free()ing in QuartzSetCursor on some ↵Jeremy Huddleston1-1/+5
configs Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-06-11xquartz: Get rid of xstrdup when argument is definitely non-NULLMikhail Gusarov1-6/+6
ditto for XQuartz Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-06-10Merge remote branch 'jeremyhu/master'Keith Packard4-29/+31
2010-06-10Remove unnecessary parentheses around return values in functionsMikhail Gusarov3-6/+6
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>
2010-06-08XQuartz: Add more sanity checking around string manipulation for xmodmapJeremy Huddleston1-11/+19
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-06-08XQuartz: Fix build regression from faeebead7bfcc78535757ca7acc1faf7554c03b7Jeremy Huddleston3-18/+12
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-06-05Change the devPrivates API to require dixRegisterPrivateKeyKeith Packard7-23/+40
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>
2010-06-05Rename region macros to eliminate screen argumentKeith Packard3-17/+17
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>
2010-06-03Move each screen's x/y origin into ScreenRec.Jamey Sharp5-25/+23
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)
2010-06-03Delete panoramiXdataPtr: it's redundant.Jamey Sharp1-2/+2
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)
2010-06-03Move each screen's root-window pointer into ScreenRec.Jamey Sharp4-5/+5
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)
2010-05-26Revert "Add a "flags" field to DeleteInputDeviceRequest."Keith Packard1-1/+1
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.
2010-05-25Add a "flags" field to DeleteInputDeviceRequest.Peter Hutterer1-1/+1
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>
2010-05-19Set event sequence number in WriteEventsToClient instead of at callers.Jamey Sharp2-11/+2
TryClientEvents already did this; this commit just moves the assignment one level down so that no event source has to worry about sequence numbers. ...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>
2010-05-19Make WriteEventsToClient/WriteToClient no-op on fake or dead clients.Jamey Sharp2-5/+2
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. For callers that don't do very much work before calling WriteToClient or WriteEventsToClient, I've removed the redundant checks. 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>
2010-05-16XQuartz: Fix a build failure on TigerJeremy Huddleston1-0/+5
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-05-16XQuartz: 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>
2010-05-16XQuartz: 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>
2010-05-14scrnintstr.h: removed unused PaintWindow function pointers.Oliver McFadden1-1/+0
Please note this patch breaks the ABI. Signed-off-by: Oliver McFadden <oliver.mcfadden@nokia.com> Reviewed-by: Keith Packard <keithp@keithp.com>
2010-05-13Eliminate boilerplate around client->noClientException.Jamey Sharp3-25/+25
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>
2010-05-13Replace X-allocation functions with their C89 counterpartsMikhail Gusarov12-50/+50
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>
2010-05-11XQuartz GL: Fix __glXAquaScreenCreateDrawable prototypeJeremy Huddleston1-4/+6
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>
2010-05-04XQuartz: 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>
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>
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>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-22 20:02:06 +0000