Commit Graph

2435 Commits

Author SHA1 Message Date
Jeremy Huddleston
9b67fca9b7 XQuartz: Starting to work on the new Mach IPC startup stuff for better launchd, ApplicationServices, and Dock support 2008-05-09 16:44:31 -07:00
Jeremy Huddleston
2232c91d5c XQuartz: Reorganized some of the build system in prep for the Mach IPC startup work. 2008-05-08 19:46:03 -07:00
Jeremy Huddleston
8a0524b30e XQuartz: Set bundle version to 2.3.0 2008-05-08 16:57:42 -07:00
Jeremy Huddleston
330ffad547 XQuartz: Fixed some issue in our bundle creation 2008-05-06 16:12:41 -07:00
Jeremy Huddleston
56b7988d26 XQuartz: Fixed typo 2008-05-06 02:59:13 -07:00
Jeremy Huddleston
e414ec462c XQuartz: Added uncommitted files 2008-05-06 02:47:03 -07:00
Jeremy Huddleston
f225222ba2 Fixed up dist 2008-05-06 02:28:36 -07:00
Jeremy Huddleston
453a982e63 XQuartz: Move server bits into bundle and setup stub in /usr/X11/bin/Xquartz in prep for startup rewrite 2008-05-06 00:06:19 -07:00
Ben Byer
b7a1a640ce Xquartz: experimental embedding of Sparkle.framework 2008-05-05 20:55:08 -07:00
Jeremy Huddleston
8d9eab3a2e XQuartz: Fix mouse input offsets earlier since GetPointerEvents does not like negative (x,y) values 2008-05-02 17:35:57 -07:00
Jeremy Huddleston
ff10c37bdd XQuartz: Avoid a possible crash at startup due to unfavorable context switching. 2008-05-02 16:53:45 -07:00
Jeremy Huddleston
f2020b9836 XQuartz: Adjust the screen origin offset properly for multimonitor setups 2008-05-01 18:02:59 -07:00
Jeremy Huddleston
1fcf74a436 XQuartz: Moved some relevant stuff from darwin.h to darwinEvents.h 2008-04-30 17:30:57 -07:00
Jeremy Huddleston
97b5174182 Merge commit 'origin/server-1.4-branch' into xorg-server-1.4-apple 2008-04-30 16:25:25 -07:00
Peter Hutterer
ff4006bd5a xfree86: fix AlwaysCore handling. (Bug #14256)
Assume AlwaysCore being set by default, just like the other options.

X.Org Bug 14256 <http://bugs.freedesktop.org/show_bug.cgi?id=14256>
(cherry picked from commit 5b8641a5fd)
2008-04-30 12:53:38 +02:00
Ben Byer
50641bce73 xquartz: created darwinTablet, to represent tablet events 2008-04-29 23:37:58 -07:00
Ben Byer
299a056737 xquartz: remove unused params from DarwinEQInit 2008-04-29 23:00:09 -07:00
Ben Byer
588683cecc XQuartz: Fix to tablet-event handling code; we now scale
more conservatively (to match Linux's Wacom driver) and
we now receive all tablet-related events.
2008-04-29 22:35:34 -07:00
Jeremy Huddleston
ce4fbfbc75 XQuartz: Unset CFProcessPath... blech 2008-04-28 15:52:24 -07:00
Jeremy Huddleston
22cf724376 XQuartz: xprIsX11Window can be called from the Appkit thread (see X11Application.m) 2008-04-28 15:28:21 -07:00
Jeremy Huddleston
9717ddad46 XQuartz: Disabled DPMS extension 2008-04-28 15:10:26 -07:00
Jeremy Huddleston
41542502b3 XQuartz: Added thread debugging to xprFrame.c 2008-04-28 12:36:54 -07:00
Jeremy Huddleston
72653c24c0 XQuartz: More startup / threading house cleaning. 2008-04-28 11:47:49 -07:00
Jeremy Huddleston
d8d9c866b9 XQuartz: Updated Localizable.strings 2008-04-28 10:50:51 -07:00
Jeremy Huddleston
03e707987f XQuartz: Added missing Xquartz.man.pre to EXTRA_DIST 2008-04-27 00:01:14 -07:00
Jeremy Huddleston
f4b963256f Xquartz: Added missing to EXTRA_DIST 2008-04-26 23:00:42 -07:00
Jeremy Huddleston
c861fe00e1 XQuartz: Cleaned up startup and thread creation a tad. 2008-04-26 19:17:42 -07:00
Jeremy Huddleston
00a9567acc XQuartz: Don't subtract the titlebar off of the pointer_y 2008-04-26 17:04:49 -07:00
Jeremy Huddleston
5c6aa1272e XQuartz: Added some pseudoramiX debug traces
(cherry picked from commit 5bee1585a3)
2008-04-25 17:57:31 -07:00
Jeremy Huddleston
515b8b855a XQuartz: More multi-monitor work... reverted Ben's workaround (worked for side-by-side only) and added more debugging. 2008-04-24 23:48:11 -07:00
Jeremy Huddleston
9112f29043 XQuartz: Cleaned up multi-monitor support.
(cherry picked from commit c05abf0a19)
2008-04-24 23:34:38 -07:00
Jeremy Huddleston
ede60ebc6f Don't need to include indirect.c twice 2008-04-23 11:35:24 -07:00
Jeremy Huddleston
21fc95930f Moved Apple GL bits into our DDX subtree 2008-04-23 10:35:59 -07:00
Ben Byer
18d70287c4 xquartz: clean up linker line for main binary
(cherry picked from commit 821d7400f2)
2008-04-23 10:28:42 -07:00
Jeremy Huddleston
755d16cbde XQuartz: Make sure QuartzAudioInit() gets run.
(cherry picked from commit bb3d034675)
2008-04-23 02:19:50 -07:00
Jeremy Huddleston
e48e2ce931 XQuartz: Fixed cmd-tab to bring all windows forward. 2008-04-21 23:44:37 -07:00
Jeremy Huddleston
fd0b4518ff XQuartz: Fixed quit dialog to be more conforming with HIG.
(cherry picked from commit 14c6b837bb)
2008-04-21 19:08:14 -07:00
Ben Byer
9a7e14286c Fix for pointer-offset issue when using a multi-display environment on X11.app. 2008-04-21 17:53:28 -07:00
Jeremy Huddleston
e36c7d425c XQuartz: Cleanup turning off COMPOSITE
(cherry picked from commit 8f920fca6f)
2008-04-20 01:24:18 -07:00
Jeremy Huddleston
6f1c85b965 XQuartz: Cleaned up some casting to get rid of compiler warnings 2008-04-18 20:38:31 -07:00
Jeremy Huddleston
bc50d41f9d XQuartz: More sanitization of the namespace 2008-04-18 20:23:26 -07:00
Jeremy Huddleston
ba074f19ea XQuartz: Handled sanitization of namespace better
(cherry picked from commit 8cb23d6721)
2008-04-18 20:16:06 -07:00
Jeremy Huddleston
49692925cc XQuartz: More thread debugging 2008-04-18 19:18:52 -07:00
Jeremy Huddleston
06e49b9aa7 Fixed mode, so we could make dist 2008-04-18 01:23:34 -07:00
Jeremy Huddleston
70e543baf2 XQuartz: Forgot to commit xprEvent.[hc] ... 2008-04-17 20:21:45 -07:00
Ben Byer
56dc121520 Added XKB support for Xquartz 2008-04-17 17:04:43 -07:00
Jeremy Huddleston
31625cc03b XQuartz: Moved some rootless-specific cruft into xpr 2008-04-17 15:49:13 -07:00
Jeremy Huddleston
7b087c965b XQuartz: Use a mutex to ensure we only have one thread calling mieqEnqueue at a time. 2008-04-17 15:23:00 -07:00
Jeremy Huddleston
f6fbdbf838 XQuartz: A little more debugging output from threadSafety 2008-04-17 14:21:31 -07:00
Jeremy Huddleston
95056afc56 XQuartz: Fixed some missing prototypes 2008-04-17 13:17:58 -07:00
Jeremy Huddleston
00beb98251 XQuartz: Added framework for asserting which thread we're in. 2008-04-17 13:12:56 -07:00
Jeremy Huddleston
b4992755c3 XQuartz: Include version info for CrashReporter 2008-04-17 11:56:48 -07:00
Jeremy Huddleston
1b4c37d8f9 XQuartz: Use strerror(errno)... cause I like text more than grepping header files 2008-04-17 11:06:54 -07:00
Ben Byer
57bb073209 merged darwinKeyboard.[ch] into quartzKeyboard 2008-04-17 02:56:54 -07:00
Ben Byer
19872a6aeb oops, missed a spot 2008-04-17 02:31:53 -07:00
Ben Byer
769acd2934 formatting cleanup 2008-04-17 02:30:36 -07:00
Ben Byer
f04f3af86a delete debugging spew 2008-04-17 02:21:33 -07:00
Ben Byer
f525a4a432 add support for horizontal scrolling (buttons 6 and 7) 2008-04-17 02:21:11 -07:00
Ben Byer
ab662c736e enable keyboard map debugging -- it's going to x11-debug.txt, anyway ... so no harm 2008-04-17 01:32:56 -07:00
Ben Byer
a8a090b853 darwinKeyboard: refactor slightly so that we're not cutting and pasting code from dix, kthx 2008-04-17 01:29:46 -07:00
Ben Byer
cab54466a6 hack to Xquartz to prevent xmodmap from wiping out our valid modmap, per daniels 2008-04-17 00:21:08 -07:00
Ben Byer
a494ff04b2 kludge: miEqEnqueue wants a device, even if we're passing custom messages,
so give it one
2008-04-17 00:21:07 -07:00
Jeremy Huddleston
6d3d344b5b XQuartz: Don't use composite. 2008-04-16 21:49:19 -07:00
Jeremy Huddleston
180ec128ad Xquartz: Don't need to link against rlAccel since we don't use it 2008-04-16 21:48:52 -07:00
Jeremy Huddleston
7b4b89c1da XQuartz: Don't enable rootless accelerated functionality... crashy...
(cherry picked from commit cdb4c291d8)
2008-04-16 19:36:13 -07:00
Jeremy Huddleston
6606b9d126 XQuartz: Removed a call to RootlessReorderWindow from the Carbon thread
(cherry picked from commit cb27d5ca82)
2008-04-15 12:01:57 -07:00
Jeremy Huddleston
55d9973b05 Xquartz: Added applicationShouldHandleReopen:hasVisibleWindows to handle dock icon clicking 2008-04-11 17:49:51 -07:00
Jeremy Huddleston
bc4883e00b Merge branch 'server-1.4-branch' into xorg-server-1.4-apple 2008-04-08 21:25:37 -07:00
Ben Byer
126e9bc8c4 add missing dix-config include 2008-04-08 20:41:44 -07:00
Jeremy Huddleston
df21312c8b XQuartz: Fix issue where clicking on an X11 window might send that event to an X11 window in another space.
(cherry picked from commit 2e78818232)
2008-04-08 16:59:56 -07:00
Jeremy C. Reed
76b950cd6e Add some more support for DragonFly. From Joerg Sonnenberger
and pkgsrc.
(cherry picked from commit 1d4bea6106)
2008-04-07 14:10:01 +03:00
Jeremy Huddleston
c95170f23c XQuartz: Change reporting of space change to debug log rather than stderr
(cherry picked from commit ed15556a9f)
2008-04-02 18:05:48 -07:00
Jeremy Huddleston
632d49fc37 XQuartz: Fixed missing close-paren in preference pane text.
(cherry picked from commit ea37e151dc)
2008-04-02 17:33:39 -07:00
Ben Byer
7e653f806f 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.
2008-04-01 00:40:46 -07:00
Ben Byer
eb083d3f68 formatting cleanup for X11Application.m (no code changes) 2008-03-31 23:31:25 -07:00
Ben Byer
bee2b377ef moved and renamed QuartzMessageServerThread to
DarwinSendDDXEvent to make more clear what it actually does.
2008-03-31 22:55:24 -07:00
Ben Byer
2143182ba4 shovelling code around ... 2008-03-31 21:34:17 -07:00
Ben Byer
6e833e41e2 fix compilation on systems that don't have
XP_EVENT_SPACE_CHANGED defined
2008-03-31 21:34:11 -07:00
Ben Byer
4aedba5aa7 just a bit of juggling headers around -- we're preparing
to call our Xquartz-specific event handlers directly
as mieqHandlers
2008-03-31 21:34:03 -07:00
Ben Byer
1e0ec02202 nuke DarwinEventQueue 2008-03-31 21:33:57 -07:00
Ben Byer
c34fce7051 continue with gutting darwinEvents.c 2008-03-31 21:33:50 -07:00
Ben Byer
bfec44d7b4 turns out we weren't actually using these files. oops 2008-03-31 21:33:45 -07:00
Ben Byer
a25704c423 remove vestigal DarwinEQPointerPost etc 2008-03-31 21:33:36 -07:00
Ben Byer
a9e081a60c gut darwinEQEnqueue, and make it just call mieqEnqueue (for the moment) 2008-03-31 21:33:29 -07:00
Ben Byer
9a03ae33c4 add prototype for DarwinEventHandler 2008-03-31 21:33:22 -07:00
Ben Byer
5848510cc5 add logging of current thread ID to DEBUG_LOG macro 2008-03-31 21:33:11 -07:00
Ben Byer
3f4447b95f Begin to move all of our Xquartz DDX-specific event handlers
to miEQ, in preparation to remove the DDX-specific code entirely.
2008-03-31 21:33:05 -07:00
Ben Byer
135eb27bce Add code to track 5 valuators for pointing device, in preparation
for supporting tablet input in Xquartz.
2008-03-31 21:32:35 -07:00
Ben Byer
a6c8fbc818 add debug statements so we can see if/when our Xinput stubs are getting called. 2008-03-31 21:32:19 -07:00
Ben Byer
8b5737b3cf Remove calls to InitValuatorAxisStruct -- these are now handled in dix by
InitValuatorDeviceClass.
Add InitProximityClassDeviceStruct call to prepare for tablet support.
2008-03-31 21:32:09 -07:00
Jeremy Huddleston
a28b8c23d9 XQuartz: Fixed names of enums to be more consistent 2008-03-31 21:31:54 -07:00
Jeremy Huddleston
cc17ce1b73 XQuartz: Another Exposé fix: F9 doesn't raise all windows
(cherry picked from commit b9cffa20de)
2008-03-31 21:31:48 -07:00
Jeremy Huddleston
f57a2f38ee 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-31 21:31:35 -07:00
Ben Byer
de722e2fea xquartz: copy in new stubs from Xi/stubs.c to replace our old
Xinput stubs.  Hey, it's a start.
2008-03-31 21:31:34 -07:00
Ben Byer
d34ff74c3c prevent "fake mouse clicks" from generating spurious extra events 2008-03-31 21:31:27 -07:00
Jeremy Huddleston
98b5f373e6 XQuartz: Disable 256 color option and fullscreen option
(cherry picked from commit 7c1964338a)
2008-03-21 19:35:02 -07:00
Jeremy Huddleston
f06a7ae344 Xquartz: Added separate preference tab for quartz-wm settings
Added FFM and "Focus on new window" options
(cherry picked from commit 6841d078b7)
2008-03-21 19:34:57 -07:00
Jeremy Huddleston
6fc293182f XQuartz: Initial framework for dealing with spaces on OS-X
(cherry picked from commit 9831324998)
2008-03-21 19:34:51 -07:00
Jeremy Huddleston
f03202ad15 Rootless: Removed safeAlphaXXXX() in favor of using fb/pixman 2008-03-17 23:57:41 -07:00
Jeremy Huddleston
509827a598 Merge branch 'server-1.4-branch' into xorg-server-1.4-apple 2008-03-01 17:10:42 -08:00
Jeremy Huddleston
f91c915903 XQuartz: Quit now properly warns the user
(cherry picked from commit ed3d7b3959)
2008-02-23 00:28:38 -08:00
Maarten Maathuis
dc30ade649 Fix rotation for multi-monitor situation.
- The (x,y)-coordinates of the crtc were not being passed as xFixed values, which made it an obscure bug to find.
- Fix bug #13787.
(cherry picked from commit a48cc88ea2)
2008-02-19 21:58:26 +02:00
Jeremy Huddleston
04a09e9271 XQuartz: unsetenv("DISPLAY") before startx if X11.app can't connect to it.
Also fix casting to silence warning.
(cherry picked from commit a5cbf78471)
2008-02-19 00:01:52 -08:00
Jeremy Huddleston
70f9495e0c Added Xquartz.plist to EXTRA_DIST 2008-02-16 01:33:13 -08:00
Jeremy Huddleston
c3e87251b8 Fixed unescaped newline in EXTRA_DIST
(cherry picked from commit 567c172c4d)
2008-02-16 01:00:35 -08:00
Jeremy Huddleston
e079e40319 XQuartz: Fixed EXTRA_DIST to include localization
(cherry picked from commit 1b338c2a93)
2008-02-15 23:18:22 -08:00
Jeremy Huddleston
b3eabf13af XQuartz: Fixed layout of Applications->Customize menu
Now resizing it won't produce weir overlaps of the widgets.  Thanks to
Pelle Johansson for his help showing me how to do this.
(cherry picked from commit ef3498e92d)
2008-02-11 12:10:55 -08:00
Jeremy Huddleston
407f7fec88 XQuartz: Added option for setting quartz-wm click-through preference
(cherry picked from commit bf54c267cb)
2008-02-10 18:30:34 -08:00
Jeremy Huddleston
fb52ef7c86 XQuartz: Converted interface to nib 3.x format
(cherry picked from commit 656aaab957)
2008-02-10 18:30:28 -08:00
Jeremy Huddleston
d6e234f96d Merge branch 'server-1.4-branch' into xorg-server-1.4-apple 2008-01-17 09:48:14 -08:00
Matthieu Herrb
59a3b83922 Fix for CVE-2007-5760 - XFree86 Misc extension out of bounds array index 2008-01-17 17:00:06 +01:00
Daniel Stone
636aa9e7be Xephyr: One-time keyboard leak fix
Don't leak the originally-allocated keysym map.
(cherry picked from commit e85130c85f)
2008-01-17 18:43:30 +11:00
Jeremy Huddleston
7429379eb1 XQuartz: Moved SetFrontProcess haco to set_front_process
So it is done by the other thread...
2008-01-13 14:00:25 -08:00
Jeremy Huddleston
a459dde0b4 XQuartz: Fixed copy-paste error with login_shell commit
(cherry picked from commit 6deec3acc6)
2008-01-12 21:34:13 -08:00
Jeremy Huddleston
7899c5bebf XQuartz: Corrected copyright X.org Project -> X.org Foundation
(cherry picked from commit f216314448)
2008-01-12 12:01:22 -08:00
Jeremy Huddleston
95a103bc60 XQuartz: added 'login_shell' option to defaults
so the user can choose something other than /bin/sh
(cherry picked from commit b549cf18ce)
2008-01-12 12:01:10 -08:00
Jeremy Huddleston
627ed60ce5 XQuartz: Fixed switching into XQuartz via expose. 2008-01-06 18:29:54 -08:00
Jeremy Huddleston
4c5c30a4be XQuartz: Cleanup for strict-prototyping
Also fixed DarwinEQEnqueue to match changes to the callback
And also use dpmsstubs.c rather than copying the code into darwin.c
2008-01-05 03:14:07 -08:00
Jeremy Huddleston
fab82c097c XQuartz: Fixed copyright in About box for 2008. Happy New Year! 2008-01-04 22:51:12 -08:00
Jeremy Huddleston
4790016cc2 XQuartz: Flush the debug log for easier debugging
Also cleaned up formatting in xpr's eventHandler
(cherry picked from commit 16861d6d42)
2008-01-04 21:27:31 -08:00
Jeremy Huddleston
c9dff90ce8 Merge branch 'server-1.4-branch' into xorg-server-1.4-apple 2008-01-03 13:26:22 -08:00
Jeremy Huddleston
8e4c28ec2a XQuartz: Cleaned up color map configuration.
8 bit color still doesn't work, but the -depth command line argument now works properly.
(cherry picked from commit 6765949c27)
2008-01-03 13:25:48 -08:00
Daniel Stone
a304fc1d4a KDrive: Xephyr: Don't leak screen damage structure
(cherry picked from commit 0b03d97a244540824c922c300adbc3d3ae4855d5)
2007-12-28 15:51:00 +02:00
Jeremy Huddleston
61cc57c510 XQuartz: *REALLY* use CFStringCreateWithCString
I need sleep!  Why am I making these stupid mistakes... sorry for pointless commit spam.  ugg.
(cherry picked from commit b16351fc64)
2007-12-21 02:09:43 -08:00
Jeremy Huddleston
6562b8d4f7 XQuartz: Use CFStringCreateWithCString
(cherry picked from commit 79782b0e14)
2007-12-21 02:07:03 -08:00
Jeremy Huddleston
628c9c708a XQuartz: Reduce code duplication in X11.app
(cherry picked from commit b81809cd91)
2007-12-21 01:57:59 -08:00
Jeremy Huddleston
b585e48cff XQuartz: Handle Pseudorami init in miinitext
(cherry picked from commit a585c94fed)
2007-12-21 01:24:31 -08:00
Jeremy Huddleston
60d28ff8df XQuartz: Added localization.
(cherry picked from commit 7a5cc7bfbb)
2007-12-20 19:38:42 -08:00
Jeremy Huddleston
9f5507a3c5 Merge branch 'server-1.4-branch' into xorg-server-1.4-apple 2007-12-20 19:04:33 -08:00
Jeremy Huddleston
82c97a5475 XQuartz: Cleaned up command line arguments.
(cherry picked from commit 603a8b73d4)
2007-12-20 18:30:09 -08:00
Jeremy Huddleston
2a3f6ce7e8 XQuartz: Kill off server-main.c and launcher-main.c
Now using xinit
(cherry picked from commit 5d6ae3d299)
2007-12-20 18:09:19 -08:00
Jeremy Huddleston
ea716249c3 XQuartz: Don't fork to exec app_to_run.
Plus other housecleaning...
(cherry picked from commit ae302db472)
2007-12-20 17:35:51 -08:00
Jeremy Huddleston
47a5869ba3 Xquartz: Use X11ControllerMain()
(cherry picked from commit a9ac932543)
2007-12-20 15:46:54 -08:00
Jeremy Huddleston
be027ea7ea Xquartz: General Cleanup
General code cleanup, whitespace, dead code removal, added missing prototypes.
Made Xquartz come to foreground later in startup, so it doesn't appear for Xquartz -version
(cherry picked from commit 36922e8ff4)
2007-12-20 13:17:56 -08:00
Ben Byer
88f289dd1c adding AM_OBJCFLAGS 2007-12-16 04:20:24 -08:00
Jeremy Huddleston
39b20011b7 Xquartz: Removed launchd plist and x11-exec. The relevant code is now in xinit.
(cherry picked from commit 767b4c9d9d)
2007-12-16 01:14:47 -08:00
Ben Byer
16c032a602 clarified debug message to indicate that we're sleeping
(in case we get reports about slow launch times, this will
help clarify what's happening)
(cherry picked from commit 2eea3483cf)
2007-12-14 15:22:26 -08:00
Ben Byer
4346e6b5dd we need to link against CoreServices, not ApplicationServices
(cherry picked from commit ba4d2096e7)
2007-12-14 15:22:21 -08:00
Ben Byer
077d54c689 fixed bug in x11-exec that prevent icon from showing up
(cherry picked from commit e1f4a0c20d)
2007-12-14 15:22:16 -08:00
Jeremy Huddleston
fcb97a55a0 Xquartz: Fixed cpprules include
(cherry picked from commit 95c02adea8)
2007-12-14 15:21:49 -08:00
Jeremy Huddleston
32e74d744c Xquartz: Don't hardcode libexec dir
(cherry picked from commit 67b479ef80)
2007-12-13 16:28:20 -08:00
Jeremy Huddleston
8eb15256ec Xquartz: Don't hardcode LaunchAgents dir
(cherry picked from commit 07a12d71fe)
2007-12-13 16:27:46 -08:00
Ben Byer
fa3ccf4c2a Modified X11 plist to use x11-exec
(cherry picked from commit 7d9a11329e)
2007-12-13 16:26:09 -08:00
Ben Byer
eb141e05f3 created x11-exec wrapper, which uses LaunchServices to find
(and then exec) X11.app
(cherry picked from commit fc04c9759b)
2007-12-13 16:26:04 -08:00
Arkadiusz Miskiewicz
d988da6eee Xprint: Clean up generated files
Remember to clean generated wrapper files.
(cherry picked from commit 977fcdea8198906936a64b8117e6a6d027c617e3)
2007-12-13 00:09:15 +02:00
Hong Liu
41f735fbe0 bgPixel (unsigned long) is 64-bit on x86_64, so -1 != 0xffffffff
This patch should fix bug 8080.
(cherry picked from commit 9adea80703)
2007-12-13 00:00:27 +02:00
Hong Liu
f4bcb53e86 Bug 13308: Verify and reject obviously broken modes.
(cherry picked from commit c6cfcd408d)
2007-12-12 23:59:54 +02:00
Jeremy Huddleston
ffa66f8e74 Xquartz: Pre-process Xquartz man page
(cherry picked from commit dec2633c41)
2007-12-10 21:02:44 -08:00
Jeremy Huddleston
ea713786b3 Xquartz: Make Alt work with Xmodmap again
(cherry picked from commit 0e017177dc)
2007-12-10 21:02:38 -08:00
Jeremy Huddleston
80089a20ed Xquartz: Removed Xplugin.h from EXTRA_DIST
(cherry picked from commit a746383eca)
2007-12-10 20:34:25 -08:00
Ben Byer
83c0f69aa1 remove Xplugin.h, because we should use the one in /usr/include
(cherry picked from commit 3e881032f3)
2007-12-09 12:03:35 -08:00
Jeremy Huddleston
14ec1cf1cb Xquartz: Added missing link to libconfig.a 2007-12-09 12:02:04 -08:00
Jeremy Huddleston
8a056b8e09 Xquartz Added quartzKeyboard.h to EXTRA_DIST
(cherry picked from commit 37c9781fdb)
2007-12-08 11:49:51 -08:00
Ben Byer
3ea32bac43 Added darwinEvents.h to EXTRA_DIST
(cherry picked from commit 45e5247564)
2007-12-08 11:33:50 -08:00
Jeremy Huddleston
b72e8fa499 Xquartz: Actually add quartzForeground.[hc]
Sorry for the commit spam... I'm tired and was overly quick to commit... forgot to include a neccessary file.
(cherry picked from commit e564b7aeaa)
2007-12-08 01:41:58 -08:00
Jeremy Huddleston
2c7c378619 Xquartz: Actually, it should be org.x.X11 for case-sensitive FS
(cherry picked from commit c5ccb98d5d)
2007-12-08 01:28:45 -08:00
Jeremy Huddleston
3357ef0f40 Xquartz: Use org.x.X11 instead of com.apple.X11 for preferences
Fixed inconsistency so preferences get read from the correct source.
(cherry picked from commit a74c38bd9f)
2007-12-08 01:25:10 -08:00
Jeremy Huddleston
743b266c17 XQuartz: Fixed "Multiple Dock Icons"
BAM!
(cherry picked from commit d0dca8a885)
(cherry picked from commit 0502955a2a)
2007-12-08 00:34:31 -08:00
Jeremy Huddleston
5676ba6fc0 XQuartz: Cleaned up configure, X11.app path in launchd script
Don't hardcode X11.app's path in the launchd plist.
Only install the launchd plist if we --enable-launchd.
(cherry picked from commit 6b74c535dc)
2007-12-08 00:32:13 -08:00
Jeremy Huddleston
aed01c4a8b Darwin: Use __APPLE__ instead of __DARWIN__
(cherry picked from commit 54654815fa)
2007-12-07 18:53:31 -08:00
Jeremy Huddleston
4ae5621664 Merge branch 'server-1.4-branch' into xorg-server-1.4-apple 2007-12-07 14:14:32 -08:00
Jeremy Huddleston
06c46ec050 Darwin: Dead coded removal
Kill off assert macro
(cherry picked from commit d6493abedb)
2007-12-07 14:08:09 -08:00
Jeremy Huddleston
898b03775e Darwin: Renamed DarwinModeBlah to QuartzBlah
(cherry picked from commit 08ebf86d37)
2007-12-05 21:25:51 -08:00
Jeremy Huddleston
15add97723 Darwin: Be more precise in version information shown. 2007-12-05 20:29:23 -08:00
Jeremy Huddleston
df5c9fef3c Darwin: Flattened quartz into darwin, renamed darwin xquartz
Leaving xpr unflattened since we want modularity to replace that with xpc (XPluginComposite) at some point
(cherry picked from commit 48e6a75fbd)
2007-12-05 20:26:16 -08:00
Jeremy Huddleston
2c68f4aa3a Darwin: Cleaned up keyboard interface headers
(cherry picked from commit 141f69dc3d)
2007-12-05 20:20:31 -08:00
Daniel Stone
9f4689173e KDrive: Xephyr: Fix non-GLX builds
Only set noGlxExtension if we're actually building GLX.
2007-12-06 00:46:32 +00:00
Daniel Stone
d37351308b XKB: Actions: Don't run certain actions on the core keyboard
Don't run VT switches, terminations, or anything, on the core keyboard: only
run actions which affect the keyboard state.  If we get an action such as VT
switch, just swallow the event.
(cherry picked from commit 320abd7d1d)
2007-12-06 00:30:02 +00:00
Jeremy Huddleston
3f60656eb3 Darwin: Rework build system to more accurately reveal code infrastructure and facilitate future modularity.
(cherry picked from commit e8399fd4d6)
2007-12-04 18:00:00 -08:00
Jeremy Huddleston
345e21a4b1 Darwin: RIP dumpkeymap, cr, and fullscreen
Taking out the trash.
We don't need dumpkeymap since we'll be getting keymaps straight from the OS. .Xmodmap should be sufficient for any user-needed changes.  If this is not
the case, please let us know, so we can address any problems you have.
fullscreen never worked AFAIK
cr isn't being used and xpr is much better.
(cherry picked from commit e41af2967e)
2007-12-04 16:41:50 -08:00
Jeremy Huddleston
e7026216cc Darwin: Combine launcher and server X11.app
This should hopefully eliminate confusion some people have over which X11.app is which.
Now BOTH are in /A/U/X11.app and we intelligently determine whether to execute our app_to_run
or launch the server.  If arguments are given, we launch the server.  Otherwise if we can
connect to an X DISPLAY, we execute app_to_run.  Otherwise, we launch the server.

(cherry picked from commit 0284b3631a)
(cherry picked from commit b0349d5b6c)
(cherry picked from commit c3c71a882f)
2007-12-03 20:20:05 -08:00
Ben Byer
39d3a87c6c added missing call to xcb_connect()
(cherry picked from commit dc2fb323ee)
2007-12-01 19:03:59 -08:00
Jeremy Huddleston
ed66724b3a Darwin: Alt is Mode_switch Switching to Mode_switch to maintain compatibility with Tiger X11.
(cherry picked from commit 8a76c99c0e)
2007-12-01 17:27:30 -08:00
Ben Byer
bf1f49c530 properly implemented xcb check for stale sockets
(cherry picked from commit f543cb8fbb)
2007-11-30 16:12:29 -08:00
Jeremy Huddleston
be05ef82d5 Darwin: Undo focus-hack which didn't work right.
(cherry picked from commit f54b28eeba)
2007-11-30 16:12:09 -08:00
Jeremy Huddleston
d2b768890f Darwin: #ifdefs around dix-config.h include and NDEBUG/assert.h workaround. 2007-11-29 02:19:22 -08:00
Jeremy Huddleston
3d153c8fa4 Darwin: Removed support for darwinSwapAltMeta 2007-11-28 23:07:41 -08:00
Jeremy Huddleston
aa1fedbd69 Darwin: Added missing function prototypes. 2007-11-26 14:54:51 -08:00
Jeremy Huddleston
b8ccca70ff Darwin: Workaround weird crash in keyboard events
Somehow including dix-config.h in darwin.h is crashing us... just defining
SHAPE as a workaround for now.
2007-11-26 14:29:07 -08:00
Jeremy Huddleston
e4933212e1 Darwin: Switched to expirimental darwinEvents.c from master 2007-11-26 13:05:48 -08:00
Jeremy Huddleston
9c6d8a035b Darwin,Rootless: Makefile cleanup 2007-11-26 13:04:57 -08:00
Jeremy Huddleston
78b053b859 Darwin: Formatting cleanup 2007-11-24 03:34:48 -08:00
Jeremy Huddleston
28ae09f355 Darwin: Sync-up to master and xorg-server-1.2-apple where appropriate 2007-11-23 14:18:04 -08:00
Jeremy Huddleston
738a229a71 Various cleanups to get Xquartz to compile. 2007-11-20 06:59:11 -08:00
Jeremy Huddleston
7f91d756ac Darwin: Formatting Cleanup
To better line up with xorg-server-1.2-apple branch
2007-11-20 04:49:34 -08:00
Jeremy Huddleston
8c533443f8 Darwin: Sync up darwinEvents.c to match what is in use in xorg-server-apple-1.2 2007-11-20 04:10:45 -08:00
Jeremy Huddleston
837fd3bb99 Darwin: Fixed make dist
Added/corrected missing EXTRA_DIST entries.
2007-11-20 04:07:44 -08:00
Jeremy Huddleston
0bd2b610c4 XDarwin dead code removal
Removed unused code from the tree
Moved some files to more appropriate locations
2007-11-20 04:07:42 -08:00
Ben Byer
260ea61540 Added some DEBUG_LOG sauce to the XP_EVENT handling code 2007-11-20 04:07:39 -08:00
Ben Byer
1ffd8ba7a2 Disabled ALT_IS_MODE_SWITCH
(just for joke, nothing more)
2007-11-20 04:07:37 -08:00
Jeremy Huddleston
db6404f9d0 Added --with-x11app-archs configure option
This configure option's value is passed to xcodebuild in ARCHS, so we can easily choose architecture targets for X11.app
2007-11-20 04:07:34 -08:00
Ben Byer
e220328bdf From Jeremy: In my previous patch, I "overfixed" hook.c. This patch
removes the changes I made to the searching for loop since those are
extraneous due to the remove function call in the delete for loop.
2007-11-20 04:07:32 -08:00
Ben Byer
c50a40263b More correctness fixes to fix compiler warnings. 2007-11-20 04:07:29 -08:00
Ben Byer
cee516e142 From Jeremy Huddleston:
1) Fixed a bug where XQUARTZ was #defined when auto but not when --enable-xquartz
2) Cleaned up missing #includes and function prototypes.
3) Fixed some invalid C syntax problems
4) Removed a bunch of dead code
5) Cleaned up code to prevent some warnings
6) Bugfix in xpr/x-hook.c - looks like someone just forgot to finish writing code for hook_remove()... I only noticed it because gcc -Wall complained about reaching the end of a non-void function... lucky for us gcc is smarter than we are.
2007-11-20 04:07:22 -08:00
Ben Byer
41eabe5d4c added a bunch of debugging code to help troubleshoot the stuck
modifier key issue; much of it may be taken out later.
Also, hopefully fixed a race condition that may have
prevented ReleaseModifiers from working in some cases.
2007-11-20 04:05:37 -08:00
Ben Byer
6577916c44 a first stab at DEBUG_LOG 2007-11-20 04:04:53 -08:00
Ben Byer
7696bcddd0 Added a lightweight debugging facility to support troubleshooting
(for example) the stuck modifier key issue
2007-11-20 04:02:28 -08:00
Ben Byer
cad8133cce More XDarwin cleanup / dead code removal from Jeremy 2007-11-20 04:02:15 -08:00
Ben Byer
da6cfcb89b Build system patches to remove XDarwin from the build (since it doesn't
work anyway), courtesy of Jeremy Huddleston
2007-11-20 04:00:00 -08:00
Ben Byer
96416bd595 fix missing -DXFree86Server; this needs to be defined when building
fb/fbcmap.c or else you get the "sunglasses effect"
2007-11-20 03:58:59 -08:00