andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
10,135 Commits 86 Branches 473 Tags 48 MiB
cb61cf5c99
Commit Graph

674 Commits

Author SHA1 Message Date
Ben Byer
062d9234e2 fixed bug in x11-exec that prevent icon from showing up 
(cherry picked from commit e1f4a0c20d)
 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 67b479ef80)
 2007-12-13 16:29:40 -08:00
Jeremy Huddleston
c39212fd73 Xquartz: Don't hardcode LaunchAgents dir 
(cherry picked from commit 07a12d71fe)
 2007-12-13 16:29:09 -08:00
Ben Byer
82e1aff9fb Modified X11 plist to use x11-exec 
(cherry picked from commit 7d9a11329e)
 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 fc04c9759b)
 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 dec2633c41)
 2007-12-10 21:03:37 -08:00
Jeremy Huddleston
1ff945a8e4 Xquartz: Make Alt work with Xmodmap again 
(cherry picked from commit 0e017177dc)
 2007-12-10 21:03:30 -08:00
Jeremy Huddleston
7d61893b49 Xquartz: Removed Xplugin.h from EXTRA_DIST 
(cherry picked from commit a746383eca)
 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 3e881032f3)
 2007-12-09 12:03:22 -08:00
Jeremy Huddleston
7b573ed436 Xquartz: Added missing link to libconfig.a 
(cherry picked from commit 14ec1cf1cb)
 2007-12-09 12:02:15 -08:00
Jeremy Huddleston
020b0e92b0 Xquartz Added quartzKeyboard.h to EXTRA_DIST 
(cherry picked from commit 37c9781fdb)
 2007-12-08 11:49:55 -08:00
Ben Byer
5e016fa9b2 Added darwinEvents.h to EXTRA_DIST 
(cherry picked from commit 45e5247564)
 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 e564b7aeaa)
 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 c5ccb98d5d)
 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 a74c38bd9f)
 2007-12-08 01:25:13 -08:00
Jeremy Huddleston
41a0aeaae9 XQuartz: Fixed "Multiple Dock Icons" 
BAM!
(cherry picked from commit d0dca8a885)
(cherry picked from commit 0502955a2a)
 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 6b74c535dc)
 2007-12-07 23:26:11 -08:00
Jeremy Huddleston
c238ef06a2 Darwin: Dead coded removal 
Kill off assert macro
(cherry picked from commit d6493abedb)
 2007-12-07 14:08:31 -08:00
Jeremy Huddleston
8a8239f2e2 Darwin: Renamed DarwinModeBlah to QuartzBlah 
(cherry picked from commit 08ebf86d37)
 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 48e6a75fbd)
 2007-12-05 20:32:40 -08:00