Ben Byer
077d54c689
fixed bug in x11-exec that prevent icon from showing up
...
(cherry picked from commit e1f4a0c20d
)
2007-12-14 15:22:16 -08:00
Jeremy Huddleston
fcb97a55a0
Xquartz: Fixed cpprules include
...
(cherry picked from commit 95c02adea8
)
2007-12-14 15:21:49 -08:00
Jeremy Huddleston
32e74d744c
Xquartz: Don't hardcode libexec dir
...
(cherry picked from commit 67b479ef80
)
2007-12-13 16:28:20 -08:00
Jeremy Huddleston
8eb15256ec
Xquartz: Don't hardcode LaunchAgents dir
...
(cherry picked from commit 07a12d71fe
)
2007-12-13 16:27:46 -08:00
Ben Byer
fa3ccf4c2a
Modified X11 plist to use x11-exec
...
(cherry picked from commit 7d9a11329e
)
2007-12-13 16:26:09 -08:00
Ben Byer
eb141e05f3
created x11-exec wrapper, which uses LaunchServices to find
...
(and then exec) X11.app
(cherry picked from commit fc04c9759b
)
2007-12-13 16:26:04 -08:00
Jeremy Huddleston
ffa66f8e74
Xquartz: Pre-process Xquartz man page
...
(cherry picked from commit dec2633c41
)
2007-12-10 21:02:44 -08:00
Jeremy Huddleston
ea713786b3
Xquartz: Make Alt work with Xmodmap again
...
(cherry picked from commit 0e017177dc
)
2007-12-10 21:02:38 -08:00
Jeremy Huddleston
80089a20ed
Xquartz: Removed Xplugin.h from EXTRA_DIST
...
(cherry picked from commit a746383eca
)
2007-12-10 20:34:25 -08:00
Ben Byer
247f7dcb87
Fixed bad calculation of dstEnd, which caused truncation of some bitblts
...
(cherry picked from commit 8a057bc9e2
)
2007-12-09 12:04:20 -08:00
Ben Byer
83c0f69aa1
remove Xplugin.h, because we should use the one in /usr/include
...
(cherry picked from commit 3e881032f3
)
2007-12-09 12:03:35 -08:00
Jeremy Huddleston
14ec1cf1cb
Xquartz: Added missing link to libconfig.a
2007-12-09 12:02:04 -08:00
Jeremy Huddleston
3d9e4ebfe3
.gitignore: added hw/xquartz/bundle/org.x.X11.plist
...
(cherry picked from commit cd13c4ba5b
)
2007-12-08 13:18:32 -08:00
Jeremy Huddleston
8a056b8e09
Xquartz Added quartzKeyboard.h to EXTRA_DIST
...
(cherry picked from commit 37c9781fdb
)
2007-12-08 11:49:51 -08:00
Ben Byer
3ea32bac43
Added darwinEvents.h to EXTRA_DIST
...
(cherry picked from commit 45e5247564
)
2007-12-08 11:33:50 -08:00
Jeremy Huddleston
b72e8fa499
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:41:58 -08:00
Jeremy Huddleston
2c7c378619
Xquartz: Actually, it should be org.x.X11 for case-sensitive FS
...
(cherry picked from commit c5ccb98d5d
)
2007-12-08 01:28:45 -08:00
Jeremy Huddleston
3357ef0f40
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:10 -08:00
Jeremy Huddleston
743b266c17
XQuartz: Fixed "Multiple Dock Icons"
...
BAM!
(cherry picked from commit d0dca8a885
)
(cherry picked from commit 0502955a2a
)
2007-12-08 00:34:31 -08:00
Jeremy Huddleston
5676ba6fc0
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-08 00:32:13 -08:00
Jeremy Huddleston
f5e857e35b
FB: Formatting cleanup that got missed in the last commit...
2007-12-07 22:48:34 -08:00
Ben Byer
1e1073334a
Added code to check for null pointers on fb* invocations
...
(cherry picked from commit 6f441d79c7
)
2007-12-07 22:47:37 -08:00
Ben Byer
24c54f53ff
Added checks to avoid writing past the end of the buffer in fbBltOne
...
(cherry picked from commit e5f54f122b
)
2007-12-07 22:47:28 -08:00
Ben Byer
c8161d482a
Just a couple of small uninitialized pointer fixes
...
(cherry picked from commit d12b650362
)
2007-12-07 22:39:55 -08:00
Jeremy Huddleston
aed01c4a8b
Darwin: Use __APPLE__ instead of __DARWIN__
...
(cherry picked from commit 54654815fa
)
2007-12-07 18:53:31 -08:00
Jeremy Huddleston
4ae5621664
Merge branch 'server-1.4-branch' into xorg-server-1.4-apple
2007-12-07 14:14:32 -08:00
Ben Byer
be59012921
fixed pathname in GL/apple/Makefile.am
...
(cherry picked from commit b6357cec6d
)
2007-12-07 14:08:20 -08:00
Ben Byer
dc56305e16
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:15 -08:00
Jeremy Huddleston
06c46ec050
Darwin: Dead coded removal
...
Kill off assert macro
(cherry picked from commit d6493abedb
)
2007-12-07 14:08:09 -08:00
Jeremy Huddleston
898b03775e
Darwin: Renamed DarwinModeBlah to QuartzBlah
...
(cherry picked from commit 08ebf86d37
)
2007-12-05 21:25:51 -08:00
Jeremy Huddleston
ab8d35d257
.gitignore: synced from master
2007-12-05 20:55:48 -08:00
Jeremy Huddleston
15add97723
Darwin: Be more precise in version information shown.
2007-12-05 20:29:23 -08:00
Jeremy Huddleston
df5c9fef3c
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:26:16 -08:00
Jeremy Huddleston
2c68f4aa3a
Darwin: Cleaned up keyboard interface headers
...
(cherry picked from commit 141f69dc3d
)
2007-12-05 20:20:31 -08:00
Daniel Stone
9f4689173e
KDrive: Xephyr: Fix non-GLX builds
...
Only set noGlxExtension if we're actually building GLX.
2007-12-06 00:46:32 +00:00
Daniel Stone
d37351308b
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.
(cherry picked from commit 320abd7d1d
)
2007-12-06 00:30:02 +00:00
Daniel Stone
27da1367c9
WaitForSomething: Ignore EAGAIN
...
If select ever returns EAGAIN, don't bother complaining.
(cherry picked from commit 85dd8efac1
)
2007-12-06 00:30:01 +00:00
Rich Coe
259f86b13b
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.
(cherry picked from commit b7f3618f39
)
2007-12-06 00:30:01 +00:00
Rich Coe
90649e6a39
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.
(cherry picked from commit d8b2cad377
)
2007-12-06 00:30:01 +00:00
Jeremy Huddleston
3f60656eb3
Darwin: Rework build system to more accurately reveal code infrastructure and facilitate future modularity.
...
(cherry picked from commit e8399fd4d6
)
2007-12-04 18:00:00 -08:00
Jeremy Huddleston
345e21a4b1
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:50 -08:00
Jeremy Huddleston
e7026216cc
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 0284b3631a
)
(cherry picked from commit b0349d5b6c
)
(cherry picked from commit c3c71a882f
)
2007-12-03 20:20:05 -08:00
Kanru Chen
25d26b55e7
Config: HAL: Fix XKB option parsing
...
Actually combine the XKB options into a string, rather than just repeatedly
writing a comma.
(cherry picked from commit da893908feb2dcf7c22420b3426ab3ac65c7ca99)
2007-12-03 12:46:50 +00:00
Jeremy Huddleston
b0069b04dd
Darwin: Added {/,/System/}Library/Fonts to DEFAULT_FONT_PATH
2007-12-02 18:21:40 -08:00
Ben Byer
39d3a87c6c
added missing call to xcb_connect()
...
(cherry picked from commit dc2fb323ee
)
2007-12-01 19:03:59 -08:00
Jeremy Huddleston
ed66724b3a
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:30 -08:00
Ben Byer
bf1f49c530
properly implemented xcb check for stale sockets
...
(cherry picked from commit f543cb8fbb
)
2007-11-30 16:12:29 -08:00
Jeremy Huddleston
be05ef82d5
Darwin: Undo focus-hack which didn't work right.
...
(cherry picked from commit f54b28eeba
)
2007-11-30 16:12:09 -08:00
Peter Harris
b037e4a5ab
Add missing swaps in panoramiXSwap.c
...
(cherry picked from commit cb67a10b7f6f564e0345de19316934361ea28720)
2007-11-30 20:42:28 +02:00
Daniel Stone
3e0993fcf3
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.
(cherry picked from commit 7ff002fe3e229330216d7f2ff16cdabe63014bcd)
2007-11-30 20:35:40 +02:00