Merge branch 'master' into XACE-SELINUX

Conflicts:

	dix/devices.c
This commit is contained in:
Eamon Walsh 2007-09-26 07:47:29 -04:00 • committed by Eamon Walsh
commit 27612748e0
89 changed files with 1451 additions and 2253 deletions

View file

@ -402,6 +402,7 @@ GetKeyboardValuatorEvents(xEvent *events, DeviceIntPtr pDev, int type,
if (!events)
return 0;
/* DO NOT WANT */
if (type != KeyPress && type != KeyRelease)
return 0;
@ -409,6 +410,9 @@ GetKeyboardValuatorEvents(xEvent *events, DeviceIntPtr pDev, int type,
(pDev->coreEvents && !inputInfo.keyboard->key))
return 0;
if (key_code < 8 || key_code > 255)
return 0;
if (pDev->coreEvents)
numEvents = 2;
else