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
Ben Byer
1157cfcc5a
Just a couple of small uninitialized pointer fixes
...
(cherry picked from commit d12b650362
)
2007-12-07 22:40:00 -08:00
Jeremy Huddleston
0ad1c359c5
Darwin: Use __APPLE__ instead of __DARWIN__
...
(cherry picked from commit 54654815fa
)
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 b6357cec6d
)
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 7caf51d1a5
)
2007-12-07 14:08:36 -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
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 48e6a75fbd
)
2007-12-05 20:32:40 -08:00
Jeremy Huddleston
e00f7061b2
Darwin: Cleaned up keyboard interface headers
...
(cherry picked from commit 141f69dc3d
)
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
Hong Liu
c6cfcd408d
Bug 13308: Verify and reject obviously broken modes.
2007-12-05 17:48:28 +01:00
Jeremy Huddleston
8d0efe4c2a
Darwin: Rework build system to more accurately reveal code infrastructure and facilitate future modularity.
...
(cherry picked from commit e8399fd4d6
)
2007-12-04 18:00:28 -08:00
Jeremy Huddleston
cc98a8e241
Darwin: RIP dumpkeymap, cr, and fullscreen
...
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 e41af2967e
)
2007-12-04 16:41:57 -08:00
Adam Jackson
13af2d1efc
Restore xf86getsecs() as not having an ANSI equivalent.
2007-12-04 17:36:21 -05:00
Jeremy Huddleston
f8d7729df3
Darwin: Combine launcher and server X11.app
...
This should hopefully eliminate confusion some people have over which X11.app is which.
Now BOTH are in /A/U/X11.app and we intelligently determine whether to execute our app_to_run
or launch the server. If arguments are given, we launch the server. Otherwise if we can
connect to an X DISPLAY, we execute app_to_run. Otherwise, we launch the server.
(cherry picked from commit e7026216cc
)
2007-12-03 20:22:01 -08:00
Dave Airlie
678f786715
xf86crtc: oh mon could be NULL, so check before quirks
2007-12-04 12:24:47 +11:00
Dave Airlie
a9df4bb555
xf86Crtc: pass correct parameter.
...
quite how this has worked I've no idea.
2007-12-04 12:17:29 +11:00
Adam Jackson
fe25f897c6
xf86getpagesize -> getpagesize elsewhere in os-support/
2007-12-03 18:34:40 -05:00
Alan Coopersmith
b84f2833a6
xf86getpagesize() -> getpagesize() in os-support/solaris/sun_bios.c
2007-12-03 14:52:46 -08:00
James Cloos
aa0dfb3f42
Remove Perl dependency from the build
...
From bugzilla bug 13467ยน:
The modeline2c script is the only part of the Xorg server that requires Perl.
[This] is a simpler replacement that works with any normal AWK.
1] http://bugs.freedesktop.org/show_bug.cgi?id=13467
Bug was posted by Joerg Sonnenberger <joerg@NetBSD.org>.
2007-12-03 16:57:58 -05:00
Alan Coopersmith
60086d9016
Use pkg-config to get -I, -L & -R flags needed for OpenSSL
...
Still just uses -lcrypto instead of the full library list from --libs
2007-12-03 11:31:21 -08:00
Alan Coopersmith
b77ca7cc9c
Use _X_EXPORT instead of __attribute__((visibility("default")))
2007-12-03 11:31:21 -08:00
Adam Jackson
1faba797cb
Death to libcwrapper.
...
This has been deprecated since 1.1. Since we're breaking ABI again anyway,
remove it entirely.
2007-12-03 14:12:58 -05:00
Jeremy Huddleston
f4dc521b38
Darwin: Added {/,/System/}Library/Fonts to DEFAULT_FONT_PATH
...
(cherry picked from commit b0069b04dd
)
2007-12-02 18:22:06 -08:00
Adam Jackson
0fff01f566
Fix swapped Xv dispatch under Xinerama.
...
Same-endian dispatch was properly calling through the Xinerama wrapping,
but other-endian dispatch wasn't.
2007-12-02 14:15:36 -05:00
Adam Jackson
fa47910045
Clean up many #if 0.
2007-12-02 12:40:25 -05:00
Ben Byer
83ba1e167c
added missing call to xcb_connect()
...
(cherry picked from commit dc2fb323ee
)
2007-12-01 19:04:06 -08:00
Jeremy Huddleston
9ad4560b3c
Darwin: Alt is Mode_switch Switching to Mode_switch to maintain compatibility with Tiger X11.
...
(cherry picked from commit 8a76c99c0e
)
2007-12-01 17:27:36 -08:00
Jeremy Huddleston
f83d758dcc
Darwin: properly implemented xcb check for stale sockets
...
(cherry picked from commit f543cb8fbb
)
2007-11-30 16:11:15 -08:00
Jeremy Huddleston
f54b28eeba
Darwin: Undo focus-hack which didn't work right.
2007-11-30 16:09:23 -08:00
Dave Airlie
f30abe30c5
edid quirk for MAX 0x77e monitor
...
From RH bugzilla 306441
2007-11-30 13:53:21 +10:00
Jeremy Huddleston
8a079be0dd
Darwin: #ifdefs around dix-config.h include and NDEBUG/assert.h workaround.
...
(cherry picked from commit d2b768890f
)
2007-11-29 02:21:16 -08:00
Jeremy Huddleston
3839756061
Darwin: Removed support for darwinSwapAltMeta
...
(cherry picked from commit 3d153c8fa4
)
2007-11-29 02:21:16 -08:00
Dave Airlie
89c3dfe41e
modes: use xf86RandR12Index to stop illegal access
...
xf86RandR12Index set to -1, and if initialised it gets 0 or higher.
This allows the server to start with xinerama turned on with only one head
2007-11-29 19:57:24 +11:00
Dave Airlie
725710fd0b
randr: make randr code not segfault when xinerama set
2007-11-29 19:40:53 +11:00
Adam Jackson
23b8ca8a37
RANDR 1.2: Only enable unknown outputs if there are no connected outputs.
...
Otherwise you end up with a confusing initial geometry, and xscreensaver
and friends get very angry.
2007-11-27 13:20:40 -05:00
Peter Hutterer
edebe76cfd
Xi: set DeviceXXXState's length fields to the correct size of the struct.
...
Setting it to the size of a pointer is an interesting but equally wrong
approach. Luckily Xlib never used this field anyway so nobody got hurt so far.
Spotted by Simon Thum.
(cherry picked from commit 0f2398d06c
)
2007-11-27 13:15:28 +10:30
Jeremy Huddleston
601307615e
Darwin,Rootless: Makefile cleanup
...
(cherry picked from commit 9c6d8a035b
)
2007-11-26 14:49:32 -08:00