summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2007-12-14Merge branch 'master' into XACE-SELINUXEamon Walsh10-139/+157
Conflicts: configure.ac This is the last pull before merging to master.
2007-12-13devPrivates rework: more cleanup from previous merge operation.Eamon Walsh4-51/+26
2007-12-13Xquartz: Don't hardcode libexec dirJeremy Huddleston4-7/+15
(cherry picked from commit 67b479ef80cb740a24981335eb8d596744168a62)
2007-12-13Xquartz: Don't hardcode LaunchAgents dirJeremy Huddleston2-69/+13
(cherry picked from commit 07a12d71fefd78c380078efa835700f2868ab204)
2007-12-13Modified X11 plist to use x11-execBen Byer2-2/+1
(cherry picked from commit 7d9a11329e476f45e4d9f9aebcb43469321347c7)
2007-12-13created x11-exec wrapper, which uses LaunchServices to findBen Byer2-0/+78
(and then exec) X11.app (cherry picked from commit fc04c9759b30d062111d4a7f3f411ed0f18cbde4)
2007-12-13Merge branch 'master' into XACE-SELINUXEamon Walsh278-23054/+2532
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-13Correct the documentation comments in xf86Modes.cAdam Jackson1-18/+6
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-13Add infrastructure for validating modes by memory bandwidth.Adam Jackson4-0/+45
2007-12-13Explain a confusing #ifdef.Adam Jackson1-4/+6
2007-12-13Clean up some #if 0.Adam Jackson1-46/+0
2007-12-12xselinux: Add new protocol for setting device create context.Eamon Walsh2-8/+42
2007-12-12Fix dist by including modeline2c.awk.Aaron Plattner1-0/+1
This was broken by commit cb44b6121c4b7b9dd7ff4ff52aaab914c82ff013, which removed modeline2c.pl from EXTRA_DIST without adding modeline2c.awk.
2007-12-12Get rid of xf86DefModes.c.Aaron Plattner3-157/+1
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-10Xquartz: Pre-process Xquartz man pageJeremy Huddleston2-18/+26
(cherry picked from commit dec2633c41dd0adf73264afdf251a6522d6ae76a)
2007-12-10Xquartz: Make Alt work with Xmodmap againJeremy Huddleston4-18/+16
(cherry picked from commit 0e017177dcca7185716ca760dcce9ddedc7bfef9)
2007-12-10Xquartz: Removed Xplugin.h from EXTRA_DISTJeremy Huddleston4-3/+30
(cherry picked from commit a746383eca77c9b9ea2cba0cf1c8fc39c0f7d536)
2007-12-09remove Xplugin.h, because we should use the one in /usr/includeBen Byer1-589/+0
(cherry picked from commit 3e881032f35f774ff9638678d7e3f77c81f62976)
2007-12-09Xquartz: Added missing link to libconfig.aJeremy Huddleston1-0/+1
(cherry picked from commit 14ec1cf1cb7ebc183c05e13f9c2b4b4eed679ff3)
2007-12-08.gitignore: added hw/xquartz/bundle/org.x.X11.plistJeremy Huddleston1-0/+1
2007-12-08Xquartz Added quartzKeyboard.h to EXTRA_DISTJeremy Huddleston1-1/+2
(cherry picked from commit 37c9781fdb672229ceab101b080762e15512943f)
2007-12-08Added darwinEvents.h to EXTRA_DISTBen Byer1-0/+1
(cherry picked from commit 45e5247564c423a2bf02cfec1993155858c91a14)
2007-12-08Xquartz: Actually add quartzForeground.[hc]Jeremy Huddleston2-0/+82
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-08Xquartz: Actually, it should be org.x.X11 for case-sensitive FSJeremy Huddleston1-1/+1
(cherry picked from commit c5ccb98d5d461c8a22fc0f3942a607ac90e1e37e)
2007-12-08Xquartz: Use org.x.X11 instead of com.apple.X11 for preferencesJeremy Huddleston1-2/+1
Fixed inconsistency so preferences get read from the correct source. (cherry picked from commit a74c38bd9f28735acd602d359d7ca6357aed1e93)
2007-12-08XQuartz: Fixed "Multiple Dock Icons"Jeremy Huddleston5-37/+41
BAM! (cherry picked from commit d0dca8a88506f50b51f41f99a2f1feb6954c8a31) (cherry picked from commit 0502955a2af487b51bf22916ac02e497c2d96aba)
2007-12-07XQuartz: Cleaned up configure, X11.app path in launchd scriptJeremy Huddleston4-67/+65
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-07Just a couple of small uninitialized pointer fixesBen Byer1-0/+2
(cherry picked from commit d12b650362da100ceaecb7e859cd4ef1908d4407)
2007-12-07Darwin: Use __APPLE__ instead of __DARWIN__Jeremy Huddleston12-15/+15
(cherry picked from commit 54654815fa5e59b25cfd1fa72610120b72c10175)
2007-12-08Add a missing linebreak after LoadModule: "foo"Brice Goglin1-1/+1
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=454742
2007-12-07Check for <sys/sdt.h> as well when determining to enable dtrace probesAlan Coopersmith1-0/+7
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-07fixed pathname in GL/apple/Makefile.amBen Byer1-2/+7
(cherry picked from commit b6357cec6d837226009c0d2b69026027da36656e)
2007-12-07ALLOCATE_LOCAL is dangerous on Darwin due to memory layout differencesBen Byer1-1/+1
from Linux, so let's define NO_ALLOCA. (cherry picked from commit 7caf51d1a5a86ae884e0087795636222c082962c)
2007-12-07Darwin: Dead coded removalJeremy Huddleston1-6/+0
Kill off assert macro (cherry picked from commit d6493abedb2caf03b2bc3a6440b637df67eff081)
2007-12-05Darwin: Renamed DarwinModeBlah to QuartzBlahJeremy Huddleston11-51/+83
(cherry picked from commit 08ebf86d379b1ddfb08df65d29aea5df66de4327)
2007-12-05.gitignore: Added Xcode user filesJeremy Huddleston1-0/+2
2007-12-05Darwin: Flattened quartz into darwin, renamed darwin xquartzJeremy Huddleston67-51/+36
Leaving xpr unflattened since we want modularity to replace that with xpc (XPluginComposite) at some point (cherry picked from commit 48e6a75fbdd0fee86e364f02ace83f20b312a2b2)
2007-12-05Darwin: Cleaned up keyboard interface headersJeremy Huddleston5-101/+101
(cherry picked from commit 141f69dc3d8d6e7d8ff65607f43700ac11243041)
2007-12-05Fix commit aa0dfb3f42f19bb351ca7f1a9507ff5ec4590e96Andrew Oakley1-1/+0
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-05XKB: Actions: Don't run certain actions on the core keyboardDaniel Stone3-4/+23
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-05WaitForSomething: Ignore EAGAINDaniel Stone1-1/+1
If select ever returns EAGAIN, don't bother complaining.
2007-12-05OS: Connection: Keep trying select while it gets interrupted (bug #9240)Rich Coe1-4/+9
If we got interrupted (EINTR or EAGAIN) during select, just try again, rather than shutting clients down on either of these errors.
2007-12-05OS: Connection: Don't shut down disappeared clients (bug #7876)Rich Coe1-1/+2
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-05Config: HAL: Fix XKB option parsingKanru Chen1-2/+3
Actually combine the XKB options into a string, rather than just repeatedly writing a comma.
2007-12-05Add missing swaps in panoramiXSwap.cPeter Harris1-0/+4
2007-12-05ProcessOtherEvent: Don't do double translation of button eventsDaniel Stone1-2/+2
We already deal with the button mapping in GetPointerEvents, so don't do the remapping again in ProcessOtherEvent.
2007-12-05Bug 13308: Verify and reject obviously broken modes.Hong Liu1-0/+6
2007-12-04Darwin: Rework build system to more accurately reveal code infrastructure ↵Jeremy Huddleston19-66/+64
and facilitate future modularity. (cherry picked from commit e8399fd4d66a2b77b770c277e2fa424229a721b2)
2007-12-04Darwin: RIP dumpkeymap, cr, and fullscreenJeremy Huddleston14-5001/+2
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 e41af2967e885466c4d194fa4c3b358e6be37c30)
2007-12-04Restore xf86getsecs() as not having an ANSI equivalent.Adam Jackson2-0/+15