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

Merge branch 'master' into mpx

Browse source 
Conflicts:

	XTrap/xtrapddmi.c
	Xext/security.c
	Xext/xprint.c
	Xext/xtest.c
	Xext/xvdisp.c
	Xi/exevents.c
	Xi/grabdevb.c
	Xi/grabdevk.c
	Xi/opendev.c
	Xi/ungrdev.c
	Xi/ungrdevb.c
	Xi/ungrdevk.c
	dix/cursor.c
	dix/devices.c
	dix/dixutils.c
	dix/events.c
	dix/getevents.c
	dix/main.c
	dix/window.c
	hw/xfree86/ramdac/xf86Cursor.c
	include/dix.h
	include/input.h
	include/inputstr.h
	mi/midispcur.c
	mi/miinitext.c
	mi/misprite.c
	render/animcur.c
	xfixes/cursor.c
	xkb/xkbAccessX.c
This commit is contained in:
Peter Hutterer 2008-01-03 17:04:54 +10:30
commit 8da83836b6
718 changed files with 11577 additions and 33702 deletions
Download patch file Download diff file Expand all files Collapse all files

50
include/xkbsrv.h
View file

@ -269,8 +269,8 @@ typedef struct
device->public.realInputProc = oldprocs->realInputProc; \
device->unwrapProc = oldprocs->unwrapProc;
extern int xkbDevicePrivateIndex;
#define XKBDEVICEINFO(dev) ((xkbDeviceInfoPtr) (dev)->devPrivates[xkbDevicePrivateIndex].ptr)
extern DevPrivateKey xkbDevicePrivateKey;
#define XKBDEVICEINFO(dev) ((xkbDeviceInfoPtr)dixLookupPrivate(&(dev)->devPrivates, xkbDevicePrivateKey))
extern void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, pointer);
@ -288,6 +288,7 @@ extern void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, pointer);
extern int XkbReqCode;
extern int XkbEventBase;
extern int XkbDisableLockActions;
extern int XkbKeyboardErrorCode;
extern char * XkbBaseDirectory;
extern char * XkbBinDirectory;
extern char * XkbInitialMap;
@ -379,29 +380,44 @@ extern void XkbFreeNames(
Bool /* freeMap */
);
extern DeviceIntPtr _XkbLookupAnyDevice(
int /* id */,
int * /* why_rtrn */
extern int _XkbLookupAnyDevice(
DeviceIntPtr *pDev,
int id,
ClientPtr client,
Mask access_mode,
int *xkb_err
);
extern DeviceIntPtr _XkbLookupKeyboard(
int /* id */,
int * /* why_rtrn */
extern int _XkbLookupKeyboard(
DeviceIntPtr *pDev,
int id,
ClientPtr client,
Mask access_mode,
int *xkb_err
);
extern DeviceIntPtr _XkbLookupBellDevice(
int /* id */,
int * /* why_rtrn */
extern int _XkbLookupBellDevice(
DeviceIntPtr *pDev,
int id,
ClientPtr client,
Mask access_mode,
int *xkb_err
);
extern DeviceIntPtr _XkbLookupLedDevice(
int /* id */,
int * /* why_rtrn */
extern int _XkbLookupLedDevice(
DeviceIntPtr *pDev,
int id,
ClientPtr client,
Mask access_mode,
int *xkb_err
);
extern DeviceIntPtr _XkbLookupButtonDevice(
int /* id */,
int * /* why_rtrn */
extern int _XkbLookupButtonDevice(
DeviceIntPtr *pDev,
int id,
ClientPtr client,
Mask access_mode,
int *xkb_err
);
extern XkbDescPtr XkbAllocKeyboard(