Eamon Walsh
a52c9b2a59
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
dix/dispatch.c
dix/property.c
hw/xfree86/common/xf86VidMode.c
include/xkbsrv.h
render/glyph.c
xkb/xkbActions.c
2007-11-05 19:08:36 -05:00
Peter Hutterer
8ead41388e
xfree86: wrap keyboard devices for XKB.
...
Call ProcessOtherEvents first, then for all keyboard devices let them be
wrapped by XKB. This way all XI events will go through XKB.
Note that the VCK is still not wrapped, so core events will bypass XKB.
(cherry picked from commit d627061b48
)
2007-10-28 17:31:07 +02:00
Eamon Walsh
5c03d13181
xace: add new hooks + access controls: XInput extension.
...
Introduces new dix API to lookup a device, dixLookupDevice(), which
replaces LookupDeviceIntRec and LookupDevice.
2007-09-28 08:02:00 -04:00
Daniel Stone
0e0174d45e
XFree86: Allow disabling of HAL
...
If NoAutoAddDevices is given as a server flag, then no devices will be added
from HAL events at all. If NoAutoEnableDevices is given, then the devices will
be added (and the DevicePresenceNotify sent), but not enabled, thus leaving
policy up to the client.
2007-08-01 03:33:06 +03:00
Daniel Stone
cd8e99e56e
Input: Don't enable devices when we open them
...
Thanks to Xi's braindead design, it's otherwise impossible to query input
devices without enabling them. Hurrah.
2007-08-01 03:33:06 +03:00
Daniel Stone
89f628394f
XFree86: Input: Fix whitespace
2007-08-01 03:33:05 +03:00
Daniel Stone
7c9e8fd56e
Input: Allow enabling and disabling of devices
...
Add DEVICE_ENABLE to KDrive and XFree86 to allow us to enable and disable
devices on the fly.
2007-08-01 01:53:31 +03:00
Adam Jackson
4d76075dbb
Death to RCS tags.
2007-06-29 14:06:52 -04:00
Tiago Vignatti
38f8e53668
Janitor work. Remove 'defined but not used' warnings from xorg and other cosmetic.
2007-06-27 03:19:37 -03:00
Zephaniah E. Hull
562ca3f2f9
In NewInputDeviceRequest, only call EnableDevice if xf86Screens[0]->vtSema is
...
true, preventing unwanted behavior in the case where a device is added while
the user is in a different VT.
2007-06-18 12:00:49 -04:00
Zephaniah E. Hull
75dece08fb
xf86PostMotionEvents[P] calls xf86SendDragEvents, xf86SendDragEvents
...
unconditionally checks device->button->buttonsDown.
Let's make it possible to have a device with motion, but no buttons.
Without segfaulting.
2007-06-04 09:09:20 -04:00
Zephaniah E. Hull
fbb9b20395
Let's not do a calloc and a free on every call to xf86PostMotionEvents.
2007-06-04 06:59:42 -04:00
Zephaniah E. Hull
3f4295e643
Add xf86PostMotionEventP, takes a pointer instead of a variable number of
...
arguments.
Bump input ABI to 1.1 since we export this.
2007-06-04 06:48:06 -04:00
Daniel Stone
9a7aaeb3f6
XFree86: Input: Assume core events per default
...
Assume that a device will be sending core events, unless explicitly
specified otherwise.
2007-06-03 18:38:53 +03:00
Daniel Stone
94361cbba7
XFree86: Input: Perform case-insensitive comparisons on option names
2007-06-03 18:38:42 +03:00
Peter Hutterer
09436fb7c3
Disable devices before removing, remove unrecoverable devices.
2007-04-24 23:11:44 +09:30
Peter Hutterer
c7e2ba0c9b
Use DevicePresence events to tell the client about enabled/disabled devices.
...
Include the device id in the event sent to the client.
2007-04-24 23:11:44 +09:30
Remigiusz Marcinkiewicz
aecbc71214
Input: Allow a pointer to a device to be returned in NIDR
...
Allow a pointer to the first device added to be returned, so we know which
device(s) were added by the NIDR call.
2007-04-11 00:38:16 +03:00
Magnus Vigerlöf
82962bbae2
Input: Add DeleteInputDeviceRequest
...
Add DIDR, which asks the DDX to remove a device, analogous to
NewInputDeviceRequest. Only implemented for XFree86 at the moment.
2007-04-10 23:58:20 +03:00
Magnus Vigerlöf
7b82a836c6
XFree86: Fix memory leaks, option parsing, in NewInputDeviceRequest
...
Plugged some possible memory leaks, and added some more checks on the
options, particular for driver/identifier. Added an unwind.
2007-04-10 23:58:20 +03:00
Daniel Stone
3e9f7a5504
XFree86 DGA: Guard against NULL pointer dereferences.
...
Ass, u, me ...
2007-03-21 02:35:31 +02:00
Daniel Stone
9398d62f27
XFree86 input: Add backwards compatibility for motion history
...
Add the old motion history API back, as a shim around the new mi API.
2007-03-21 00:18:24 +02:00
Daniel Stone
0f75c47e0c
xfree86 input: Re-enable DGA support
...
Re-enable DGA support for relative mouse motion.
2007-03-21 00:12:02 +02:00
Daniel Stone
8884a73a3f
xfree86/input: re-add support for disabling drag events
2006-12-06 23:24:24 +02:00
Daniel Stone
96e32805d1
Xi: disallow changing core keyboard and pointer
...
Just short-circuit the change core keyboard/pointer requests.
2006-10-29 03:43:34 +03:00
Daniel Stone
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
Daniel Stone
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
Daniel Stone
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
Zephaniah E. Hull
e26a494f41
Merge branch 'input-hotplug' of git+ssh://git.freedesktop.org/git/xorg/xserver
2006-10-21 04:26:14 -04:00
Zephaniah E. Hull
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
Daniel Stone
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
Zephaniah E. Hull
1b1698af41
Pass SetDeviceValuators down to the driver.
...
NOTE: This changes the LocalDeviceRec struct, which breaks input drivers.
2006-10-18 04:57:22 -04:00
Daniel Stone
4ae7745a0d
xfree86 input: always open devices on NewInputDeviceRequest
2006-10-15 21:48:01 +03:00
Daniel Stone
ef7e05e9de
xfree86/xinput: pass first_valuator params, don't clip to first screen bound
...
Pass first_valuator to GetPointerEvents/GetKeyboardValuatorEvents.
Don't clip axis bounds to that of screen 0 when initialising axes.
2006-10-08 21:42:15 +03:00
Daniel Stone
41bb9fce47
mipointer: take device arguments, split miPointerAbsoluteCursor
...
Update mipointer API to take a device argument to (almost) all functions,
and split miPointerAbsoluteCursor into a couple of separate functions.
Remove miPointerAbsoluteCursor call from mieq, as we now deal with it in
GetPointerEvents.
Make miPointerSetPosition (successor of miPointerAbsoluteCursor) take
pointers to x and y, so it can return the clipped values.
Modify callers of miPointer*() functions to generally use the new
functions.
This should fix things with multi-head setups.
2006-10-08 20:34:32 +03:00
Daniel Stone
3ae4d25018
xfree86 Xinput: remove still more excessive debugging
...
There isn't any more debugging left for input events in the XFree86 DDX.
2006-10-08 16:20:42 +03:00
Daniel Stone
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
Daniel Stone
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
Daniel Stone
afcad4ad99
xfree86 ddx: always free GKE/GPE events
...
free() events we get passed back from GKE and GPE so we don't just, er,
leak them all. *cough*.
2006-08-07 18:11:05 +03:00
Daniel Stone
ca3f4fc1b0
add fallback ChangeDeviceControl, allow XOpenDevice on closed device
...
Add a fallback ChangeDeviceControl, which allows the attributes we know about
so far.
Allow XOpenDevice on closed devices.
2006-07-23 19:02:12 -04:00
Daniel Stone
7465010d59
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-07-21 19:05:41 -04:00
Adam Jackson
0aaac95b0d
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
Daniel Stone
60ea7b51fe
xorg ddx: move to new input API, remove old keyboard driver
...
Remove most of the rest of the old keyboard driver.
Move to the new Get{Keyboard,Pointer}Events API, which is mostly
complete at this stage: just missing the proximity events.
2006-07-21 15:23:37 -04:00
Daniel Stone
c9a3d9baa8
xorg DDX: implement NewInputDeviceRequest
...
Implement NewInputDeviceRequest for Xorg, mainly written by Kristian Høgsberg.
Move MatchInput to xf86Helper.c, as xf86LookupInputDriver.
2006-07-21 15:19:50 -04:00
Adam Jackson
a68c11bb1d
Mark everything in xf86sym.c as _X_EXPORT.
2006-03-25 19:52:05 +00:00
Fredrik Höglund
ae935832fa
Refactored the screensaver and DPMS timer code to use the screensaver timer
...
for both screensaver and DPMS. Removed the SetDPMSTimers() and
FreeDPMSTimers() functions.
2006-03-24 20:50:13 +00:00
Adam Jackson
59279da498
Bug #1429 : Report input device type correctly. (Stéphane VOLTZ)
2005-10-21 19:06:13 +00:00
Daniel Stone
e03198972c
Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
...
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
source files in the xserver/xorg tree, predicated on defines of
HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
<X11/fonts/foo.h>.
2005-07-03 07:02:09 +00:00
Daniel Stone
9b1debcdb6
Change all misc.h and os.h references to <X11/foo.h>.
2005-07-01 22:43:43 +00:00
Daniel Stone
292c4cff26
Fix includes right throughout the Xserver tree:
...
change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
change "foo.h", "extensions/foo.h" and "X11/foo.h" to
<X11/extensions/foo.h> for extension headers, e.g. Xv.h;
change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
2005-04-20 12:25:48 +00:00