Commit Graph

5861 Commits

Author SHA1 Message Date
Peter Hutterer
684b5d8382 Xi: whoops, stray ! caused a bit of memory mess. 2008-04-26 19:55:59 +09:30
Peter Hutterer
87071b604c Revert "Xi: disable XI for clients < XI 2.0"
Turns out some programs don't like this change. gnome-settings-daemon crashes
hard if you tell it that XI doesn't exist. So, tell them we have XI, but leave
the other change (the one that pretends no devices are available).

This reverts commit 8973a3f798.
2008-04-26 19:37:57 +09:30
Peter Hutterer
7447a30fb2 Xi: if a pre-XI2 client tries to list the devices, pretend we don't have any.
XI 1.x isn't supported anymore, so let's pretend we don't have any devices.
This stops clients from opening them and thus stops interference.
2008-04-26 19:03:13 +09:30
Peter Hutterer
8973a3f798 Xi: disable XI for clients < XI 2.0
Sorry. With the huge changes in the device handling I honestly don't know how
to support XI and XI2 alongside. So let's just pretend XI doesn't exist if a
client doesn't request it supporting XI2.
2008-04-26 19:01:00 +09:30
Peter Hutterer
b304b0a65c Xi: add versioning support.
Remember the version the client sent to us, so we can adjust our replies
accordingly. This requires the client to use the {major|minor}Version fields
in the GetExtensionVersion request. However, they were padding before, so we
must assume they are garbage if nbytes is non-zero. If nbytes is zero, the
client is probably a new client and we can handle it correctly.
2008-04-26 17:47:15 +09:30
Jeremy Huddleston
b9ca789635 XQuartz: Added some pseudoramiX debug traces
(cherry picked from commit 5bee1585a3)
2008-04-25 18:04:22 -07:00
Peter Hutterer
e251c9e75a Remove all traces of #ifdef XINPUT and the matching bits from the configure.ac 2008-04-25 16:49:35 +09:30
Peter Hutterer
1d0438de17 Xi: remove RemoveOtherCoreGrabs()
PickPointer() returns grabbed devices, so we can't get a double grab anyway.
2008-04-25 16:28:58 +09:30
Peter Hutterer
be5ff2b8d8 Xi: remove some superflous code 2008-04-25 16:25:13 +09:30
Jeremy Huddleston
0209e46249 XQuartz: More multi-monitor work... reverted Ben's workaround (worked for side-by-side only) and added more debugging.
(cherry picked from commit 515b8b855a)
2008-04-24 23:50:23 -07:00
Jeremy Huddleston
b65dbd350b XQuartz: Cleaned up multi-monitor support.
(cherry picked from commit c05abf0a19)
(cherry picked from commit 9112f29043)
2008-04-24 23:50:21 -07:00
Peter Hutterer
b093bf3ec3 dix: don't search for grabbed devices, PickPointer does it for us now.
Follow-up to 93ee338307.
2008-04-25 15:15:31 +09:30
Peter Hutterer
6198bad07e dix: remove misleading (stale) comment 2008-04-25 15:02:44 +09:30
Peter Hutterer
93ee338307 dix: let PickPointer() return devices that are core-grabbed by the client.
If the client currently holds a core grab on any device, this device has
priority, even over the ClientPointer.
2008-04-25 15:02:08 +09:30
Peter Hutterer
f5ac98747d Standardise copyright headers for all new files created as part of MPX. 2008-04-25 14:50:24 +09:30
Peter Hutterer
3fc67b4205 Xi: remove leftover chpkpair.h file.
Used to contain declarations for ChangePointerKeyboardPairing request
handling.
2008-04-25 14:30:46 +09:30
Peter Hutterer
89add4ee98 dix: remove obsolete InitWindowPrivates(). 2008-04-25 14:30:26 +09:30
Peter Hutterer
dcdc66fcfc dix: add mi.h include to stop compiler warning 2008-04-25 14:30:06 +09:30
Peter Hutterer
97552413d2 dix: remove "unused variable" compiler warning. 2008-04-25 14:29:46 +09:30
Peter Hutterer
d9c38e84cc dix: remove pairingClient definition.
This variable was used originally to determine which client is allowed to
change the pointer-keyboard pairing. For now, we just let anyone change it and
see how that works out.
2008-04-25 14:29:26 +09:30
Peter Hutterer
c14b858aec Xi: fix two compiler warnings
unused variable in exevents.c
implicit declaration in warpdevp.c
2008-04-25 14:29:05 +09:30
Peter Hutterer
6015b7a812 Xi: handle requests through a dispatch handler.
Same principle as e.g. in the RandR extension, rather than having a load of
    if (type == XI_whatever)
use an array of function pointers.
2008-04-25 14:28:45 +09:30
Peter Hutterer
cb8cb87bc6 Xi: remove unused #define DISPATCH 2008-04-25 14:28:25 +09:30
Jeremy Huddleston
5869e3f555 darwin gots /dev/urandom, too yo!
(cherry picked from commit bf0144f380)
2008-04-24 19:54:57 -07:00
Alan Coopersmith
b1ae7c79db Bug 14247: If pkg-config can't find openssl.pc, just link with -lcrypto
X.Org bugzilla #14247 <http://bugs.freedesktop.org/show_bug.cgi?id=14247>
2008-04-24 19:02:43 -07:00
Jeremy Huddleston
1daae4574c Added missing HAVE_LAUNCHD to dix-config.h.in
(cherry picked from commit 1b4b73cefb)
2008-04-24 18:25:37 -07:00
Jeremy Huddleston
63853e4ad2 XQuartz: Compile in missing glx source that we still need
(cherry picked from commit c611335dee)
2008-04-24 18:24:46 -07:00
Dave Airlie
ae982a27e4 glx: test for valid read and draw privates before using them
this should fix a bug where f-spot exiting blows up the X server
2008-04-24 16:37:29 +10:00
Peter Hutterer
f377141912 Xi: don't attempt to send to a NULL window.
Only applicable when the server comes down/restarts. In this case,
WindowTable[i] may be NULL. Let's not try to send an event then.
2008-04-24 14:19:28 +09:30
Peter Hutterer
aec485f2dc dix: NULL out WindowTable after freeing all the windows.
CloseDownDevices() tries to send PresenceNotify events. If the windows are
already freed, then we are accessing dangling pointers.
2008-04-24 14:19:28 +09:30
Peter Hutterer
9ab4e2fd8e xfree86: don't free the config-file related information in DIDR. #15645
In DeleteInputDeviceRequest, leave the conf_idev (which is shared with
xf86ConfigLayout.input) alone for devices that were specified in the
ServerLayout section of the config file. This way, in the next server
generation we are left with what was the original config and can thus re-init
the devices.

This is an addon to 6d22a9615a, an attempt to
fix Bug 14418.

X.Org Bug 15645 <https://bugs.freedesktop.org/show_bug.cgi?id=15645>
X.Org Bug 14418 <https://bugs.freedesktop.org/show_bug.cgi?id=15645>
2008-04-24 14:19:28 +09:30
Peter Hutterer
7dc40c8eca xfree86: Don't free master devices.
The previous check works in the master-branch, but doesn't work with MPX. We
actually copy the SD's information into the MDs public.devicePrivate, so we
need to explicitly check whether a device is a MD before freeing the module.
2008-04-24 12:47:29 +09:30
Peter Hutterer
cc13f87cd8 Xext: XGE: change function definition to have return value on separate line.
This seems to be the common style in most parts of the server.
2008-04-24 11:43:47 +09:30
Peter Hutterer
d0890c40b9 Xext: add a few lines of comments to XGE. 2008-04-24 11:32:36 +09:30
Peter Hutterer
745b90cde1 Xext: re-do the XGE versioning handling.
Basically the same approach RandR takes. Remember which one the client
requested, send back the one the server supports. Also divide XGE server
version (now defined in geext.c) and the client's version (still in the
protocol definition).
2008-04-24 11:27:22 +09:30
Peter Hutterer
5f3e5b3462 Xext: remove trailing whitespaces in geext.{c|h} 2008-04-24 11:14:43 +09:30
Jeremy Huddleston
d09c520b32 Moved Apple GL bits into our DDX subtree
(cherry picked from commit c9356f3289)
2008-04-23 10:22:34 -07:00
Jeremy Huddleston
b05b416c62 XQuartz: No need to include indirect.c a second time
(cherry picked from commit 41ed532525)
2008-04-23 10:17:13 -07:00
Ben Byer
565492c70a xquartz: build fixes for GLX/DRI2 fallout (note: not guaranteed)
(cherry picked from commit 85a5796b66)
2008-04-23 10:17:07 -07:00
Ben Byer
6f6505db51 glx / xquartz: we still need glxcontentmodes.[ch] kthx
(cherry picked from commit 27545fd37f)
2008-04-23 10:17:02 -07:00
Ben Byer
4e3a8af575 xquartz: clean up linker line for main binary
(cherry picked from commit 821d7400f2)
2008-04-23 10:16:55 -07:00
Ben Byer
3685b171da xquartz: remove vestigial aglGlx.c
(cherry picked from commit 40bd041e42)
2008-04-23 10:16:46 -07:00
Hans de Goede
f6e22d69af Prefer glxvisuals with stencil buffer for default visuals
The first fbconfig which has a depthbuffer > 0  and doublebuf is choosen
when associating fbconfigs with the visuals, indepenent of stencil bits.
This happens to work ok on intel as there all fbconfigs with a
depthbuffer > 0 also have stencil bits.

This patch fixes this by first trying to get a fbconfig for default X visuals
with both stencilbuf, depthbuf and doublebuffering, and if that fails fallback
to trying to get one with only a depthbuf and doublebuffering.
2008-04-23 12:28:30 -04:00
George Sapountzis
00effad583 xephyr: XEPHYR_DRI is identical to XF86DRI 2008-04-23 18:11:56 +03:00
George Sapountzis
6a9f7f28ec xephyr: sync with mesa 2008-04-23 18:11:56 +03:00
George Sapountzis
7ffc68c5cc xephyr: libGL is client lib 2008-04-23 18:11:56 +03:00
George Sapountzis
a27c244d72 xephyr: Makefile cleanup 2 2008-04-23 18:11:56 +03:00
George Sapountzis
d4d19b2f22 xephyr: Makefile cleanup 1 2008-04-23 18:11:56 +03:00
George Sapountzis
cdc4571b58 drop TOGCUP remnants 2008-04-23 18:11:56 +03:00
George Sapountzis
6cd9287aed drop EVI remnants 2008-04-23 18:11:56 +03:00