# HG changeset patch
# User paulo@thepaulopc
# Date 1276761035 25200
# Node ID 0d5dc7c29c7892440b2af2795640d2ad69a40086
# Parent  ab8a496afb67970f5ce04ed7cef77ec42379405d
fix tabbing

diff -r ab8a496afb67 -r 0d5dc7c29c78 keynav.c
--- a/keynav.c	Tue Sep 08 22:45:57 2009 -0700
+++ b/keynav.c	Thu Jun 17 00:50:35 2010 -0700
@@ -27,497 +27,497 @@
 
 struct  /* undo stack */
 {
-  int x[N_UNDO];
-  int y[N_UNDO];
-  int w[N_UNDO];
-  int h[N_UNDO];
-  int ninegrid[N_UNDO];
+	int x[N_UNDO];
+	int y[N_UNDO];
+	int w[N_UNDO];
+	int h[N_UNDO];
+	int ninegrid[N_UNDO];
 } u;
 
 void toggleninegrid() {
-  if (ninegrid)
-	ninegrid = 0;
-  else 
-	ninegrid = 1;
+	if (ninegrid)
+		ninegrid = 0;
+	else 
+		ninegrid = 1;
 }
 
 void stats(int hits, int moves) {
-  allhits += hits;
-  allmoves += moves;
-  allclicks++;
-  printf("hits=%d, moves=%d \n", hits, moves);
-  printf("total hits=%d, total moves=%d, total clicks=%d, avg. hit/click=%.2f, avg. moves/click=%.2f \n", allhits, allmoves, allclicks, (float)allhits/(float)allclicks, (float)allmoves/(float)allclicks);
-  fflush(stdout); fflush(stderr); // force buffers to write out
+	allhits += hits;
+	allmoves += moves;
+	allclicks++;
+	printf("hits=%d, moves=%d \n", hits, moves);
+	printf("total hits=%d, total moves=%d, total clicks=%d, avg. hit/click=%.2f, avg. moves/click=%.2f \n", allhits, allmoves, allclicks, (float)allhits/(float)allclicks, (float)allmoves/(float)allclicks);
+	fflush(stdout); fflush(stderr); // force buffers to write out
 }
  
 void grab(char *keyname, int mods) {
-  int key;
-
-  key = XKeysymToKeycode(dpy, XStringToKeysym(keyname));
-  XGrabKey(dpy, key, mods, root, False,
-	       GrabModeAsync, GrabModeAsync);
-  XGrabKey(dpy, key, mods | CAPSLOCKMASK, root, False,
-	       GrabModeAsync, GrabModeAsync);
-  XGrabKey(dpy, key, mods | NUMLOCKMASK, root, False,
-	       GrabModeAsync, GrabModeAsync);
-  XGrabKey(dpy, key, mods | CAPSLOCKMASK | NUMLOCKMASK, root, False,
-	       GrabModeAsync, GrabModeAsync);
+	int key;
+	
+	key = XKeysymToKeycode(dpy, XStringToKeysym(keyname));
+	XGrabKey(dpy, key, mods, root, False,
+			GrabModeAsync, GrabModeAsync);
+	XGrabKey(dpy, key, mods | CAPSLOCKMASK, root, False,
+			GrabModeAsync, GrabModeAsync);
+	XGrabKey(dpy, key, mods | NUMLOCKMASK, root, False,
+			GrabModeAsync, GrabModeAsync);
+	XGrabKey(dpy, key, mods | CAPSLOCKMASK | NUMLOCKMASK, root, False,
+			GrabModeAsync, GrabModeAsync);
 }
 
 void ungrab(char *keyname, int mod) {
-  int key;
-
-  key = XKeysymToKeycode(dpy, XStringToKeysym(keyname));
-  XUngrabKey(dpy, key, mod, root);
-  XUngrabKey(dpy, key, mod | CAPSLOCKMASK, root);
-  XUngrabKey(dpy, key, mod | NUMLOCKMASK, root);
-  XUngrabKey(dpy, key, mod | CAPSLOCKMASK | NUMLOCKMASK, root);
+	int key;
+	
+	key = XKeysymToKeycode(dpy, XStringToKeysym(keyname));
+	XUngrabKey(dpy, key, mod, root);
+	XUngrabKey(dpy, key, mod | CAPSLOCKMASK, root);
+	XUngrabKey(dpy, key, mod | NUMLOCKMASK, root);
+	XUngrabKey(dpy, key, mod | CAPSLOCKMASK | NUMLOCKMASK, root);
 }
 
 void buttondown(int i) {
-  XTestFakeButtonEvent(dpy, i, True, 50);
+	XTestFakeButtonEvent(dpy, i, True, 50);
 }
 
 void buttonup(int i) {
-  XTestFakeButtonEvent(dpy, i, False, 50);
+	XTestFakeButtonEvent(dpy, i, False, 50);
 }
 
 void warppointer(int x, int y, int w, int h) {
-  XWarpPointer(dpy, None, root, 0, 0, 0, 0, x + w/2, y + h/2);
+	XWarpPointer(dpy, None, root, 0, 0, 0, 0, x + w/2, y + h/2);
 }
 
 /* operations for undo */
 void undo_stack_push(int x, int y, int w, int h) {
-  int i;
+	int i;
 
-  if (x >= 0 && y >= 0 && w > 0 && h > 0) {
-	fprintf(stderr,"undo_stack_push success: @(%d,%d) #(%d,%d)\n", x, y, w, h);
-	for (i=N_UNDO-1; i>0; i--) {
-	  u.x[i] = u.x[i-1]; 
-	  u.y[i] = u.y[i-1]; 
-	  u.w[i] = u.w[i-1]; 
-	  u.h[i] = u.h[i-1]; 
-	  u.ninegrid[i] = u.ninegrid[i-1]; 
+	if (x >= 0 && y >= 0 && w > 0 && h > 0) {
+		fprintf(stderr,"undo_stack_push success: @(%d,%d) #(%d,%d)\n", x, y, w, h);
+		for (i=N_UNDO-1; i>0; i--) {
+			u.x[i] = u.x[i-1]; 
+			u.y[i] = u.y[i-1]; 
+			u.w[i] = u.w[i-1]; 
+			u.h[i] = u.h[i-1]; 
+			u.ninegrid[i] = u.ninegrid[i-1]; 
+		}
+		u.x[0] = x;
+		u.y[0] = y;
+		u.w[0] = w;
+		u.h[0] = h;
+		u.ninegrid[0] = ninegrid;
 	}
-	u.x[0] = x;
-	u.y[0] = y;
-	u.w[0] = w;
-	u.h[0] = h;
-	u.ninegrid[0] = ninegrid;
-  }
 }
 
 int undo_stack_pop(int *x, int *y, int *w, int *h, int *ninegrid) {
-  int i;
-  int ret = 0;
+	int i;
+	int ret = 0;
+	
+	int rx = u.x[0];
+	int ry = u.y[0];
+	int rw = u.w[0];
+	int rh = u.h[0];
+	int rninegrid = u.ninegrid[0];
 
-  int rx = u.x[0];
-  int ry = u.y[0];
-  int rw = u.w[0];
-  int rh = u.h[0];
-  int rninegrid = u.ninegrid[0];
-
-  if (rx >= 0 && ry >= 0 && rw > 0 && rh > 0) {
-	fprintf(stderr,"undo_stack_pop success: @(%d,%d) #(%d,%d)\n", *x, *y, *w, *h);
-	ret = 1; 	// return success
-	for (i=0; i<N_UNDO-1; i++) {
-	  u.x[i] = u.x[i+1];
-	  u.y[i] = u.y[i+1];
-	  u.w[i] = u.w[i+1];
-	  u.h[i] = u.h[i+1];
-	  u.ninegrid[i] = u.ninegrid[i+1];
+	if (rx >= 0 && ry >= 0 && rw > 0 && rh > 0) {
+		fprintf(stderr,"undo_stack_pop success: @(%d,%d) #(%d,%d)\n", *x, *y, *w, *h);
+		ret = 1; 	// return success
+		for (i=0; i<N_UNDO-1; i++) {
+			u.x[i] = u.x[i+1];
+			u.y[i] = u.y[i+1];
+			u.w[i] = u.w[i+1];
+			u.h[i] = u.h[i+1];
+			u.ninegrid[i] = u.ninegrid[i+1];
+		}
+		u.x[N_UNDO-1] = -1;
+		u.y[N_UNDO-1] = -1;
+		u.w[N_UNDO-1] = -1;
+		u.h[N_UNDO-1] = -1;
+		u.ninegrid[N_UNDO-1] = -1;
+		*x = rx;
+		*y = ry;
+		*w = rw;
+		*h = rh;
+		*ninegrid = rninegrid;
 	}
-	u.x[N_UNDO-1] = -1;
-	u.y[N_UNDO-1] = -1;
-	u.w[N_UNDO-1] = -1;
-	u.h[N_UNDO-1] = -1;
-	u.ninegrid[N_UNDO-1] = -1;
-	*x = rx;
-	*y = ry;
-	*w = rw;
-	*h = rh;
-	*ninegrid = rninegrid;
-  }
-  return ret;
+	return ret;
 }
 
 void undo_stack_reset() {
-  int i;
+	int i;
 
-  for (i=0; i<N_UNDO; i++) {
-	u.x[i] = -1;
-	u.y[i] = -1;
-	u.w[i] = -1;
-	u.h[i] = -1;
-  }
+	for (i=0; i<N_UNDO; i++) {
+		u.x[i] = -1;
+		u.y[i] = -1;
+		u.w[i] = -1;
+		u.h[i] = -1;
+	}
 }
 /* =-=-=-=-=-= */
 
 int chk_keysym(int keysym, char *str) {
-  int ret = 0;
+	int ret = 0;
 
-  if (XStringToKeysym(str) == keysym)
-	ret = 1;
+	if (XStringToKeysym(str) == keysym)
+		ret = 1;
 
-  return ret;
+	return ret;
 }
 
 GC creategc(Window win) {
-  GC gc;
-  XGCValues values;
-
-  gc = XCreateGC(dpy, win, 0, &values);
-  XSetForeground(dpy, gc, BlackPixel(dpy, 0));
-  XSetBackground(dpy, gc, WhitePixel(dpy, 0));
-  XSetLineAttributes(dpy, gc, LINEWIDTH, LineSolid, CapButt, JoinBevel);
-  XSetFillStyle(dpy, gc, FillSolid);
-
-  return gc;
+	GC gc;
+	XGCValues values;
+	
+	gc = XCreateGC(dpy, win, 0, &values);
+	XSetForeground(dpy, gc, BlackPixel(dpy, 0));
+	XSetBackground(dpy, gc, WhitePixel(dpy, 0));
+	XSetLineAttributes(dpy, gc, LINEWIDTH, LineSolid, CapButt, JoinBevel);
+	XSetFillStyle(dpy, gc, FillSolid);
+	
+	return gc;
 }
 
 void drawquadrants(Window win, int w, int h) {
-  GC gc;
-  XRectangle clip[20];
-  int idx = 0;
-  Colormap colormap;
-  XColor color;
+	GC gc;
+	XRectangle clip[20];
+	int idx = 0;
+	Colormap colormap;
+	XColor color;
+	
+	gc = creategc(win);
+	colormap = DefaultColormap(dpy, 0);
+	
+	if (drag)  
+		XAllocNamedColor(dpy, colormap, DRAG_COLOR, &color, &color);
+	else
+		XAllocNamedColor(dpy, colormap, NORM_COLOR, &color, &color);
+	
+	/*left*/ clip[idx].x = 0; clip[idx].y = 0; clip[idx].width = BORDER; clip[idx].height = h;
+	idx++;
+	/*right*/ clip[idx].x = w-BORDER; clip[idx].y = 0; clip[idx].width = BORDER; clip[idx].height = h;
+	idx++;
+	/*top*/ clip[idx].x = 0; clip[idx].y = 0; clip[idx].width = w; clip[idx].height = BORDER;
+	idx++;
+	/*bottom*/ clip[idx].x = 0; clip[idx].y = h-BORDER; clip[idx].width = w; clip[idx].height = BORDER;
+	idx++;
+	
+	if (ninegrid) {
+		/*1st horiz*/  
+		clip[idx].x = 0; clip[idx].y = h/3 - BORDER/2;
+		clip[idx].width = w; clip[idx].height = BORDER;
+		idx++;
+		/*2nd horiz*/
+		clip[idx].x = 0; clip[idx].y = h*2/3 - BORDER/2;
+		clip[idx].width = w; clip[idx].height = BORDER;
+		idx++;
+		/*1st vert*/
+		clip[idx].x = w/3 - BORDER/2; clip[idx].y = 0;
+		clip[idx].width = BORDER; clip[idx].height = h;
+		idx++;
+		/*2nd vert*/
+		clip[idx].x = w*2/3 - BORDER/2; clip[idx].y = 0;
+		clip[idx].width = BORDER; clip[idx].height = h;
+		idx++;
+	} else {
+		/*horiz*/
+		clip[idx].x = 0; clip[idx].y = h/2 - BORDER/2;
+		clip[idx].width = w; clip[idx].height = BORDER;
+		idx++;
+		/*vert*/
+		clip[idx].x = w/2 - BORDER/2; clip[idx].y = 0;
+		clip[idx].width = BORDER; clip[idx].height = h;
+		idx++;
+	}
 
-  gc = creategc(win);
-  colormap = DefaultColormap(dpy, 0);
+	XShapeCombineRectangles(dpy, win, ShapeBounding, 0, 0, clip, idx, ShapeSet, 0);
+	
+	XFillRectangle(dpy, win, gc, 0, 0, w, h);
+	
+	XSetForeground(dpy, gc, color.pixel);
+	XDrawLine(dpy, win, gc, BORDER - PEN, BORDER - PEN, w - PEN, BORDER - PEN); //top line
+	XDrawLine(dpy, win, gc, BORDER - PEN, h - PEN, w - PEN, h - PEN); //bottom line
+	XDrawLine(dpy, win, gc, BORDER - PEN, BORDER - PEN, BORDER - PEN, h - PEN); //left line
+	XDrawLine(dpy, win, gc, w - PEN, BORDER - PEN, w - PEN, h - PEN); //left line
 
-  if (drag)  
-	XAllocNamedColor(dpy, colormap, DRAG_COLOR, &color, &color);
-  else
-	XAllocNamedColor(dpy, colormap, NORM_COLOR, &color, &color);
+	if (ninegrid) {
+		XDrawLine(dpy, win, gc, w/3, 0, w/3, h); // 1st vert line
+		XDrawLine(dpy, win, gc, w*2/3, 0, w*2/3, h); // 2nd vert line
+		XDrawLine(dpy, win, gc, 0, h/3, w, h/3); // 1st horiz line
+		XDrawLine(dpy, win, gc, 0, h*2/3, w, h*2/3); // 2nd horiz line
+	} else {
+		XDrawLine(dpy, win, gc, w/2, 0, w/2, h); // vert line
+		XDrawLine(dpy, win, gc, 0, h/2, w, h/2); // horiz line
+	}
 
-  /*left*/ clip[idx].x = 0; clip[idx].y = 0; clip[idx].width = BORDER; clip[idx].height = h;
-  idx++;
-  /*right*/ clip[idx].x = w-BORDER; clip[idx].y = 0; clip[idx].width = BORDER; clip[idx].height = h;
-  idx++;
-  /*top*/ clip[idx].x = 0; clip[idx].y = 0; clip[idx].width = w; clip[idx].height = BORDER;
-  idx++;
-  /*bottom*/ clip[idx].x = 0; clip[idx].y = h-BORDER; clip[idx].width = w; clip[idx].height = BORDER;
-  idx++;
-
-  if (ninegrid) {
-	/*1st horiz*/  
-	clip[idx].x = 0; clip[idx].y = h/3 - BORDER/2;
-	clip[idx].width = w; clip[idx].height = BORDER;
-	idx++;
-	/*2nd horiz*/
-	clip[idx].x = 0; clip[idx].y = h*2/3 - BORDER/2;
-	clip[idx].width = w; clip[idx].height = BORDER;
-	idx++;
-	/*1st vert*/
-	clip[idx].x = w/3 - BORDER/2; clip[idx].y = 0;
-	clip[idx].width = BORDER; clip[idx].height = h;
-	idx++;
-	/*2nd vert*/
-	clip[idx].x = w*2/3 - BORDER/2; clip[idx].y = 0;
-	clip[idx].width = BORDER; clip[idx].height = h;
-	idx++;
-  } else {
-	/*horiz*/
-	clip[idx].x = 0; clip[idx].y = h/2 - BORDER/2;
-	clip[idx].width = w; clip[idx].height = BORDER;
-	idx++;
-	/*vert*/
-	clip[idx].x = w/2 - BORDER/2; clip[idx].y = 0;
-	clip[idx].width = BORDER; clip[idx].height = h;
-	idx++;
-  }
-
-  XShapeCombineRectangles(dpy, win, ShapeBounding, 0, 0, clip, idx, ShapeSet, 0);
-
-  XFillRectangle(dpy, win, gc, 0, 0, w, h);
-
-  XSetForeground(dpy, gc, color.pixel);
-  XDrawLine(dpy, win, gc, BORDER - PEN, BORDER - PEN, w - PEN, BORDER - PEN); //top line
-  XDrawLine(dpy, win, gc, BORDER - PEN, h - PEN, w - PEN, h - PEN); //bottom line
-  XDrawLine(dpy, win, gc, BORDER - PEN, BORDER - PEN, BORDER - PEN, h - PEN); //left line
-  XDrawLine(dpy, win, gc, w - PEN, BORDER - PEN, w - PEN, h - PEN); //left line
-
-  if (ninegrid) {
-	XDrawLine(dpy, win, gc, w/3, 0, w/3, h); // 1st vert line
-	XDrawLine(dpy, win, gc, w*2/3, 0, w*2/3, h); // 2nd vert line
-	XDrawLine(dpy, win, gc, 0, h/3, w, h/3); // 1st horiz line
-	XDrawLine(dpy, win, gc, 0, h*2/3, w, h*2/3); // 2nd horiz line
-  } else {
-	XDrawLine(dpy, win, gc, w/2, 0, w/2, h); // vert line
-	XDrawLine(dpy, win, gc, 0, h/2, w, h/2); // horiz line
-  }
-
-  XFlush(dpy);
+	XFlush(dpy);
 }
 
 int handlekey(int keysym, int mod, int *moves,  int *x, int *y, int *w, int *h) {
-  int ret = 1;
-  int ox = *x;
-  int oy = *y;
-  int ow = *w;
-  int oh = *h;;
+	int ret = 1;
+	int ox = *x;
+	int oy = *y;
+	int ow = *w;
+	int oh = *h;;
 
-  if (mod & SHIFTMASK || mod & SHIFTMASK & NUMLOCKMASK || mod & SHIFTMASK & CAPSLOCKMASK || mod & SHIFTMASK & CAPSLOCKMASK & NUMLOCKMASK) {
-	if (chk_keysym(keysym, KEY_CENTER))
-	  toggleninegrid();
-	if (chk_keysym(keysym, KEY_LEFT) || chk_keysym(keysym, KEY_UPLEFT) || chk_keysym(keysym, KEY_DOWNLEFT)) {
-	  if (*x > 0) *x -= *w; // shift left
-	} 
-	 if (chk_keysym(keysym, KEY_DOWN) || chk_keysym(keysym, KEY_DOWNLEFT) || chk_keysym(keysym, KEY_DOWNRIGHT)) {
-	  if ((*y + *h) < attr.height) *y += *h; // shift down
-	} 
-	if (chk_keysym(keysym, KEY_UP) || chk_keysym(keysym, KEY_UPLEFT) || chk_keysym(keysym, KEY_UPRIGHT)) {
-	  if (*y > 0) *y -= *h; // shift up
-	} 
-	if (chk_keysym(keysym, KEY_RIGHT) || chk_keysym(keysym, KEY_UPRIGHT) || chk_keysym(keysym, KEY_DOWNRIGHT)) {
-	  if ((*x + *w) < attr.width) *x += *w; // shift right
+	if (mod & SHIFTMASK || mod & SHIFTMASK & NUMLOCKMASK || mod & SHIFTMASK & CAPSLOCKMASK || mod & SHIFTMASK & CAPSLOCKMASK & NUMLOCKMASK) {
+		if (chk_keysym(keysym, KEY_CENTER))
+			toggleninegrid();
+		if (chk_keysym(keysym, KEY_LEFT) || chk_keysym(keysym, KEY_UPLEFT) || chk_keysym(keysym, KEY_DOWNLEFT)) {
+			if (*x > 0) *x -= *w; // shift left
+		} 
+		if (chk_keysym(keysym, KEY_DOWN) || chk_keysym(keysym, KEY_DOWNLEFT) || chk_keysym(keysym, KEY_DOWNRIGHT)) {
+			if ((*y + *h) < attr.height) *y += *h; // shift down
+		} 
+		if (chk_keysym(keysym, KEY_UP) || chk_keysym(keysym, KEY_UPLEFT) || chk_keysym(keysym, KEY_UPRIGHT)) {
+			if (*y > 0) *y -= *h; // shift up
+		} 
+		if (chk_keysym(keysym, KEY_RIGHT) || chk_keysym(keysym, KEY_UPRIGHT) || chk_keysym(keysym, KEY_DOWNRIGHT)) {
+			if ((*x + *w) < attr.width) *x += *w; // shift right
+		}
+	} else {
+		if (ninegrid) {
+			if (chk_keysym(keysym, KEY_UPLEFT)) {
+				*w /= 3; *h /= 3; // split upper left
+			} else if (chk_keysym(keysym, KEY_UP)) {
+				*w /= 3; *h /= 3; // split up 
+				*x += *w;
+			} else if (chk_keysym(keysym, KEY_UPRIGHT)) {
+				*w /= 3; *h /= 3; // split upper right 
+				*x += *w * 2;
+			} else if (chk_keysym(keysym, KEY_LEFT)) {
+				*w /= 3; *h /= 3; // split left
+				*y += *h;
+			} else if (chk_keysym(keysym, KEY_CENTER)) {
+				*w /= 3; *h /= 3; // split center
+				*x += *w; *y += *h;
+			} else if (chk_keysym(keysym, KEY_RIGHT)) {
+				*w /= 3; *h /= 3; // split right
+				*x += *w * 2; *y += *h;
+			} else if (chk_keysym(keysym, KEY_DOWNLEFT)) {
+				*w /= 3; *h /= 3; // split bottom left
+				*y += *h * 2;
+			} else if (chk_keysym(keysym, KEY_DOWN)) {
+				*w /= 3; *h /= 3; // split down
+				*x += *w; *y += *h * 2;
+			} else if (chk_keysym(keysym, KEY_DOWNRIGHT)) {
+				*w /= 3; *h /= 3; // split bottom right
+				*x += *w * 2; *y += *h * 2;
+			}
+		} else {
+			if (chk_keysym(keysym, KEY_LEFT) || chk_keysym(keysym, KEY_UPLEFT) || chk_keysym(keysym, KEY_DOWNLEFT)) {
+				*w /= 2; // split left
+			}
+			if (chk_keysym(keysym, KEY_DOWN) || chk_keysym(keysym, KEY_DOWNLEFT) || chk_keysym(keysym, KEY_DOWNRIGHT)) {
+				*h /= 2; // split down
+				*y += *h;
+			}
+			if (chk_keysym(keysym, KEY_UP) || chk_keysym(keysym, KEY_UPLEFT) || chk_keysym(keysym, KEY_UPRIGHT)) {
+				*h /= 2; // split up
+			} 
+			if (chk_keysym(keysym, KEY_RIGHT) || chk_keysym(keysym, KEY_UPRIGHT) || chk_keysym(keysym, KEY_DOWNRIGHT)) {
+				*w /= 2; // split right
+				*x += *w;
+			}
+		}
 	}
-  } else {
-	if (ninegrid) {
-	  if (chk_keysym(keysym, KEY_UPLEFT)) {
-	    *w /= 3; *h /= 3; // split upper left
-	  } else if (chk_keysym(keysym, KEY_UP)) {
-	    *w /= 3; *h /= 3; // split up 
-	    *x += *w;
-	  } else if (chk_keysym(keysym, KEY_UPRIGHT)) {
-	    *w /= 3; *h /= 3; // split upper right 
-	    *x += *w * 2;
-	  } else if (chk_keysym(keysym, KEY_LEFT)) {
-	    *w /= 3; *h /= 3; // split left
-	    *y += *h;
-	  } else if (chk_keysym(keysym, KEY_CENTER)) {
-	    *w /= 3; *h /= 3; // split center
-	    *x += *w; *y += *h;
-	  } else if (chk_keysym(keysym, KEY_RIGHT)) {
-	    *w /= 3; *h /= 3; // split right
-	    *x += *w * 2; *y += *h;
-	  } else if (chk_keysym(keysym, KEY_DOWNLEFT)) {
-	    *w /= 3; *h /= 3; // split bottom left
-	    *y += *h * 2;
-	  } else if (chk_keysym(keysym, KEY_DOWN)) {
-	    *w /= 3; *h /= 3; // split down
-	    *x += *w; *y += *h * 2;
-	  } else if (chk_keysym(keysym, KEY_DOWNRIGHT)) {
-	    *w /= 3; *h /= 3; // split bottom right
-	    *x += *w * 2; *y += *h * 2;
-	  }
-	} else {
-	  if (chk_keysym(keysym, KEY_LEFT) || chk_keysym(keysym, KEY_UPLEFT) || chk_keysym(keysym, KEY_DOWNLEFT)) {
-	    *w /= 2; // split left
-	  }
-	   if (chk_keysym(keysym, KEY_DOWN) || chk_keysym(keysym, KEY_DOWNLEFT) || chk_keysym(keysym, KEY_DOWNRIGHT)) {
-	    *h /= 2; // split down
-	    *y += *h;
-	  }
-	   if (chk_keysym(keysym, KEY_UP) || chk_keysym(keysym, KEY_UPLEFT) || chk_keysym(keysym, KEY_UPRIGHT)) {
-	    *h /= 2; // split up
-	  } 
-	   if (chk_keysym(keysym, KEY_RIGHT) || chk_keysym(keysym, KEY_UPRIGHT) || chk_keysym(keysym, KEY_DOWNRIGHT)) {
-	    *w /= 2; // split right
-	    *x += *w;
-	  }
+
+	if (ox != *x || oy != *y || ow != *w || oh != *h) {
+		undo_stack_push(ox, oy, ow, oh);
+		*moves += 1;
 	}
-  }
+	else if (chk_keysym(keysym, KEY_UNDO)) {
+		int i, j;
 
-  if (ox != *x || oy != *y || ow != *w || oh != *h) {
-	undo_stack_push(ox, oy, ow, oh);
-	*moves += 1;
-  }
-  else if (chk_keysym(keysym, KEY_UNDO)) {
-	int i, j;
+		if (mod & SHIFTMASK) j = 0;
+		else j = SHIFT_N_UNDO-1; 
 
-	if (mod & SHIFTMASK) j = 0;
-	else j = SHIFT_N_UNDO-1; 
+		for (i=j; i<SHIFT_N_UNDO; i++) {
+		  undo_stack_pop(x, y, w, h, &ninegrid);
+		  *moves -= 1;
+		}
+		ret = 2;
+	}
 
-	for (i=j; i<SHIFT_N_UNDO; i++) {
-	  undo_stack_pop(x, y, w, h, &ninegrid);
-	  *moves -= 1;
+	if (*w < 1 || *h < 1) {
+		fprintf(stderr,"OOPS. Area too small. Giving up :(\n");
+		return 0;
 	}
-	ret = 2;
-  }
 
-  if (*w < 1 || *h < 1) {
-	fprintf(stderr,"OOPS. Area too small. Giving up :(\n");
-	return 0;
-  }
-
-  if (drag && !(mod & WARPMASK) || !drag && (mod & WARPMASK))
-	warppointer(*x, *y, *w, *h);
-
-  fprintf(stderr,"Box: @(%d,%d) #(%d,%d)\n", *x, *y, *w, *h);
-
-  return ret;
+	if (drag && !(mod & WARPMASK) || !drag && (mod & WARPMASK))
+		warppointer(*x, *y, *w, *h);
+	
+	fprintf(stderr,"Box: @(%d,%d) #(%d,%d)\n", *x, *y, *w, *h);
+	
+	return ret;
 }
 
 void startmousekey(int from_undo) {
-  int keysym;
-  int done = 0;
-  int x,y,w,h;
-  int warp = 0;
-  int click = 0;
-  int k, hits, moves;
-  int mod;
+	int keysym;
+	int done = 0;
+	int x,y,w,h;
+	int warp = 0;
+	int click = 0;
+	int k, hits, moves;
+	int mod;
+	
+	Window zone;
+	
+	// disable trigger keygrab
+	ungrab(KEY_TRIGGER, TRIGGERMASK);
+	ungrab(KEY_UNDO, TRIGGERMASK);
+	
+	// grab keyboard
+	XGrabKeyboard(dpy, root, False, GrabModeAsync, GrabModeAsync, CurrentTime);
+	
+	// init stuff
+	hits = moves = 0;
+	if (from_undo && undo_stack_pop(&x, &y, &w, &h, &ninegrid));
+		/* null -- only check for undo_stack_pop success */
+	else {
+		undo_stack_reset();
+		if (ninegrid_default)
+		  ninegrid = 1;
+		x = y = 0;
+		w = attr.width;
+		h = attr.height;
+	}
 
-  Window zone;
+	zone = XCreateSimpleWindow(dpy, root, x, y, w, h, 1, BlackPixel(dpy, 0), WhitePixel(dpy, 0));
+	
+	{ /* Tell the window manager not to manage us */
+		unsigned long valuemask;
+		XSetWindowAttributes winattr;
+		winattr.override_redirect = 1;
+		XChangeWindowAttributes(dpy, zone, CWOverrideRedirect, &winattr);
+	}
 
-  // disable trigger keygrab
-  ungrab(KEY_TRIGGER, TRIGGERMASK);
-  ungrab(KEY_UNDO, TRIGGERMASK);
-
-  // grab keyboard
-  XGrabKeyboard(dpy, root, False, GrabModeAsync, GrabModeAsync, CurrentTime);
-
-  // init stuff
-  hits = moves = 0;
-  if (from_undo && undo_stack_pop(&x, &y, &w, &h, &ninegrid));
-	/* null -- only check for undo_stack_pop success */
-  else {
-	undo_stack_reset();
-	if (ninegrid_default)
-	  ninegrid = 1;
-	x = y = 0;
-	w = attr.width;
-	h = attr.height;
-  }
-
-  zone = XCreateSimpleWindow(dpy, root, x, y, w, h, 1, BlackPixel(dpy, 0), WhitePixel(dpy, 0));
-
-  { /* Tell the window manager not to manage us */
-	unsigned long valuemask;
-	XSetWindowAttributes winattr;
-	winattr.override_redirect = 1;
-	XChangeWindowAttributes(dpy, zone, CWOverrideRedirect, &winattr);
-  }
-
-  drawquadrants(zone, w, h);
-  XMapWindow(dpy, zone);
-  drawquadrants(zone, w, h);
-
-  fprintf(stderr,"Starting quadrants...\n");
-  while (!done) {
-	XEvent e;
-	XNextEvent(dpy, &e);
-	if (e.type == KeyPress) {
-	  keysym = XKeycodeToKeysym(dpy, e.xkey.keycode, 0);
-	  mod = e.xkey.state;
-	  if (chk_keysym(keysym, KEY_Q_CLICK)) {
-	    done++;
-	    click = 1;
-	  } else if (chk_keysym(keysym, KEY_Q_RCLICK)) {
-	    done++;
-	    click = 3;
-	  } else if (chk_keysym(keysym, KEY_QW_CLICK)) {
-	    done++;
-	    warp = 1;
-	    click = 1;
-	  } else if (chk_keysym(keysym, KEY_Q_MCLICK)) {
-	    done++;
-	    click = 2;
-	  } else if (chk_keysym(keysym, KEY_QW_RCLICK)) {
-	    done++;
-	    warp = 1;
-	    click = 3;
-	  } else if (chk_keysym(keysym, KEY_HIDE)) {
-	    done++;
-	    warp = 1;
-	    x = w; y = h;
-	  } else if (chk_keysym(keysym, KEY_ESCAPE)) {
-	    warp = 0;
-	    done++;
-	  } else if (!drag && chk_keysym(keysym, KEY_ONE)) {
-	      buttondown(1);
-	      buttonup(1);
-	  } else if (!drag && chk_keysym(keysym, KEY_TWO)) {
-	      buttondown(2);
-	      buttonup(2);
-	  } else if (!drag && chk_keysym(keysym, KEY_THREE)) {
-	      buttondown(3);
-	      buttonup(3);
-	  } else {
-	    	if (k = handlekey(keysym, mod, &moves, &x, &y, &w, &h)) {
-	      	if (ninegrid_default && ninegrid_n_switch && k < 2 && moves >= ninegrid_n_switch)
-	        		ninegrid = 0;
-	      	hits++;
-	      	XMoveResizeWindow(dpy, zone, x, y, w, h);
-	      	drawquadrants(zone, w, h);
-	    	} else 
-	      	done++;
+	drawquadrants(zone, w, h);
+	XMapWindow(dpy, zone);
+	drawquadrants(zone, w, h);
+	
+	fprintf(stderr,"Starting quadrants...\n");
+	while (!done) {
+		XEvent e;
+		XNextEvent(dpy, &e);
+		if (e.type == KeyPress) {
+			keysym = XKeycodeToKeysym(dpy, e.xkey.keycode, 0);
+			mod = e.xkey.state;
+			if (chk_keysym(keysym, KEY_Q_CLICK)) {
+				done++;
+				click = 1;
+			} else if (chk_keysym(keysym, KEY_Q_RCLICK)) {
+				done++;
+				click = 3;
+			} else if (chk_keysym(keysym, KEY_QW_CLICK)) {
+				done++;
+				warp = 1;
+				click = 1;
+			} else if (chk_keysym(keysym, KEY_Q_MCLICK)) {
+				done++;
+				click = 2;
+			} else if (chk_keysym(keysym, KEY_QW_RCLICK)) {
+				done++;
+				warp = 1;
+				click = 3;
+			} else if (chk_keysym(keysym, KEY_HIDE)) {
+				done++;
+				warp = 1;
+				x = w; y = h;
+			} else if (chk_keysym(keysym, KEY_ESCAPE)) {
+				warp = 0;
+				done++;
+			} else if (!drag && chk_keysym(keysym, KEY_ONE)) {
+				buttondown(1);
+				buttonup(1);
+			} else if (!drag && chk_keysym(keysym, KEY_TWO)) {
+				buttondown(2);
+				buttonup(2);
+			} else if (!drag && chk_keysym(keysym, KEY_THREE)) {
+				buttondown(3);
+				buttonup(3);
+			} else {
+				if (k = handlekey(keysym, mod, &moves, &x, &y, &w, &h)) {
+					if (ninegrid_default && ninegrid_n_switch && k < 2 && moves >= ninegrid_n_switch)
+						ninegrid = 0;
+					hits++;
+					XMoveResizeWindow(dpy, zone, x, y, w, h);
+					drawquadrants(zone, w, h);
+				} else 
+					done++;
 			}
 		}
-  }
+	}
 
-  // end mouse key
-  XUngrabKeyboard(dpy, CurrentTime);
-  XDestroyWindow(dpy, zone);
-  undo_stack_push(x, y, w, h);
+	// end mouse key
+	XUngrabKeyboard(dpy, CurrentTime);
+	XDestroyWindow(dpy, zone);
+	undo_stack_push(x, y, w, h);
 
-  if (warp)
-	warppointer(x, y, w, h);
-  if (click == 1) {
-	if (!drag)
-	  buttondown(1);
-	if (mod & DRAGMASK && !drag) 
-	  drag = 1;
-	else if (mod & DRAGMASK) {
-	  buttonup(1);
-	  buttondown(1);
-	} else {
-	  buttonup(1);
-	  drag = 0;
+	if (warp)
+		warppointer(x, y, w, h);
+	if (click == 1) {
+		if (!drag)
+			buttondown(1);
+		if (mod & DRAGMASK && !drag) 
+			drag = 1;
+		else if (mod & DRAGMASK) {
+			buttonup(1);
+			buttondown(1);
+		} else {
+			buttonup(1);
+			drag = 0;
+		}
+	} else if (click) {
+		buttondown(click);
+		buttonup(click);
+	} 
+
+	if (click) stats(hits, moves); 
+	
+	// loop back if in drag mode
+	if (drag) {
+		usleep(50); 
+		startmousekey(0);
 	}
-  } else if (click) {
-	buttondown(click);
-	buttonup(click);
-  } 
 
-  if (click) stats(hits, moves); 
-
-  // loop back if in drag mode
-  if (drag) {
-	usleep(50); 
-	startmousekey(0);
-  }
-
-  // re-enable trigger keygrabs
-  grab(KEY_TRIGGER, TRIGGERMASK);
-  grab(KEY_UNDO, TRIGGERMASK);
+	// re-enable trigger keygrabs
+	grab(KEY_TRIGGER, TRIGGERMASK);
+	grab(KEY_UNDO, TRIGGERMASK);
 }
 
 int main(int argc, char **argv) {
-  char *pcDisplay;
-
-  if ((dpy = XOpenDisplay(pcDisplay = getenv("DISPLAY"))) == NULL) {
+	char *pcDisplay;
+	
+	if ((dpy = XOpenDisplay(pcDisplay = getenv("DISPLAY"))) == NULL) {
 	fprintf(stderr,"Error: Can't open display: %s", pcDisplay);
 	exit(1);
-  }
-  fprintf(stderr,"Display: %s\n", pcDisplay);
+	}
+	fprintf(stderr,"Display: %s\n", pcDisplay);
 
-  // parse options
-  if (argc > 1) 
-	if (argv[1][0] && argv[1][0] == '-') 
-	  if (argv[1][1] && argv[1][1] == 'n') {
-	    ninegrid_default = 1;
-	    fprintf(stderr,"nine-grid default mode \n");
-	    if (argv[2]) {
-	      ninegrid_n_switch = atoi(argv[2]);
-	      fprintf(stderr,"nine-grid autoswitch num: %d \n", ninegrid_n_switch);
-	    }
-	  }
+	// parse options
+	if (argc > 1) 
+		if (argv[1][0] && argv[1][0] == '-') 
+			if (argv[1][1] && argv[1][1] == 'n') {
+				ninegrid_default = 1;
+				fprintf(stderr,"nine-grid default mode \n");
+				if (argv[2]) {
+					ninegrid_n_switch = atoi(argv[2]);
+					fprintf(stderr,"nine-grid autoswitch num: %d \n", ninegrid_n_switch);
+				}
+			}
 
-  root = XDefaultRootWindow(dpy);
-  XGetWindowAttributes(dpy, root, &attr);
-
-  // these are the trigger keygrabs
-  grab(KEY_TRIGGER, TRIGGERMASK);
-  grab(KEY_UNDO, TRIGGERMASK);
-
-  while (1) {
+	root = XDefaultRootWindow(dpy);
+	XGetWindowAttributes(dpy, root, &attr);
+	
+	// these are the trigger keygrabs
+	grab(KEY_TRIGGER, TRIGGERMASK);
+	grab(KEY_UNDO, TRIGGERMASK);
+	
+	while (1) {
 	XEvent e;
 	XNextEvent(dpy, &e);
 	if (e.type == KeyPress)
-	  if (chk_keysym(XKeycodeToKeysym(dpy, e.xkey.keycode, 0), KEY_UNDO))
-	    startmousekey(1);
-	  else
-	    startmousekey(0);
-  }
+		if (chk_keysym(XKeycodeToKeysym(dpy, e.xkey.keycode, 0), KEY_UNDO))
+			startmousekey(1);
+		else
+			startmousekey(0);
+	}
 }