Ben Byer
7078458432
add missing dix-config include
...
(cherry picked from commit 126e9bc8c4 )
2008-04-08 21:24:53 -07:00
Ben Byer
19e1327cdc
add correct default ACLOCAL and PKGCONFIG_PATH settings to autogen.sh
...
(cherry picked from commit 2bb14682c6 )
2008-04-08 21:24:48 -07:00
Jeremy Huddleston
2d4194a8d1
XQuartz: Fix issue where clicking on an X11 window might send that event to an X11 window in another space.
...
(cherry picked from commit df21312c8b )
2008-04-08 17:02:56 -07:00
Jeremy Huddleston
6acb674a7a
XQuartz: Change reporting of space change to debug log rather than stderr
...
(cherry picked from commit ed15556a9f )
2008-04-02 18:05:52 -07:00
Jeremy Huddleston
025909a605
Merge branch 'server-1.5-branch' into xorg-server-1.5-apple
2008-04-02 17:44:10 -07:00
Ben Byer
c8b387349e
The AppKit thread should not be calling directly into the X server
...
functions to change state when the keyboard is reloaded; instead,
pass it as an event.
(cherry picked from commit 7e653f806f )
2008-04-02 17:43:46 -07:00
Ben Byer
e8b6088c7b
formatting cleanup for X11Application.m (no code changes)
...
(cherry picked from commit eb083d3f68 )
2008-04-02 17:43:37 -07:00
Ben Byer
503600c7de
moved and renamed QuartzMessageServerThread to
...
DarwinSendDDXEvent to make more clear what it actually does.
(cherry picked from commit bee2b377ef )
2008-04-02 17:42:52 -07:00
Ben Byer
d39f9a63d7
shovelling code around ...
...
(cherry picked from commit 2143182ba4 )
2008-04-02 17:42:31 -07:00
Ben Byer
9dcf5b4701
just a bit of juggling headers around -- we're preparing
...
to call our Xquartz-specific event handlers directly
as mieqHandlers
(cherry picked from commit 4aedba5aa7 )
2008-04-02 17:40:59 -07:00
Ben Byer
8c4a81ce8e
nuke DarwinEventQueue
...
(cherry picked from commit 1e0ec02202 )
2008-04-02 17:40:47 -07:00
Jeremy Huddleston
216fdc8514
continue with gutting darwinEvents.c
...
(cherry picked from commit c34fce7051 )
2008-04-02 17:40:34 -07:00
Jeremy Huddleston
8fc5cd57bb
turns out we weren't actually using these files. oops
...
(cherry picked from commit bfec44d7b4 )
2008-04-02 17:39:04 -07:00
Ben Byer
d34dbcbdb0
remove vestigal DarwinEQPointerPost etc
...
(cherry picked from commit a25704c423 )
2008-04-02 17:36:59 -07:00
Ben Byer
e301ec43da
gut darwinEQEnqueue, and make it just call mieqEnqueue (for the moment)
...
(cherry picked from commit a9e081a60c )
2008-04-02 17:36:50 -07:00
Ben Byer
71b47657ef
add prototype for DarwinEventHandler
...
(cherry picked from commit 9a03ae33c4 )
2008-04-02 17:36:42 -07:00
Ben Byer
b35ecb21a1
add logging of current thread ID to DEBUG_LOG macro
...
(cherry picked from commit 5848510cc5 )
2008-04-02 17:36:30 -07:00
Ben Byer
dd9adee6cf
Begin to move all of our Xquartz DDX-specific event handlers
...
to miEQ, in preparation to remove the DDX-specific code entirely.
(cherry picked from commit 3f4447b95f )
2008-04-02 17:36:19 -07:00
Kristian Høgsberg
81af92f5d9
Pick up dri2proto from the standard proto header include path.
2008-04-02 19:22:05 -04:00
Kristian Høgsberg
856d9dd615
Send the GLX_EXT_texture_from_pixmap attributes to the client.
2008-04-02 19:06:40 -04:00
Jeremy Huddleston
69b9505a13
XQuartz: Fixed missing close-paren in preference pane text.
...
(cherry picked from commit ea37e151dc )
2008-04-02 15:15:48 -07:00
Kristian Høgsberg
bbd87f85a3
Add @XORG_CFLAGS@ to satisfy xf86* includes.
...
Pointed out by Hasso Tepper.
2008-04-02 18:00:06 -04:00
Kristian Høgsberg
2478122793
dri2: Unbreak glcore visual setup.
2008-04-02 12:59:25 -04:00
Xiang, Haihao
7d97c19c2d
dri2: fix crasher if DRI2Connect fails
2008-04-02 12:03:12 -04:00
Kristian Høgsberg
2156bdf3b7
Implement DRI2 direct rendering and update AIGLX to DRI interface changes.
...
Get rid of glcontextmodes.[ch] from build, rename __GlcontextModes to
__GLXcontext. Drop all #includes of glcontextmodes.h and glcore.h.
Drop the DRI context modes extension.
Add protocol code to DRI2 module and load DRI2 extension by default.
(cherry picked from commit c40e0b51f0 )
2008-04-01 11:58:27 -04:00
Thomas Jaeger
a45586da2b
XKB: Fix processInputProc wrapping
...
If input processing is frozen, only wrap realInputProc: don't smash
processInputProc as well. When input processing is thawed, pIP will be
rewrapped correctly.
This supersedes the previous workaround in 50e80c9.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
(cherry picked from commit 37b1258f0a )
2008-04-01 15:32:01 +03:00
Jeremy Huddleston
d84cda5fb1
Merge branch 'server-1.5-branch' into xorg-server-1.5-apple
2008-03-31 16:44:29 -07:00
Ben Byer
ba5202d0a9
Add code to track 5 valuators for pointing device, in preparation
...
for supporting tablet input in Xquartz.
(cherry picked from commit 22c8849ea819eb70a14b2e06330b11b22aa63ebc)
2008-03-31 16:42:14 -07:00
Ben Byer
24d465c155
add debug statements so we can see if/when our Xinput stubs are getting called.
...
(cherry picked from commit 6e160bbe15dd2c2b8685847c06831cb6aebc6f74)
2008-03-31 16:42:06 -07:00
Ben Byer
bd1daecaed
Remove calls to InitValuatorAxisStruct -- these are now handled in dix by
...
InitValuatorDeviceClass.
Add InitProximityClassDeviceStruct call to prepare for tablet support.
(cherry picked from commit 1bd980a5b114f5320360943214f8f9f23b29c1e3)
2008-03-31 16:41:59 -07:00
Eamon Walsh
bde2890148
XSELinux: Add a request to get a client's context from a resource ID.
...
(cherry picked from commit 9f56fc5806 )
2008-03-31 19:22:53 -04:00
Jeremy Huddleston
33c435705e
XQuartz: Fixed names of enums to be more consistent
...
(cherry picked from commit c309a08806daf5d716a860c709e51eacad2c745a)
2008-03-28 17:01:24 -07:00
Jeremy Huddleston
d56433d302
XQuartz: Another Exposé fix: F9 doesn't raise all windows
...
(cherry picked from commit b9cffa20de )
2008-03-28 17:01:18 -07:00
Eamon Walsh
c26bccf417
XSELinux: Add xorg.conf option for permissive/enforcing/disabled.
...
Patch by Joe Nall.
The option goes in the "extmod" subsection.
TODO: Make it easier for extension modules to handle their own options.
(cherry picked from commit b5f98fcea2 )
2008-03-28 14:24:06 -04:00
Jeremy Huddleston
b0a093c8a9
XQuartz: Sanity-check the removal of the 256-color option
...
Fixes the 'one-time-preferences' bug in 2.2.0_rc1
(cherry picked from commit 38cbd13490 )
2008-03-27 19:22:01 -07:00
Ben Byer
8c9b183683
Fixed bad calculation of dstEnd, which caused truncation of some bitblts
...
(cherry picked from commit 8a057bc9e2 )
2008-03-27 19:15:52 -07:00
Ben Byer
ac1009fdcb
Added code to check for null pointers on fb* invocations
...
(cherry picked from commit 6f441d79c7 )
(cherry picked from commit 1e1073334a )
2008-03-27 19:15:38 -07:00
Ben Byer
5dcdb2f748
Added checks to avoid writing past the end of the buffer in fbBltOne
...
(cherry picked from commit e5f54f122b )
(cherry picked from commit 24c54f53ff )
2008-03-27 19:15:20 -07:00
Ben Byer
8688356dba
xquartz: copy in new stubs from Xi/stubs.c to replace our old
...
Xinput stubs. Hey, it's a start.
(cherry picked from commit 566412b4aece24ae6af8c7c835986b685aa456a2)
2008-03-27 19:14:25 -07:00
Ben Byer
1fc0c7b877
prevent "fake mouse clicks" from generating spurious extra events
...
(cherry picked from commit bd85a24969427e41389688663ead2d4dd41c9999)
2008-03-27 19:14:19 -07:00
Adam Jackson
ae8edf3ee7
Fix that last commit.
...
I can apply patches, really.
(cherry picked from commit 333e7123dc )
2008-03-25 12:48:44 -04:00
Sascha Hlusiak
ff99a3aa2b
Fix getValuatorEvents to compute number of valuators correctly.
...
(cherry picked from commit e7a3644255 )
2008-03-25 12:33:03 -04:00
David Nusinow
2d312eaf4f
Bug #10016 : Implement WM_CLASS hints in Xephyr.
...
(cherry picked from commit f028e245a7 )
2008-03-24 16:59:22 -04:00
Adam Jackson
d6ec5eaded
Bug #11510 : Fix build without RECORD.
...
(cherry picked from commit 862ff9ac92 )
2008-03-24 13:38:01 -04:00
Adam Jackson
f250352d2e
Bug #11508 : Fix build without XV.
...
(cherry picked from commit 87bfd3bd96 )
2008-03-24 13:34:30 -04:00
Adam Jackson
fdf927c2cd
Bug #13962 : Re-arm the DPMS timer when re-enabling DPMS.
...
(cherry picked from commit 536f2ff538 )
2008-03-24 12:24:38 -04:00
Julien Cristau
80968c4a91
xaa: use xf86ReturnOptValBool instead of xf86IsOptionSet
...
The latter doesn't return the option's value, just whether it's present
in the configuration.
(cherry picked from commit 4217ba0cf0 )
2008-03-24 10:22:41 -04:00
Julien Cristau
f40bd686e5
exa: use xf86ReturnOptValBool instead of xf86IsOptionSet
...
The latter doesn't give you the option's value, it just tells you if
it's present in the configuration. So using Option "EXANoComposite" "false"
disabled composite acceleration.
(cherry picked from commit 6b9d2bb1f7 )
2008-03-24 10:22:37 -04:00
Michel Dänzer
84a27f7a92
Fix RandR 1.2 driver interface conversion of two colour cursors to ARGB
...
This patch (and not setting HARDWARE_CURSOR_BIT_ORDER_MSBFIRST on big endian
platforms) fixes it for me with the radeon driver and doesn't break intel.
Correct patch this time :)
(cherry picked from commit da973e962d )
2008-03-24 10:20:14 -04:00
Alan Coopersmith
a65e9722c4
Make Xevie private symbol names less generic
...
Makes it easier to figure out what you're seeing in the stack trace
instead of wondering where in the server "ProcSend" is.
(cherry picked from commit 060a99444e )
2008-03-24 10:20:03 -04:00