summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2009-10-181.6.5-apple2xorg-server-1.6-appleJeremy Huddleston1-2/+2
2009-10-18Rootless: src drawable window can now be NULLJeremy Huddleston1-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> (cherry picked from commit 7e178ffbed7c8557faf8d471ad275aa2b0365e1d)
2009-10-18Rootless: Abstract some of the Xplugin specific stuff which has crept into ↵Jeremy Huddleston7-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> (cherry picked from commit 6980f77892e0409b44bd8f33ba82e7273c6462a4)
2009-10-121.6.5-apple1Jeremy Huddleston1-2/+2
2009-10-12Merge commit 'origin/server-1.6-branch' into xorg-server-1.6-appleJeremy Huddleston7-21/+60
2009-10-11Bump version to 1.6.5xorg-server-1.6.5Keith Packard1-2/+2
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-10-11ephyr: if -parent is given, check for a trailing -screen. (#24144)Peter Hutterer2-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) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-10-02XQuartz: Fix a possible minor memory leakJeremy Huddleston1-0/+1
(cherry picked from commit 24e640e1fa6cfb3917ba90dcdabf1fadddff20aa)
2009-10-02XQuartz: Send mouse location with scroll events.Jeremy Huddleston1-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)
2009-10-02render: rename SetBit to RenderSetBit.Peter Hutterer1-5/+5
Avoiding namespace collision with the SetBit macro soon to be used in the input code. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 8460425740c72e58bcb897557f033e2836251160)
2009-10-01Bump to version 1.6.4.901xorg-server-1.6.4.901Keith Packard1-2/+2
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-10-01XQuartz: Updated bundle version to 2.4.1Jeremy Huddleston1-2/+2
2009-10-01XQuartz: Dead code removal: quartzPasteboard.[hc]Jeremy Huddleston7-256/+0
(cherry picked from commit 9936b5b188dd85f169c41ef8ec46c9a210528c3f)
2009-10-01dix: add SetBit(arr, bit) and ClearBit(arr, bit) to include/inputstr.hPeter Hutterer1-0/+2
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 5e0967f5fc2e0fcf2a55128eb03931cf6f5709e9)
2009-10-01XQuartz: Set the proper bitmap for key repeats...Jeremy Huddleston1-7/+41
XkbSetRepeatKeys lies and doesn't do what it says it will... (cherry picked from commit 873467adad479be02cd9cc6b43685919f5612d91)
2009-09-30Re-fix DGA removal.Keith Packard4-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)
2009-09-28XQuartz: Cleaned up keymap setting for easier maintenanceJeremy Huddleston1-61/+66
(cherry picked from commit b9dfed9e88389cbd29406a20d38ee4297638649b)
2009-09-28XQuartz: Push kXquartzReloadKeymap into DarwinEventHandlerJeremy Huddleston3-3/+7
2009-09-28XQuartz: Remove the redundant xquartz_resetenv_displayJeremy Huddleston2-8/+1
unsetenv(DISPLAY) takes care of this for us anyway (cherry picked from commit d2263645d839c9edeedea0835d26f1f41b37f70e)
2009-09-28XQuartz: Query the BundleIdentifier from the bundle in X11.bin rather than ↵Jeremy Huddleston1-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)
2009-09-27Merge commit 'origin/server-1.6-branch' into xorg-server-1.6-appleJeremy Huddleston12-144/+87
2009-09-27Rootless: Correct border rendering on parent-relative windowsJeremy Huddleston3-0/+48
Resurected code from the punted RootlessPaintBackground/Border and added it conditionally to miPaintWindow (cherry picked from commit cf2e3312cff3f341e9edba8c321a4ca7ffd8748e)
2009-09-27XQuartz: Fix a bunch of compilation warnings about styleJeremy Huddleston14-48/+52
(cherry picked from commit 54000bdcbca52a2de31f7c1a1147de6d8e9dbbb8)
2009-09-27XQuartz: Nuke TSMJeremy Huddleston1-16/+0
It's deprecated in SnowLeopard. Ben and I both have no idea what it is for. It says something about unicode input, but urxvt seems fine taking in unicode, so /shrug... bye. (cherry picked from commit 29cb904e4de2411a9b6dbe68694954788f0525f7)
2009-09-27XQuartz: Fix inverse map from mode_switch to altJeremy Huddleston1-0/+4
(cherry picked from commit de6cee11e1c335a0e5f708e7641e81d3cfe52529)
2009-09-27XQuartz: Force a keymap resync on the first keypress to workaround XKB ↵Jeremy Huddleston1-0/+11
mucking with our keymap. We need to find a better way to work with XKB on this. (cherry picked from commit ceaa5c779ceed3de5ea53727649613be3133b24e)
2009-09-27Bump to version 1.6.4xorg-server-1.6.4Keith Packard1-2/+2
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-09-27Don't send events through the master if the device has SendCoreEvents off.Peter Hutterer2-4/+4
In server 1.6, all devices are attached to the master device (VCP or VCK). Sending an event through the master device means the device is sending core events. If a device is configured as SendCoreEvents, just send through the device, not through the master. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-27add doltlibtool to gitignoreBen Byer1-0/+1
2009-09-27Add (ok, fix) support for DTrace under OS XBen Byer5-8/+12
2009-09-26XQuartz: Stop checking version numbers of the bundle because ↵Jeremy Huddleston1-14/+0
CFBundleGetVersionNumber is gimpish
2009-09-23XQuartz: GLX capabilities: Allow 16bit accumulation buffersJeremy Huddleston1-6/+8
http://xquartz.macosforge.org/trac/ticket/308 (cherry picked from commit e9e63a2118b76b6c31c4081fec08a99e4d796e22)
2009-09-22xfree86/modes: Remove all framebuffer support from DGAKeith Packard3-101/+29
This removes all rendering and mapping code from xf86DiDGA, leaving just mode setting and raw input device access. The mapping code didn't have the offset within /dev/mem for the frame buffer and the pixmap support assumed that the framebuffer was never reallocated. (cherry picked from 0b7c6c728c2e2d8433a188315cc591308a89cd85) Signed-off-by: Keith Packard <keithp@keithp.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-22dix: append "built-ins" to the font path in SetDefaultFontPathRémi Cardona2-19/+26
49b93df8a3002db7196aa3fc1fd8dca1c12a55d6 made the hard dependency on a "fixed" font go away but only Xorg could use the built-ins fonts by default. With this commit, all DDXs get "built-ins" appended to their FontPath, not just Xorg. Tested with Xorg, Xvfb and Xnest. (cherry picked from commit f56cbe1ef24415d0142b9a7d0ab0a031069ccb52) Signed-off-by: Rémi Cardona <remi@gentoo.org> Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Tested-by: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com>
2009-09-22fbdevhw: Test for graphics:fb%d as well as graphics/fb%dDaniel Stone1-1/+7
Apparently the kernel can't decide on an API to expose to userspace, so let's just try both in the hope that one will work. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Acked-by: Michel Dänzer <michel@daenzer.net> (cherry picked from commit f4350c66b493d63fa06be87caa958d7033232ea4)
2009-09-22render: return the supported version rather than just passing the proto's ↵Keith Packard1-2/+5
version Signed-off-by: Keith Packard <keithp@keithp.com>
2009-09-22dri2: Don't crash if pPriv is NULL.Michel Dänzer1-2/+10
(cherry picked from commit df597709d71f47b8516e27c6fb1bfffd59de5e48) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-09-22Don't reset the lastDeviceEventTime when doing DPMS actionsRichard Hughes1-13/+4
When we change the DPMS mode, don't play games with the last event time as this breaks applications using IDLETIME to turn the backlight off after a preset time. This patch fixes gnome-power-manager and xfce-power-manager Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit c1d901d723c3bee523736eacc15b44a7dff484fe) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-09-14XQuartz: pbproxy: Remove debugging XBell()Jeremy Huddleston1-4/+0
(cherry picked from commit 1fd7c1fd4740393a32e261af33e64c19be48ca9a)
2009-09-06XQuartz: launchd: Fallback on :0 if prefix:0 gives an error for the socket nameJeremy Huddleston1-2/+5
(cherry picked from commit 647c871dc9f2d0adc172b401cde89ffbdfcc4d7a)
2009-09-06XQuartz: Fix "warning: function declaration isn’t a prototype" noiseJeremy Huddleston1-1/+1
(cherry picked from commit 9a77905a975e562daa4230739937bbb0b4caf087)
2009-09-06XQuartz: pbproxy: 64bit fixes: Properly process an array of AtomsJeremy Huddleston2-7/+8
(cherry picked from commit 1b659cda1af02762a31cc7875e457b08c8dc68b5)
2009-09-05XQuartz: Fix a strcpy/strcmp typoJeremy Huddleston1-5/+6
(cherry picked from commit 701c24da3ef76a05ccb2d7e84ccfa1b7c5d38e15)
2009-09-04XQuartz: Check the DISPLAY environment variable to see if the socket at ↵Jeremy Huddleston2-10/+42
startup is ours. If not, ignore it and fork/exec startx. (cherry picked from commit 3d5e10cce360a04bf917227615fb9b825675124f)
2009-09-04XQuartz: Use --with-launchd-id-prefix for consistency with xinitJeremy Huddleston7-17/+23
Also actually honor LAUNCHD_ID_PREFIX and APPLE_APPLICATION_NAME (cherry picked from commit 990038ab006b2f5e03dcef385514ba4e4584bd25)
2009-09-01Xext: fix a typo for bigreqsproto.h header fileJerome Glisse1-1/+1
Signed-off-by: Jerome Glisse <jglisse@redhat.com> (cherry picked from commit 0e46066efea4e385b2874d4a62a786957e572fe5)
2009-08-31Xext: Require newer versions of xcmiscproto, bigreqsproto, and ↵Jeremy Huddleston4-5/+4
xf86bigfontproto for new *proto.h header file names bigreqsproto >= 1.1.0 xcmiscproto >= 1.2.0 xf86bigfontproto >= 1.2.0
2009-08-311.6.3-apple1Jeremy Huddleston1-2/+2
2009-08-31Merge commit 'origin/server-1.6-branch' into xorg-server-1.6-appleJeremy Huddleston2-3/+3
2009-08-31mi: fix build error caused by missing xtest.hJeremy Huddleston2-2/+2
xtest.h was renamed to xtestconst.h in xextproto. Requires xextproto 7.0.99.3 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 20daa145c437c3ba67970146f6182849f87a1b43)