Commit graph

2819 commits

Author SHA1 Message Date
Jeremy Huddleston
be616f0f8f XQuartz: Under the new startup model, we no longer need to do the foreground/background dance.
(cherry picked from commit 4505bae5d7)
2008-06-10 10:51:40 -07:00
Jeremy Huddleston
8e3a85beb9 XQuartz: Fixed the "laggy" startup under the new model. This was caused by xinit blocking expecting SIGUSR1 and our stub never sending it.
(cherry picked from commit ee92aced10)
2008-06-10 01:45:57 -07:00
Jeremy Huddleston
a58487db23 XQuartz: Updated icon with more rsolutions and made it more dark-background friendly
(cherry picked from commit d8cf5623fa)
2008-06-10 01:45:50 -07:00
Jeremy Huddleston
33bfb761a7 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-06-10 01:45:40 -07:00
Paulo Cesar Pereira de Andrade
60990c69b4 Correct a NULL pointer deference
The problem happens if Monitor/Card combo doesn't provide EDID info,
and the XFree86-VidModeExtension extension is used.

Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
(cherry picked from commit c8af7ce35a)
2008-06-09 14:09:39 -04:00
Drew Parsons
c00ff932f8 Disable D-BUS from Xprint.
Use dummy config functions to replace those from config/config.c, and
therefore do not link Xprt with $CONFIG_LIB.

Works around an endlessly spinning loop in dix/dispatch.c::Dispatch()
(WaitForSomething() not waiting) when built with dbus, which was
causing Xprt to use 95% cpu.
(cherry picked from commit 2a3d1421e0)
2008-06-09 13:57:03 -04:00
Drew Parsons
2f994cb00e Create dix/libXpdix.la for Xprint-specific build of libdix.la
(cherry picked from commit 4e2c6dbabdbbaaca213fd08edd422de15d0900cc)

required because of commit 7c0709a736,
which made requestingClient in dix specific to Xprint only.
Add to XPRINT_LIBS in hw/xprint/Makefile.am in front of
$(XSERVER_LIBS) to override definitions in libdix.la for standard xservers.

Follows 571206832d (providing -DXPRINT
to xprint subdirs).

Note it may be possible to restructure the code so that
requestingClient is stored elsewhere than in dix. See discussions
following http://lists.freedesktop.org/archives/xorg/2008-March/033844.html
If this is done it may be possible to revert this commit (if not 571206...).
(cherry picked from commit 966ae1781f)
2008-06-09 13:56:59 -04:00
Drew Parsons
30774d6b3c Define XPRINT in XPRINT_CFLAGS (configure.ac)
-DXPRINT had only been set for Xprt in hw/xprint/Makefile.am
After commit 7c0709a736 it is also
required for ps/PsArea.c and PsFonts.c to ensure ‘requestingClient’ is
defined, so make it a global Xprint definition in configure.ac.
(cherry picked from commit 28a6719fd486d9a9cecad0b057d9ea7c59c66055)
(cherry picked from commit 571206832d)
2008-06-09 13:56:53 -04:00
Dave Airlie
50e77eb838 int10: add pci_device_enable support on Linux
(cherry picked from commit ea4ec9e998)
2008-06-09 13:29:32 -04:00
Jeremy Huddleston
500ace5659 XQuartz: Removed async debugging sleep
(cherry picked from commit 7812a8bdf9)
2008-06-04 12:23:12 -07:00
Jeremy Huddleston
677c8d6af7 XQuartz: use a condition variable to signal when darwinEvents is ready rather than polling
(cherry picked from commit ff1c443cad)
2008-06-04 12:23:06 -07:00
Jeremy Huddleston
9e30e41c6e XQuartz: Don't forget to destroy the mutex and cond after we're done with them
(cherry picked from commit c3558bb8cd)
2008-06-04 12:23:00 -07:00
Jeremy Huddleston
469b649e13 XQuartz: Fork for trigger
(cherry picked from commit dd0f8a0f59)
2008-06-04 12:22:54 -07:00
Jeremy Huddleston
17fb292b52 XQuartz: Switched over to new startup path for testing. Cleaned it up a bit. Server still crashes when using the icon to launch =/
(cherry picked from commit 7f840e9dc1)
2008-06-04 12:22:48 -07:00
Jeremy Huddleston
f060c41843 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-05-23 02:31:25 -07:00
Jeremy Huddleston
0f44d72873 XQuartz: A 2 second delay for launchd socket connections should be sufficient.
(cherry picked from commit 2bb4251b3c)
2008-05-23 02:31:16 -07:00
Jeremy Huddleston
b55226326c XQuartz: Move the launchd display grabbing into mach_startup
(cherry picked from commit c3866c98d2)
2008-05-23 02:30:02 -07:00
Jeremy Huddleston
517151d5f4 XQuartz: Fixed a few issues with fd passing... still not working =(
(cherry picked from commit 7dd3512715)
2008-05-23 02:29:50 -07:00
Adam Jackson
5efe36f7af Fix reduced-blanking mode filtering in RANDR 1.2.
If the monitor isn't reduced-blanking (either through EDID logic, or
config file setting), then remove RB modes from the default pool.  Any
RB modes from the driver and config file pools will stick around though;
you asked for them, you got them.
(cherry picked from commit 0178b6a4ab)
2008-05-19 11:27:58 -04:00
Jeremy Huddleston
86bfcd8d78 XQuartz: First stab at SCM_RIGHTS passing the $DISPLAY launchd fd from the stub to server
(cherry picked from commit cccee9cfc2)
2008-05-19 02:47:12 -07:00
Jeremy Huddleston
afc8507e48 XQuartz: Fixed dropped code in the !XKB blocks, disable XKB support until we figure out a solution for xkeyboard-config
(cherry picked from commit 2a72309c06)
2008-05-19 02:47:07 -07:00
Jeremy Huddleston
18a8825adc XQuartz: Cleaned up ListenOnOpenFD...
(cherry picked from commit 6fb587d3d5)
2008-05-18 23:32:53 -07:00
Jeremy Huddleston
2147b74126 New XQuartz icon thanks to Simone Karin Lehmann
(cherry picked from commit c27e0c8f3c)
2008-05-18 23:32:45 -07:00
Jeremy Huddleston
b6ab42ad39 XQuartz: More work towards Mach-IPC startup... started working on FD passing
(cherry picked from commit 27fbfeacfa)
2008-05-18 22:44:50 -07:00
Jeremy Huddleston
b54b2529ad Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-05-17 14:55:45 -07:00
Jeremy Huddleston
85a6286dcd 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...
(cherry picked from commit 301262b070)
2008-05-17 14:55:38 -07:00
Jeremy Huddleston
1f4d224f82 XQuartz: Added functionality to add a file descriptor to the connection list after the server is already running.
(cherry picked from commit 543c2cd68d)
2008-05-17 14:55:31 -07:00
Jeremy Huddleston
3a0fc76ac7 XQuartz: Disable xkb since it doesn't work after getting xkeyboard-config installed
Need to setup configs for the quartz keyboard
(cherry picked from commit c28fecc621)
2008-05-17 14:54:15 -07:00
Jeremy Huddleston
7d39e7e400 XQuartz: Made DarwinSendDDXEvent a little more robust to context switching diring server init.
(cherry picked from commit 5626b0949b)
2008-05-17 14:54:10 -07:00
Jeremy Huddleston
880a872498 Xquartz: Xquartz stub now can send Mach IPC to start the server.
(cherry picked from commit 55a3bca8ea)
2008-05-17 14:54:04 -07:00
Adam Jackson
0230f39fa3 RANDR 1.1 compat: remove senseless comparison against the virtual size.
(cherry picked from commit aad1c37b09)
2008-05-16 11:11:40 -04:00
Adam Jackson
95985256ef xf86SetDesiredModes(): Skip disabled CRTCs first thing.
(cherry picked from commit 14726b776d)
2008-05-16 11:11:40 -04:00
Adam Jackson
bedcf98558 Fix initial mode selection even harder.
The first guess used to be "is the preferred mode for one output the
preferred mode on all outputs".  Instead, do "find the largest mode that's
preferred for at least one output and available on all outputs".
(cherry picked from commit 459f34b089)
2008-05-16 11:11:40 -04:00
Adam Jackson
bd50c41f6f Redo RANDR compatibility output selection.
Old logic was just the first one that happened to have an associated
CRTC.  The new logic tries to find one that's definitely connected, has
probed modes, and has the largest candidate mode.
(cherry picked from commit 96111c1547)
2008-05-16 11:11:40 -04:00
Adam Jackson
0b031442fe Re-add sync range inference from legacy setup to RANDR 1.2.
(cherry picked from commit a4bbe1c8bc)
2008-05-16 11:11:39 -04:00
Adam Jackson
cfff55a2bb Fix fbdevhw initialization for PCI drivers.
graphics/fb%d, not graphics:fb%d.  Thanks sysfs.  Thysfs.
(cherry picked from commit 86678e7cc2)
2008-05-16 10:03:24 -04:00
Jeremy Huddleston
800db31e16 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-05-14 01:15:43 -07:00
Jeremy Huddleston
f8929b9e5b XQuartz: More work on the Mach-IPC startup path
(cherry picked from commit 49cd0b185f)
2008-05-14 01:15:38 -07:00
Jeremy Huddleston
4160d13b48 Xquartz: More work on the new Mach startup
(cherry picked from commit 6237acf75d)
2008-05-14 01:15:31 -07:00
Jeremy Huddleston
02744383d5 Added missing to EXTRA_DIST
(cherry picked from commit e39613f463)
2008-05-14 01:15:23 -07:00
Jeremy Huddleston
0605c35188 XQuartz: Cleaned up the about box.
(cherry picked from commit 0279a59706)
2008-05-14 01:15:15 -07:00
Jeremy Huddleston
1c507cb8bf Don't need the fink-friendly printf in the DDX anymore.
(cherry picked from commit fe22794404)
2008-05-14 01:15:06 -07:00
Jeremy Huddleston
c624964539 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
(cherry picked from commit 78032815ae)
2008-05-12 10:41:58 -07:00
Jeremy Huddleston
5687d51d7e XQuartz: More startup work... listen if we're the actual server
(cherry picked from commit 3b0afb47c3)
2008-05-12 10:41:48 -07:00
Jeremy Huddleston
6cb8900736 XQuartz: Starting to work on the new Mach IPC startup stuff for better launchd, ApplicationServices, and Dock support
(cherry picked from commit 9b67fca9b7)
2008-05-12 10:41:38 -07:00
Julien Cristau
f2278a882f 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:38:03 +02:00
Jeremy Huddleston
e2431ff488 XQuartz: Reorganized some of the build system in prep for the Mach IPC startup work.
(cherry picked from commit 2232c91d5c)
2008-05-08 19:57:48 -07:00
Jeremy Huddleston
d6cf35fc56 XQuartz: Set bundle version to 2.3.0
(cherry picked from commit 8a0524b30e)
2008-05-08 19:57:17 -07:00
Jeremy Huddleston
561ece68ea XQuartz: Fixed some issue in our bundle creation
(cherry picked from commit 330ffad547)
2008-05-08 19:56:29 -07:00
Jeremy Huddleston
50ce5f2083 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-05-08 19:55:25 -07:00