yay no tabs in the source

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index a5d983c3b64ddda26ceb0b70a10a7a01a2ca64a9..c0e6f96c39578a2ebb9d43eec136d20a3d219111 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -141,10 +141,10 @@ void event_startup(gboolean reconfig)
         const KeyCode num_lock = XKeysymToKeycode(ob_display, XK_Num_Lock);
         const KeyCode scroll_lock = XKeysymToKeycode(ob_display,
                                                      XK_Scroll_Lock);
-         
+
         for (cnt = 0; cnt < size; ++cnt) {
             if (! modmap->modifiermap[cnt]) continue;
-              
+
             if (num_lock == modmap->modifiermap[cnt])
                 NumLockMask = mask_table[cnt / modmap->max_keypermod];
             if (scroll_lock == modmap->modifiermap[cnt])
@@ -251,9 +251,9 @@ static void event_set_lasttime(XEvent *e)
 }
 
 #define STRIP_MODS(s) \
-       s &= ~(LockMask | NumLockMask | ScrollLockMask), \
-       /* kill off the Button1Mask etc, only want the modifiers */ \
-       s &= (ControlMask | ShiftMask | Mod1Mask | \
+        s &= ~(LockMask | NumLockMask | ScrollLockMask), \
+        /* kill off the Button1Mask etc, only want the modifiers */ \
+        s &= (ControlMask | ShiftMask | Mod1Mask | \
               Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask) \
 
 static void event_hack_mods(XEvent *e)
@@ -317,7 +317,7 @@ static gboolean event_ignore(XEvent *e, ObClient *client)
            want will be of type NotifyAncestor. This situation does not occur
            for FocusOut, so it is safely ignored there.
         */
-       if (INVALID_FOCUSIN(e) ||
+        if (INVALID_FOCUSIN(e) ||
             client == NULL) {
 #ifdef DEBUG_FOCUS
             ob_debug("FocusIn on %lx mode %d detail %d IGNORED\n",
@@ -336,7 +336,7 @@ static gboolean event_ignore(XEvent *e, ObClient *client)
 #endif
         break;
     case FocusOut:
-       if (INVALID_FOCUSOUT(e)) {
+        if (INVALID_FOCUSOUT(e)) {
 #ifdef DEBUG_FOCUS
         ob_debug("FocusOut on %lx mode %d detail %d IGNORED\n",
                  e->xfocus.window, e->xfocus.mode, e->xfocus.detail);
@@ -495,7 +495,7 @@ static void event_process(const XEvent *ec, gpointer data)
         /* unhandled configure requests must be used to configure the
            window directly */
         XWindowChanges xwc;
-              
+
         xwc.x = e->xconfigurerequest.x;
         xwc.y = e->xconfigurerequest.y;
         xwc.width = e->xconfigurerequest.width;
@@ -531,7 +531,7 @@ static void event_process(const XEvent *ec, gpointer data)
 
                 menu_can_hide = FALSE;
                 ob_main_loop_timeout_add(ob_main_loop,
-                                         G_USEC_PER_SEC / 4,
+                                         config_menu_hide_delay * 1000,
                                          menu_hide_delay_func,
                                          NULL, NULL);
 
@@ -840,7 +840,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
                 if (e->xconfigurerequest.value_mask & CWY)
                     y = newy;
             }
-              
+
             switch (client->gravity) {
             case NorthEastGravity:
             case EastGravity:
@@ -1038,7 +1038,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
                 if (e->xclient.data.l[0] & 1 << 9)
                     y = newy;
             }
-              
+
             client_configure(client, OB_CORNER_TOPLEFT,
                              x, y, w, h, FALSE, TRUE);