andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4f2cd0ed96
xserver-multidpi/Xi
History
Peter Hutterer 4f2cd0ed96 Merge branch 'master' into mpx 
This merge reverts Magnus' device coorindate scaling changes. MPX core event
generation is very different, so we can't scale in GetPointerEvents.

Conflicts:

	Xi/opendev.c
	dix/devices.c
	dix/dixfonts.c
	dix/getevents.c
	dix/resource.c
	dix/window.c
	hw/xfree86/common/xf86Xinput.c
	mi/mipointer.c
	xkb/ddxBeep.c
	xkb/ddxCtrls.c
	xkb/ddxKeyClick.c
	xkb/ddxList.c
	xkb/ddxLoad.c
	xkb/xkb.c
	xkb/xkbAccessX.c
	xkb/xkbEvents.c
	xkb/xkbInit.c
	xkb/xkbPrKeyEv.c
	xkb/xkbUtils.c
2008-03-04 18:11:10 +10:30
..
allowev.c Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
allowev.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
chaccess.c Xi: switch to using "rc" (instead of "err") as returncode. 2008-01-03 18:36:33 +10:30
chaccess.h Xi: Add access control request handling. 2007-02-22 20:00:59 +10:30
chdevcur.c Xi: switch to using "rc" (instead of "err") as returncode. 2008-01-03 18:36:33 +10:30
chdevcur.h Xi: Adding ChangeDeviceCursor request 2007-01-08 12:31:18 +10:30
chdevhier.c Xi: even if ChangeDeviceHierarchy fails, we may need to send an event. 2008-02-18 16:46:07 +10:30
chdevhier.h Xi: remove ChangePointerKeyboardPairing in favour of ChangeDeviceHierarchy. 2007-10-19 14:36:37 +09:30
chgdctl.c Merge branch 'master' into mpx 2008-03-04 18:11:10 +10:30
chgdctl.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
chgfctl.c XACE: Change access modes for some device-related requests. 2008-02-13 20:20:49 -05:00
chgfctl.h Static cleanup on Xi/ 2007-03-25 21:18:39 -04:00
chgkbd.c Input: Return errors to the dispatcher instead of sending them ourself. 2007-09-26 07:26:59 -04:00
chgkbd.h Xi: disallow changing core keyboard and pointer 2006-10-29 03:43:34 +03:00
chgkmap.c XACE: Change access modes for some device-related requests. 2008-02-13 20:20:49 -05:00
chgkmap.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
chgprop.c Fix for CVE-2007-6427 - Xinput extension memory corruption. 2008-01-17 15:27:34 +01:00
chgprop.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
chgptr.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
chgptr.h Static cleanup on Xi/ 2007-03-25 21:18:39 -04:00
chpkpair.h Send PointerKeyboardPairingChangedNotifyEvent using XGE. 2007-05-01 12:12:58 +09:30
closedev.c Merge branch 'master' into mpx 2008-03-04 18:11:10 +10:30
closedev.h Static cleanup on Xi/ 2007-03-25 21:18:39 -04:00
devbell.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
devbell.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
exevents.c Xi: finish XKB initialisation before copying the keymap. 2008-02-07 21:24:45 +10:30
exglobals.h Clean up, correct some comments. 2007-05-17 17:59:02 +09:30
extgrbdev.c Xi: remove ungrab handling of ExtendedUngrabDevice request. 2008-02-25 17:00:42 +10:30
extgrbdev.h Add ExtendedGrabDevice handling. 2007-05-14 10:42:03 +09:30
extinit.c Xi: remove GetPairedPointer handling. 2008-02-25 17:52:45 +10:30
getbmap.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
getbmap.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
getcptr.c Xi: remove trailing whitespaces. 2007-11-13 17:14:35 +10:30
getcptr.h Xi: add GetClientPointer and GetPointerPairing requests. 2007-03-22 17:47:01 +10:30
getdctl.c Xi: specify correct struct when calculating size of GetDeviceControl reply. 2007-12-19 18:18:10 +10:30
getdctl.h Static cleanup on Xi/ 2007-03-25 21:18:39 -04:00
getfctl.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
getfctl.h Static cleanup on Xi/ 2007-03-25 21:18:39 -04:00
getfocus.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
getfocus.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
getkmap.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
getkmap.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
getmmap.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
getmmap.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
getprop.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
getprop.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
getselev.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
getselev.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
getvers.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
getvers.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
grabdev.c Merge branch 'master' into mpx 2008-01-26 13:55:07 +10:30
grabdev.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
grabdevb.c Merge branch 'master' into mpx 2008-01-26 13:55:07 +10:30
grabdevb.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
grabdevk.c Merge branch 'master' into mpx 2008-01-26 13:55:07 +10:30
grabdevk.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
gtmotion.c Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
gtmotion.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
listdev.c Xi: MDs return the paired device's ID in attached field of ListInputDevices. 2008-02-26 13:51:19 +10:30
listdev.h Xi: make SizeDeviceInfo public and re-use from CreateClassesChangedEvent. 2008-02-18 18:42:46 +10:30
Makefile.am Xi: remove GetPairedPointer handling. 2008-02-25 17:52:45 +10:30
opendev.c Merge branch 'master' into mpx 2008-03-04 18:11:10 +10:30
opendev.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
qryacces.c Xi: switch to using "rc" (instead of "err") as returncode. 2008-01-03 18:36:33 +10:30
qryacces.h Xi: Add access control request handling. 2007-02-22 20:00:59 +10:30
querydp.c Xi: QueryDevicePointer doesn't have a shared field anymore. 2008-02-14 09:48:19 +10:30
querydp.h xfree86: Changing "IsMPDevice" to "SharedPointer" option. Devices will default 2006-12-20 13:05:53 +10:30
queryst.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
queryst.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
selectev.c Fix for CVE-2007-6427 - Xinput extension memory corruption. 2008-01-17 15:27:34 +01:00
selectev.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
sendexev.c Merge branch 'master' into mpx 2008-01-26 13:55:07 +10:30
sendexev.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
setbmap.c XACE: Change access modes for some device-related requests. 2008-02-13 20:20:49 -05:00
setbmap.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
setcptr.c Xi: ProcXSetClientPointer should directly check for the client from the id. 2008-01-03 18:48:13 +10:30
setcptr.h Xi: Add SetClientPointer request handling. 2007-03-09 15:45:25 +10:30
setdval.c Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
setdval.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
setfocus.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
setfocus.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
setmmap.c XACE: Change access modes for some device-related requests. 2008-02-13 20:20:49 -05:00
setmmap.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
setmode.c Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
setmode.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
stubs.c Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
ungrdev.c Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
ungrdev.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
ungrdevb.c Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
ungrdevb.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
ungrdevk.c Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
ungrdevk.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
warpdevp.c Xi: switch to using "rc" (instead of "err") as returncode. 2008-01-03 18:36:33 +10:30
warpdevp.h xfree86: Changing "IsMPDevice" to "SharedPointer" option. Devices will default 2006-12-20 13:05:53 +10:30
xiselev.c Xi: if deviceid is > 127 assume GE mask is for all devices (XiSelectEvent). 2008-01-25 10:27:30 +10:30
xiselev.h Add missing files for ProcXiSelectEvent. 2007-05-02 13:51:16 +09:30