andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4f2cd0ed96
xserver-multidpi/dix
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
..
access.c dix: add support for WindowAccessAllowAll in device access checking. 2008-02-18 17:25:15 +10:30
atom.c Small static cleanups on dix/ 2007-11-15 17:01:33 -05:00
buildatoms XFree86 4.3.0.1 2003-11-14 16:49:22 +00:00
BuiltInAtoms R6.6 is the Xorg base-line 2003-11-14 15:54:54 +00:00
CHANGES R6.6 is the Xorg base-line 2003-11-14 15:54:54 +00:00
colormap.c Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
cursor.c Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
deprecated.c dix: add new, combined resource lookup function. Move all dix lookup API 2007-04-04 16:00:15 -04:00
devices.c Merge branch 'master' into mpx 2008-03-04 18:11:10 +10:30
dispatch.c Merge branch 'master' into mpx 2008-03-04 18:11:10 +10:30
dispatch.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
dixfonts.c Merge branch 'master' into mpx 2008-03-04 18:11:10 +10:30
dixutils.c Rip out useless indirection in the callback list management. 2008-02-14 07:02:13 +11:00
events.c Xi: remove ungrab handling of ExtendedUngrabDevice request. 2008-02-25 17:00:42 +10:30
extension.c registry: swap out the DTRACE XErrorDB stuff for the new registry call. 2007-11-26 15:59:44 -05:00
ffs.c ffs: handle 0 argument (bug #8968) 2006-11-11 14:13:56 +02:00
gc.c Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
getevents.c Merge branch 'master' into mpx 2008-03-04 18:11:10 +10:30
globals.c requestingClient is an xprintism, hide it for other servers. 2008-02-14 07:11:52 +11:00
glyphcurs.c Add CreatePixmap allocation hints. 2007-11-04 16:11:28 -08:00
grabs.c Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
initatoms.c Bug #10560: Code-Cleanup: function declarations () -> (void) 2007-04-09 14:33:15 -07:00
main.c Merge branch 'master' into mpx 2008-03-04 18:11:10 +10:30
Makefile.am Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
pixmap.c Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
privates.c devPrivates rework: Free callback lists after use. 2008-01-03 23:17:06 -05:00
property.c Merge branch 'master' into mpx 2008-03-04 18:11:10 +10:30
protocol.txt registry: Add a great big list of protocol names, like the XErrorDB that 2007-11-26 15:26:04 -05:00
registry.c registry: Add a call for DTRACE compatibility. 2007-11-26 15:59:01 -05:00
resource.c Merge branch 'master' into mpx 2008-03-04 18:11:10 +10:30
strcasecmp.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
swaprep.c DIX: Remove usage of alloca 2007-11-05 14:34:43 +00:00
swapreq.c dix: remove 'register' keyword for all variables. 2007-03-08 17:50:25 +10:30
tables.c Remove the old Kerberos 5 authentication code. 2007-06-04 18:07:00 -04:00
window.c Merge branch 'master' into mpx 2008-03-04 18:11:10 +10:30
xpstubs.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
Xserver-dtrace.h.in Add DTrace probe points for X server <-> client communications 2006-11-03 12:54:43 -08:00
Xserver.d Add DTrace probe points for X server <-> client communications 2006-11-03 12:54:43 -08:00