Peter Hutterer
ec2fca7e6f
xfree86: DGA needs to call into Xi.
...
Two steps: first use UpdateDeviceState() instead of replicating the device
changing code. And emulate XI events instead of core events.
2008-04-29 14:53:20 +09:30
Peter Hutterer
8208b842b7
Xi: add IEventBase global variable. Stores event base for X Input events.
2008-04-29 14:19:42 +09:30
Peter Hutterer
46340b7406
Xi: change UpdateDeviceState to be _X_EXPORT.
2008-04-29 14:17:48 +09:30
Peter Hutterer
3a922c5d07
Xi: apply ValuatorEvent data to the device's valuators.
...
After UpdateDeviceState, the device has the current position in absolute
coordinates, the event has the correct valuator data to be delivered to the
client.
2008-04-29 11:18:35 +09:30
Peter Hutterer
f2a20294fe
dix: store all valuators as they come from the device in the valuator events.
...
The event's sequenceNumber is mis-used to determine whether the values are
relative or absolute.
2008-04-29 11:18:35 +09:30
Peter Hutterer
53dba5381f
dix: if alloc of a master keyboard fails, remove the master pointer.
2008-04-28 11:37:52 +09:30
Peter Hutterer
1fab51edfc
mi: guard against NULL-pointer dereference.
2008-04-28 11:37:21 +09:30
Peter Hutterer
b5004722a2
Xi: Only return VCP, VCK and floating SDs to Xi 1.x clients.
...
This is better than the approach implemented with
8973a3f798
which disabled XI altogether for 1.x.
Instead, return a device list that resembles a traditional XI setup on pre XI
2.0 servers. If the client tries to open a device other than a floating SD,
return a BadDevice error.
2008-04-28 10:26:01 +09:30
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
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
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
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
Peter Hutterer
275cdc1c74
xfree86: pass correct value to mieqEnqueue (merge detritus I guess)
2008-04-23 16:16:15 +09:30
Peter Hutterer
c3659cb414
dix: always send FocusIn events if mode is NotifyUngrab.
...
In the case of a NotifyUngrab, the flag for the device may already be set but
we still need to send the FocusIn event.
2008-04-23 14:22:21 +09:30
Peter Hutterer
8190ef8754
Merge branch 'master' into mpx
...
Conflicts:
Xext/EVI.c
Xext/appgroup.c
Xext/cup.c
Xext/mitmisc.c
Xext/sampleEVI.c
dix/window.c
2008-04-22 18:04:05 +09:30
Peter Hutterer
179a082c26
Xext: route event through master if required (XTestFakeInput)
2008-04-22 17:45:55 +09:30
Peter Hutterer
fb784d99c5
mi: fix typo in comment.
2008-04-22 17:45:48 +09:30
Peter Hutterer
8209fdbc7c
Xext: Update sprite on fake input only for MDs and floating SDs.
2008-04-22 17:45:42 +09:30
Peter Hutterer
2ddbfd3457
xnest: re-enable XKB support. #10015
...
XKB was disabled in 08928afb05
, with the comment
"Disable XKB, as we can't yet use it". Seems like "yet" is over, running GNOME
and changing XKB settings seems to work in Xnest now.
X.Org Bug 10015 <https://bugs.freedesktop.org/show_bug.cgi?id=10015 >
2008-04-22 16:32:56 +09:30
Jeremy Huddleston
a8b8700c73
XQuartz: Fixed cmd-tab to bring all windows forward.
...
(cherry picked from commit e48e2ce931228f4dfa36c39b8ec8c72a58025b1b)
2008-04-21 23:45:00 -07:00
Dave Airlie
a368ab757e
GLcore: make googleearth not crash the server on sw-rendering.
...
I don't think this is the 100% correct answer as I get log spam saying
(EE) DoSwapInterval: cx = 0x98b8998, GLX screen = 0x96dd780
(EE) AIGLX: cx->pGlxScreen->swapInterval == NULL
but thats better than X exiting in my book.
2008-04-22 15:13:57 +10:00
Egbert Eich
449723510a
xkb: use the correct device instead of an uninitialised "dev". #15614
...
X.Org Bug 15614 <http://bugs.freedesktop.org/show_bug.cgi?id=15614 >
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
2008-04-22 13:30:25 +09:30
Jeremy Huddleston
ba87c25321
Make rootless use dixLookupClient rather than deprecated LookupClient.
...
(cherry picked from commit 582b5b01f9697b66489ea906a2ecb8bfc5915571)
2008-04-21 20:09:30 -07:00
Jeremy Huddleston
8822110d7d
Fixed dixLookupClient to work with client=NullClient as it did in the 1.3 branch
...
(cherry picked from commit e41ccc64702f856e5e09dfa652fe73c14b8a0225)
(cherry picked from commit ce5a5f93990647de85e535734ee6bb430ad591cb)
2008-04-21 20:09:20 -07:00
Ben Byer
5ffb6a2fe8
Nuke a call to deprecated LookupClient, and hopefully prevent a
...
null-pointer dereference, too!
(cherry picked from commit 3d28e9f953709914e18807bc74c241333671cb30)
2008-04-21 19:58:03 -07:00
Jeremy Huddleston
590688131d
XQuartz: Fixed quit dialog to be more conforming with HIG.
...
(cherry picked from commit 14c6b837bb03bd0956f90882f550847f13d0ca09)
2008-04-21 19:08:30 -07:00
Jeremy Huddleston
d20b3ac22d
.gitignore: Added Xquartz stuff
...
(cherry picked from commit 0a9a3bec2de8d1f442493e13cf9f039902a4928f)
2008-04-21 19:08:28 -07:00
Ben Byer
570b0dca26
Fix for pointer-offset issue when using a multi-display environment on X11.app.
...
(cherry picked from commit 9a7e14286ced55c5e2a4512e2629e03836443009)
2008-04-21 17:55:19 -07:00
Tilman Sauerbeck
3f081b4de5
EXA: Set pixmap->accel_blocked on the screen pixmap, too.
2008-04-21 23:07:39 +02:00