Commit Graph

5197 Commits

Author SHA1 Message Date
Jeremy Huddleston
5af5db5033 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:56:57 -07:00
Jeremy Huddleston
2408303d79 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:56:53 -07:00
Jeremy Huddleston
01612fe612 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:56:34 -07:00
Jeremy Huddleston
1d09deaa6e XQuartz: Made DarwinSendDDXEvent a little more robust to context switching diring server init.
(cherry picked from commit 5626b0949b)
2008-05-17 14:56:30 -07:00
Jeremy Huddleston
adc62f62b9 Xquartz: Xquartz stub now can send Mach IPC to start the server.
(cherry picked from commit 55a3bca8ea)
2008-05-17 14:56:26 -07:00
Brad Smith
93c082a060 OpenBSD doesn't define __x86_64__, simplify tests.
Seeing as this code seems to be specific to OpenBSD I don't think
__x86_64__ should have been added there at all. It appears to have
been added wherever __amd64__ existed before which is wrong. I
think that part of the commit should be reverted but also all four of
the checks should be __OpenBSD__ && __amd64__ instead of two one
direction and two flipped.
2008-05-17 13:14:31 +02:00
Brad Smith
895d4e274d BSD's also have /dev/urandom. 2008-05-17 13:05:58 +02:00
Adam Jackson
aad1c37b09 RANDR 1.1 compat: remove senseless comparison against the virtual size. 2008-05-16 11:10:33 -04:00
Adam Jackson
14726b776d xf86SetDesiredModes(): Skip disabled CRTCs first thing. 2008-05-16 11:10:33 -04:00
Adam Jackson
459f34b089 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".
2008-05-16 11:10:33 -04:00
Adam Jackson
96111c1547 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.
2008-05-16 11:10:32 -04:00
Adam Jackson
a4bbe1c8bc Re-add sync range inference from legacy setup to RANDR 1.2. 2008-05-16 11:10:32 -04:00
Adam Jackson
f52f6c5c7e Fix hal shutdown crash.
Removing the device invalidates its ->next pointer.  Copy it aside before
destroying the device.
2008-05-16 09:49:20 -04:00
Adam Jackson
99e4531f7c The great kdrive purge.
Most of these drivers didn't work.  ati was the only one that even came
close.  The igs, ipaq, itsy, pcmcia, savage, sis530, trident, trio, ts300,
and vxworks directories have never built since modularisation, so clearly
no one can miss them.
2008-05-16 08:16:01 -04:00
Eric Anholt
7cabf81c86 Add necessary include for COMPILEDDISPLAYCLASS.
Fixes build after 07f69023b0.
2008-05-15 13:24:27 -07:00
Adam Jackson
07f69023b0 Move defaultDisplayClass to xdmcp-only visibility. 2008-05-14 16:07:51 -04:00
Adam Jackson
166177e36b Simplify default font path setup. 2008-05-14 16:02:05 -04:00
Adam Jackson
2efe1abb6f Remove global argc/argv variables.
Was only used in the logging code anymore, and uselessly so there.
2008-05-14 15:53:11 -04:00
Adam Jackson
6c27b91122 Restore compression of duplicate log file entries.
This undoes the workaround for bug #964, which was an Xprintism.
2008-05-14 15:44:04 -04:00
Jeremy Huddleston
cbb4e80eb7 XQuartz: More work on the Mach-IPC startup path
(cherry picked from commit 49cd0b185f)
2008-05-14 01:16:04 -07:00
Jeremy Huddleston
3b57c59bb0 Xquartz: More work on the new Mach startup
(cherry picked from commit 6237acf75d)
2008-05-14 01:16:01 -07:00
Jeremy Huddleston
e435acc84c Added missing to EXTRA_DIST
(cherry picked from commit e39613f463)
2008-05-14 01:15:58 -07:00
Jeremy Huddleston
f7d6d20ad6 XQuartz: Cleaned up the about box.
(cherry picked from commit 0279a59706)
2008-05-14 01:15:56 -07:00
Jeremy Huddleston
b37e1f1f5c Don't need the fink-friendly printf in the DDX anymore.
(cherry picked from commit fe22794404)
2008-05-14 01:15:54 -07:00
Alan Coopersmith
7cdc19b29d When XKB fails to open rules file, log the file name, not the NULL file pointer 2008-05-13 16:39:30 -07:00
Alan Coopersmith
ed65e8b4f0 Check for strcasestr and workaround it on systems without it 2008-05-12 18:50:04 -07:00
Aaron Plattner
c50b5d9789 Bug #14692: Allow drivers to have a say in Xinerama visual consolidation.
Create a new exported global variable, XineramaVisualsEqualPtr.  Use this
pointer to decide whether two visuals are equal during visual consolidation.
This pointer can be wrapped, which allows drivers and extensions to control
which visuals are consolidated.  A wrapper can reject the visuals without
calling down, but must call down and return that result if it deems the visuals
equal.  This ensures that all layers agree that the visuals are equal.

Pass the screen of the other visual into the VisualsEqual callchain.

Don't free PanoramiXVisuals since we need it for PanoramiXTranslateVisualID.

Don't skip the first visual on the other screen in PanoramiXMaybeAddVisual.

Skip the loop in PanoramiXTranslateVisualID if screen is 0.
2008-05-12 14:49:53 -07:00
Adam Jackson
86678e7cc2 Fix fbdevhw initialization for PCI drivers.
graphics/fb%d, not graphics:fb%d.  Thanks sysfs.  Thysfs.
2008-05-12 14:53:37 -04:00
Adam Jackson
1c8bd318fb X n'est pas une print API. 2008-05-12 14:15:11 -04:00
Jeremy Huddleston
f9fae16456 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:42:20 -07:00
Jeremy Huddleston
ac4e33a9cd XQuartz: More startup work... listen if we're the actual server
(cherry picked from commit 3b0afb47c3)
2008-05-12 10:42:16 -07:00
Jeremy Huddleston
a7800d9355 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:42:12 -07:00
James Cloos
04211c3532 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
2008-05-12 03:03:13 -04:00
James Cloos
7e768c08f7 Clean up whitespace 2008-05-12 02:53:59 -04:00
Dave Airlie
3b6735528e pci: don't do this pci stuff when we don't have hw access 2008-05-12 16:36:42 +10:00
Julien Cristau
9dfb525f6c 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.
2008-05-11 23:35:41 +02:00
Alan Coopersmith
1a01e96c6d Return a valid X error when stuck in font alias loop
Part of fix for Sun bug 4258475
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=4258475>
2008-05-09 15:38:44 -07:00
Drew Parsons
7b3066d9b9 Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver into upstream-experimental 2008-05-10 00:01:15 +10:00
Drew Parsons
2a3d1421e0 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.
2008-05-09 23:58:19 +10:00
Jeremy Huddleston
315f089056 XQuartz: Reorganized some of the build system in prep for the Mach IPC startup work.
(cherry picked from commit 2232c91d5c)
2008-05-08 19:58:24 -07:00
Jeremy Huddleston
28ac79450c Updated .gitignore for new Xquartz layout
(cherry picked from commit cd4d2355e2)
2008-05-08 19:58:18 -07:00
Jeremy Huddleston
a07c5ad172 XQuartz: Set bundle version to 2.3.0
(cherry picked from commit 8a0524b30e)
2008-05-08 19:58:15 -07:00
Jeremy Huddleston
05f23ed3ea XQuartz: Fixed some issue in our bundle creation
(cherry picked from commit 330ffad547)
2008-05-08 19:58:09 -07:00
Jeremy Huddleston
90b963c0da Set CSRG_BASED on OSX
(cherry picked from commit ff085deba1)
2008-05-08 19:58:04 -07:00
Peter Hutterer
ff013b0da4 config: override xkb_{r,m,l,v} with Xkb{r,m,l,v} if the latter is set.
The HAL spec says that input.xkb.{rmlv}* can be sent, but if the user
specifies a X-specific {rmlv}, then this is overridden through the use of
input.x11_options.Xkb{RMLV}.
However, the way how the server parses options--by ignoring capitalisation,
underscores and spaces--the HAL and the x11_options would override each other.

So we simply filter the options, letting Xkb{RMLV} override xkb_{rmlv} and
only actually add them to the device after parsing _all_ options.

* rmlv ... rules, model, layout, variant

See Bug 13037 <http://bugs.freedesktop.org/show_bug.cgi?id=13037>
(cherry picked from commit fc35d1e3be)
2008-05-09 10:09:35 +09:30
Peter Hutterer
901978ebe0 config: remove trailing whitespaces.
It makes my vim look ugly. Put "let c_space_errors=1" into your .vimrc.
(cherry picked from commit 1f54c05cf8)
2008-05-09 10:09:25 +09:30
Daniel Stone
1c54c14889 Revert "GL: Make errors non-fatal"
Turns out this just caused segfaults further down the line.  Oops.

This reverts commit 268d61e00c.
2008-05-09 00:26:16 +03:00
Adam Jackson
f17ba5d584 Bug #13104: Remove broken XAA a1 glyph fast path. 2008-05-08 16:04:24 -04:00
Adam Jackson
ddaecfa13c Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver 2008-05-08 14:33:58 -04:00
Daniel Stone
cf20df39cc 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.
2008-05-07 22:56:03 +03:00