Commit Graph

5883 Commits

Author SHA1 Message Date
Peter Hutterer 9fc94edfe3 Xext: fix typo in condition.
Fall-out from dc3aba8a55.
We must free the event if it is NOT an extension event.
2008-05-16 17:02:12 +09:30
Brian Rogers 5127942f80 DGA: pass nevents to UpdateDeviceState. #15936
Missing parameter caused event processing to go nuts when checking valuators.

X.Org Bug 15936 <http://bugs.freedesktop.org/show_bug.cgi?id=15936>

Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
2008-05-16 15:43:01 +09:30
Peter Hutterer 28378d26b4 Xi: assemble button/modifier state before updating the device. #15934
The state field of the event must specify the state of the devices before the
event occured. With the code as it was, the state would also include the
event (e.g. state from a button press event would show the button as pressed)
Gathering the state before updating the device should fix this.

X.Org Bug 15934 <http://bugs.freedesktop.org/show_bug.cgi?id=15934>
2008-05-16 15:42:57 +09:30
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
Peter Hutterer 937e5aae33 dix: don't undisplay cursor if we don't own a sprite.
Sometimes we didn't have a cursor when coming back from suspend. Reason was
that the suspend caused the server to lose the device that was attached to the
VCP, and a RemoveDevice() would then set the cursor to NULL.
Solution: only set the cursor to NULL if we actually own the sprite.
2008-05-14 22:30:15 +09:30
Jeremy Huddleston cbb4e80eb7 XQuartz: More work on the Mach-IPC startup path
(cherry picked from commit 49cd0b185fd6c99b07357a74734b6a4023faca84)
2008-05-14 01:16:04 -07:00
Jeremy Huddleston 3b57c59bb0 Xquartz: More work on the new Mach startup
(cherry picked from commit 6237acf75d3310d7d4f262556b677557c2907284)
2008-05-14 01:16:01 -07:00
Jeremy Huddleston e435acc84c Added missing to EXTRA_DIST
(cherry picked from commit e39613f4633ed992bc276b70833a703560e528f9)
2008-05-14 01:15:58 -07:00
Jeremy Huddleston f7d6d20ad6 XQuartz: Cleaned up the about box.
(cherry picked from commit 0279a5970694937e949ba533330ea48961c4edba)
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 fe2279440450c795d67ba5a2234b0797d0bfe39c)
2008-05-14 01:15:54 -07:00
Peter Hutterer 68b4f250ee dmx: fix build.
Just because it builds, doesn't mean it works.
2008-05-14 16:18:48 +09:30
Peter Hutterer 00db0f35ac dix: InitAndStartDevices doesn't need a window parameter.
Leftover from the old pointer-keyboard pairing code, obsolete and gone now.
2008-05-14 15:29:28 +09:30
Peter Hutterer da728f2127 dix: don't use serverClient in AddInputDevice, use the one supplied instead.
We pass in the client that wants to create the device anyway, lets use the
parameter instead of hardcoding the serverClient.

Wow. I hope this is merge detritus, otherwise it'd be a sign that I didn't
have enough coffee that day.
2008-05-14 15:17:05 +09:30
Peter Hutterer a6659291c7 mi: protect against NULL-pointer dereference.
Required by the recent patch to use a NullCursor instead of UndisplayCursor().
2008-05-14 09:42:50 +09:30
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
Peter Hutterer dc3aba8a55 Xext: emulate XI events from core events when faking input.
We need XI events for event processing, so lets get rid of the pure core
events ASAP.
2008-05-13 20:00:08 +09:30
Peter Hutterer 8b3802d320 Xext: core button events have rootX/Y unset too. 2008-05-13 13:47:52 +09:30
Alan Coopersmith ed65e8b4f0 Check for strcasestr and workaround it on systems without it 2008-05-12 18:50:04 -07:00
Peter Hutterer 8234af6c6a xfree86: remove Ubuntu-ism.
Additional #include was required due to broken libc headers or something like
that. Remove it, there's more to the world than ubuntu alone.
2008-05-13 11:17:39 +09:30
Peter Hutterer 59b8d29b3a Xi: Fix up ProcIVector, got out of sync with the protocol.
When the opcode squash happened in the protocol, the processing vector got out
of sync for a few requests. As a result, client and server would interpret
requests differently, leading to a couple of BadLength problems.
2008-05-13 11:17:02 +09:30
Peter Hutterer 1fc1a2897e Remove UndisplayCursor API.
We can achieve the same thing by simply displaying a NullCursor, there's no
need for a separate API.
2008-05-13 11:17:02 +09:30
Peter Hutterer 913989d643 mi: don't try to display a cursor for devices w/o cursors. 2008-05-13 11:17:02 +09:30
Peter Hutterer 248a1df634 render: don't dereference cursor if cursor is NULL. 2008-05-13 11:17:02 +09:30
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 78032815aeb10c22ff45b49702e9c9df82ab471c)
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 3b0afb47c3d8ad922cb2315ed8034f4d77d4a249)
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 9b67fca9b7d3050d3d5582a5210270db7eb2ed05)
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 2232c91d5c277673929eab2abb5e0495c00877cb)
2008-05-08 19:58:24 -07:00
Jeremy Huddleston 28ac79450c Updated .gitignore for new Xquartz layout
(cherry picked from commit cd4d2355e227549a3410485a130549dd91ccdcfe)
2008-05-08 19:58:18 -07:00
Jeremy Huddleston a07c5ad172 XQuartz: Set bundle version to 2.3.0
(cherry picked from commit 8a0524b30e1e860f3ae35741c116fc8da28aef79)
2008-05-08 19:58:15 -07:00
Jeremy Huddleston 05f23ed3ea XQuartz: Fixed some issue in our bundle creation
(cherry picked from commit 330ffad5477e32c5ab9ed338bc628bd5ae9f4c98)
2008-05-08 19:58:09 -07:00
Jeremy Huddleston 90b963c0da Set CSRG_BASED on OSX
(cherry picked from commit ff085deba18682caa2f93d61a75b38db87d747b1)
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