Age | Commit message (Collapse) | Author | Files | Lines |
|
Conflicts:
configure.ac
This is the last pull before merging to master.
|
|
|
|
(cherry picked from commit 67b479ef80cb740a24981335eb8d596744168a62)
|
|
(cherry picked from commit 07a12d71fefd78c380078efa835700f2868ab204)
|
|
(cherry picked from commit 7d9a11329e476f45e4d9f9aebcb43469321347c7)
|
|
(and then exec) X11.app
(cherry picked from commit fc04c9759b30d062111d4a7f3f411ed0f18cbde4)
|
|
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...
|
|
Most of those functions do not, in fact, work with circular mode lists,
and by this point the API isn't really "proposed" anymore.
|
|
|
|
|
|
|
|
|
|
This was broken by commit cb44b6121c4b7b9dd7ff4ff52aaab914c82ff013, which
removed modeline2c.pl from EXTRA_DIST without adding modeline2c.awk.
|
|
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.
|
|
(cherry picked from commit dec2633c41dd0adf73264afdf251a6522d6ae76a)
|
|
(cherry picked from commit 0e017177dcca7185716ca760dcce9ddedc7bfef9)
|
|
(cherry picked from commit a746383eca77c9b9ea2cba0cf1c8fc39c0f7d536)
|
|
(cherry picked from commit 3e881032f35f774ff9638678d7e3f77c81f62976)
|
|
(cherry picked from commit 14ec1cf1cb7ebc183c05e13f9c2b4b4eed679ff3)
|
|
|
|
(cherry picked from commit 37c9781fdb672229ceab101b080762e15512943f)
|
|
(cherry picked from commit 45e5247564c423a2bf02cfec1993155858c91a14)
|
|
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)
|
|
(cherry picked from commit c5ccb98d5d461c8a22fc0f3942a607ac90e1e37e)
|
|
Fixed inconsistency so preferences get read from the correct source.
(cherry picked from commit a74c38bd9f28735acd602d359d7ca6357aed1e93)
|
|
BAM!
(cherry picked from commit d0dca8a88506f50b51f41f99a2f1feb6954c8a31)
(cherry picked from commit 0502955a2af487b51bf22916ac02e497c2d96aba)
|
|
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)
|
|
(cherry picked from commit d12b650362da100ceaecb7e859cd4ef1908d4407)
|
|
(cherry picked from commit 54654815fa5e59b25cfd1fa72610120b72c10175)
|
|
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=454742
|
|
Avoids auto-detecting dtrace is present on systems with the ISDN trace tool
named dtrace installed, but not the dynamic tracing facility named dtrace
|
|
(cherry picked from commit b6357cec6d837226009c0d2b69026027da36656e)
|
|
from Linux, so let's define NO_ALLOCA.
(cherry picked from commit 7caf51d1a5a86ae884e0087795636222c082962c)
|
|
Kill off assert macro
(cherry picked from commit d6493abedb2caf03b2bc3a6440b637df67eff081)
|
|
(cherry picked from commit 08ebf86d379b1ddfb08df65d29aea5df66de4327)
|
|
|
|
Leaving xpr unflattened since we want modularity to replace that with xpc (XPluginComposite) at some point
(cherry picked from commit 48e6a75fbdd0fee86e364f02ace83f20b312a2b2)
|
|
(cherry picked from commit 141f69dc3d8d6e7d8ff65607f43700ac11243041)
|
|
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>
|
|
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.
|
|
If select ever returns EAGAIN, don't bother complaining.
|
|
If we got interrupted (EINTR or EAGAIN) during select, just try again, rather
than shutting clients down on either of these errors.
|
|
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.
|
|
Actually combine the XKB options into a string, rather than just repeatedly
writing a comma.
|
|
|
|
We already deal with the button mapping in GetPointerEvents, so don't
do the remapping again in ProcessOtherEvent.
|
|
|
|
and facilitate future modularity.
(cherry picked from commit e8399fd4d66a2b77b770c277e2fa424229a721b2)
|
|
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)
|
|
|