Reindent all code.

1 files changed, 135 insertions, 149 deletions

diff --git a/setupx.c b/setupx.c
index 34f0682..4f4f583 100644
--- a/setupx.c
+++ b/setupx.c
@@ -10,162 +10,148 @@
 
 int widths[3] = { 125, 250, 500 };
 int heights[3] = { 147, 294, 588 };
+
 int winsize = 2;
 
-Display *display=0;
-int screen=0;
-Visual *visual=0;
-Colormap cmap=0;
-Window window=0;
-Window rootwin=0;
-GC gc=0;
-Atom wm_protocols_atom=0;
-Atom delete_atom=0;
-Atom paste_atom=0;
+Display *display = 0;
+int screen = 0;
+Visual *visual = 0;
+Colormap cmap = 0;
+Window window = 0;
+Window rootwin = 0;
+GC gc = 0;
+Atom wm_protocols_atom = 0;
+Atom delete_atom = 0;
+Atom paste_atom = 0;
 XEvent event;
 
 int bit_on, bit_off;
 
-void
-setup_x(void)
-{
-  char *name = "hcalc";
-
-  if(winsize == 2)
-	  scale_factor = 4;
-  else
-	  scale_factor = winsize + 1;
-
-  XSizeHints size_hints;
-  XTextProperty xtp;
-  XSetWindowAttributes attributes;
-  XColor color;
-
-  display = XOpenDisplay(0);
-  screen = XDefaultScreen(display);
-  cmap = XDefaultColormap(display, screen);
-  visual = XDefaultVisual(display, screen);
-  rootwin = XDefaultRootWindow(display);
-  gc = XCreateGC(display, rootwin, 0, 0);
-
-  wm_protocols_atom = XInternAtom(display, "WM_PROTOCOLS", 0);
-  delete_atom = XInternAtom(display, "WM_DELETE_WINDOW", 0);
-  paste_atom = XInternAtom(display, "PASTE_DATA", 0);
-
-  size_hints.flags = PSize | PMinSize | PMaxSize;
-  size_hints.width = size_hints.min_width = size_hints.max_width = widths[winsize];
-  size_hints.height = size_hints.min_height = size_hints.max_height = heights[winsize];
-  size_hints.x = 0;
-  size_hints.y = 0;
-
-  window = XCreateWindow(display,
-			 rootwin,
-			 size_hints.x, size_hints.y,
-			 size_hints.width, size_hints.height,
-			 0,
-			 CopyFromParent, /* depth */
-			 InputOutput,
-			 CopyFromParent, /* visual */
-			 0, 0);
-
-  XSetWMNormalHints(display, window, &size_hints);
-
-  XStringListToTextProperty(&name, 1, &xtp);
-  XSetWMName(display, window, &xtp);
-  XFree(xtp.value);
-
-  XSetWMProtocols(display, window, &delete_atom, 1);
-
-  attributes.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
-  XChangeWindowAttributes(display, window, CWEventMask, &attributes);
-
-  XMapWindow(display, window);
-  XFlush(display);
-
-  color.red   = 0x6666;
-  color.green = 0xffff;
-  color.blue  = 0x6666;
-  color.flags = DoRed | DoGreen | DoBlue;
-  XAllocColor(display, cmap, &color);
-  bit_on = color.pixel;
-
-  color.red   = 0x3333;
-  color.green = 0xcccc;
-  color.blue  = 0x3333;
-  color.flags = DoRed | DoGreen | DoBlue;
-  XAllocColor(display, cmap, &color);
-  bit_off = color.pixel;
-}
+void setup_x(void) {
+	char *name = "hcalc";
 
-void
-process_input()
-{
-  char c;
-  KeySym keysym;
-  XTextProperty tprop;
-
-  show_value();
-
-  while (1)
-  {
-    XNextEvent(display, &event);
-    if (event.xany.window == window)
-    {
-      switch (event.type)
-      {
-      case Expose:
-	if (event.xexpose.count == 0)
-	  redraw();
-	break;
-      case KeyPress:
-	if (XLookupString(&event.xkey, &c, 1, &keysym, 0) == 1)
-	{
-	  key(c);
-	}
+	if(winsize == 2)
+		scale_factor = 4;
 	else
-	{
-	  switch (keysym)
-	  {
-	  case XK_F1:
-	    key('D');
-	    break;
-	  case XK_F2:
-	    key('H');
-	    break;
-	  case XK_F3:
-	    key('O');
-	    break;
-	  case XK_F4:
-	    key('B');
-	    break;
-	  case XK_Insert:
-       if(event.xkey.state & ShiftMask)
-	      paste();
-	    break;
-	  }
+		scale_factor = winsize + 1;
+
+	XSizeHints size_hints;
+	XTextProperty xtp;
+	XSetWindowAttributes attributes;
+	XColor color;
+
+	display = XOpenDisplay(0);
+	screen = XDefaultScreen(display);
+	cmap = XDefaultColormap(display, screen);
+	visual = XDefaultVisual(display, screen);
+	rootwin = XDefaultRootWindow(display);
+	gc = XCreateGC(display, rootwin, 0, 0);
+
+	wm_protocols_atom = XInternAtom(display, "WM_PROTOCOLS", 0);
+	delete_atom = XInternAtom(display, "WM_DELETE_WINDOW", 0);
+	paste_atom = XInternAtom(display, "PASTE_DATA", 0);
+
+	size_hints.flags = PSize | PMinSize | PMaxSize;
+	size_hints.width = size_hints.min_width = size_hints.max_width =
+		widths[winsize];
+	size_hints.height = size_hints.min_height = size_hints.max_height =
+		heights[winsize];
+	size_hints.x = 0;
+	size_hints.y = 0;
+
+	window = XCreateWindow(display, rootwin, size_hints.x, size_hints.y, size_hints.width, size_hints.height, 0, CopyFromParent,	/* depth */
+						   InputOutput, CopyFromParent,	/* visual */
+						   0, 0);
+
+	XSetWMNormalHints(display, window, &size_hints);
+
+	XStringListToTextProperty(&name, 1, &xtp);
+	XSetWMName(display, window, &xtp);
+	XFree(xtp.value);
+
+	XSetWMProtocols(display, window, &delete_atom, 1);
+
+	attributes.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
+	XChangeWindowAttributes(display, window, CWEventMask, &attributes);
+
+	XMapWindow(display, window);
+	XFlush(display);
+
+	color.red = 0x6666;
+	color.green = 0xffff;
+	color.blue = 0x6666;
+	color.flags = DoRed | DoGreen | DoBlue;
+	XAllocColor(display, cmap, &color);
+	bit_on = color.pixel;
+
+	color.red = 0x3333;
+	color.green = 0xcccc;
+	color.blue = 0x3333;
+	color.flags = DoRed | DoGreen | DoBlue;
+	XAllocColor(display, cmap, &color);
+	bit_off = color.pixel;
+}
+
+void process_input() {
+	char c;
+	KeySym keysym;
+	XTextProperty tprop;
+
+	show_value();
+
+	while(1) {
+		XNextEvent(display, &event);
+		if(event.xany.window == window) {
+			switch (event.type) {
+				case Expose:
+					if(event.xexpose.count == 0)
+						redraw();
+					break;
+				case KeyPress:
+					if(XLookupString(&event.xkey, &c, 1, &keysym, 0) == 1) {
+						key(c);
+					} else {
+						switch (keysym) {
+							case XK_F1:
+								key('D');
+								break;
+							case XK_F2:
+								key('H');
+								break;
+							case XK_F3:
+								key('O');
+								break;
+							case XK_F4:
+								key('B');
+								break;
+							case XK_Insert:
+								if(event.xkey.state & ShiftMask)
+									paste();
+								break;
+						}
+					}
+					break;
+				case ButtonPress:
+					button(event.xbutton.button, event.xbutton.x,
+						   event.xbutton.y);
+					break;
+				case SelectionRequest:
+					send_current_display();
+					break;
+				case SelectionNotify:
+					if(event.xselection.property == paste_atom) {
+						XGetTextProperty(display, window, &tprop,
+										 paste_atom);
+						complete_paste(tprop.value, tprop.nitems);
+					}
+					break;
+			}
+			if(event.type == ClientMessage
+			   && event.xclient.data.l[0] == delete_atom) {
+				/* printf( "Shutting down now!!!\n"); */
+				break;
+			}
+		}
 	}
-	break;
-      case ButtonPress:
-	button(event.xbutton.button, event.xbutton.x, event.xbutton.y);
-	break;
-      case SelectionRequest:
-	send_current_display();
-	break;
-      case SelectionNotify:
-	if (event.xselection.property == paste_atom)
-	{
-	  XGetTextProperty(display, window, &tprop, paste_atom);
-	  complete_paste(tprop.value, tprop.nitems);
-	} 
-	break;
-      }      
-      if (event.type == ClientMessage 
-    			&& event.xclient.data.l[0] == delete_atom)
-      {
-    	/* printf( "Shutting down now!!!\n"); */
-        break;
-      }
-    }
-  }
-  XCloseDisplay(display);
+	XCloseDisplay(display);
 }