e8777a91f3
Merge branch 'master' into mpx
...
Conflicts:
Xi/closedev.c
Xi/exevents.c
Xi/extinit.c
Xi/listdev.c
dix/window.c
hw/xfree86/common/xf86Xinput.c
include/extinit.h
mi/mipointer.c
2007-04-02 15:36:26 +09:30
f2808005f4
Bug #6620 : Fixed a missing 'else' in ATIPseudoDMAInit().
...
Before this, we'd write some registers twice on R200 hardware and also
possibly end up with a bad value in atis->cce_pri_size.
2007-03-31 16:51:24 +02:00
e76b634951
Fix indentation of fakexa help text.
2007-03-27 16:47:07 -07:00
021fc5cb2c
Static markup and dead code cull over xkb/.
...
The former <X11/extensions/XKBsrv.h> has been pulled into the server now as
include/xkbsrv.h, and the world updated to look for it in the new place,
since it made no sense to define server API in an extension header. Any
further work along this line will need to do similar things with XKBgeom.h
and friends.
2007-03-20 18:37:02 -04:00
c5b07fb717
kdrive: update kdrive to new mi API with additional device argument. Includes
...
an update of ati_cursor.c and i810_cursor.c
2007-03-14 17:42:30 +10:30
68d39d8571
kdrive/ephyr: fix keysym type confusion once and for all
...
Take keysyms in as an XID in hostx_load_keymap() and explicitly
convert them to CARD32 for loading into the server. Fixes Xephyr on
AMD64, wa-hey.
2007-02-16 23:02:46 +02:00
5507cb885d
kdrive: delete input debugging, yet again ...
...
I have no idea how this keeps on coming back.
2007-02-16 23:02:45 +02:00
0f6dd4aea6
kdrive/ephyr: free screen struct
...
Free screen->driver on screenFini, instead of just leaking it.
2007-02-15 16:14:57 +02:00
5dcad9e9d7
Fix bus error on startup in 64-bit Xephyr
...
hostx_get_visual_masks takes unsigned long * arguments, but was being
passed pointers to CARD32's.
2007-02-02 14:45:16 -08:00
8724af248c
kdrive/mga: fix compiler warning
...
Change a case that only made one test for an if, preventing the compiler
warning about all other PICT_* types being unsupported.
2006-12-06 23:24:24 +02:00
99378b58db
kdrive/tslib: remove vendor-specific hacks
...
Parts of the KDrive merge accidentally contained a bunch of
vendor-specific hacks; sorry.
2006-12-06 23:24:24 +02:00
f2903c12bb
SyntheticMotion: don't dereference sprite.screen when not using Xinerama
...
(cherry picked from aa052e43c6c293e14f78837e00c6b7581f9713bb commit)
2006-12-06 23:24:23 +02:00
332f179db7
kdrive/sdl: fix compilation
2006-11-08 15:30:03 +02:00
aa0261a98e
Improve vm86 error handling in Xvesa.
2006-11-06 02:29:49 +01:00
6b2c65fdd1
Fix typo in Xvesa: incorrect reporting of DAC capabilities.
2006-11-06 00:30:09 +01:00
412e93349e
kdrive: make building of Linux support conditional (bug #5613 )
...
Only try to build Linux support on Linux. We should probably disable all
OS-dependent DDXes if we don't have a workable OS (and only build
Xephyr/Xfake), but that's future work.
2006-11-04 19:08:23 +02:00
a2d6242106
kdrive:remove Change{Keyboard,Pointer}Device
...
This was removed in the DIX, so just axe it.
2006-11-02 00:46:33 +02:00
3df454719f
kdrive: add KdRingBell prototype
2006-11-01 23:02:57 +02:00
644ee2434a
kdrive: avoid null dereferences
...
Avoid jumping into NULL pointers for OS or card functions which do not
exist.
2006-10-29 03:52:11 +03:00
738d2e8817
kdrive: move bell ringing into an OS function
...
Move the bell into an OS function, and use that if it's declared; else,
fall back to using the driver's function.
Remove the Linux keyboard bell function; just move it into the OS layer.
Use named initialisers when converting the old structures, and eliminate
unused functions.
2006-10-29 03:48:02 +03:00
65cd5aa4d7
kdrive/input: remove unnecessary #ifdef XINPUTs
...
Xi is now mandatory, so don't bother with the ifdefs.
2006-10-25 01:12:45 +03:00
b9e180e632
port all users to the new DIX motion history API
...
Port KDrive, Xvfb, and Xnest, as well as the virtual core devices, to the
new motion history API. Make GetPointerEvents also update the history.
2006-10-25 01:09:19 +03:00
a7c2d9a15d
kdrive: numerous warning fixes
2006-10-23 06:08:27 +03:00
523fe64ba1
kdrive/lots of DDXes: make stubs use KdOsAddInputDrivers()
...
In theory, removing LinuxPciScan should make these drivers OS-independent.
2006-10-23 02:56:28 +03:00
57f98e2b72
kdrive/tslib: port to new absolute API, remove debugging
...
Port to new absolute device (not touchscreen) API, and remove some
leftover debugging.
2006-10-23 02:55:41 +03:00
a6dc629052
kdrive/os: add KdOsAddInputDrivers
...
Add KdOsAddInputDrivers, which adds all relevant input drivers.
Could possibly be refactored to KdAddInputDrivers, which called through
OsFuncs to a new function, if it existed.
2006-10-23 02:54:59 +03:00
ac240b00ff
kdrive/input: use Absolute instead of Touchscreen
...
Adjust to suit Zepheniah's new absolute device API.
2006-10-23 02:54:07 +03:00
b1ba4b3e8a
kdrive/neomagic: include vesa.h, use DebugF
2006-10-23 02:53:15 +03:00
f08b6b2367
kdrive: change DEVICE_TOUCHSCREEN to DEVICE_ABS_{CALIB,AREA}
2006-10-22 12:30:02 +03:00
aeba855b07
move keymap copy to event processing, from enqueuing
...
Move the keymap copying to event processing time (in
ProcessInputEvents), instead of being at event enqueuing time.
Break SetCore{Pointer,Keyboard} out into separate functions.
Change mieqEnqueue to take a device pointer, that asks for the
_original_ device associated with this event.
2006-10-20 00:43:11 +03:00
58314756ae
GetPointerEvents: add first_valuator parameter
...
Add a first_valuator parameter. Looks correct by inspection, but untested
with first_valuator != 0 as yet.
2006-10-08 16:18:05 +03:00
8d8e7f8bae
kdrive/input: remove excessive debugging in NIDR
2006-10-08 15:26:54 +03:00
ad631afcf3
make core keyboard/pointer map functions act on all core-sending devices
...
Make Set{Keyboard,Modifier,Pointer}Mapping act on all devices which send core
events.
Change LegalModifier to accept a DeviceIntPtr.
2006-09-29 00:34:23 +03:00
5e9d33fe87
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-09-07 15:43:31 +03:00
69d5becce4
Fix previous commit breaking other kdrives pulling in fbdev.a
2006-08-31 17:30:24 +01:00
fd609956f2
Add framebuffer device command line switch for Xfbdev
2006-08-31 17:18:57 +01:00
5ddbf4bcd4
Re-add support for tslib (1.0 release) and Xcalibrate extension.
2006-08-29 22:07:15 +01:00
393dc0a338
kdrive: remove @KDRIVE_LIBS@ from Xfoo_DEPENDENCIES
2006-08-29 22:53:54 +03:00
89d272bb18
[PATCH] kdrive/linux keyboard: remove more debugging spew
2006-08-29 15:18:25 +03:00
bd6f539ff9
[PATCH] kdrive/linux keyboard: silence excessive debugging noise
2006-08-29 15:18:23 +03:00
f9624e0109
kdrive/input: verify SIGIO with --enable-debug
2006-08-17 16:09:51 +03:00
5d073697ad
kdrive/input: minor warning cleanups
...
And also a compiler error fix when VERIFY_SIGIO is defined.
2006-08-15 15:37:10 +03:00
47c1c948e6
kdrive/input: only run special key behaviours on non-XKB
...
Only attempt to manually deal with special key behaviours (e.g. terminating
the server) when not using XKB, and leave locking behaviour up to GKVE.
2006-08-15 15:25:16 +03:00
cec284f2b3
kdrive: properly ifdef composite enabling
2006-08-10 18:03:58 +03:00
539d1f3347
GKVE/GPE: have DDX allocate events
...
Don't allocate events on every GKE/GKVE/GPE call, just have the DDX manage
it instead. Introduce GetMaximumEventsNum(), which is the maximum number
of events these functions will ever produce.
2006-08-10 14:00:14 +03:00
4be9abb850
kdrive: remove ddx_DEPENDENCIES
...
Remove foo_DEPENDENCIES as they weren't guaranteed to just be libs,
and loader arguments (-lfoo, -Lfoo) might've crept in.
2006-08-09 07:20:16 +03:00
bedc4ecf23
xephyr: aid input debugging
...
Add the 'ephyr' mouse and keyboard drivers to the driver list so we can
re-add devices.
Set the names properly in Ephyr{Keyboard,Mouse}Init, not in InitInput.
2006-08-07 23:00:45 +03:00
baf93b3abe
kdrive: move map initialisation to KdNewPointer
...
Do a linear n -> n initialisation on the map up until KD_MAX_BUTTON in
KdNewPointer, moving it out of both KdParsePointer, and KdPointerProc.
Also remove dead pointer acceleration code.
2006-08-07 21:12:45 +03:00
ccb53340b6
ephyr: cleanup
...
Remove extraneous KdAddPointerDriver call.
2006-08-07 21:12:00 +03:00
9b7ecbd1dd
kdrive: prevent overrun in map
...
We actually need n + 1 elements for the mouse button map, not n.
2006-08-07 21:09:32 +03:00
Peter Hutterer
Alberto Mardegan
Eric Anholt
Adam Jackson
Daniel Stone
Alan Coopersmith
Juliusz Chroboczek
Samuel Thibault
Matthew Allum
Daniel Stone