Commit Graph

195 Commits

Author SHA1 Message Date
Jeremy Huddleston 180a5aba4d XQuartz: Fixed copy-paste error with login_shell commit
(cherry picked from commit 6deec3acc6f8010b5b53a1e55a0a2c4080ba69d2)
2008-01-12 21:34:09 -08:00
Jeremy Huddleston 6fd4a5e2e4 XQuartz: Corrected copyright X.org Project -> X.org Foundation
(cherry picked from commit f21631444816fc12b8a534c2cf79e6ac6c2af7c9)
2008-01-12 12:02:01 -08:00
Jeremy Huddleston f72255639c XQuartz: added 'login_shell' option to defaults
so the user can choose something other than /bin/sh
(cherry picked from commit b549cf18cebd3435d70f62855239484974c455a1)
2008-01-12 12:01:57 -08:00
Jeremy Huddleston ec24a6b5aa XQuartz: Fixed switching into XQuartz via expose.
(cherry picked from commit 627ed60ce5d7499761028edf379ebd95250d3e04)
2008-01-12 12:01:52 -08:00
Jeremy Huddleston 7d226d6a25 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
(cherry picked from commit 4c5c30a4beb7a427b00b18097f548876ad3c11d7)
2008-01-05 03:17:27 -08:00
Jeremy Huddleston 11967dce11 XQuartz: Fixed copyright in About box for 2008. Happy New Year! 2008-01-04 23:10:10 -08:00
Jeremy Huddleston aca75f389e XQuartz: Flush the debug log for easier debugging
Also cleaned up formatting in xpr's eventHandler
(cherry picked from commit 16861d6d4239c7f3918332ef07752f1e211afb23)
2008-01-04 23:10:10 -08:00
Jeremy Huddleston e46d559739 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 6765949c27c053d22882f54337cfd09203aa5383)
2008-01-03 13:25:56 -08:00
Jeremy Huddleston beb29c605b XQuartz: *REALLY* use CFStringCreateWithCString
I need sleep!  Why am I making these stupid mistakes... sorry for pointless commit spam.  ugg.
(cherry picked from commit b16351fc6457aabead328472d16dc25789032940)
2007-12-21 02:09:15 -08:00
Jeremy Huddleston 5dd895efa3 XQuartz: Use CFStringCreateWithCString
(cherry picked from commit 79782b0e14761dcf5d6635b8eec161b74f06763a)
2007-12-21 02:07:07 -08:00
Jeremy Huddleston 2c24231fc2 XQuartz: Reduce code duplication in X11.app
(cherry picked from commit b81809cd91a9f90b7f2de77b1dcf514cee87c32d)
2007-12-21 01:58:03 -08:00
Jeremy Huddleston f3042a63be XQuartz: Handle Pseudorami init in miinitext
(cherry picked from commit a585c94fedd4ecbc87524703c01bb128fc2aa951)
2007-12-21 01:24:43 -08:00
Jeremy Huddleston fa9680a730 XQuartz: Added localization.
(cherry picked from commit 7a5cc7bfbb296a2c41a580b063324c448f7131db)
2007-12-20 19:38:49 -08:00
Jeremy Huddleston 603a8b73d4 XQuartz: Cleaned up command line arguments. 2007-12-20 18:29:57 -08:00
Jeremy Huddleston 4cf3002b60 XQuartz: Kill off server-main.c and launcher-main.c
Now using xinit
(cherry picked from commit 5d6ae3d299f72df714117948b3d31dcbddf6c0bc)
2007-12-20 18:09:24 -08:00
Jeremy Huddleston 1f74bef1ad XQuartz: Don't fork to exec app_to_run.
Plus other housecleaning...
(cherry picked from commit ae302db472f127be082d05b418ede332fae8ccc5)
2007-12-20 17:38:39 -08:00
Jeremy Huddleston 2d15d439f8 Xquartz: Use X11ControllerMain()
(cherry picked from commit a9ac932543374aa2540f5a12cc85ef82c85b0e0c)
2007-12-20 17:38:39 -08:00
Jeremy Huddleston 42802a8e6b 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 36922e8ff4316c93843aa3fe959cf8df3c7d5892)
2007-12-20 13:18:17 -08:00
Jeremy Huddleston bf20c4374a Xquartz: Removed launchd plist and x11-exec. The relevant code is now in xinit.
(cherry picked from commit 767b4c9d9daa5d0ea59ac1f0d70146798da631cb)
2007-12-16 01:14:55 -08:00
Ben Byer a3f7f7b60e 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 2eea3483cf893f8f81bacd434b31408dfb38cb06)
2007-12-14 15:22:57 -08:00
Ben Byer e0e59b3bbc we need to link against CoreServices, not ApplicationServices
(cherry picked from commit ba4d2096e7953ef5b971682f0e28535da968acb1)
2007-12-14 15:22:49 -08:00
Ben Byer 062d9234e2 fixed bug in x11-exec that prevent icon from showing up
(cherry picked from commit e1f4a0c20d3a52d98954c4b28d0ec4d44564bc32)
2007-12-14 15:22:44 -08:00
Jeremy Huddleston 95c02adea8 Xquartz: Fixed cpprules include 2007-12-14 15:21:40 -08:00
Eamon Walsh 86b2e59bfb Merge branch 'master' into XACE-SELINUX
Conflicts:

	configure.ac

This is the last pull before merging to master.
2007-12-14 00:32:24 -05:00
Eamon Walsh 1c1a4bc970 devPrivates rework: more cleanup from previous merge operation. 2007-12-13 19:51:40 -05:00
Jeremy Huddleston cb0d7e2c26 Xquartz: Don't hardcode libexec dir
(cherry picked from commit 67b479ef80cb740a24981335eb8d596744168a62)
2007-12-13 16:29:40 -08:00
Jeremy Huddleston c39212fd73 Xquartz: Don't hardcode LaunchAgents dir
(cherry picked from commit 07a12d71fefd78c380078efa835700f2868ab204)
2007-12-13 16:29:09 -08:00
Ben Byer 82e1aff9fb Modified X11 plist to use x11-exec
(cherry picked from commit 7d9a11329e476f45e4d9f9aebcb43469321347c7)
2007-12-13 16:28:35 -08:00
Ben Byer 1a5910588a created x11-exec wrapper, which uses LaunchServices to find
(and then exec) X11.app
(cherry picked from commit fc04c9759b30d062111d4a7f3f411ed0f18cbde4)
2007-12-13 16:28:30 -08:00
Eamon Walsh c8feb73f58 Merge branch 'master' into XACE-SELINUX
Conflicts:

	Xext/EVI.c
	Xext/bigreq.c
	Xext/cup.c
	Xext/dpms.c
	Xext/fontcache.c
	Xext/mitmisc.c
	Xext/xcmisc.c
	Xext/xf86bigfont.c
	Xext/xtest.c
	configure.ac
	dbe/dbe.c
	hw/darwin/darwin.h
	hw/darwin/darwinEvents.c
	hw/darwin/iokit/xfIOKit.h
	hw/darwin/iokit/xfIOKitCursor.c
	hw/darwin/quartz/fullscreen/fullscreen.c
	hw/darwin/quartz/fullscreen/quartzCursor.c
	hw/darwin/quartz/quartz.c
	hw/darwin/quartz/quartzCommon.h
	hw/darwin/quartz/quartzCursor.c
	hw/darwin/quartz/xpr/dri.c
	hw/darwin/quartz/xpr/dristruct.h
	hw/darwin/quartz/xpr/xprCursor.c
	hw/darwin/quartz/xpr/xprFrame.c
	hw/xfree86/modes/xf86RandR12.c
	include/cursor.h
	miext/rootless/rootlessCommon.h
	miext/rootless/rootlessScreen.c
	miext/rootless/rootlessWindow.c
	render/picturestr.h

Trying to pick up the pieces from the darwin churn here...
2007-12-13 18:38:25 -05:00
Jeremy Huddleston eab0c4e490 Xquartz: Pre-process Xquartz man page
(cherry picked from commit dec2633c41dd0adf73264afdf251a6522d6ae76a)
2007-12-10 21:03:37 -08:00
Jeremy Huddleston 1ff945a8e4 Xquartz: Make Alt work with Xmodmap again
(cherry picked from commit 0e017177dcca7185716ca760dcce9ddedc7bfef9)
2007-12-10 21:03:30 -08:00
Jeremy Huddleston 7d61893b49 Xquartz: Removed Xplugin.h from EXTRA_DIST
(cherry picked from commit a746383eca77c9b9ea2cba0cf1c8fc39c0f7d536)
2007-12-10 20:34:40 -08:00
Ben Byer 8f2eff643b remove Xplugin.h, because we should use the one in /usr/include
(cherry picked from commit 3e881032f35f774ff9638678d7e3f77c81f62976)
2007-12-09 12:03:22 -08:00
Jeremy Huddleston 7b573ed436 Xquartz: Added missing link to libconfig.a
(cherry picked from commit 14ec1cf1cb7ebc183c05e13f9c2b4b4eed679ff3)
2007-12-09 12:02:15 -08:00
Jeremy Huddleston 020b0e92b0 Xquartz Added quartzKeyboard.h to EXTRA_DIST
(cherry picked from commit 37c9781fdb672229ceab101b080762e15512943f)
2007-12-08 11:49:55 -08:00
Ben Byer 5e016fa9b2 Added darwinEvents.h to EXTRA_DIST
(cherry picked from commit 45e5247564c423a2bf02cfec1993155858c91a14)
2007-12-08 11:33:54 -08:00
Jeremy Huddleston 6bb5dacc17 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 e564b7aeaab63e4c943445275af680b3b5898a94)
2007-12-08 01:42:03 -08:00
Jeremy Huddleston 02df036670 Xquartz: Actually, it should be org.x.X11 for case-sensitive FS
(cherry picked from commit c5ccb98d5d461c8a22fc0f3942a607ac90e1e37e)
2007-12-08 01:28:49 -08:00
Jeremy Huddleston 740cc54f08 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 a74c38bd9f28735acd602d359d7ca6357aed1e93)
2007-12-08 01:25:13 -08:00
Jeremy Huddleston 41a0aeaae9 XQuartz: Fixed "Multiple Dock Icons"
BAM!
(cherry picked from commit d0dca8a88506f50b51f41f99a2f1feb6954c8a31)
(cherry picked from commit 0502955a2af487b51bf22916ac02e497c2d96aba)
2007-12-08 00:35:14 -08:00
Jeremy Huddleston a1b0346853 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 6b74c535dc331d1d621b2541492a3336f69d70a2)
2007-12-07 23:26:11 -08:00
Jeremy Huddleston c238ef06a2 Darwin: Dead coded removal
Kill off assert macro
(cherry picked from commit d6493abedb2caf03b2bc3a6440b637df67eff081)
2007-12-07 14:08:31 -08:00
Jeremy Huddleston 8a8239f2e2 Darwin: Renamed DarwinModeBlah to QuartzBlah
(cherry picked from commit 08ebf86d379b1ddfb08df65d29aea5df66de4327)
2007-12-05 21:26:16 -08:00
Jeremy Huddleston bc65a24393 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 48e6a75fbdd0fee86e364f02ace83f20b312a2b2)
2007-12-05 20:32:40 -08:00