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

..

appgroup.c

Merge branch 'master' into mpx

2008-01-03 17:04:54 +10:30

appgroup.h

Static and dead code cleaup for Xext/

2007-03-25 17:57:22 -04:00

bigreq.c

Merge branch 'master' into mpx

2008-01-03 17:04:54 +10:30

cup.c

Merge branch 'master' into mpx

2008-01-26 13:55:07 +10:30

dpms.c

Merge branch 'master' into mpx

2008-01-03 17:04:54 +10:30

dpmsproc.h

xace: add hooks + new access codes: core protocol screensaver requests

2007-08-16 10:36:05 -04:00

dpmsstubs.c

Xext: remove redefinition of Bool.

2007-12-19 18:11:32 +10:30

EVI.c

Merge branch 'master' into mpx

2008-01-26 13:55:07 +10:30

EVIstruct.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

fontcache.c

Merge branch 'master' into mpx

2008-01-03 17:04:54 +10:30

geext.c

Xext: add GEDeviceMaskIsSet (GE mask checking per device)

2008-01-25 10:27:26 +10:30

geext.h

Xext: add GEDeviceMaskIsSet (GE mask checking per device)

2008-01-25 10:27:26 +10:30

geint.h

Merge branch 'master' into mpx

2008-01-03 17:04:54 +10:30

Makefile.am

Merge branch 'master' into mpx

2008-01-26 13:55:07 +10:30

mbuf.c

Merge branch 'master' into mpx

2008-01-10 13:38:46 +10:30

mbufbf.c

Xext: Scruffy the janitor don't like no "register" keywords.

2007-11-21 15:59:31 +10:30

mbufpx.c

Xext: Remove usage of alloca

2007-11-05 14:34:46 +00:00

mitmisc.c

Merge branch 'master' into mpx

2008-01-03 17:04:54 +10:30

panoramiX.c

Merge branch 'master' into mpx

2008-03-04 18:11:10 +10:30

panoramiX.h

Death to RCS tags.

2007-06-29 14:06:52 -04:00

panoramiXh.h

Static and dead code cleaup for Xext/

2007-03-25 17:57:22 -04:00

panoramiXprocs.c

Fix Xinerama's consolidated visual handling.

2008-02-22 15:19:54 -05:00

panoramiXsrv.h

Fix Xinerama's consolidated visual handling.

2008-02-22 15:19:54 -05:00

panoramiXSwap.c

Merge branch 'master' into mpx

2008-01-03 17:04:54 +10:30

sampleEVI.c

Merge branch 'master' into mpx

2008-01-26 13:55:07 +10:30

saver.c

Merge branch 'master' into mpx

2008-03-04 18:11:10 +10:30

security.c

Merge branch 'master' into mpx

2008-03-04 18:11:10 +10:30

securitysrv.h

Rework of the XC-SECURITY extension. The gen-auth protocol has not changed,

2007-11-08 16:32:42 -05:00

shape.c

Merge branch 'master' into mpx

2008-01-03 17:04:54 +10:30

shm.c

Merge branch 'master' into mpx

2008-01-26 13:55:07 +10:30

shmint.h

Export fbShmPutImage to modules.

2007-08-24 14:02:35 +02:00

sleepuntil.c

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

sleepuntil.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

sync.c

Merge branch 'master' into mpx

2008-01-03 17:04:54 +10:30

xace.c

XACE: Move the selection access hook to its own function.

2008-02-12 19:59:10 -05:00

xace.h

XACE: Make the default window background state configurable per-window.

2008-02-20 15:59:40 -05:00

xacestr.h

XACE: Push the dix "structure" includes down to the security modules.

2008-02-05 21:06:05 -05:00

xcalibrate.c

[Kdrive] make XCalibrate 'orientation aware'

2008-01-08 12:31:47 +01:00

xcmisc.c

Merge branch 'master' into mpx

2008-01-03 17:04:54 +10:30

xevie.c

Merge branch 'master' into mpx

2008-01-03 17:04:54 +10:30

xf86bigfont.c

Use strerror instead of errno values in user strings.

2008-02-14 07:52:02 +11:00

xprint.c

Merge branch 'master' into mpx

2008-01-03 17:04:54 +10:30

xres.c

Merge branch 'master' into mpx

2008-01-03 17:04:54 +10:30

xselinux.c

xselinux: Prefix a few remaining error messages with "SELinux".

2008-02-27 22:48:29 -05:00

xselinux.h

xselinux: Stub out selection protocol requests.

2008-02-26 23:14:29 -05:00

xtest.c

Merge branch 'master' into mpx

2008-01-03 17:04:54 +10:30

xvdisp.c

Yet another Xv extension byte swapping fix.

2008-01-16 14:24:22 +01:00

xvdisp.h

Fix swapped Xv dispatch under Xinerama.

2007-12-02 14:15:36 -05:00

xvdix.h

devPrivates rework: since API is already broken, switch everything

2007-08-28 09:28:25 -04:00

xvmain.c

dix: remove inputInfo.pointer reference in TryClientEvents.

2008-01-18 18:48:46 +10:30

xvmc.c

Merge branch 'master' into mpx

2008-01-03 17:04:54 +10:30

xvmcext.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00