did a retab in vim to catch any remaining tabs

2 files changed, 44 insertions, 34 deletions

diff --git a/src/xlibclient.c b/src/xlibclient.c
index 5c136be..6ae1027 100644
--- a/src/xlibclient.c
+++ b/src/xlibclient.c
@@ -58,10 +58,10 @@ NestedvClientCheckDisplay(char *displayName)
 
     d = XOpenDisplay(displayName);
     if (!d) {
-	return FALSE;
+        return FALSE;
     } else {
       XCloseDisplay(d);
-	return TRUE;
+        return TRUE;
     }
 }
 
diff --git a/src/xlibclient.c~ b/src/xlibclient.c~
index 0ca2e1a..5c136be 100644
--- a/src/xlibclient.c~
+++ b/src/xlibclient.c~
@@ -152,7 +152,8 @@ Pixel *retBlueMask)
             return NULL;
         }
 
-        pPriv->shminfo.shmaddr = (char *)shmat(pPriv->shminfo.shmid, NULL, 0);
+        pPriv->shminfo.shmaddr = (char *)shmat(pPriv->shminfo.shmid, NULL,
+                0);
 
         if (pPriv->shminfo.shmaddr == (char *) -1) {
             XDestroyImage(pPriv->img);
@@ -185,7 +186,7 @@ Pixel *retBlueMask)
         pPriv->usingShm = FALSE;
     }
     if (!pPriv->img->data)
-return NULL;
+        return NULL;
 
     NestedvClientHideCursor(pPriv); /* Hide cursor */
 
@@ -199,16 +200,17 @@ xf86DrvMsg(scrnIndex, X_INFO, "red_mask: 0x%lx\n", pPriv->img->red_mask);
 xf86DrvMsg(scrnIndex, X_INFO, "gre_mask: 0x%lx\n", pPriv->img->green_mask);
 xf86DrvMsg(scrnIndex, X_INFO, "blu_mask: 0x%lx\n", pPriv->img->blue_mask);
 #endif
+
     *retRedMask = pPriv->img->red_mask;
     *retGreenMask = pPriv->img->green_mask;
     *retBlueMask = pPriv->img->blue_mask;
 
     XEvent ev;
     while (1) {
-XNextEvent(pPriv->display, &ev);
-if (ev.type == Expose) {
-break;
-}
+        XNextEvent(pPriv->display, &ev);
+        if (ev.type == Expose) {
+            break;
+        }
     }
 
     return pPriv;
@@ -218,9 +220,11 @@ void NestedvClientHideCursor(NestedvClientPrivatePtr pPriv)
 {
     char noData[]= {0,0,0,0,0,0,0,0};
     pPriv->color1.red = pPriv->color1.green = pPriv->color1.blue = 0;
-    pPriv->bitmapNoData = XCreateBitmapFromData(pPriv->display, pPriv->window, noData, 7, 7);
-    pPriv->mycursor = XCreatePixmapCursor(pPriv->display, pPriv->bitmapNoData, pPriv->bitmapNoData,
-                             &pPriv->color1, &pPriv->color1, 0, 0);
+    pPriv->bitmapNoData = XCreateBitmapFromData(pPriv->display,
+            pPriv->window, noData, 7, 7);
+    pPriv->mycursor = XCreatePixmapCursor(pPriv->display,
+            pPriv->bitmapNoData, pPriv->bitmapNoData,
+            &pPriv->color1, &pPriv->color1, 0, 0);
     XDefineCursor(pPriv->display, pPriv->window, pPriv->mycursor);
     XFreeCursor(pPriv->display, pPriv->mycursor);
 }
@@ -232,18 +236,18 @@ NestedvClientGetFrameBuffer(NestedvClientPrivatePtr pPriv)
 }
 
 void
-NestedvClientUpdateScreen(NestedvClientPrivatePtr pPriv, int16_t x1, int16_t y1,
-int16_t x2, int16_t y2)
+NestedvClientUpdateScreen(NestedvClientPrivatePtr pPriv, int16_t x1,
+        int16_t y1, int16_t x2, int16_t y2)
 {
     if (pPriv->usingShm) {
-XShmPutImage(pPriv->display, pPriv->window, pPriv->gc, pPriv->img,
-x1, y1, x1, y1, x2 - x1, y2 - y1, FALSE);
-/* Without this sync we get some freezes, probably due to some lock in
-* the shm usage */
-XSync(pPriv->display, FALSE);
+        XShmPutImage(pPriv->display, pPriv->window, pPriv->gc, pPriv->img,
+                x1, y1, x1, y1, x2 - x1, y2 - y1, FALSE);
+        /* Without this sync we get some freezes, probably due to some lock
+         * in the shm usage */
+        XSync(pPriv->display, FALSE);
     } else {
-XPutImage(pPriv->display, pPriv->window, pPriv->gc, pPriv->img,
-x1, y1, x1, y1, x2 - x1, y2 - y1);
+        XPutImage(pPriv->display, pPriv->window, pPriv->gc, pPriv->img,
+                x1, y1, x1, y1, x2 - x1, y2 - y1);
     }
 }
 
@@ -255,17 +259,23 @@ NestedvClientTimerCallback(NestedvClientPrivatePtr pPriv)
     char *msg2 = "Root";
 
     while(XCheckMaskEvent(pPriv->display, ~0, &ev)) {
-if (ev.type == Expose) {
-NestedvClientUpdateScreen(pPriv,
-((XExposeEvent*)&ev)->x,
-((XExposeEvent*)&ev)->y,
-((XExposeEvent*)&ev)->x + ((XExposeEvent*)&ev)->width,
-((XExposeEvent*)&ev)->y + ((XExposeEvent*)&ev)->height);
-}
-if (ev.type == MotionNotify) {
-XDrawString(pPriv->display, pPriv->window, DefaultGC(pPriv->display, pPriv->screenNumber), ((XMotionEvent*)&ev)->x, ((XMotionEvent*)&ev)->y, msg, strlen(msg));
-XDrawString(pPriv->display, pPriv->window, DefaultGC(pPriv->display, pPriv->screenNumber), ((XMotionEvent*)&ev)->x_root, ((XMotionEvent*)&ev)->y_root, msg2, strlen(msg2));
-}
+        if (ev.type == Expose) {
+            NestedvClientUpdateScreen(pPriv,
+                    ((XExposeEvent*)&ev)->x,
+                    ((XExposeEvent*)&ev)->y,
+                    ((XExposeEvent*)&ev)->x + ((XExposeEvent*)&ev)->width,
+                    ((XExposeEvent*)&ev)->y + ((XExposeEvent*)&ev)->height);
+        }
+        if (ev.type == MotionNotify) {
+            XDrawString(pPriv->display, pPriv->window,
+                    DefaultGC(pPriv->display, pPriv->screenNumber),
+                    ((XMotionEvent*)&ev)->x, ((XMotionEvent*)&ev)->y, msg,
+                    strlen(msg));
+            XDrawString(pPriv->display, pPriv->window,
+                    DefaultGC(pPriv->display, pPriv->screenNumber),
+                    ((XMotionEvent*)&ev)->x_root,
+                    ((XMotionEvent*)&ev)->y_root, msg2, strlen(msg2));
+        }
     }
 }
 
@@ -273,10 +283,10 @@ void
 NestedvClientCloseScreen(NestedvClientPrivatePtr pPriv)
 {
     if (pPriv->usingShm) {
-XShmDetach(pPriv->display, &pPriv->shminfo);
-shmdt(pPriv->shminfo.shmaddr);
+        XShmDetach(pPriv->display, &pPriv->shminfo);
+        shmdt(pPriv->shminfo.shmaddr);
     } else {
-free(pPriv->img->data);
+        free(pPriv->img->data);
     }
     XDestroyImage(pPriv->img);
     XCloseDisplay(pPriv->display);