hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-09-25 21:02:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into mpx

Browse source 
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
This commit is contained in:
Peter Hutterer 2008-03-04 18:11:10 +10:30
commit 4f2cd0ed96
170 changed files with 8249 additions and 19613 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/misc.h
View file

@ -87,10 +87,8 @@ extern unsigned long serverGeneration;
#define MAXSCREENS 16
#endif
#define MAXCLIENTS 256
#define MAXDITS 1
#define MAXEXTENSIONS 128
#define MAXEXTENSIONS 128
#define MAXFORMATS 8
#define MAXVISUALS_PER_SCREEN 50
typedef unsigned long PIXEL;
typedef unsigned long ATOM;