Jeremy Huddleston
6b74c535dc
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.
2007-12-07 23:21:08 -08:00
Jeremy Huddleston
54654815fa
Darwin: Use __APPLE__ instead of __DARWIN__
2007-12-07 18:53:08 -08:00
Jeremy Huddleston
d6493abedb
Darwin: Dead coded removal
...
Kill off assert macro
2007-12-05 21:36:34 -08:00
Jeremy Huddleston
08ebf86d37
Darwin: Renamed DarwinModeBlah to QuartzBlah
2007-12-05 21:23:36 -08:00
Jeremy Huddleston
9e0032c0b8
Marved version 1.3.0-apple3
2007-12-05 20:17:47 -08:00
Jeremy Huddleston
48e6a75fbd
Darwin: Flattened quartz into darwin, renamed darwin xquartz
...
Leaving xpr unflattened since we want modularity to replace that with xpc (XPluginComposite) at some point
2007-12-05 19:43:49 -08:00
Jeremy Huddleston
141f69dc3d
Darwin: Cleaned up keyboard interface headers
2007-12-04 23:18:37 -08:00
Jeremy Huddleston
e8399fd4d6
Darwin: Rework build system to more accurately reveal code infrastructure and facilitate future modularity.
2007-12-04 17:59:13 -08:00
Jeremy Huddleston
b823224a49
Revert "build system cleanup: move all files from quartz/xpr/ to quartz/"
...
This reverts commit 73c6f7983d
2007-12-04 17:34:42 -08:00
Jeremy Huddleston
9ddf361171
Revert "oops, missed a spot"
...
This reverts commit 03e0788cce
2007-12-04 17:34:33 -08:00
Jeremy Huddleston
30e4f7489e
Revert "more xpr cleanup"
...
This reverts commit 17a41dcf77
2007-12-04 17:34:03 -08:00
Ben Byer
17a41dcf77
more xpr cleanup
2007-12-04 16:40:54 -08:00
Ben Byer
03e0788cce
oops, missed a spot
2007-12-04 16:00:12 -08:00
Ben Byer
73c6f7983d
build system cleanup: move all files from quartz/xpr/ to quartz/
2007-12-04 15:48:22 -08:00
Ben Byer
4dcd9106a8
added debug hook to disable fb code; create a file
...
called /tmp/disable_fb.txt to try it
2007-12-04 15:25:40 -08:00
Jeremy Huddleston
e41af2967e
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.
2007-12-03 23:59:19 -08:00
Jeremy Huddleston
c3c71a882f
Darwin: Always set DISPLAY
...
We weren't setting $DISPLAY when we should be...
2007-12-03 19:28:32 -08:00
Jeremy Huddleston
b0349d5b6c
Darwin: Use launcher if only command line argument to X11.app is psn.
2007-12-03 18:19:33 -08:00
Jeremy Huddleston
0284b3631a
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.
2007-12-03 15:44:38 -08:00
Ben Byer
dc2fb323ee
added missing call to xcb_connect()
2007-12-01 18:28:19 -08:00
Jeremy Huddleston
b6a98afe61
Darwin: Marked 1.3.0-apple2 and X11.app as 2.1.0
2007-12-01 16:23:52 -08:00
Jeremy Huddleston
8a76c99c0e
Darwin: Alt is Mode_switch Switching to Mode_switch to maintain compatibility with Tiger X11.
2007-12-01 16:23:23 -08:00
Ben Byer
d1a9f616f2
Removed redundant scroll wheel event code, and added
...
support for buttons 6 and 7 (horizontal scrolling)
2007-11-30 19:22:26 -08:00
Ben Byer
7e8515715f
Merge branch 'xorg-server-1.2-apple' of ssh://git.freedesktop.org/git/xorg/xserver into xorg-server-1.2-apple
2007-11-30 11:20:47 -08:00
Ben Byer
f543cb8fbb
properly implemented xcb check for stale sockets
2007-11-30 11:18:46 -08:00
Jeremy Huddleston
7fc12de692
Darwin: Use dix-config.h instead of xorg-config.h
2007-11-29 02:12:26 -08:00
Jeremy Huddleston
f5e5b255d1
Darwin: Undefine NDEBUG for assert.h
...
For some reason, having NDEBUG defined when #including assert.h causes assert() to hang us. This should just
cause assert() to nop (it is #defined to be (void)0 in that case).
2007-11-29 01:42:10 -08:00
Jeremy Huddleston
a8e35ebf93
Darwin: Cleaned up includes
...
I cleaned up the #includes a bit to make sure all the source files properly included xorg-config.h
Only quartzStartup.c and darwinKeyboard.c do not include it. I ran into some weird crashes when they did which I'm looking into...
2007-11-29 00:41:57 -08:00
Jeremy Huddleston
1b35aa5c00
Darwin: Removed the NSDefaults keymapping
...
most users are able to use .Xmodmap for their issues... we should probably eventually do something like this to support MM and non-apple keyboards...
2007-11-28 23:00:59 -08:00
Jeremy Huddleston
2b2df4f517
Darwin,Rootless: Makefile cleanup
...
(cherry picked from commit 9c6d8a035b
2007-11-26 14:11:01 -08:00
Jeremy Huddleston
f3e6d12966
Darwin: Formatting cleanup
2007-11-24 03:31:54 -08:00
Jeremy Huddleston
9079e43f9e
Darwin: Cleaned up debug logging.
2007-11-24 03:02:42 -08:00
Jeremy Huddleston
61b6dad5ef
Darwin: Initial support for keyboard modifier remapping.
2007-11-24 02:46:22 -08:00
Jeremy Huddleston
165ab0af3a
Darwin: Further cleanup to line up to master
2007-11-22 02:16:16 -08:00
Jeremy Huddleston
52e84a353f
Darwin: Misc cleanups to line up with master
2007-11-22 00:35:36 -08:00
Jeremy Huddleston
cef853a568
Darwin: dumpkeymap: Use system's event_status_driver.h
2007-11-21 23:38:23 -08:00
Jeremy Huddleston
1786f9464a
Use UTF8String since lossyCString is deprecated
2007-11-21 16:53:10 -08:00
Jeremy Huddleston
86fc74a86b
Darwin: Makefile Style Fixes
...
* Fixed Makefile style to be consistent with self and downsteam
* Readded solaris to DIST_SUBDIRS in hw/xfree86/os-support/Makefile.am
2007-11-21 16:52:47 -08:00
Jeremy Huddleston
84490775b9
Darwin: Formatting Cleanup
...
To better line up with xorg-server-1.4-apple branch
2007-11-20 04:51:18 -08:00
Jeremy Huddleston
a649bbe974
1.3a1
2007-11-19 21:04:42 -08:00
Jeremy Huddleston
3b0201f893
Merge branch 'server-1.3-branch' into xorg-server-1.2-apple
...
Conflicts:
configure.ac
2007-11-19 20:27:52 -08:00
Jeremy Huddleston
3a843e26a6
Darwin: Fixed make dist
...
Added/corrected missing EXTRA_DIST entries.
2007-11-19 19:16:19 -08:00
Jeremy Huddleston
9304a3f984
XDarwin dead code removal
...
Removed unused code from the tree
Moved some files to more appropriate locations
2007-11-19 02:38:24 -08:00
Ben Byer
ec84a4cef6
Added some DEBUG_LOG sauce to the XP_EVENT handling code
2007-11-19 02:38:24 -08:00
Ben Byer
fd181254f8
Disabled ALT_IS_MODE_SWITCH
...
(just for joke, nothing more)
2007-11-19 02:38:24 -08:00
Jeremy Huddleston
6ec763f52c
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-19 02:38:24 -08:00
Ben Byer
2ab1dd5e74
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-19 02:38:24 -08:00
Ben Byer
604e6afc8e
1.2a11
2007-11-19 02:38:24 -08:00
Ben Byer
dc48ad4a45
More correctness fixes to fix compiler warnings.
2007-11-19 02:38:24 -08:00
Ben Byer
213b51710c
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-19 02:38:24 -08:00
