George Staplin
a665ed16f7
XQuartz: GL: Set the __GLXconfig renderType to GLX_RGBA_BIT.
...
(cherry picked from commit 3c14546f58 )
2009-01-10 01:00:17 -08:00
George Staplin
15bb6abd59
XQuartz: GL: Make many more fbconfigs and visuals available for the 1.5 branch.
...
Use a __GLXconfig linked list struct to store the configurations for the
fbconfigs and visuals in a pGlxScreen.
Also, remove the __GLXvisualConfig/GlxSetVisualConfigs code that isn't used
anymore. There is more code we can remove later, but I want to do that in
separate commits.
(cherry picked from commit 94162b0f8a )
2009-01-10 01:00:03 -08:00
Jeremy Huddleston
7bfb1821df
Merge commit 'origin/server-1.6-branch' into xorg-server-1.6-apple
2009-01-10 00:59:32 -08:00
Peter Hutterer
1ffd9ec760
xfree86: don't restore the TTY mode if we didn't initialize it ourselves
...
Restoring it unconditionally means we restore to whatever tty_mode has as
default value (i.e. 0). K_RAW happens to be 0x00, so we always restore to raw
mode if allowEmptyInput is off.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
(cherry picked from commit aea6f19f25 )
2009-01-09 11:04:09 -08:00
Peter Hutterer
3c11efd7dc
xfree86: If an input device failed to activate, return immediately.
...
Devices are only activated once - right after they've been added to the
server. If a device failes activation, it's dead. There's no reason to
continue. Return the error code from ActivateDevice() without setting up
sprite information or even sending a event to the client.
Then - in the DDX - just remove the device again.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 27011254c4 )
2009-01-09 11:04:03 -08:00
Peter Hutterer
2ce48363b8
xfree86: don't call CheckMotion if a device hasn't been enabled. #19176
...
X.Org Bug <http://bugs.freedesktop.org/show_bug.cgi?id=19176 >
(cherry picked from commit e1a3a1a0d8 )
2009-01-09 11:03:58 -08:00
Maarten Maathuis
3225e1378e
exa: preparing as source and finishing access as mask is a bad idea
...
(cherry picked from commit 027b440d4f )
2009-01-09 11:03:52 -08:00
Maarten Maathuis
2056c10d12
exa: Allow drivers to set non-NULL devPrivate.ptr for !offscreen pixmaps.
...
(cherry picked from commit 3534a5e5d9 )
2009-01-09 11:03:47 -08:00
Jeremy Huddleston
4130761f15
XQuartz: Fat binary buildfixes
...
Let Xarch.h set X_BYTE_ORDER for us.
Determine _XSERVER64 at build time.
(cherry picked from commit f54736c2b0 )
(cherry picked from commit cc677cb4f4 )
2009-01-09 11:03:37 -08:00
Jeremy Huddleston
2eb09af561
XQuartz: Use AvailabilityMacros.h instead of availability.h for Tiger
...
(cherry picked from commit 91f3c34357 )
(cherry picked from commit 65ab2f44ea )
2009-01-09 11:03:32 -08:00
Jeremy Huddleston
fecc82ee11
XQuartz: Copyright Update... happy new year
...
(cherry picked from commit 9f1c26ae8d )
(cherry picked from commit df6ca888b0 )
2009-01-09 11:03:27 -08:00
Jeremy Huddleston
d80e35a9ae
XQuartz: pbproxy: Push dpy init and CFRunLoop hook setup into the pbproxy thread to avoid possible deadlock
...
(cherry picked from commit 49e59d32b8 )
(cherry picked from commit adbfd49da2 )
2009-01-09 11:03:21 -08:00
Jeremy Huddleston
c32a680f26
XQuartz: Don't use NX_SECONDARYFNMASK, NX_NUMERICPADMASK, NX_HELPMASK
...
We don't have keycodes for them, so don't try to use them
(cherry picked from commit cb912aca3a )
(cherry picked from commit 0676a580fc )
2009-01-09 11:03:05 -08:00
Jeremy Huddleston
e08ce79152
XQuartz: Make sure to reset the saved key state when deactivating X11.app
...
(cherry picked from commit 3eef78eb32 )
(cherry picked from commit 0d2621b6d4 )
2009-01-09 11:02:59 -08:00
Jeremy Huddleston
bdf776b457
XQuartz: Honor system key repeat rate
...
(cherry picked from commit 4303c9be39 )
(cherry picked from commit 9faf3de7e5 )
2009-01-09 11:02:52 -08:00
Jeremy Huddleston
16560db0c0
XQuartz: Better avoid stuck keys on context switches
...
(cherry picked from commit e9963f1a4f )
(cherry picked from commit 4be8d7346b )
2009-01-09 11:02:48 -08:00
Jeremy Huddleston
66f801f5a0
XQuartz: Workaround OSX VNC server bug for modifier key state
...
A better approach which ensures we have a L modifier key down if we are told neither are down and atleast one is down... =/
(cherry picked from commit bc13dda345 )
(cherry picked from commit c67a3e2972 )
2009-01-09 11:02:42 -08:00
Jeremy Huddleston
a05dbce402
XQuartz: Updated man page fullscreen_hotkeys fullscreen_menu
...
(cherry picked from commit 00f3a2e33c )
(cherry picked from commit d790c9dd04 )
2009-01-09 11:02:34 -08:00
Jeremy Huddleston
b8877bb9e4
XQuartz: pbproxy: We explicitly need libX11 for pbproxy
...
(cherry picked from commit 32824120da )
(cherry picked from commit 8c6e8fa811 )
2009-01-09 11:02:29 -08:00
Jeremy Huddleston
de78ac4378
XQuartz: Try harder to get the user's login environment
...
(cherry picked from commit 6bedaddd78 )
(cherry picked from commit 338f096861 )
2009-01-09 11:02:24 -08:00
Jeremy Huddleston
c391114df9
XQuartz: Reposition windows when we enter fullscreen to ensure our root window
...
(cherry picked from commit 7617d3659b )
(cherry picked from commit 61ae56f973 )
2009-01-09 11:02:19 -08:00
Jeremy Huddleston
beafebef82
XQuartz: Re-enable rlAccel
...
It was incorrectly blamed for some crashes a few months ago, and it should be
safe to use until we get an EXA driver to replace it.
(cherry picked from commit 8121f30bd2 )
(cherry picked from commit 85347902d9 )
2009-01-09 11:02:14 -08:00
Jeremy Huddleston
86ba5eff62
XQuartz: Don't use keycode 0 to determine !swallow since our most common key to swallow is actual keycode 0 (a)
...
(cherry picked from commit 33f43a7f03 )
(cherry picked from commit 84f0c03418 )
2009-01-09 11:00:27 -08:00
Jeremy Huddleston
2a42a059ce
XQuartz: Update our "screens" when we toggle rootless rather than when we toggle fullscreen
...
This old behavior was used as a workaround for the menubar behavior in the older server,
but we handle it better now and need to update our screens when we toggle the rootless
state instead.
(cherry picked from commit 508aa95bc2 )
(cherry picked from commit 7e7758e178 )
2009-01-09 11:00:21 -08:00
Jeremy Huddleston
51319550c9
XQuartz: Run applications via '/bin/sh -c ...' to support users who expect shell parsing
...
(cherry picked from commit 67455e716e )
(cherry picked from commit 7dc0dafef1 )
2009-01-09 11:00:16 -08:00
Jeremy Huddleston
b0503b69f9
XQuartz: pbproxy: Release display notification lock when not needed to avoid deadlock
...
(cherry picked from commit 22f664ab95 )
(cherry picked from commit 4c256c0e9c )
2009-01-09 11:00:11 -08:00
Jeremy Huddleston
6c635faa6f
XQuartz: update quoting in case X11.app is moved to a directory with a space.
...
(cherry picked from commit cc805dc799 )
(cherry picked from commit ecc3a7b609 )
2009-01-09 11:00:05 -08:00
Jeremy Huddleston
14d9ccf0ce
XQuartz: Changed X11.sh to allow use of a ~/.x11run as requested by users of alternate shells
...
(cherry picked from commit b62ed1f8ea )
(cherry picked from commit c3812aec97 )
2009-01-09 10:59:56 -08:00
Jeremy Huddleston
87df8e6819
XQuartz: Get rid of white rectangle bug
...
(cherry picked from commit 3269959033 )
(cherry picked from commit fd6fb6a277 )
2009-01-09 10:59:32 -08:00
Jeremy Huddleston
5ff6b1e7ed
XQuartz: Name the startup shell script X11 for better compatability
...
(cherry picked from commit f84613d6fc )
(cherry picked from commit 102abeda37 )
2009-01-09 10:59:25 -08:00
Maarten Maathuis
ffdf013905
randr/xfree86: Fix a one off error in the panning calculations.
...
- Example: mode 1280x1024, panned area 1281x1024
panned_area.x2 = 1281
mode.width = 1280
If you substract 1280 from 1281, then that leaves you with one.
Which is the one pixel that you need to move to actually see the last pixel collumn.
Substracting 1 from this will consistently prevent you from seeing the right and bottom edge.
(cherry picked from commit aedd2f566d )
2009-01-09 10:59:05 -08:00
Jeremy Huddleston
2a822c2311
mi: Reuse memory in mieqProcessInputEvents rather than making excessive calls to calloc()
...
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit a939368ab8 )
2009-01-09 10:30:58 -08:00
Peter Hutterer
a067bd907e
mi: Clean up CopyGetMasterEvent, re-use the memory.
...
Alloc an EventList once and then re-use instead of allocing a new event each
time we need a master event.
There's a trick included: because all the event processing handlers only take
an xEvent, init a size 1 EventList and squash the events into this one.
Events that have count > 1 must be squished into an xEvent array anyway before
passing into the event handlers, so we don't lose anything here.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
(cherry picked from commit d281866b74 )
2009-01-09 10:30:27 -08:00
Peter Hutterer
3519f83f50
dix: move MAX_VALUATOR_EVENTS into include/input.h
...
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 0b4fef6337 )
2009-01-09 10:30:26 -08:00
Francis Giraldeau
3ec3b502e3
Don't log audit messages when -audit 0 specified
...
make the auditTrailLevel check more general and don't log when not
using DTRACE and -audit 0 is set.
(cherry picked from commit d61e902aab )
2009-01-09 09:59:54 -08:00
Colin Guthrie
053f32d928
Fix compilation with -Werror=format-security
...
(cherry picked from commit 6d8ea5104c )
2009-01-09 09:59:01 -08:00
Adam Jackson
8ed4ca2801
XAA: Disable offscreen pixmaps by default.
...
Say Option "XaaOffscreenPixmaps" to turn them back on.
Apropos of bugs #13795 and #15098 . But this still isn't correct.
(cherry picked from commit 0c6987df3b )
2009-01-09 09:57:46 -08:00
Jeremy Huddleston
6850846b78
XQuartz: Update padding in appledristr. This shouldn't change how the struct ends up in memory, but should make it more obvious for human eyes
...
(cherry picked from commit f7b6c1907c )
2009-01-07 18:29:08 -08:00
Jeremy Huddleston
cc677cb4f4
XQuartz: Fat binary buildfixes
...
Let Xarch.h set X_BYTE_ORDER for us.
Determine _XSERVER64 at build time.
(cherry picked from commit f54736c2b0 )
2009-01-07 10:56:26 -08:00
Jeremy Huddleston
65ab2f44ea
XQuartz: Use AvailabilityMacros.h instead of availability.h for Tiger
...
(cherry picked from commit 91f3c34357 )
2009-01-07 01:47:52 -08:00
Jeremy Huddleston
df6ca888b0
XQuartz: Copyright Update... happy new year
...
(cherry picked from commit 9f1c26ae8d )
2009-01-02 11:07:24 -08:00
Jeremy Huddleston
adbfd49da2
XQuartz: pbproxy: Push dpy init and CFRunLoop hook setup into the pbproxy thread to avoid possible deadlock
...
(cherry picked from commit 49e59d32b8 )
2009-01-02 11:02:36 -08:00
Jeremy Huddleston
0676a580fc
XQuartz: Don't use NX_SECONDARYFNMASK, NX_NUMERICPADMASK, NX_HELPMASK
...
We don't have keycodes for them, so don't try to use them
(cherry picked from commit cb912aca3a )
2008-12-31 12:45:31 -08:00
Jeremy Huddleston
0d2621b6d4
XQuartz: Make sure to reset the saved key state when deactivating X11.app
...
(cherry picked from commit 3eef78eb32 )
2008-12-31 12:45:08 -08:00
Jeremy Huddleston
9faf3de7e5
XQuartz: Honor system key repeat rate
...
(cherry picked from commit 4303c9be39 )
2008-12-31 12:44:50 -08:00
Jeremy Huddleston
4be8d7346b
XQuartz: Better avoid stuck keys on context switches
...
(cherry picked from commit e9963f1a4f )
2008-12-31 12:43:13 -08:00
Jeremy Huddleston
c67a3e2972
XQuartz: Workaround OSX VNC server bug for modifier key state
...
A better approach which ensures we have a L modifier key down if we are told neither are down and atleast one is down... =/
(cherry picked from commit bc13dda345 )
2008-12-31 12:42:57 -08:00
Jeremy Huddleston
d790c9dd04
XQuartz: Updated man page fullscreen_hotkeys fullscreen_menu
...
(cherry picked from commit 00f3a2e33c )
2008-12-31 12:42:46 -08:00
Jeremy Huddleston
8c6e8fa811
XQuartz: pbproxy: We explicitly need libX11 for pbproxy
...
(cherry picked from commit 32824120da )
2008-12-28 22:17:39 -08:00
Jeremy Huddleston
338f096861
XQuartz: Try harder to get the user's login environment
...
(cherry picked from commit 6bedaddd78 )
2008-12-28 22:17:26 -08:00