frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,084 Commits 293 Branches 13 Tags 61 MiB
Commit Graph

5084 Commits

Author SHA1 Message Date
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
Adam Jackson efcdc0d701 Correct the documentation comments in xf86Modes.c 
Most of those functions do not, in fact, work with circular mode lists,
and by this point the API isn't really "proposed" anymore.
 2007-12-13 15:38:41 -05:00
Adam Jackson 1768af38c7 Add infrastructure for validating modes by memory bandwidth. 2007-12-13 15:06:18 -05:00
Adam Jackson 4359193aaa Explain a confusing #ifdef. 2007-12-13 10:59:48 -05:00
Adam Jackson 8cedbb0a53 Clean up some #if 0. 2007-12-13 10:57:35 -05:00
Eamon Walsh 9a7ce57363 xselinux: Add new protocol for setting device create context. 2007-12-12 20:44:59 -05:00
Aaron Plattner a125ce4a84 Fix dist by including modeline2c.awk. 
This was broken by commit cb44b6121c, which
removed modeline2c.pl from EXTRA_DIST without adding modeline2c.awk.
 2007-12-12 12:24:29 -08:00
Aaron Plattner 6715923437 Get rid of xf86DefModes.c. 
It's out of date and not included in the build.  Instead, xf86DefModeSet.c is
built from vesamodes and extramodes using modeline2c.awk and *that's* what gets
built.
 2007-12-12 10:59:15 -08:00
Peter Hutterer d86e7f2ecc dix: when getting a bogus event, at least print out the type. 2007-12-11 17:49:16 +10:30
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 cd13c4ba5b .gitignore: added hw/xquartz/bundle/org.x.X11.plist 2007-12-08 13:18:17 -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
Ben Byer 1157cfcc5a Just a couple of small uninitialized pointer fixes 
(cherry picked from commit d12b650362da100ceaecb7e859cd4ef1908d4407)
 2007-12-07 22:40:00 -08:00
Jeremy Huddleston 0ad1c359c5 Darwin: Use __APPLE__ instead of __DARWIN__ 
(cherry picked from commit 54654815fa5e59b25cfd1fa72610120b72c10175)
 2007-12-07 18:54:58 -08:00
Brice Goglin 85ed0bb440 Add a missing linebreak after LoadModule: "foo" 
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=454742
 2007-12-08 02:53:51 +01:00
Alan Coopersmith 4fc288a13f Check for <sys/sdt.h> as well when determining to enable dtrace probes 
Avoids auto-detecting dtrace is present on systems with the ISDN trace tool
named dtrace installed, but not the dynamic tracing facility named dtrace
 2007-12-07 17:28:37 -08:00
Ben Byer 67907904f0 fixed pathname in GL/apple/Makefile.am 
(cherry picked from commit b6357cec6d837226009c0d2b69026027da36656e)
 2007-12-07 14:10:15 -08:00
Ben Byer 56f5066d47 ALLOCATE_LOCAL is dangerous on Darwin due to memory layout differences 
from Linux, so let's define NO_ALLOCA.
(cherry picked from commit 7caf51d1a5a86ae884e0087795636222c082962c)
 2007-12-07 14:08:36 -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
Peter Hutterer 3a058456e0 mi: unify ErrorFs, prepend [mi] 2007-12-07 20:23:36 +10:30
Peter Hutterer c5acf401da mi: unify last two ErrorF's in mieq.c 2007-12-07 20:19:43 +10:30
Peter Hutterer 117458d2db mi: change infamous "Tossed event ..." error for something more explanatory. 
Few whitespace errors fixed.
Two ErrorF's prefixed with [mi].
 2007-12-07 20:18:49 +10:30
Jeremy Huddleston 8a8239f2e2 Darwin: Renamed DarwinModeBlah to QuartzBlah 
(cherry picked from commit 08ebf86d379b1ddfb08df65d29aea5df66de4327)
 2007-12-05 21:26:16 -08:00
Jeremy Huddleston 540439a966 .gitignore: Added Xcode user files 2007-12-05 20:55:06 -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
Jeremy Huddleston e00f7061b2 Darwin: Cleaned up keyboard interface headers 
(cherry picked from commit 141f69dc3d8d6e7d8ff65607f43700ac11243041)
 2007-12-05 20:31:36 -08:00
Andrew Oakley cb44b6121c Fix commit aa0dfb3f42 
From bugzilla bug 13467¹:

Currently the xserver fails to build without this (now deleted) file, as the
Makefile tries to distribute it.  The patch simply removes the reference to
modeline2c.pl.

1] http://bugs.freedesktop.org/show_bug.cgi?id=13467

Signed-off-by: James Cloos <cloos@jhcloos.com>
 2007-12-05 20:23:05 -05:00
Daniel Stone 320abd7d1d 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.
 2007-12-05 19:37:48 +00:00
Daniel Stone 85dd8efac1 WaitForSomething: Ignore EAGAIN 
If select ever returns EAGAIN, don't bother complaining.
 2007-12-05 19:36:59 +00:00
Rich Coe b7f3618f39 OS: Connection: Keep trying select while it gets interrupted (bug #9240) 
If we got interrupted (EINTR or EAGAIN) during select, just try again, rather
than shutting clients down on either of these errors.
 2007-12-05 19:36:37 +00:00
Rich Coe d8b2cad377 OS: Connection: Don't shut down disappeared clients (bug #7876) 
If a client disappears in the middle of CheckConnections (presumably
because its appgroup leader disappears), then don't attempt to shut it down
a second time, when it's already vanished.
 2007-12-05 19:31:07 +00:00
Kanru Chen a8e27a108a Config: HAL: Fix XKB option parsing 
Actually combine the XKB options into a string, rather than just repeatedly
writing a comma.
 2007-12-05 18:29:54 +00:00
Peter Harris 2d723bbd0d Add missing swaps in panoramiXSwap.c 2007-12-05 18:29:54 +00:00
Daniel Stone 0fccb24aa9 ProcessOtherEvent: Don't do double translation of button events 
We already deal with the button mapping in GetPointerEvents, so don't
do the remapping again in ProcessOtherEvent.
 2007-12-05 18:29:54 +00:00