andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,198 Commits 86 Branches 473 Tags 48 MiB
C 95%
Roff 1.2%
Objective-C 0.9%
Meson 0.8%
M4 0.6%
Other 1.4%
4f2cd0ed96
Go to file
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
afb Merge branch 'master' into XACE-SELINUX 2007-11-19 18:10:46 -05:00
cfb Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
cfb32 get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE 2006-07-18 18:17:38 -04:00
composite Resize composite overlay window when the root window changes. 2008-02-17 11:21:01 +01:00
config config: don't reset connection info on disconnect. 2008-01-29 09:13:25 +10:30
damageext Revert "registry: Register DAMAGE extension protocol names." 2007-11-20 17:31:00 -05:00
dbe Clean up many #if 0. 2007-12-02 12:40:25 -05:00
dix Merge branch 'master' into mpx 2008-03-04 18:11:10 +10:30
doc Merge branch 'master' into XACE-SELINUX 2007-11-19 18:10:46 -05:00
exa EXA: Let the driver decide what repeat/extend types are supported. 2008-02-27 23:44:39 +01:00
fb fbFillRegionTiled() is now dead code. 2008-02-22 15:22:38 -05:00
GL More checking for failed contexts/drawables 2008-02-27 17:06:27 +00:00
hw Merge branch 'master' into mpx 2008-03-04 18:11:10 +10:30
include Merge branch 'master' into mpx 2008-03-04 18:11:10 +10:30
mfb devPrivates rework: put back some changes that were mistakenly removed 2007-11-20 15:31:44 -05:00
mi Merge branch 'master' into mpx 2008-03-04 18:11:10 +10:30
miext Rootless: RootlessEnsureFrame: Added check for !IsRoot 2008-01-28 12:25:29 -08:00
os Merge branch 'master' into mpx 2008-03-04 18:11:10 +10:30
randr Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
record Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
render Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
Xext Merge branch 'master' into mpx 2008-03-04 18:11:10 +10:30
xfixes Merge branch 'master' into mpx 2008-03-04 18:11:10 +10:30
Xi Merge branch 'master' into mpx 2008-03-04 18:11:10 +10:30
xkb Merge branch 'master' into mpx 2008-03-04 18:11:10 +10:30
XTrap Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
.gitignore Add tags/TAGS to .gitignore for ctags usage 2008-01-21 21:16:13 -05:00
acinclude.m4 Include comment/copyright/license for AC_DEFINE_DIR in acinclude.m4 2007-07-25 17:42:23 -07:00
autogen.sh DeliverEventsToWindow: ensure that genericMask has a defined value. 2007-07-10 19:11:30 +09:30
configure.ac Add DRI2 module. 2008-02-14 19:53:49 -05:00
COPYING COPYING: Collapse 'canonical license' into one statement 2007-11-07 03:58:56 +02:00
cpprules.in For MANDEFS, also replace __mandir__ for $(mandir) which includes 2006-12-08 15:51:44 -06:00
Makefile.am Generate ChangeLog file for make dist. 2007-07-10 21:33:54 -07:00
xorg-server.m4 Add xorg-server.m4 for driver dependency checking. 2005-11-01 15:01:51 +00:00
xorg-server.pc.in Export the server ABI versions from xorg-server.pc 2007-11-05 17:18:46 -05:00