Commit Graph

4080 Commits

Author SHA1 Message Date
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
83f7252939 XQuartz: Add the launchd fd to AllSockets as well 2008-05-23 02:10:14 -07:00
Jeremy Huddleston
36db2ace75 1.4.0-apple12 2008-05-23 01:42:51 -07:00
Jeremy Huddleston
1e1f4fb717 XQuartz: Don't need launchd checking in configure.ac anymore since its functionality has been removed from libxtrans and into the mach startup code. 2008-05-23 01:42:24 -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
Peter Hutterer
ddcca23a81 xkb: when copying the keymap, make sure the structs default to 0/NULL.
It actually does help if a pointer is NULL rather than pointing to nirvana
when you're trying to free it lateron. Who would have thought?
(cherry picked from commit 7a97ca667405a42d008265c3a870210cc1da97dd)
(cherry picked from commit 0b0a097973)
2008-05-17 15:12:38 +02: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
Michel Dänzer
22b1a9dd0f EXA: Skip empty glyphs. (cherry picked from commit ce50bfd336) 2008-05-16 19:52:33 +03:00
Daniel Stone
2989f10716 Prevent the -wm command line option from causing a SEGV
The -wm (when mapped) option for the BackingStore support has been
causing the server to dereference a NULL pointer.

This has probably been the case since backing store has been
implemented on top of Composite.

It looks like (some of?) Composite didn’t expect its WIndowPtr
argument to be the root window.

In Composite’s compCheckRedirect() function we now avoid calling
compAllocPixmap() and compFreePixmap() when the pWin pointer’s
parent member is NULL, as is it the case with a server’s root window.

This addresses:

https://bugs.freedesktop.org/show_bug.cgi?id=15878
(cherry picked from commit 04211c3532)
2008-05-16 19:49:05 +03:00
Adam Jackson
33a9ee9ba0 Bug #13962: Re-arm the DPMS timer when re-enabling DPMS.
(cherry picked from commit 536f2ff538)
2008-05-16 17:26: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
Adam Jackson
d5a7badd6a Fix hal shutdown crash.
Removing the device invalidates its ->next pointer.  Copy it aside before
destroying the device.
(cherry picked from commit f52f6c5c7e)
2008-05-16 17:20:08 +03:00
Eric Anholt
458b487723 Fix overly-restrictive integer overflow check in EXA pixmap creation.
The result was that at 32bpp, pixmaps of width 8192 or greater couldn't be
created, due to treating a pitch value as a width.
(cherry picked from commit bc2d516f16)
2008-05-16 17:20:08 +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
Alan Coopersmith
d0554a5748 When XKB fails to open rules file, log the file name, not the NULL file pointer
(cherry picked from commit 7cdc19b29d)
2008-05-13 18:11:20 -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
4ee20bf395 XQuartz: 1.4.0-apple11 2008-05-12 10:37:42 -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
cd4d2355e2 Updated .gitignore for new Xquartz layout 2008-05-08 19:47:40 -07:00
Jeremy Huddleston
ee62197578 1.4.0-apple10 2008-05-08 19:46:35 -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
91dd6c47aa Merge commit 'origin/server-1.4-branch' into xorg-server-1.4-apple 2008-05-08 16:56:54 -07:00
Daniel Stone
104048501f XKB: Actually explain keymap failures
When something went wrong building a keymap, try to explain to the user
what it actually was, instead of the dreaded 'Failed to load XKB keymap'
catch-all.
(cherry picked from commit cf20df39cc)

Conflicts:
	xkb/ddxLoad.c
2008-05-07 23:11:31 +03:00
Magnus Vigerlöf
b1145a6b42 dix: Move motion history update until after screen crossing and clipping
Cross screen and clip the coordinates before updating the motion history
so that it will have the same contents as the events that are reported.
(cherry picked from commit a56ef7aaa4)
2008-05-07 19:22:41 +02:00