1f0075786f
Merge branch 'master' into mpx
...
Conflicts:
configure.ac
dix/getevents.c
hw/xfree86/ramdac/xf86Cursor.c
mi/mipointer.c
xkb/xkbUtils.c
2007-03-05 12:37:17 +10:30
12175b668a
o fix minor error in comment for GetPointerEvents()
2007-03-03 13:57:39 +10:30
d570ff7c81
fix: WarpCursor needs to send MotionNotify.
2007-02-15 10:28:55 +10:30
25104ed2e6
dix: fix typo in condition.
2007-02-14 11:26:53 +10:30
33ef546b94
dix: Clean up GetPointerEvents. If pDev == inputInfo.pointer, assume that
...
we do not want Xi events.
mi: Remove POINTER_CORE_ONLY flag.
2007-02-14 11:18:43 +10:30
7cd73b00a2
dix: If POINTER_CORE_ONLY is set, GetPointerEvents() only creates a core event
...
mi: fix: Create motion event in miPointerMoved
2007-02-05 14:48:48 +10:30
4aaaa70d1b
Xi: Adding ChangePointerKeyboardPairing request
...
Adding PointerKeyboardPairingChanged event
Correct error values for XWarpDevicePointer
dix: Adding device argument to SendMappingNotify
Adding spriteOwner flag to devices
2007-01-29 18:23:24 +10:30
15a81b6325
Merge branch 'master'
2007-01-28 17:18:57 +10:30
cc3d66d4a5
o fix minor error in comment for GetPointerEvents()
2007-01-28 17:08:17 +10:30
3759254c09
Merge branch 'master'
2007-01-28 17:05:55 +10:30
05f915050c
dix/events: take screen number, not pointer, in PostSyntheticMotion
...
Since we were using PostSyntheticMotion incorrectly anyway, update the
declared API to match.
2006-12-27 16:38:06 +00:00
ca5ebe3971
Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver
2006-12-19 10:51:01 +10:30
2d0a63126b
Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver
2006-12-19 10:31:40 +10:30
a96788058e
mi: removing MPX ifdefs
...
global sprite renaming in mipointer and misprite
fixed: multiple remove cursor call in miSpriteInstallColormap
fixed: wrong core pointer usage in miSpriteStoreColors
dix: bugfix in CheckCursorConfinement
removing MPX ifdefs
removing MPX event generation (using Xi solely now)
2006-12-14 10:50:18 +10:30
ae3c24da34
dix: Moving SpriteRec into DeviceIntRec
...
removing global sprite structure
beginning to remove MPX ifdefs
xnest: Fix to make xnest compile again
2006-12-11 18:09:59 +10:30
72e7f2ac6c
GetPointerEvents: always send valuator events for MotionNotify
...
Always chase a DeviceMotionNotify event with a DeviceValuator, which is
not required in the spec, but will silently break the lib if you don't
include.
2006-12-06 23:24:24 +02:00
c458a70d65
GetPointerEvents: fix typo
...
Fix typo that resulted in inverted axes when using an absolute positioning
device that didn't report y, and thus relied on the previous value.
2006-12-06 23:24:24 +02:00
3c8f166022
Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver into mpx
...
Conflicts:
dix/events.c
2006-12-05 18:28:33 +10:30
f44f14fe56
Define calls away when not building XACE, allowing ifdef's to be removed.
2006-12-01 21:15:41 -05:00
416f1bb99a
mpx: SelectEvents and GetEventBase requests.
...
Some renaming and cleaning up in extinit.c
MPXLastEvent added
Xi: ShouldFreeInputMask() from XI is not static any more, used in mpx
dix: GetPointerEvents() allocates MPX event for MPX devices.
DeliverDeviceEvents() caters for MPX devices.
2006-12-01 15:56:52 +10:30
b4b0d901d9
Merge branch 'randr-1.2'
...
Conflicts:
dix/events.c
dix/getevents.c
hw/xfree86/common/xf86Mode.c
hw/xfree86/dri/Makefile.am
hw/xfree86/os-support/drm/xf86drm.c
hw/xfree86/os-support/xf86drm.h
2006-11-27 15:43:15 -08:00
c957a16180
dix: added isMPdev field to _DeviceIntRec, is used in GetPointerEvents()
...
mieq: avoid merging events from different devices in mieqEnqueue()
xfree86/common
isMPdev field used from xf86ActivateDevice(), xf86PostMotionEvent()
and xf86PostButtonEvent()
2006-11-16 15:11:14 +10:30
7ce2dc5784
dix:
...
merge with code cleanup from master
GetPointerEvents treats events in the same way as XINPUT devices when flag
has POINTER_MULTIPOINTER set.
xfree86/common:
added XI86_MP_DEVICE flag and parsing in xf86ProcessCommonOptions
added POINTER_MULTIPOINTER define. Is used in xf86PostMotionEvent and
xf86PostButtonEvent for the flags that are passed into GetPointerEvents()
global:
added flags to configure.ac to enable/disable MPX define
added flags to dix-config.h.in to define MPX
2006-11-16 12:51:08 +10:30
4d07b50372
dix: cleaned up GetPointerEvents() to avoid code duplication.
2006-11-16 10:55:15 +10:30
f737cd925e
o fix minor error in comment for GetPointerEvents()
2006-11-15 17:50:02 +10:30
e7900d68c3
remove trailing whitespace
...
Whitespace police in full effect.
2006-11-08 15:36:47 +02:00
b5438f7fb2
Get*Events: massive reorganisation
...
Reorganise the code logically, and put more comments in.
Clip valuators in proximity calls.
2006-11-08 15:30:03 +02:00
1dcda4f3c5
Avoid dereferencing sprite.screen when Xinerama is not running. ( #8925 )
...
With Xinerama support built into the X server but not in use,
sprite.screen is NULL and yet the SyntheticMotion
macro would dereference it. Avoid that by just passing sprite.screen
to PostSyntheticMotion which can then dereference it when Xinerama is
enabled.
Also, define PostSyntheticMotion in dixevents.h and include dixevents.h in
getevents.c
2006-11-07 01:29:51 -08:00
85212eb504
getValuatorEvents: make sure we put MORE_EVENTS in the right places
...
Make sure we put MORE_EVENTS in with the device id if there are, in fact,
more valuator events coming.
2006-10-27 01:23:58 +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
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
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
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
77e724585f
minor formatting fixes
2006-10-22 11:45:12 +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
4d8030076e
dix: move GetKeyboardEvents/GetPointerEvents to a new file, export symbols
...
Move GKE and GPE to a separate file, to help stem the events.c explosion.
Mark GKE/GKVE/GPE as _X_EXPORT.
2006-10-14 22:14:07 +03:00
Peter Hutterer
Daniel Stone
Eamon Walsh
Eric Anholt
Keith Packard