Commit Graph

2414 Commits

Author SHA1 Message Date
Jeremy Huddleston
c8244177b0 XQuartz: Always use TIS for the keyboard layout seed since KB* aren't thread safe. 2008-08-26 23:09:20 -07:00
Jeremy Huddleston
01b3a99dff XQuartz: Fixed needed xplugin version. >< 2008-08-26 21:11:35 -07:00
Jeremy Huddleston
e7658e745f XQuartz: Use new Xplugin API to determine if a keypress event corresponds to an OS-X hotkey that we should dispatch to Appkit. 2008-08-26 19:13:56 -07:00
Jeremy Huddleston
54a882dcbd XQuartz: Made a note to come back to the xinitrc race condition in the 1.5 branch when we move up to it. 2008-08-25 22:10:46 -07:00
Jeremy Huddleston
f0351c2b80 XQuartz: Fixed bogus args to debug ErrorF 2008-08-22 01:12:37 -07:00
Jeremy Huddleston
c286f2a718 XQuartz: Cleaned up mouse event translation a bit more. 2008-08-22 01:11:33 -07:00
Jeremy Huddleston
07548f1394 Xquartz: Added missing ev_type for NSTabletPoint event. 2008-08-22 00:45:12 -07:00
Jeremy Huddleston
3520386261 XQuartz: Made X11Application.m a little more tidy. 2008-08-20 10:37:17 -07:00
Jeremy Huddleston
fcdc9f8b5a XQuartz: Added more explanation to debug keylayout spew to cut down on report-spam. 2008-08-20 10:21:23 -07:00
Jeremy Huddleston
81187364e5 XQuartz: Support windowItemModMask=0 or -1 to disable window shortcuts. 2008-08-20 09:50:54 -07:00
Jeremy Huddleston
e4110861d3 XQuartz: Added window_item_modifiers defaults item (and option to localization) to change the modifier keys used for the windows menu. 2008-08-20 09:21:44 -07:00
Jeremy Huddleston
745bc8ab38 XQuartz: Just cleaned up formatting of event processing code... no "meat" changed... 2008-08-19 02:18:16 -07:00
Jeremy Huddleston
02af74d7a5 XQuartz: Added appkit_modifiers defaults option which users can set to 'rcommand' to get access to the input menu with right command 2008-08-19 02:02:11 -07:00
Jeremy Huddleston
8fb6a1cf44 XQuartz: More input fixes
stuck-modifier fixes (capslock)
3button-emulation now doesn't send the modifier key with the click
Added other options to fake_button2 and fake_button3 defaults options:
	({l,r}{control,alt,command,shift})
2008-08-15 13:28:58 -07:00
Jeremy Huddleston
eedecba0b8 XQuartz: Updated bundle version to 2.3.1 2008-08-14 09:34:12 -07:00
Jeremy Huddleston
eeb6e5a9e9 XQuartz: Fixed a stuck modifier key bug. 2008-08-14 09:08:14 -07:00
Jeremy Huddleston
d207b037d2 XQuartz: Made 3-button mouse simulation a little more consistent. 2008-08-14 07:32:37 -07:00
Jeremy Huddleston
b287c481e1 XQuartz: Reverted "Control" text to be accurately "Command" in the input prefs. 2008-08-13 19:09:05 -07:00
Jeremy Huddleston
f3d478148c 1.4.2-apple7 2008-08-13 10:12:15 -07:00
Jeremy Huddleston
5854e712e9 XQuartz: Re-added deprecated code fallback failsafe for keyboard layout on Leopard with some debugging spew. 2008-08-08 00:19:41 -07:00
Jeremy Huddleston
672682ebf9 XQuartz: Now properly disable xauth checking on launchd socket and mostly fix the xinitrc / launchd race condition 2008-08-05 18:38:30 -07:00
Jeremy Huddleston
a8f0d32216 XQuartz: Added code and made comments more helpful for debugging first-client-auth bug. 2008-08-05 15:14:08 -07:00
Jeremy Huddleston
e1e0c398bb XQuartz: Fixed some errors / typos in the preferences pane. 2008-08-05 14:33:03 -07:00
Jeremy Huddleston
d3157ca45c XQUartz: UI Cleanup. Removed done/cancel buttons from Applications->Customize 2008-08-05 14:24:25 -07:00
Jeremy Huddleston
c51545729f Merge commit 'origin/server-1.4-branch' into xorg-server-1.4-apple 2008-08-05 12:44:56 -07:00
Jeremy Huddleston
ca0babafa4 XQuartz: Fixed proper processing of tablet button presses 2008-08-04 20:11:45 -07:00
Alex Deucher
ff49f5944d Fix potential crasher in xf86CrtcRotate()
xf86CrtcRotate() is called by randr 1.2 drivers via xf86CrtcSetMode() or xf86SetDesiredModes()
during ScreenInit() at which point pScrn->pScreen is not set. If a user specifies a rotation
in their config file pScrn->pScreen is dereferenced and boom.
2008-07-29 18:40:44 -07:00
Peter Hutterer
969f1db96b Revert "kdrive: don't post motion event if there was no motion. #16179"
This reverts commit 5903b4c749.

And this one wasn't supposed to be pushed too.
2008-07-29 13:17:27 +09:30
Peter Hutterer
b50932d998 Revert "xfree86: AllowEmptyInput is now enabled by default if hotplugging is enabled."
This reverts commit 153c6d48c6.

How did this one end up on the branch? Sure as hell wasn't supposed to be
pushed.
2008-07-29 13:14:49 +09:30
Jeremy Huddleston
4991f54a8d XQuartz: Nuke Sparkle. 2008-07-15 17:48:29 -07:00
Jeremy Huddleston
08f3fe153e XQuartz: Fixed first-client-can't-connect bug
Readded the old exec() server startup path for regression testing.
Don't use the dynamic fd addition code since it's not quite working correctly.
2008-07-15 17:15:54 -07:00
Jeremy Huddleston
5538e43b9a XQuartz: Use CFEqual to compare keyboards 2008-07-09 10:02:41 -07:00
Jeremy Huddleston
199d2dcb70 XQuartz: More fd handoff cleanup. 2008-07-07 16:34:47 -07:00
Jeremy Huddleston
9c20a4804d XQuartz: Some fd handoff cleanup. 2008-07-07 10:55:58 -07:00
Jeremy Huddleston
69cfc1a21e XQuartz: Remove deprecated keyboard code. 2008-07-04 19:23:21 -07:00
Peter Hutterer
153c6d48c6 xfree86: AllowEmptyInput is now enabled by default if hotplugging is enabled.
Remove AEI check from configImpliedLayout as the setting isn't actually parsed
at this point anyway (written by Sasha Hlusiak).

Resurrect checkInput() and check for devices there if AEI is false (this also
creates the default devices if required).

Set AllowEmptyInput to enabled by default if hotplugging is enabled.
(cherry picked from commit bea743f3d629bafdc301f40e9c0bc11382dfe8bc)

Conflicts:

	hw/xfree86/common/xf86Config.c
	hw/xfree86/doc/man/xorg.conf.man.pre
2008-07-03 15:05:14 +09:30
Peter Hutterer
5903b4c749 kdrive: don't post motion event if there was no motion. #16179
Based on the patch by Tomas Janousek.
Backported from master to server-1.4.

X.Org Bug 16179 <http://bugs.freedesktop.org/show_bug.cgi?id=16179>
(cherry picked from commit 26e7e69ab8)
2008-06-28 20:31:39 +09:30
Jeremy Huddleston
49668e8a88 XQuartz: Set noPanoramixExtension earlier to avoid a possible race. 2008-06-25 11:51:27 -07:00
Jeremy Huddleston
e65a36d57f Xquartz: Removed include directive for removed header 2008-06-11 11:44:45 -07:00
Jeremy Huddleston
a9ee6b0d00 XQuartz: Removed code path for old startup 2008-06-10 10:47:37 -07:00
Jeremy Huddleston
4505bae5d7 XQuartz: Under the new startup model, we no longer need to do the foreground/background dance. 2008-06-10 02:15:25 -07:00
Jeremy Huddleston
ee92aced10 XQuartz: Fixed the "laggy" startup under the new model. This was caused by xinit blocking expecting SIGUSR1 and our stub never sending it. 2008-06-10 01:39:15 -07:00
Jeremy Huddleston
d8cf5623fa XQuartz: Updated icon with more rsolutions and made it more dark-background friendly 2008-06-04 18:28:20 -07:00
Jeremy Huddleston
7812a8bdf9 XQuartz: Removed async debugging sleep 2008-06-04 12:19:28 -07:00
Jeremy Huddleston
ff1c443cad XQuartz: use a condition variable to signal when darwinEvents is ready rather than polling 2008-06-04 12:01:19 -07:00
Jeremy Huddleston
c3558bb8cd XQuartz: Don't forget to destroy the mutex and cond after we're done with them 2008-06-04 11:35:24 -07:00
Jeremy Huddleston
dd0f8a0f59 XQuartz: Fork for trigger 2008-06-04 11:18:52 -07:00
Jeremy Huddleston
7f840e9dc1 XQuartz: Switched over to new startup path for testing. Cleaned it up a bit. Server still crashes when using the icon to launch =/ 2008-06-03 00:06:26 -07:00
Jeremy Huddleston
2bb4251b3c XQuartz: A 2 second delay for launchd socket connections should be sufficient. 2008-05-23 02:27:58 -07:00
Jeremy Huddleston
c3866c98d2 XQuartz: Move the launchd display grabbing into mach_startup 2008-05-23 01:39:02 -07:00
Jeremy Huddleston
7dd3512715 XQuartz: Fixed a few issues with fd passing... still not working =( 2008-05-19 03:13:09 -07:00
Jeremy Huddleston
cccee9cfc2 XQuartz: First stab at SCM_RIGHTS passing the $DISPLAY launchd fd from the stub to server 2008-05-19 02:45:47 -07:00
Jeremy Huddleston
2a72309c06 XQuartz: Fixed dropped code in the !XKB blocks, disable XKB support until we figure out a solution for xkeyboard-config 2008-05-18 23:51:06 -07:00
Jeremy Huddleston
6fb587d3d5 XQuartz: Cleaned up ListenOnOpenFD... 2008-05-18 23:31:41 -07:00
Jeremy Huddleston
c27e0c8f3c New XQuartz icon thanks to Simone Karin Lehmann 2008-05-18 23:02:12 -07:00
Jeremy Huddleston
632ea62166 Merge branch 'server-1.4-branch' into xorg-server-1.4-apple 2008-05-17 14:55:57 -07:00
Jeremy Huddleston
301262b070 XQuartz: Ok, pass XQUARTZ_USE_XKB since it breaks worse without it... but we have issues when we have the keyboard configs installed... need to figure out what to do there... 2008-05-17 14:51:09 -07:00
Mart Raudsepp
4e5cf76eca xf86: Add AutoConfig driver for PCI ID 1022:2081 to 'amd'
(cherry picked from commit ab9b0b36ac)
(cherry picked from commit 4fa89fbe18)
... and backported to 1.4 (back to no new devprivates and "amd" driver name)
2008-05-16 20:16:57 +03:00
Adam Jackson
a08f848d4c Bump DEFAULT_DPI to 96.
75 is just nonsense.
(cherry picked from commit db9ae86353)
2008-05-16 17:26:53 +03:00
Michel Dänzer
2621380cf6 Fix RandR 1.2 driver interface conversion of two colour cursors to ARGB
This patch (and not setting HARDWARE_CURSOR_BIT_ORDER_MSBFIRST on big endian
platforms) fixes it for me with the radeon driver and doesn't break intel.

Correct patch this time :)
(cherry picked from commit da973e962d)
2008-05-16 17:20:08 +03:00
Donnie Berkholz
9db5401d69 xprint: fix linking by including XSERVER_LIBS. 2008-05-16 17:20:08 +03:00
Donnie Berkholz
1022c7774b xprint: fix build by adding {New,Delete}InputDeviceRequest. 2008-05-16 17:20:08 +03:00
Donnie Berkholz
9df3886354 xephyr: fix linking by adding pixman and using XSERVER_LIBS. 2008-05-16 17:20:08 +03:00
Donnie Berkholz
6c5c1c5c98 dmx: link in XSERVER_LIBS. 2008-05-16 17:20:08 +03:00
Donnie Berkholz
71f0711f40 dmx: fix build by adding {New,Delete}InputDeviceRequest. 2008-05-16 17:20:07 +03:00
Jeremy Huddleston
27fbfeacfa XQuartz: More work towards Mach-IPC startup... started working on FD passing 2008-05-15 12:26:32 -07:00
Jeremy Huddleston
543c2cd68d XQuartz: Added functionality to add a file descriptor to the connection list after the server is already running. 2008-05-15 09:55:17 -07:00
Jeremy Huddleston
c28fecc621 XQuartz: Disable xkb since it doesn't work after getting xkeyboard-config installed
Need to setup configs for the quartz keyboard
2008-05-15 07:08:21 -07:00
Jeremy Huddleston
5626b0949b XQuartz: Made DarwinSendDDXEvent a little more robust to context switching diring server init. 2008-05-15 05:49:43 -07:00
Jeremy Huddleston
55a3bca8ea Xquartz: Xquartz stub now can send Mach IPC to start the server. 2008-05-14 01:33:43 -07:00
Jeremy Huddleston
49cd0b185f XQuartz: More work on the Mach-IPC startup path 2008-05-14 01:13:15 -07:00
Jeremy Huddleston
3251fb54cd Merge branch 'server-1.4-branch' into xorg-server-1.4-apple 2008-05-14 00:33:17 -07:00
Jeremy Huddleston
6237acf75d Xquartz: More work on the new Mach startup 2008-05-13 10:40:20 -07:00
Jeremy Huddleston
e39613f463 Added missing to EXTRA_DIST 2008-05-12 17:57:07 -07:00
Jeremy Huddleston
0279a59706 XQuartz: Cleaned up the about box. 2008-05-12 13:36:35 -07:00
Jeremy Huddleston
fe22794404 Don't need the fink-friendly printf in the DDX anymore. 2008-05-12 11:34:06 -07:00
Jeremy Huddleston
78032815ae XQuartz: Added some version checking protection so we don't trigger an infinite exec loop with new /usr/X11/bin/Xquartz and older X11.app 2008-05-12 10:36:44 -07:00
Jeremy Huddleston
3b0afb47c3 XQuartz: More startup work... listen if we're the actual server 2008-05-12 09:27:27 -07:00
Julien Cristau
3f8ba89076 kdrive: allow disabling Composite
KdInitOutput() used to enable Composite when it was disabled by default,
but now this hack prevents ``-extension Composite'' from working.
Remove it, as Composite is enabled by default anyway.
(cherry picked from commit 9dfb525f6c)
2008-05-11 23:37:19 +02:00
Jeremy Huddleston
9b67fca9b7 XQuartz: Starting to work on the new Mach IPC startup stuff for better launchd, ApplicationServices, and Dock support 2008-05-09 16:44:31 -07:00
Jeremy Huddleston
2232c91d5c XQuartz: Reorganized some of the build system in prep for the Mach IPC startup work. 2008-05-08 19:46:03 -07:00
Jeremy Huddleston
8a0524b30e XQuartz: Set bundle version to 2.3.0 2008-05-08 16:57:42 -07:00
Jeremy Huddleston
330ffad547 XQuartz: Fixed some issue in our bundle creation 2008-05-06 16:12:41 -07:00
Jeremy Huddleston
56b7988d26 XQuartz: Fixed typo 2008-05-06 02:59:13 -07:00
Jeremy Huddleston
e414ec462c XQuartz: Added uncommitted files 2008-05-06 02:47:03 -07:00
Jeremy Huddleston
f225222ba2 Fixed up dist 2008-05-06 02:28:36 -07:00
Jeremy Huddleston
453a982e63 XQuartz: Move server bits into bundle and setup stub in /usr/X11/bin/Xquartz in prep for startup rewrite 2008-05-06 00:06:19 -07:00
Ben Byer
b7a1a640ce Xquartz: experimental embedding of Sparkle.framework 2008-05-05 20:55:08 -07:00
Jeremy Huddleston
8d9eab3a2e XQuartz: Fix mouse input offsets earlier since GetPointerEvents does not like negative (x,y) values 2008-05-02 17:35:57 -07:00
Jeremy Huddleston
ff10c37bdd XQuartz: Avoid a possible crash at startup due to unfavorable context switching. 2008-05-02 16:53:45 -07:00
Jeremy Huddleston
f2020b9836 XQuartz: Adjust the screen origin offset properly for multimonitor setups 2008-05-01 18:02:59 -07:00
Jeremy Huddleston
1fcf74a436 XQuartz: Moved some relevant stuff from darwin.h to darwinEvents.h 2008-04-30 17:30:57 -07:00
Jeremy Huddleston
97b5174182 Merge commit 'origin/server-1.4-branch' into xorg-server-1.4-apple 2008-04-30 16:25:25 -07:00
Peter Hutterer
ff4006bd5a xfree86: fix AlwaysCore handling. (Bug #14256)
Assume AlwaysCore being set by default, just like the other options.

X.Org Bug 14256 <http://bugs.freedesktop.org/show_bug.cgi?id=14256>
(cherry picked from commit 5b8641a5fd)
2008-04-30 12:53:38 +02:00
Ben Byer
50641bce73 xquartz: created darwinTablet, to represent tablet events 2008-04-29 23:37:58 -07:00
Ben Byer
299a056737 xquartz: remove unused params from DarwinEQInit 2008-04-29 23:00:09 -07:00
Ben Byer
588683cecc XQuartz: Fix to tablet-event handling code; we now scale
more conservatively (to match Linux's Wacom driver) and
we now receive all tablet-related events.
2008-04-29 22:35:34 -07:00
Jeremy Huddleston
ce4fbfbc75 XQuartz: Unset CFProcessPath... blech 2008-04-28 15:52:24 -07:00
Jeremy Huddleston
22cf724376 XQuartz: xprIsX11Window can be called from the Appkit thread (see X11Application.m) 2008-04-28 15:28:21 -07:00
Jeremy Huddleston
9717ddad46 XQuartz: Disabled DPMS extension 2008-04-28 15:10:26 -07:00