598ac7a836
Merge branch 'origin'
2006-10-24 17:23:12 -07:00
828c34e83c
Byte swap RRSelectInput enable flags.
2006-10-24 17:23:02 -07:00
3da918a16c
mipointer: remember to update pointer location
...
Update pointer location so it doesn't get quickly reset by the next
pointer update.
2006-10-25 02:22:07 +03:00
aabc087998
GetPointerEvents: always ensure correct number of events
...
Ensure correct number of valuator events are returned, and that we always
increment events correctly.
2006-10-25 02:21:39 +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
0514d53e10
xfree86: remove motion history handling
...
Remove motion history handling, as we now deal with this in the DIX.
2006-10-25 01:10:44 +03:00
b1debebf8f
mi: remove mi motion history
...
This is now unneeded as we do motion history in the DIX.
2006-10-25 01:10:20 +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
5b38eb69cd
dix: add motion history support
...
Add motion history support (sort of based on the XFree86 DDX's
implementation) to the DIX.
2006-10-25 01:08:29 +03:00
11fb58be77
miscellaneous warning fixes
...
Use the correct type for time, and fix the mi prototype of EnqueueEvent.
2006-10-25 01:07:36 +03:00
2a74b8a91d
xfree86: re-bump input abi to 1.0, yet again
2006-10-25 01:04:53 +03:00
37d1fffe79
inputstr: try to keep device structs the same size
...
Try to make sure DeviceIntRec and friends stay the same size,
regardless of whether or not XKB is enabled.
2006-10-24 23:06:57 +03:00
9f9ac01a81
inputstr: fix indentation
2006-10-24 23:01:05 +03:00
27d682fa03
Fix from HEAD accidentally reverted during merge.
2006-10-24 09:04:14 -07:00
8b90913566
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
...
Conflicts:
hw/xfree86/Makefile.am
hw/xfree86/common/xf86.h
hw/xfree86/common/xf86DoScanPci.c
hw/xfree86/os-support/bus/linuxPci.c
hw/xfree86/scanpci/extrapci.ids
hw/xfree86/scanpci/pci.ids
hw/xfree86/scanpci/pciid2c.pl
hw/xfree86/scanpci/xf86PciStdIds.h
2006-10-24 08:57:59 -07:00
0cd6a3d8ef
xfree86/input: add proximity support, free valuators
...
Re-add support for proximity events, and remember to both va_end our
varargs, and free our valuators.
2006-10-23 06:56:07 +03:00
cccf7ae0ff
GetProximityEvents: add (untested) function
...
Add untested first guess at what GetProximityEvents should look like.
2006-10-23 06:55:21 +03:00
35fa4ac12b
GetPointerEvents: break into separate functions
...
Break out clipAxis, clipValuators, and getValuatorEvents, into
separate functions, to be used by the proximity event code.
2006-10-23 06:23:45 +03:00
a7c2d9a15d
kdrive: numerous warning fixes
2006-10-23 06:08:27 +03:00
c8f76fb3a4
xfree86/input: disallow pointer device changes, fix drag event calculation
...
Don't allow users to change the core pointer.
Fix xf86SendDragEvents to check the device button state, not the core
pointer's.
Remove unused xf86CheckButton.
2006-10-23 05:12:15 +03:00
c5b5b046e8
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-10-23 02:58:30 +03:00
fab1d37ecb
xfree86/options: don't blindly dereference NULL pointers
...
Sure, conf_idev should be initialised, but if it's not, try to make the
best of a bad situation.
2006-10-23 02:57:00 +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
29f28dd1a8
configure.ac: add XSERVER_LIBS to XNEST_LIBS
2006-10-23 02:52:52 +03:00
2f33f4065d
Xnest: port to new input API
...
Port Xnest to Get{Pointer,Keyboard}Events, plus the new mieq API.
2006-10-23 02:52:35 +03:00
08928afb05
Xnest: disable XKB, reshuffle code
...
Disable XKB, as we can't yet use it; move Composite disabling to
ddxInitGlobals, along with XKB.
2006-10-23 02:51:52 +03:00
cd3b16a57e
Xvfb: port to new mieq API
2006-10-23 02:51:13 +03:00
bf4df9b73f
include: move POINTER_* flags from inputstr.h to input.h
...
Given they're just numeric constants, they should be included in
input.h, not inputstr.h.
2006-10-23 02:50:53 +03:00
4dd91c45ab
miinitext: Xi and XKB are not hardware-only extensions
...
Xi is now a required extension, and XKB can be used without hardware,
so include them both when NO_HW_ONLY_EXTS is defined.
2006-10-23 02:50:03 +03:00
562096a012
XkbCopyKeymap: increment shapes and outlines when copying
...
Remember to increment the source and destination shapes when copying,
instead of just endlessly copying the first one.
2006-10-23 02:49:22 +03:00
eec1822591
dix/getevents: move SyntheticMotion to getevents.c
...
Mostly, this is just a cheesy hack to ensure that getevents.o gets
included when linking. Sigh.
2006-10-23 02:48:30 +03:00
bc701a1429
dix/getevents: cosmetic cleanups, remove keymap copy from GKVE
...
Remove keymap copy from GetKeyboardValuatorEvents, as
SwitchCoreKeyboard now takes care of this for us.
Remove unused variable and function prototype.
Update comments to be as informative as possible.
2006-10-23 00:08:32 +03:00
b03e2f7029
xi: fix NIDR return yet again
...
For a one-line function, it was pretty broken.
2006-10-22 19:56:49 +03:00
90de7ce25a
xi: fix return type for NIDR
2006-10-22 19:54:36 +03:00
f46dc27291
xi: add NewInputDeviceRequest to stubs
2006-10-22 19:51:35 +03:00
31a6307b7b
xi: change DEVICE_TOUCHSCREEN to ABS_{AREA_CALIB} for stubs
2006-10-22 19:49:31 +03:00
eae6594d03
Xi: swap control in DevicePresenceNotify
2006-10-22 16:39:44 +03:00
be21630164
dix, Xi: make use of deviceid in DevicePresenceNotify
...
Use the deviceid and control fields in DevicePresenceNotify since
the last push to inputproto to send a DPN whenever a control changes
on a device.
2006-10-22 16:33:02 +03:00
f08b6b2367
kdrive: change DEVICE_TOUCHSCREEN to DEVICE_ABS_{CALIB,AREA}
2006-10-22 12:30:02 +03:00
77e724585f
minor formatting fixes
2006-10-22 11:45:12 +03:00
948a97b97e
Minor typo fix to xorg.conf man page.
2006-10-21 23:09:22 +10:00
04554a3adc
Minor typos in Xserver man page.
2006-10-21 22:06:43 +10:00
e26a494f41
Merge branch 'input-hotplug' of git+ssh://git.freedesktop.org/git/xorg/xserver
2006-10-21 04:26:14 -04:00
736b0d5078
DEVICE_TOUCHSCREEN becomes DEVICE_ABS_CALIB.
...
Update the DEVICE_ABS_CALIB stuff to include the new elements.
New DEVICE_ABS_AREA support.
dev->touchscreen becomes dev->absolute, with _CALIB and _AREA stuff in it.
Update xfree86 to compile with this, kdrive needs an update too.
2006-10-21 04:24:49 -04:00
edd5f17454
Add ast driver/device info to Xorg server & config utilities
2006-10-19 17:30:54 -07: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
Keith Packard
Daniel Stone
Ian Romanick
Drew Parsons
Zephaniah E. Hull
Carl Switzky