From 0f834b91a4768673833ab4917e87d86c237bb1a6 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 23 Mar 2012 10:05:55 +0100
Subject: libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git
 update 23 Mar 2012

---
 xorg-server/Xi/chgdctl.c | 91 +++++++++++++++++++++++++-----------------------
 1 file changed, 48 insertions(+), 43 deletions(-)

(limited to 'xorg-server/Xi/chgdctl.c')

diff --git a/xorg-server/Xi/chgdctl.c b/xorg-server/Xi/chgdctl.c
index ca697d9d8..ff5d69aef 100644
--- a/xorg-server/Xi/chgdctl.c
+++ b/xorg-server/Xi/chgdctl.c
@@ -54,9 +54,9 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include "inputstr.h"	/* DeviceIntPtr      */
+#include "inputstr.h"           /* DeviceIntPtr      */
 #include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>	/* control constants */
+#include <X11/extensions/XIproto.h>     /* control constants */
 #include "XIstubs.h"
 
 #include "exglobals.h"
@@ -80,17 +80,17 @@ SProcXChangeDeviceControl(ClientPtr client)
     swaps(&stuff->length);
     REQUEST_AT_LEAST_SIZE(xChangeDeviceControlReq);
     swaps(&stuff->control);
-    ctl = (xDeviceCtl*)&stuff[1];
+    ctl = (xDeviceCtl *) &stuff[1];
     swaps(&ctl->control);
     swaps(&ctl->length);
-    switch(stuff->control) {
-        case DEVICE_ABS_CALIB:
-        case DEVICE_ABS_AREA:
-        case DEVICE_CORE:
-        case DEVICE_ENABLE:
-        case DEVICE_RESOLUTION:
-            /* hmm. beer. *drool* */
-            break;
+    switch (stuff->control) {
+    case DEVICE_ABS_CALIB:
+    case DEVICE_ABS_AREA:
+    case DEVICE_CORE:
+    case DEVICE_ENABLE:
+    case DEVICE_RESOLUTION:
+        /* hmm. beer. *drool* */
+        break;
 
     }
     return (ProcXChangeDeviceControl(client));
@@ -130,44 +130,47 @@ ProcXChangeDeviceControl(ClientPtr client)
 
     switch (stuff->control) {
     case DEVICE_RESOLUTION:
-	r = (xDeviceResolutionCtl *) & stuff[1];
-	if ((len < bytes_to_int32(sizeof(xDeviceResolutionCtl))) ||
-	    (len != bytes_to_int32(sizeof(xDeviceResolutionCtl)) + r->num_valuators)) {
+        r = (xDeviceResolutionCtl *) &stuff[1];
+        if ((len < bytes_to_int32(sizeof(xDeviceResolutionCtl))) ||
+            (len !=
+             bytes_to_int32(sizeof(xDeviceResolutionCtl)) + r->num_valuators)) {
             ret = BadLength;
             goto out;
-	}
-	if (!dev->valuator) {
+        }
+        if (!dev->valuator) {
             ret = BadMatch;
             goto out;
-	}
-	if ((dev->deviceGrab.grab) && !SameClient(dev->deviceGrab.grab, client)) {
-	    rep.status = AlreadyGrabbed;
+        }
+        if ((dev->deviceGrab.grab) && !SameClient(dev->deviceGrab.grab, client)) {
+            rep.status = AlreadyGrabbed;
             ret = Success;
             goto out;
-	}
-	resolution = (CARD32 *) (r + 1);
-	if (r->first_valuator + r->num_valuators > dev->valuator->numAxes) {
+        }
+        resolution = (CARD32 *) (r + 1);
+        if (r->first_valuator + r->num_valuators > dev->valuator->numAxes) {
             ret = BadValue;
             goto out;
-	}
-	status = ChangeDeviceControl(client, dev, (xDeviceCtl *) r);
-	if (status == Success) {
-	    a = &dev->valuator->axes[r->first_valuator];
-	    for (i = 0; i < r->num_valuators; i++)
-		if (*(resolution + i) < (a + i)->min_resolution ||
-		    *(resolution + i) > (a + i)->max_resolution)
-		    return BadValue;
-	    for (i = 0; i < r->num_valuators; i++)
-		(a++)->resolution = *resolution++;
+        }
+        status = ChangeDeviceControl(client, dev, (xDeviceCtl *) r);
+        if (status == Success) {
+            a = &dev->valuator->axes[r->first_valuator];
+            for (i = 0; i < r->num_valuators; i++)
+                if (*(resolution + i) < (a + i)->min_resolution ||
+                    *(resolution + i) > (a + i)->max_resolution)
+                    return BadValue;
+            for (i = 0; i < r->num_valuators; i++)
+                (a++)->resolution = *resolution++;
 
             ret = Success;
-	} else if (status == DeviceBusy) {
-	    rep.status = DeviceBusy;
+        }
+        else if (status == DeviceBusy) {
+            rep.status = DeviceBusy;
             ret = Success;
-	} else {
+        }
+        else {
             ret = BadMatch;
-	}
-	break;
+        }
+        break;
     case DEVICE_ABS_CALIB:
     case DEVICE_ABS_AREA:
         /* Calibration is now done through properties, and never had any effect
@@ -180,7 +183,7 @@ ProcXChangeDeviceControl(ClientPtr client)
         ret = BadMatch;
         break;
     case DEVICE_ENABLE:
-        e = (xDeviceEnableCtl *)&stuff[1];
+        e = (xDeviceEnableCtl *) &stuff[1];
 
         status = ChangeDeviceControl(client, dev, (xDeviceCtl *) e);
 
@@ -190,10 +193,12 @@ ProcXChangeDeviceControl(ClientPtr client)
             else
                 DisableDevice(dev, TRUE);
             ret = Success;
-        } else if (status == DeviceBusy) {
+        }
+        else if (status == DeviceBusy) {
             rep.status = DeviceBusy;
             ret = Success;
-        } else {
+        }
+        else {
             ret = BadMatch;
         }
 
@@ -202,7 +207,7 @@ ProcXChangeDeviceControl(ClientPtr client)
         ret = BadValue;
     }
 
-out:
+ out:
     if (ret == Success) {
         dpn.type = DevicePresenceNotify;
         dpn.time = currentTime.milliseconds;
@@ -227,9 +232,9 @@ out:
 
 void
 SRepXChangeDeviceControl(ClientPtr client, int size,
-			 xChangeDeviceControlReply * rep)
+                         xChangeDeviceControlReply * rep)
 {
     swaps(&rep->sequenceNumber);
     swapl(&rep->length);
-    WriteToClient(client, size, (char *)rep);
+    WriteToClient(client, size, (char *) rep);
 }
-- 
cgit v1.2.3