--- a/src/input.cc	Sat Sep 24 19:44:54 2011 +0300
+++ b/src/input.cc	Sat Sep 24 19:52:10 2011 +0300
@@ -75,39 +75,40 @@
     KeySym ks;
     inpev_t key;
 } key_info_t;
+
 static const key_info_t key_info[] = {
-    {XK_BackSpace, YK_BACKSPACE},
-#ifdef XK_ISO_Left_Tab                /* OpenServer 5.0 X11R5 doesn't have XK_ISO_Left_Tab */
-    {XK_ISO_Left_Tab, YK_BACKTAB},
+    { XK_BackSpace,     YK_BACKSPACE},
+#ifdef XK_ISO_Left_Tab                 /* OpenServer 5.0 X11R5 doesn't have XK_ISO_Left_Tab */
+    { XK_ISO_Left_Tab,  YK_BACKTAB},
 #endif
-    {XK_Delete, YK_DEL,},
-    {XK_Down, YK_DOWN,},
-    {XK_End, YK_END,},
-    {XK_Escape, YK_ESC,},
-    {XK_F1, YK_F1,},
-    {XK_F2, YK_F2,},
-    {XK_F3, YK_F3,},
-    {XK_F4, YK_F4,},
-    {XK_F5, YK_F5,},
-    {XK_F6, YK_F6,},
-    {XK_F7, YK_F7,},
-    {XK_F8, YK_F8,},
-    {XK_F9, YK_F9,},
-    {XK_F10, YK_F10,},
-    {XK_Home, YK_HOME,},
-    {XK_Insert, YK_INS,},
-    {XK_Left, YK_LEFT,},
-    {XK_Linefeed, YK_RETURN,},
-#ifdef XK_Page_Down                /* HP-UX 10 doesn't have XK_Page_Down */
-    {XK_Page_Down, YK_PD,},
+    { XK_Delete,        YK_DEL,},
+    { XK_Down,          YK_DOWN,},
+    { XK_End,           YK_END,},
+    { XK_Escape,        YK_ESC,},
+    { XK_F1,            YK_F1,},
+    { XK_F2,            YK_F2,},
+    { XK_F3,            YK_F3,},
+    { XK_F4,            YK_F4,},
+    { XK_F5,            YK_F5,},
+    { XK_F6,            YK_F6,},
+    { XK_F7,            YK_F7,},
+    { XK_F8,            YK_F8,},
+    { XK_F9,            YK_F9,},
+    { XK_F10,           YK_F10,},
+    { XK_Home,          YK_HOME,},
+    { XK_Insert,        YK_INS,},
+    { XK_Left,          YK_LEFT,},
+    { XK_Linefeed,      YK_RETURN,},
+#ifdef XK_Page_Down                    /* HP-UX 10 doesn't have XK_Page_Down */
+    { XK_Page_Down,     YK_PD,},
 #endif
-#ifdef XK_Page_Up                /* HP-UX 10 doesn't have XK_Page_Up */
-    {XK_Page_Up, YK_PU,},
+#ifdef XK_Page_Up                      /* HP-UX 10 doesn't have XK_Page_Up */
+    { XK_Page_Up,       YK_PU,},
 #endif
-    {XK_Return, YK_RETURN,},
-    {XK_Right, YK_RIGHT,},
-    {XK_Tab, YK_TAB,},
-    {XK_Up, YK_UP,},
+    { XK_Return,        YK_RETURN,},
+    { XK_Right,         YK_RIGHT,},
+    { XK_Tab,           YK_TAB,},
+    { XK_Up,            YK_UP,},
 };
 
 
@@ -125,6 +126,7 @@
 
     if (!dpy)                        /* Sanity check */
         fatal_error("get_input_status() called before XOpenDisplay()");
+
     if (XPending(dpy) == 0)
     {
         // No event ? Wait for <idle_sleep_ms> ms before polling again.
@@ -135,7 +137,7 @@
 #elif defined Y_USLEEP
         usleep(1000ul * idle_sleep_ms);
 #else
-        ;                        // Neither nanosleep() no usleep() so be a CPU hog.
+        // Neither nanosleep() no usleep() so be a CPU hog.
         // FIXME: if autoscroll is turned off, could as well
         // call XNextEvent and sleep for good.
 #endif
@@ -148,27 +150,12 @@
     {
         /* Exposure */
     case Expose:
-#if 0
-        printf("expose: send=%d w=%d x,y=%4d,%4d w,h=%4d,%4d c=%d\n",
-               (int) ev.xexpose.send_event,
-               (int) ev.xexpose.window,
-               (int) ev.xexpose.x,
-               (int) ev.xexpose.y,
-               (int) ev.xexpose.width,
-               (int) ev.xexpose.height, (int) ev.xexpose.count);
-#endif
         if (ev.xexpose.window == win && ev.xexpose.count == 0)
             is.key = YE_EXPOSE;
         break;
 
         /* Resize */
     case ConfigureNotify:
-#if 0
-        printf("configure: x,y=%4d,%4d w,h=%4d,%4d\n",
-               (int) ev.xconfigure.x,
-               (int) ev.xconfigure.y,
-               (int) ev.xconfigure.width, (int) ev.xconfigure.height);
-#endif
         if (is.width < 0 || ev.xconfigure.width != is.width
             || ev.xconfigure.height != is.height)
         {
@@ -355,15 +342,6 @@
                 if (is.key != 0 && is.alt)
                     is.key |= YK_ALT;
             }
-#if 0
-            if (ev.type == KeyPress)
-            {
-                printf("key=%04hXh", is.key);
-                if (is.key >= 0 && is.key <= UCHAR_MAX && isprint(is.key))
-                    printf(" (%c)", (char) is.key);
-                putchar('\n');
-            }
-#endif
             break;
         }
     }                                /* switch (ev.type) */
@@ -441,6 +419,7 @@
     inpev_t key;
     const char *string;
 } key_string_t;
+
 static const key_string_t key_string[] = {
     {' ', "Space"},
     {YK_BACKSPACE, "BS"},
@@ -474,7 +453,7 @@
 {
     static char buf[51];
 
-// Is one of the special keys ?
+    // Is one of the special keys ?
     size_t n;
     const size_t nmax = sizeof key_string / sizeof *key_string;
     for (n = 0; n < nmax; n++)