Commit graph

2340 commits

Author SHA1 Message Date
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