Commit Graph

3850 Commits

Author SHA1 Message Date
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
Jeremy Huddleston
d2b768890f Darwin: #ifdefs around dix-config.h include and NDEBUG/assert.h workaround. 2007-11-29 02:19:22 -08:00
Jeremy Huddleston
3d153c8fa4 Darwin: Removed support for darwinSwapAltMeta 2007-11-28 23:07:41 -08:00
Jeremy Huddleston
aa1fedbd69 Darwin: Added missing function prototypes. 2007-11-26 14:54:51 -08:00
Jeremy Huddleston
b8ccca70ff Darwin: Workaround weird crash in keyboard events
Somehow including dix-config.h in darwin.h is crashing us... just defining
SHAPE as a workaround for now.
2007-11-26 14:29:07 -08:00
Jeremy Huddleston
e4933212e1 Darwin: Switched to expirimental darwinEvents.c from master 2007-11-26 13:05:48 -08:00
Jeremy Huddleston
9c6d8a035b Darwin,Rootless: Makefile cleanup 2007-11-26 13:04:57 -08:00
Jeremy Huddleston
78b053b859 Darwin: Formatting cleanup 2007-11-24 03:34:48 -08:00
Jeremy Huddleston
28ae09f355 Darwin: Sync-up to master and xorg-server-1.2-apple where appropriate 2007-11-23 14:18:04 -08:00
Jeremy Huddleston
fa5f25482c Rootless: Imported changes made in xorg-server-1.2-apple branch
(cherry picked from commit a751bc12be)
2007-11-23 13:46:46 -08:00
Jeremy Huddleston
d045981457 Rootless: Added missing includes.
(cherry picked from commit f6a4c10636)
2007-11-23 13:45:53 -08:00
Jeremy Huddleston
b436b1cfbb Rootless: Pulled in changes from fb{Blt,Fill} into rl{Blt,Fill}
(cherry picked from commit 4e18c62635)
2007-11-23 13:42:05 -08:00
Jeremy Huddleston
e261f829e4 DIX: Remove remaining alloca calls 2007-11-20 16:15:59 -08:00
Jeremy Huddleston
1b048cc5d1 Dix: Re-ebable ErrorF reporting of incorrect refcount in FreeFontPath 2007-11-20 16:05:19 -08:00
Jeremy Huddleston
738a229a71 Various cleanups to get Xquartz to compile. 2007-11-20 06:59:11 -08:00
Jeremy Huddleston
89c4aa9d4a Force --disable-Xorg when on darwin 2007-11-20 05:57:15 -08:00
Jeremy Huddleston
7f91d756ac Darwin: Formatting Cleanup
To better line up with xorg-server-1.2-apple branch
2007-11-20 04:49:34 -08:00
Jeremy Huddleston
8c533443f8 Darwin: Sync up darwinEvents.c to match what is in use in xorg-server-apple-1.2 2007-11-20 04:10:45 -08:00
Jeremy Huddleston
837fd3bb99 Darwin: Fixed make dist
Added/corrected missing EXTRA_DIST entries.
2007-11-20 04:07:44 -08:00
Jeremy Huddleston
0bd2b610c4 XDarwin dead code removal
Removed unused code from the tree
Moved some files to more appropriate locations
2007-11-20 04:07:42 -08:00
Ben Byer
260ea61540 Added some DEBUG_LOG sauce to the XP_EVENT handling code 2007-11-20 04:07:39 -08:00
Ben Byer
1ffd8ba7a2 Disabled ALT_IS_MODE_SWITCH
(just for joke, nothing more)
2007-11-20 04:07:37 -08:00
Jeremy Huddleston
db6404f9d0 Added --with-x11app-archs configure option
This configure option's value is passed to xcodebuild in ARCHS, so we can easily choose architecture targets for X11.app
2007-11-20 04:07:34 -08:00
Ben Byer
e220328bdf From Jeremy: In my previous patch, I "overfixed" hook.c. This patch
removes the changes I made to the searching for loop since those are
extraneous due to the remove function call in the delete for loop.
2007-11-20 04:07:32 -08:00
Ben Byer
c50a40263b More correctness fixes to fix compiler warnings. 2007-11-20 04:07:29 -08:00
Ben Byer
cee516e142 From Jeremy Huddleston:
1) Fixed a bug where XQUARTZ was #defined when auto but not when --enable-xquartz
2) Cleaned up missing #includes and function prototypes.
3) Fixed some invalid C syntax problems
4) Removed a bunch of dead code
5) Cleaned up code to prevent some warnings
6) Bugfix in xpr/x-hook.c - looks like someone just forgot to finish writing code for hook_remove()... I only noticed it because gcc -Wall complained about reaching the end of a non-void function... lucky for us gcc is smarter than we are.
2007-11-20 04:07:22 -08:00
Ben Byer
41eabe5d4c added a bunch of debugging code to help troubleshoot the stuck
modifier key issue; much of it may be taken out later.
Also, hopefully fixed a race condition that may have
prevented ReleaseModifiers from working in some cases.
2007-11-20 04:05:37 -08:00
Ben Byer
6577916c44 a first stab at DEBUG_LOG 2007-11-20 04:04:53 -08:00
Ben Byer
7696bcddd0 Added a lightweight debugging facility to support troubleshooting
(for example) the stuck modifier key issue
2007-11-20 04:02:28 -08:00
Ben Byer
cad8133cce More XDarwin cleanup / dead code removal from Jeremy 2007-11-20 04:02:15 -08:00
Ben Byer
5320f4fab0 Patch to avert (some) damage / rootless crashes, courtesy of Ken Thomases 2007-11-20 04:00:03 -08:00