summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Rootless: src drawable window can now be NULLxorg-server-1.7-appleJeremy Huddleston2009-10-131-2/+2
| | | | | | | Fix a possible crash when pSrc->pDrawable is NULL. Signed-off-by: Colin Harrison <colin.harrison@virgin.net> Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
* Rootless: Abstract some of the Xplugin specific stuff which has crept into ↵Jeremy Huddleston2009-10-137-71/+76
| | | | | | | | | | | | | | | | | | | | | rootlessWindow.c The rootless extension now directly calls some Xplugin functions, and relies on types defined in Xplugin.h, which isn't very abstracted :-) This patch is a start at abstracting some of the Xplugin specific stuff which has crept into rootlessWindow.c. This has been done in a pretty mindless fashion, without much thought as to if the additions to the generic rootless interface are the correct ones There is some confusion as to if RootlesscolormapCallback() returns a Bool or xp_error_enum value (not so abstact), but I have no way of checking, of finding out if Xplugin actually checks the result :-) Based on patches from Colin Harrison, Jon Turney and Yaakov Selkowitz Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
* Merge commit 'origin/server-1.7-branch' into xorg-server-1.7-appleJeremy Huddleston2009-10-1312-64/+90
|\
| * xserver 1.7.0.901xorg-server-1.7.0.901Peter Hutterer2009-10-121-2/+2
| | | | | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * EXA: Fix exaTryDriverSolidFill() for solid source pictures.Michel Dänzer2009-10-101-13/+22
| | | | | | | | | | | | | | | | | | Solid pictures have a NULL pFormat field, but their format is always PICT_a8r8g8b8. Signed-off-by: Michel Dänzer <daenzer@vmware.com> Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 1088073b11ed488c0df45af3867b900ef93c6fe1)
| * EXA: fix exaGetRGBAFromPixel to not loop forever on PICT_a8 pictureBen Skeggs2009-10-101-14/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | Easily reproducible by running "rendercheck -t fill". It should be safe to just test against rbits for all colour components as we should always have values for r/g/bbits for PICT_FORMAT_COLOR formats. Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Signed-off-by: Michel Dänzer <daenzer@vmware Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 55305cf8db7787883bc80b7348eb626e609626f8)
| * composite: Revert changes from adding support for BGRA picture formats.Michel Dänzer2009-10-101-3/+1
| | | | | | | | | | | | | | | | | | | | | | They were aimed towards a since abandoned approach for making radeon KMS work on big endian machines, and Aaron Plattner pointed out that they break the Composite extension when the X server runs in 16bpp. Signed-off-by: Michel Dänzer <daenzer@vmware.com> Tested-by: Aaron Plattner <aplattner@nvidia.com> Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit b375be9285c40467578fac2f1360c29a75306ab4)
| * Fix make warning: overriding commands for target `dix.O'Alan Coopersmith2009-10-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | Not only does automake generate unnecessary rules for dix.O on platforms for which SPECIAL_DTRACE_OBJECTS is false, it generates duplicate sets when "if SPECIAL_DTRACE_OBJECTS" is nested inside "if XSERVER_DTRACE" Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Acked-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit c0a1bb511a4629bf5683d8a710dc4a1c577a5d44)
| * XQuartz: Send mouse location with scroll events.Jeremy Huddleston2009-10-071-1/+1
| | | | | | | | | | | | This fixes the problem where (0, 0) was sent as the mouse location with scroll button events causing the event to not reach the client. (cherry picked from commit c4886fbabc1d8b4054654b227fcad83f58e8e798)
| * Add platform tests for Dtrace linker magicAlan Coopersmith2009-10-076-8/+18
| | | | | | | | | | | | | | | | Replaces special handling for Xquartz DDX and scales better to handling the multiple platforms that now have some level of Dtrace support available. Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
| * Fix build of unit tests when dtrace probes are enabledAlan Coopersmith2009-10-074-2/+12
| | | | | | | | | | | | | | ar loses the dtrace probe magic when building static libraries, so we have to link with the .O files in order to resolve the dtrace probe symbols. Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| * Set XQUARTZ to no on non-Darwin OS'esAlan Coopersmith2009-10-071-0/+1
| | | | | | | | | | | | | | Fixes build with dtrace probes on Solaris after efacd7bfd08ffc0725de6f639c6afbf3b2f6c9fe Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
| * render: Fix clip region translation in miClipPictureSrc().Kim Woelders2009-10-061-4/+4
| | | | | | | | | | | | | | Signed-off-by: Kim Woelders <kim@woelders.dk> Reviewed-by: Soren Sandmann Pedersen <sandmann@redhat.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit cbc886a3513079c084fb7ce47b87c3e5bba19f3f)
| * xfree86: remove log-spamming DebugFPeter Hutterer2009-10-061-10/+0
| | | | | | | | | | | | | | | | | | | | All input drivers use xf86PostKeyEventP indirectly now and have been since it exists. I guess that qualifies it as tested - no need to spam the logs. Reported-by: Felix Wenk Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Daniel Stone <daniel@fooishbar.org> (cherry picked from commit bd7430a32e63df8cd60352764744076448ee623f)
| * Require libXtst >= 1.0.99.2 and libdmx >= 1.0.99.1Peter Hutterer2009-10-061-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | libXtst requirement is already implicit since we require xextproto 7.1 and that doesn't go well with pre 1.0.99.2 versions of libXtst. Nonetheless, list it explicitly. Since d0440275108920f5cb5d630f55fc9a3320c496d3 we require dmxproto 2.2.99.1. Complementing that is libdmx 1.0.99.1 with the dmxext.h header file. Reported-by: Mark Rosenstand Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit c629e0fc50dfaffaa40a56709da7f035c289fed2)
| * XQuartz: Set the proper bitmap for key repeats...Jeremy Huddleston2009-10-011-61/+86
| | | | | | | | | | | | | | XkbSetRepeatKeys lies and doesn't do what it says it will... (cherry picked from commits b9dfed9e88389cbd29406a20d38ee4297638649b and 873467adad479be02cd9cc6b43685919f5612d91)
| * XQuartz: Query the BundleIdentifier from the bundle in X11.bin rather than ↵Jeremy Huddleston2009-10-011-32/+45
| | | | | | | | | | | | | | using the configure option. This lets X11.bin drop into any .app ... the Info.plist and Xquartz binary need to have it hardcoded still. (cherry picked from commit 9ad16b8e50b13eb6d0cd20386d07aa8d7320f671)
| * xkb: check permissions on XKM_OUTPUT_DIRNirbheek Chauhan2009-10-021-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Checking just for root is insufficient since that does not guarantee write/read permissions in XKM_OUTPUT_DIR (for example with sandbox). Check if we can write a file, as well as read it later. Otherwise, invoke the fallback to /tmp Signed-off-by: Nirbheek Chauhan <nirbheek@gentoo.org> Signed-off-by: Rémi Cardona <remi@gentoo.org> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 9bc7cbf9c02656982c2525836b5498993f708e02)
| * XQuartz: Update version strings to be X11R7.5 and the bundle 2.5.0Jeremy Huddleston2009-10-022-3/+3
| | | | | | | | | | Is fink really _still_ relying on this X11R7.x version string? (cherry picked from commit 3d7cf468df96c0130a862f0d93fec990b9110c2f)
| * dix: Fix potential memory corruption in doListFontsWithInfo.Kim Woelders2009-10-021-1/+1
| | | | | | | | | | | | | | Signed-off-by: Kim Woelders <kim@woelders.dk> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 4970666827e65424ee17ccf6341ff84aac974383)
* | XQuartz: Fix a possible minor memory leakJeremy Huddleston2009-10-021-0/+1
| | | | | | | | (cherry picked from commit 24e640e1fa6cfb3917ba90dcdabf1fadddff20aa)
* | XQuartz: Send mouse location with scroll events.Jeremy Huddleston2009-10-021-1/+1
| | | | | | | | | | | | This fixes the problem where (0, 0) was sent as the mouse location with scroll button events causing the event to not reach the client. (cherry picked from commit c4886fbabc1d8b4054654b227fcad83f58e8e798)
* | Merge commit 'origin/server-1.7-branch' into xorg-server-1.7-appleJeremy Huddleston2009-10-0123-211/+330
|\ \ | |/
| * xserver 1.7.0xorg-server-1.7.0Peter Hutterer2009-10-021-2/+2
| | | | | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * dix: force a minimum of 0 for screen coordinates.Peter Hutterer2009-10-021-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the root coordinates may fall into ]-1..0] if the subpixel remainder is less than 0. Screen coordinates mustn't go below 0, so use miPointerSetPosition to cap off the remainder if the coordinates are below 0. This is cheating a bit, a more comprehensive solution to deal with subpixels correctly when crossing screens is needed. For now, this'll do. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Simon Thum <simon.thum@gmx.de> (cherry picked from commit 45f447dafded5adfe11b7df3325c2d8f6ae0639b)
| * configure: if xnest was requested but modules weren't found, fail.Peter Hutterer2009-10-021-0/+3
| | | | | | | | | | | | | | Tested-by: Xavier Chantry <shiningxc@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Julien Cristau <jcristau@debian.org> (cherry picked from commit 64fe5784b49347e1fd27b0c463be5c16557594c9)
| * rotate: drop unwrapping inside block handler.Dave Airlie2009-10-021-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | Keith has shown half the block handlers wrappers are wrong, also dynamic wrapping/unwrapping from what I can see will happen after the drivers, so its really accidental ABI, that we can't change now without modifing drivers. So be safe for 1.7. Signed-off-by: Dave Airlie <airlied@redhat.com> Declared-as-sane-by: Keith Packard <keithp@keithp.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 3ebb82d61c2b56e8f7145443a552a4e913bbfc80)
| * render: Fix crash in RenderAddGlyphs (#23645)Peter Hutterer2009-10-011-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes two bugs: size is calculated as glyph height * padded_width. If the client submits garbage, this may get above INT_MAX, resulting in a negative size if size is unsigned. The sanity checks don't trigger for negative sizes and the server goes and writes into random memory locations. If the client submits glyphs with a width or height 0, the destination pixmap is NULL, causing a null-pointer dereference. Since there's nothing to composite if the width/height is 0, we might as well skip the whole thing anyway. Tested with Xvfb, Xephyr and Xorg. X.Org Bug 23645 <http://bugs.freedesktop.org/show_bug.cgi?id=23645> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 622fc98fd08aba98369e6933c3ab8c9ff85385d5)
| * render: set the glyph picture to NULL by default.Peter Hutterer2009-10-011-26/+31
| | | | | | | | | | | | | | | | | | | | | | In a follow-up patch we may have glyphs with a NULL picture. To cope with that, always set the pictures for glyphs to NULL at creation time and cope with cleaning up such glyphs. Also, since compositing a NULL source doesn't do a lot anyway, skip trying to do so. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 758ab55d2defc78d0169fd61a7036eb9f889e9e7)
| * exa: avoid infinite loops if UTS sw fallbacks.Michel Dänzer2009-10-011-5/+5
| | | | | | | | | | | | | | | | | | | | | | The upload in finish access can cause an infinite loop if UTS returns FALSE in here. Fixes fd.o bug #24246. Signed-off-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit b5fcc5553eb784c9f4826936e839079c0cdee55a)
| * Re-fix DGA removal.Keith Packard2009-10-014-18/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing DGA ended up breaking any drivers calling into the old xf86DiDGAInit function as it tried to see if DGA was already enabled and ended up crashing if the VT wasn't completely initialized. Oops. Also, if the driver initializes DGA itself, have the DiDGA initialization overwrite that information as the DiDGA code will call ReInit on mode detect. Signed-off-by: Keith Packard <keithp@keithp.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit db98b26ee145f70e732e2cf4a6ac3de77fdf4adc)
| * dix/glx/composite: consolidate visual resize in one place.Dave Airlie2009-09-304-110/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous code was copied and in both cases incorrectly fixed up the colormaps after resizing the visuals, this patch consolidates the visual resize + colormaps fixups in one place. This version also consolidates the vid allocation for the DepthPtr inside the function. I'm not 100% sure colormap.[ch] is the correct place for this but visuals are mostly created in fb and I know thats not the place to be resizing them. Fixes fd.o bug #19470. Signed-off-by: Dave Airlie <airlied@redhat.com> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 6ffda5aae75272fabdc27d6f693ae827be119e95)
| * Fix ShmPutImage non-ZPixmap case.Michel Dänzer2009-09-301-9/+34
| | | | | | | | | | Fixes http://bugs.freedesktop.org/show_bug.cgi?id=23298 . (cherry picked from commit 11817a881cb93a89788105d1e575a468f2a8d27c)
| * ephyr: if -parent is given, check for a trailing -screen. (#24144)Peter Hutterer2009-09-302-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If -parent is given, don't open up a new window if -screen is given as well. The commandline option -screen allows to set the depth of the embedded Xephry instance, even though width and height are autoscaled on -parent. This patch checks for a -screen parameter after -parent and - if one is found - delays initializing the screen. The parent window id is stored temporarily but re-set after a -screen argument. The following command is thus valid: Xephyr -parent 1234 -screen 640x480@8 -screen 1024x768 It embeds the first 8-bit screen into window 1234 and opens up a new window for the second screen. Multiple parent arguments are possible, the screens are embedded in-order. X.Org Bug 24144 <http://bugs.freedesktop.org/show_bug.cgi?id=24144> Tested-by: Vic Lee Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 19be992d9dc542b61fa3f4fd32a09071c9e64880)
| * xfree86: use the DDC size if either width or height of DisplaySize is bogus.Peter Hutterer2009-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | If either width or height of DisplaySize is invalid, assume that the configuration is invalid and use the DDC-reported values instead. See Comment 9, Bug 9758. http://bugs.freedesktop.org/show_bug.cgi?id=9758#c9 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Dave Airlie <airlied@redhat.com> (cherry picked from commit 83023ffd09a84ff48e6b99f57ebad101a00478db)
| * render: Plug a memory leak in AddGlyph. (#23286)Peter Hutterer2009-09-301-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | AddGlyph was missing the FreePicture() call that DeleteGlyph used, resulting in a memory leak when more than one Glyph was added in a RenderAddGlyphs request. Since the code in AddGlyph and DeleteGlyph is identical, move into a static function to avoid such mistakes in the future. X.Org Bug 23286 <http://bugs.freedesktop.org/show_bug.cgi?id=23286> (cherry picked from commit f772014c435f56db56520ca13ffa39431684f122)
| * xserver 1.6.99.903 (xserver 1.7 RC3)xorg-server-1.6.99.903Peter Hutterer2009-09-281-2/+2
| | | | | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * Merge remote branch 'origin/xorg-server-1.7-apple' into server-1.7-branchPeter Hutterer2009-09-2837-511/+296
| |\
| * | configure: make XNEST default to auto.Tilman Sauerbeck2009-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we're checking whether to build Xnest, we're comparing the variable to auto but before it never was assigned that. Signed-off-by: Tilman Sauerbeck <tilman@code-monkey.de> [Xnest was enabled to yes to increase build exposure and catch compiler errors early. The requirements to Xnest are quite low and I expect most developers have them, so Xnext will be enabled on most boxes. Anyone missing those requires probably doesn't want to build Xnest anyway.] Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 3db28f92b0c810b452506abbed299a204c90ba0b)
| * | Revert "alpha: kill xf86SlowBCopyToBus and xf86SlowBCopyFromBus"Peter Hutterer2009-09-284-9/+77
| | | | | | | | | | | | | | | | | | | | | | | | The vesa driver still uses slowbcopy_frombus and slowbcopy_tobus. This reverts commit 5ef53a94ce4e48e11de26290cd677266308640c8. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * | Merge remote branch 'origin/xorg-server-1.7-apple' into server-1.7-branchPeter Hutterer2009-09-286-28/+17
| |\ \
| * | | xfree86: Hurd fixSamuel Thibault2009-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I hadn't paid attention that the parameters order had changed, here is a trivial patch, please apply. Signed-off-by: Julien Cristau <jcristau@debian.org> (cherry picked from commit 78ad6ca9a97440b74019c00a28144ea7d1e03431)
* | | | XQuartz: Update version strings to be X11R7.5 and the bundle 2.5.0Jeremy Huddleston2009-10-012-3/+3
| | | | | | | | | | | | | | | | | | | | Is fink really _still_ relying on this X11R7.x version string? (cherry picked from commit 3d7cf468df96c0130a862f0d93fec990b9110c2f)
* | | | XQuartz: Set the proper bitmap for key repeats...Jeremy Huddleston2009-10-011-7/+41
| | | | | | | | | | | | | | | | | | | | XkbSetRepeatKeys lies and doesn't do what it says it will... (cherry picked from commit 873467adad479be02cd9cc6b43685919f5612d91)
* | | | XQuartz: Cleaned up keymap setting for easier maintenanceJeremy Huddleston2009-09-281-61/+52
| | | |
* | | | XQuartz: Remove the redundant xquartz_resetenv_displayJeremy Huddleston2009-09-282-8/+1
| | | | | | | | | | | | | | | | unsetenv(DISPLAY) takes care of this for us anyway
* | | | XQuartz: Query the BundleIdentifier from the bundle in X11.bin rather than ↵Jeremy Huddleston2009-09-281-32/+45
| |_|/ |/| | | | | | | | | | | | | | using the configure option. This lets X11.bin drop into any .app ... the Info.plist and Xquartz binary need to have it hardcoded still.
* | | Add (ok, fix) support for DTrace under OS XBen Byer2009-09-275-8/+12
| | | | | | | | | | | | (cherry picked from commit 8428a57184f542941d2c8c90e97d18e111a69dd2)
* | | Rootless: Correct border rendering on parent-relative windowsJeremy Huddleston2009-09-273-0/+48
| | | | | | | | | | | | Resurected code from the punted RootlessPaintBackground/Border and added it conditionally to miPaintWindow
* | | XQuartz: Fix QuartzSetCursor to match the expected prototype.Jeremy Huddleston2009-09-271-2/+2
| | |
View Lorry Controller Status