From: Michael Stapelberg <michael@stapelberg.de>
Date: Thu, 6 Sep 2012 12:49:14 +0000 (+0200)
Subject: re-indent src/config.c
X-Git-Tag: 4.3~34
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f44d4ce4b3467b6c4ab037d494fa1ae50ef9df07;p=i3%2Fi3

re-indent src/config.c
---

diff --git a/src/config.c b/src/config.c
index c5846279..017d40ce 100644
--- a/src/config.c
+++ b/src/config.c
@@ -26,27 +26,27 @@ struct barconfig_head barconfigs = TAILQ_HEAD_INITIALIZER(barconfigs);
  *
  */
 void ungrab_all_keys(xcb_connection_t *conn) {
-        DLOG("Ungrabbing all keys\n");
-        xcb_ungrab_key(conn, XCB_GRAB_ANY, root, XCB_BUTTON_MASK_ANY);
+    DLOG("Ungrabbing all keys\n");
+    xcb_ungrab_key(conn, XCB_GRAB_ANY, root, XCB_BUTTON_MASK_ANY);
 }
 
 static void grab_keycode_for_binding(xcb_connection_t *conn, Binding *bind, uint32_t keycode) {
-        DLOG("Grabbing %d\n", keycode);
-        /* Grab the key in all combinations */
-        #define GRAB_KEY(modifier) \
-                do { \
-                        xcb_grab_key(conn, 0, root, modifier, keycode, \
-                                     XCB_GRAB_MODE_SYNC, XCB_GRAB_MODE_ASYNC); \
-                } while (0)
-        int mods = bind->mods;
-        if ((bind->mods & BIND_MODE_SWITCH) != 0) {
-                mods &= ~BIND_MODE_SWITCH;
-                if (mods == 0)
-                        mods = XCB_MOD_MASK_ANY;
-        }
-        GRAB_KEY(mods);
-        GRAB_KEY(mods | xcb_numlock_mask);
-        GRAB_KEY(mods | xcb_numlock_mask | XCB_MOD_MASK_LOCK);
+    DLOG("Grabbing %d\n", keycode);
+    /* Grab the key in all combinations */
+    #define GRAB_KEY(modifier) \
+        do { \
+            xcb_grab_key(conn, 0, root, modifier, keycode, \
+                         XCB_GRAB_MODE_SYNC, XCB_GRAB_MODE_ASYNC); \
+        } while (0)
+    int mods = bind->mods;
+    if ((bind->mods & BIND_MODE_SWITCH) != 0) {
+        mods &= ~BIND_MODE_SWITCH;
+        if (mods == 0)
+            mods = XCB_MOD_MASK_ANY;
+    }
+    GRAB_KEY(mods);
+    GRAB_KEY(mods | xcb_numlock_mask);
+    GRAB_KEY(mods | xcb_numlock_mask | XCB_MOD_MASK_LOCK);
 }
 
 /*
@@ -55,28 +55,28 @@ static void grab_keycode_for_binding(xcb_connection_t *conn, Binding *bind, uint
  *
  */
 Binding *get_binding(uint16_t modifiers, xcb_keycode_t keycode) {
-        Binding *bind;
+    Binding *bind;
+
+    TAILQ_FOREACH(bind, bindings, bindings) {
+        /* First compare the modifiers */
+        if (bind->mods != modifiers)
+            continue;
 
-        TAILQ_FOREACH(bind, bindings, bindings) {
-                /* First compare the modifiers */
-                if (bind->mods != modifiers)
-                        continue;
-
-                /* If a symbol was specified by the user, we need to look in
-                 * the array of translated keycodes for the event’s keycode */
-                if (bind->symbol != NULL) {
-                        if (memmem(bind->translated_to,
-                                   bind->number_keycodes * sizeof(xcb_keycode_t),
-                                   &keycode, sizeof(xcb_keycode_t)) != NULL)
-                                break;
-                } else {
-                        /* This case is easier: The user specified a keycode */
-                        if (bind->keycode == keycode)
-                                break;
-                }
+        /* If a symbol was specified by the user, we need to look in
+         * the array of translated keycodes for the event’s keycode */
+        if (bind->symbol != NULL) {
+            if (memmem(bind->translated_to,
+                       bind->number_keycodes * sizeof(xcb_keycode_t),
+                       &keycode, sizeof(xcb_keycode_t)) != NULL)
+                break;
+        } else {
+            /* This case is easier: The user specified a keycode */
+            if (bind->keycode == keycode)
+                break;
         }
+    }
 
-        return (bind == TAILQ_END(bindings) ? NULL : bind);
+    return (bind == TAILQ_END(bindings) ? NULL : bind);
 }
 
 /*
@@ -133,22 +133,22 @@ void translate_keysyms(void) {
  *
  */
 void grab_all_keys(xcb_connection_t *conn, bool bind_mode_switch) {
-        Binding *bind;
-        TAILQ_FOREACH(bind, bindings, bindings) {
-                if ((bind_mode_switch && (bind->mods & BIND_MODE_SWITCH) == 0) ||
-                    (!bind_mode_switch && (bind->mods & BIND_MODE_SWITCH) != 0))
-                        continue;
-
-                /* The easy case: the user specified a keycode directly. */
-                if (bind->keycode > 0) {
-                        grab_keycode_for_binding(conn, bind, bind->keycode);
-                        continue;
-                }
-
-                xcb_keycode_t *walk = bind->translated_to;
-                for (int i = 0; i < bind->number_keycodes; i++)
-                        grab_keycode_for_binding(conn, bind, *walk++);
+    Binding *bind;
+    TAILQ_FOREACH(bind, bindings, bindings) {
+        if ((bind_mode_switch && (bind->mods & BIND_MODE_SWITCH) == 0) ||
+            (!bind_mode_switch && (bind->mods & BIND_MODE_SWITCH) != 0))
+            continue;
+
+        /* The easy case: the user specified a keycode directly. */
+        if (bind->keycode > 0) {
+            grab_keycode_for_binding(conn, bind, bind->keycode);
+            continue;
         }
+
+        xcb_keycode_t *walk = bind->translated_to;
+        for (int i = 0; i < bind->number_keycodes; i++)
+            grab_keycode_for_binding(conn, bind, *walk++);
+    }
 }
 
 /*
@@ -156,22 +156,22 @@ void grab_all_keys(xcb_connection_t *conn, bool bind_mode_switch) {
  *
  */
 void switch_mode(const char *new_mode) {
-        struct Mode *mode;
+    struct Mode *mode;
 
-        LOG("Switching to mode %s\n", new_mode);
+    LOG("Switching to mode %s\n", new_mode);
 
-        SLIST_FOREACH(mode, &modes, modes) {
-                if (strcasecmp(mode->name, new_mode) != 0)
-                        continue;
+    SLIST_FOREACH(mode, &modes, modes) {
+        if (strcasecmp(mode->name, new_mode) != 0)
+            continue;
 
-                ungrab_all_keys(conn);
-                bindings = mode->bindings;
-                translate_keysyms();
-                grab_all_keys(conn, false);
-                return;
-        }
+        ungrab_all_keys(conn);
+        bindings = mode->bindings;
+        translate_keysyms();
+        grab_all_keys(conn, false);
+        return;
+    }
 
-        ELOG("ERROR: Mode not found\n");
+    ELOG("ERROR: Mode not found\n");
 }
 
 /*