Merge branch 'uli42-pr/Xi-1.2.0' into 3.6.x

nx-X11/programs/Xserver/Xi/allowev.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group

nx-X11/programs/Xserver/Xi/chgdctl.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group

nx-X11/programs/Xserver/Xi/chgfctl.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group

nx-X11/programs/Xserver/Xi/chgkbd.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group

nx-X11/programs/Xserver/Xi/chgkmap.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group

nx-X11/programs/Xserver/Xi/chgprop.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group

nx-X11/programs/Xserver/Xi/chgptr.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group

nx-X11/programs/Xserver/Xi/closedev.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group

nx-X11/programs/Xserver/Xi/devbell.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group

nx-X11/programs/Xserver/Xi/exevents.c

@@ -174,6 +174,9 @@ ProcessOtherEvent(xEventPtr xE, register DeviceIntPtr other, int count)
 	}
 
     if (xE->u.u.type == DeviceKeyPress) {
+        if (!k)
+            return;
+
 	modifiers = k->modifierMap[key];
 	kptr = &k->down[key >> 3];
 	if (*kptr & bit) {	/* allow ddx to generate multiple downs */
@@ -203,6 +206,9 @@ ProcessOtherEvent(xEventPtr xE, register DeviceIntPtr other, int count)
 	    return;
 	}
     } else if (xE->u.u.type == DeviceKeyRelease) {
+        if (!k)
+            return;
+
 	kptr = &k->down[key >> 3];
 	if (!(*kptr & bit))	/* guard against duplicates */
 	    return;
@@ -225,6 +231,9 @@ ProcessOtherEvent(xEventPtr xE, register DeviceIntPtr other, int count)
 	if (other->fromPassiveGrab && (key == other->activatingKey))
 	    deactivateDeviceGrab = TRUE;
     } else if (xE->u.u.type == DeviceButtonPress) {
+        if (!b)
+            return;
+
 	kptr = &b->down[key >> 3];
 	*kptr |= bit;
 	if (other->valuator)
@@ -242,6 +251,9 @@ ProcessOtherEvent(xEventPtr xE, register DeviceIntPtr other, int count)
 		return;
 
     } else if (xE->u.u.type == DeviceButtonRelease) {
+        if (!b)
+            return;
+
 	kptr = &b->down[key >> 3];
 	*kptr &= ~bit;
 	if (other->valuator)
@@ -1075,6 +1087,9 @@ MaybeSendDeviceMotionNotifyHint(deviceKeyButtonPointer * pEvents, Mask mask)
     DeviceIntPtr dev;
 
     dev = LookupDeviceIntRec(pEvents->deviceid & DEVICE_BITS);
+    if (!dev)
+        return 0;
+
     if (pEvents->type == DeviceMotionNotify) {
 	if (mask & DevicePointerMotionHintMask) {
 	    if (WID(dev->valuator->motionHintWindow) == pEvents->event) {
@@ -1096,6 +1111,9 @@ CheckDeviceGrabAndHintWindow(WindowPtr pWin, int type,
     DeviceIntPtr dev;
 
     dev = LookupDeviceIntRec(xE->deviceid & DEVICE_BITS);
+    if (!dev)
+        return;
+
     if (type == DeviceMotionNotify)
 	dev->valuator->motionHintWindow = pWin;
     else if ((type == DeviceButtonPress) && (!grab) &&

nx-X11/programs/Xserver/Xi/extinit.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group
@@ -576,8 +575,7 @@ SEventDeviceValuator(deviceValuator * from, deviceValuator * to)
     swaps(&to->sequenceNumber);
     swaps(&to->device_state);
     ip = &to->valuator0;
-    for (i=0; i<6; i++)
-	{
+    for (i = 0; i < 6; i++) {
 	swapl((ip + i));	/* macro - braces are required      */
     }
 }
@@ -822,7 +820,7 @@ IResetProc(ExtensionEntry * unused)
  *
  */
 
- void
+void
 AssignTypeAndName(DeviceIntPtr dev, Atom type, char *name)
 {
     dev->type = type;

nx-X11/programs/Xserver/Xi/getbmap.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group

nx-X11/programs/Xserver/Xi/getdctl.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group

nx-X11/programs/Xserver/Xi/getfctl.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group

nx-X11/programs/Xserver/Xi/getfocus.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group

nx-X11/programs/Xserver/Xi/getkmap.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group

nx-X11/programs/Xserver/Xi/getmmap.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group

nx-X11/programs/Xserver/Xi/getprop.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group

nx-X11/programs/Xserver/Xi/getselev.c

@@ -44,7 +44,6 @@ SOFTWARE.
 
 ********************************************************/
 
-
 /***********************************************************************
  *
  * Extension function to get the current selected events for a given window.

nx-X11/programs/Xserver/Xi/getvers.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group

nx-X11/programs/Xserver/Xi/grabdev.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group

nx-X11/programs/Xserver/Xi/grabdevb.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group

nx-X11/programs/Xserver/Xi/grabdevk.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group

nx-X11/programs/Xserver/Xi/gtmotion.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group
@@ -142,8 +141,7 @@ ProcXGetDeviceMotionEvents(ClientPtr client)
 	size = sizeof(Time) + (axes * sizeof(INT32));
 	tsize = num_events * size;
 	coords = (INT32 *) malloc(tsize);
-	if (!coords)
-	    {
+	if (!coords) {
 	    SendErrorToClient(client, IReqCode, X_GetDeviceMotionEvents, 0,
 			      BadAlloc);
 	    return Success;

nx-X11/programs/Xserver/Xi/listdev.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group

nx-X11/programs/Xserver/Xi/opendev.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group
@@ -163,7 +162,7 @@ ProcXOpenDevice(register ClientPtr client)
     rep.length = (j * sizeof(xInputClassInfo) + 3) >> 2;
     rep.num_classes = j;
     WriteReplyToClient(client, sizeof(xOpenDeviceReply), &rep);
-    WriteToClient(client, j * sizeof (xInputClassInfo), evbase);
+    WriteToClient(client, j * sizeof(xInputClassInfo), evbase);
     return (Success);
 }
 

nx-X11/programs/Xserver/Xi/selectev.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group

nx-X11/programs/Xserver/Xi/sendexev.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group

nx-X11/programs/Xserver/Xi/setbmap.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group

nx-X11/programs/Xserver/Xi/setdval.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group

nx-X11/programs/Xserver/Xi/setfocus.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group

nx-X11/programs/Xserver/Xi/setmmap.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group

nx-X11/programs/Xserver/Xi/setmode.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group

nx-X11/programs/Xserver/Xi/stubs.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group

nx-X11/programs/Xserver/Xi/ungrdev.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group

nx-X11/programs/Xserver/Xi/ungrdevb.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group

nx-X11/programs/Xserver/Xi/ungrdevk.c

-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group

nx-X11/programs/Xserver/code-versions.txt

@@ -18,5 +18,5 @@ record            1.4.2
 render            6.9/7.0
 Xext              7.1/1.1
 xfixes            1.4.2
-Xi                7.1/1.1
+Xi                1.3.0.0
 xkb               7.1/1.1