Apply coding std to <mouse> code & add .clang-format

The files:
    include/config/mousebind.h
    src/config/mousebind.c
    src/config/rc.xml
were formatted automatically via clang-format using the rules specified
in the .clang-format file. Specifically, the command;
clang-format -i -style=file include/config/mousebind.h \
src/config/mousebind.c src/config/rc.xml

This is unfortunately adding a break before the brace in enum
declarations

diff --git a/.clang-format b/.clang-format
new file mode 100644 (file)
index 0000000..b32bbe2
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,7 @@
+BasedOnStyle: LLVM
+IndentWidth: 8
+AlwaysBreakAfterReturnType: TopLevel
+UseTab: ForIndentation
+BreakBeforeBraces: Linux
+AllowShortEnumsOnASingleLine: false
+AlignAfterOpenBracket: DontAlign

diff --git a/include/config/mousebind.h b/include/config/mousebind.h
index ebe9ca09f9ee8627618da9a575248e400442a821..97d120248f4cf8e6fa45d4825c095fd346779619 100644 (file)
--- a/include/config/mousebind.h
+++ b/include/config/mousebind.h
@@ -4,23 +4,30 @@
 #include "ssd.h"
 #include <wayland-util.h>
 
-enum action_mouse_did {
+enum action_mouse_did
+{
        MOUSE_ACTION_DOUBLECLICK,
        MOUSE_ACTION_NONE
 };
 
 struct mousebind {
        enum ssd_part_type context; /* ex: titlebar */
-       uint32_t button; /* ex: BTN_LEFT, BTN_RIGHT from linux/input_event_codes.h */
-       enum action_mouse_did mouse_action; /* ex: doubleclick, press, drag, etc */
-       const char* action; /* what to do because mouse did previous action */
-       const char* command;
+
+       /* ex: BTN_LEFT, BTN_RIGHT from linux/input_event_codes.h */
+       uint32_t button;
+
+       /* ex: doubleclick, press, drag, etc */
+       enum action_mouse_did mouse_action;
+
+       /* what to do because mouse did previous action */
+       const char *action;
+
+       const char *command;
        struct wl_list link;
 };
 
-struct mousebind*
-mousebind_create(const char* context_str, const char* mouse_button_str,
-               const char* action_mouse_did_str, const char* action,
-               const char* command);
+struct mousebind *
+mousebind_create(const char *context_str, const char *mouse_button_str,
+    const char *action_mouse_did_str, const char *action, const char *command);
 
 #endif /* __LABWC_MOUSEBIND_H */

diff --git a/src/config/mousebind.c b/src/config/mousebind.c
index 3f6ec6df667ac692e25343790e8b622209155601..0bf07d30ce2defe72615b0b06faf677273ce1243 100644 (file)
--- a/src/config/mousebind.c
+++ b/src/config/mousebind.c
@@ -1,18 +1,17 @@
 #define _POSIX_C_SOURCE 200809L
 #include "config/mousebind.h"
 #include "config/rcxml.h"
-#include <wlr/util/log.h>
+#include <linux/input-event-codes.h>
 #include <strings.h>
 #include <unistd.h>
-#include <linux/input-event-codes.h>
+#include <wlr/util/log.h>
 
 static enum ssd_part_type
-context_from_str(const char* str)
+context_from_str(const char *str)
 {
-       if(str == NULL) {
+       if (str == NULL) {
                return LAB_SSD_NONE;
-       }
-       else if(strcasecmp(str, "Titlebar") == 0) {
+       } else if (strcasecmp(str, "Titlebar") == 0) {
                return LAB_SSD_PART_TITLEBAR;
        } else {
                return LAB_SSD_NONE;
@@ -20,16 +19,15 @@ context_from_str(const char* str)
 }
 
 static uint32_t
-mouse_button_from_str(const char* str)
+mouse_button_from_str(const char *str)
 {
-       if(str == NULL) {
+       if (str == NULL) {
                return UINT32_MAX;
-       }
-       else if(strcasecmp(str, "Left") == 0) {
+       } else if (strcasecmp(str, "Left") == 0) {
                return BTN_LEFT;
-       } else if(strcasecmp(str, "Right") == 0) {
+       } else if (strcasecmp(str, "Right") == 0) {
                return BTN_RIGHT;
-       } else if(strcasecmp(str, "Middle") == 0) {
+       } else if (strcasecmp(str, "Middle") == 0) {
                return BTN_MIDDLE;
        } else {
                return UINT32_MAX;
@@ -37,42 +35,42 @@ mouse_button_from_str(const char* str)
 }
 
 static enum action_mouse_did
-action_mouse_did_from_str(const char* str)
+action_mouse_did_from_str(const char *str)
 {
-       if(str == NULL) {
+       if (str == NULL) {
                return MOUSE_ACTION_NONE;
-       }
-       else if(strcasecmp(str, "doubleclick") == 0) {
+       } else if (strcasecmp(str, "doubleclick") == 0) {
                return MOUSE_ACTION_DOUBLECLICK;
        } else {
                return MOUSE_ACTION_NONE;
        }
 }
 
-struct mousebind*
-mousebind_create(const char* context_str, const char* mouse_button_str,
-               const char* action_mouse_did_str, const char* action,
-               const char* command)
+struct mousebind *
+mousebind_create(const char *context_str, const char *mouse_button_str,
+    const char *action_mouse_did_str, const char *action, const char *command)
 {
-       struct mousebind* m = calloc(1, sizeof(struct mousebind));
+       struct mousebind *m = calloc(1, sizeof(struct mousebind));
 
        enum ssd_part_type context = context_from_str(context_str);
        uint32_t button = mouse_button_from_str(mouse_button_str);
-       enum action_mouse_did action_mouse_did = action_mouse_did_from_str(action_mouse_did_str);
+       enum action_mouse_did action_mouse_did =
+           action_mouse_did_from_str(action_mouse_did_str);
 
-       if(context == LAB_SSD_NONE) {
+       if (context == LAB_SSD_NONE) {
                wlr_log(WLR_ERROR, "unknown mouse context (%s)", context_str);
                goto CREATE_ERROR;
        }
-       if(button == UINT32_MAX) {
+       if (button == UINT32_MAX) {
                wlr_log(WLR_ERROR, "unknown button (%s)", mouse_button_str);
                goto CREATE_ERROR;
        }
-       if(action_mouse_did == MOUSE_ACTION_NONE) {
-               wlr_log(WLR_ERROR, "unknown mouse action (%s)", action_mouse_did_str);
+       if (action_mouse_did == MOUSE_ACTION_NONE) {
+               wlr_log(WLR_ERROR, "unknown mouse action (%s)",
+                   action_mouse_did_str);
                goto CREATE_ERROR;
        }
-       if(action == NULL) {
+       if (action == NULL) {
                wlr_log(WLR_ERROR, "action is NULL\n");
                goto CREATE_ERROR;
        }
@@ -81,7 +79,7 @@ mousebind_create(const char* context_str, const char* mouse_button_str,
        m->button = button;
        m->mouse_action = action_mouse_did;
        m->action = strdup(action); /* TODO: replace with strndup? */
-       if(command && !strcasecmp(action, "Execute")) {
+       if (command && !strcasecmp(action, "Execute")) {
                m->command = strdup(command);
        }
 

diff --git a/src/config/rcxml.c b/src/config/rcxml.c
index 4d4034db657b7a15b463db7a71d53981721fbbf6..81fbbacb428ac9c7841a334d922733002bd461bb 100644 (file)
--- a/src/config/rcxml.c
+++ b/src/config/rcxml.c
@@ -1,4 +1,11 @@
 #define _POSIX_C_SOURCE 200809L
+#include "config/rcxml.h"
+#include "common/dir.h"
+#include "common/nodename.h"
+#include "common/string-helpers.h"
+#include "common/zfree.h"
+#include "config/keybind.h"
+#include "config/mousebind.h"
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
@@ -12,22 +19,15 @@
 #include <unistd.h>
 #include <wayland-server-core.h>
 #include <wlr/util/log.h>
-#include "common/dir.h"
-#include "common/nodename.h"
-#include "common/string-helpers.h"
-#include "common/zfree.h"
-#include "config/keybind.h"
-#include "config/mousebind.h"
-#include "config/rcxml.h"
 
 static bool in_keybind = false;
 static bool in_mousebind = false;
 static bool is_attribute = false;
 static struct keybind *current_keybind;
-static const char* current_mouse_context = "";
+static const char *current_mouse_context = "";
 
-
-enum font_place {
+enum font_place
+{
        FONT_PLACE_UNKNOWN = 0,
        FONT_PLACE_ACTIVEWINDOW,
        FONT_PLACE_MENUITEM,
@@ -38,11 +38,11 @@ enum font_place {
  * unchecked mousebind params. we fill these out one at a time, then pass them
  * all to mousebind_create() once we are ready
  */
-static const char* current_mouse_button = "";
-static const char* current_action_mouse_did= "";
+static const char *current_mouse_button = "";
+static const char *current_action_mouse_did = "";
 struct mouse_action {
-       const char* action;
-       const char* command;
+       const char *action;
+       const char *command;
 };
 /*
  * A given mousebind can have multiple actions associated with it.
@@ -54,8 +54,8 @@ struct mouse_action {
 static struct mouse_action mouse_actions[MAX_MOUSE_ACTIONS] = {{0}};
 static int num_mouse_actions = 0;
 
-
-static void load_default_key_bindings(void);
+static void
+load_default_key_bindings(void);
 
 static void
 fill_keybind(char *nodename, char *content)
@@ -89,35 +89,33 @@ fill_keybind(char *nodename, char *content)
 static void
 add_new_mousebinds(void)
 {
-       for(int i = 0; i < num_mouse_actions; i++) {
-               struct mousebind* m = mousebind_create(current_mouse_context,
-                               current_mouse_button,
-                               current_action_mouse_did,
-                               mouse_actions[i].action,
-                               mouse_actions[i].command);
-               if(m != NULL) {
+       for (int i = 0; i < num_mouse_actions; i++) {
+               struct mousebind *m = mousebind_create(current_mouse_context,
+                   current_mouse_button, current_action_mouse_did,
+                   mouse_actions[i].action, mouse_actions[i].command);
+               if (m != NULL) {
                        wl_list_insert(&rc.mousebinds, &m->link);
                } else {
-                       wlr_log(WLR_ERROR, "failed to create mousebind\n"
-                                       "    context: (%s)\n"
-                                       "    button: (%s)\n"
-                                       "    mouse action (%s)\n"
-                                       "    action (%s)\n"
-                                       "    command: (%s)\n",
-                                       current_mouse_context,
-                                       current_mouse_button,
-                                       current_action_mouse_did,
-                                       mouse_actions[i].action,
-                                       mouse_actions[i].command);
+                       wlr_log(WLR_ERROR,
+                           "failed to create mousebind\n"
+                           "    context: (%s)\n"
+                           "    button: (%s)\n"
+                           "    mouse action (%s)\n"
+                           "    action (%s)\n"
+                           "    command: (%s)\n",
+                           current_mouse_context, current_mouse_button,
+                           current_action_mouse_did, mouse_actions[i].action,
+                           mouse_actions[i].command);
                }
        }
 
        num_mouse_actions = 0;
-       memset(mouse_actions, 0, sizeof(struct mouse_action) * MAX_MOUSE_ACTIONS);
+       memset(
+           mouse_actions, 0, sizeof(struct mouse_action) * MAX_MOUSE_ACTIONS);
 }
 
 static void
-fill_mousebind(char* nodename, char* content)
+fill_mousebind(char *nodename, char *content)
 {
        /*
         * Example of what we're parsing:
@@ -126,32 +124,33 @@ fill_mousebind(char* nodename, char* content)
         *   <action name="ToggleMaximize"/>
         * </mousebind>
         */
-       if(!content) {
+       if (!content) {
                return;
        }
 
        string_truncate_at_pattern(nodename, ".mousebind.context.mouse");
 
-       if(is_attribute && !strcmp(nodename, "button")) {
+       if (is_attribute && !strcmp(nodename, "button")) {
                current_mouse_button = content;
-       } else if(!strcmp(nodename, "action")) {
+       } else if (!strcmp(nodename, "action")) {
                /*
-                * checking for is_attribute fails even though we are looking for the
-                * attribute of mousebind named action. initial thoughts were to check
-                * for is_attribute to distinguish the attribute of mousebind named
-                * action from the child of mousebind named action. since the child of
-                * mousebind named action doesn't have any content, I don't think we
-                * need to make this distinction since we already filtered out nodes that
-                * don't have content
+                * checking for is_attribute fails even though we are looking
+                * for the attribute of mousebind named action. initial thoughts
+                * were to check for is_attribute to distinguish the attribute
+                * of mousebind named action from the child of mousebind named
+                * action. since the child of mousebind named action doesn't
+                * have any content, I don't think we need to make this
+                * distinction since we already filtered out nodes that don't
+                * have content
                 */
                current_action_mouse_did = content;
-       } else if(is_attribute && !strcmp(nodename, "name.action")) {
-               if(num_mouse_actions < MAX_MOUSE_ACTIONS) {
+       } else if (is_attribute && !strcmp(nodename, "name.action")) {
+               if (num_mouse_actions < MAX_MOUSE_ACTIONS) {
                        num_mouse_actions++;
-                       mouse_actions[num_mouse_actions-1].action = content;
+                       mouse_actions[num_mouse_actions - 1].action = content;
                }
-       } else if(!strcmp(nodename, "command.action")) {
-               mouse_actions[num_mouse_actions-1].command = content;
+       } else if (!strcmp(nodename, "command.action")) {
+               mouse_actions[num_mouse_actions - 1].command = content;
        }
 }
 
@@ -207,7 +206,7 @@ fill_font(char *nodename, char *content, enum font_place place)
                }
                break;
 
-       /* TODO: implement for all font places */
+               /* TODO: implement for all font places */
 
        default:
                break;
@@ -290,7 +289,7 @@ entry(xmlNode *node, char *nodename, char *content)
        } else if (!strcasecmp(nodename, "RaiseOnFocus.focus")) {
                rc.focus_follow_mouse = true;
                rc.raise_on_focus = get_bool(content);
-       } else if(!strcasecmp(nodename, "doubleClickTime.mouse")) {
+       } else if (!strcasecmp(nodename, "doubleClickTime.mouse")) {
                long doubleclick_time_parsed = strtol(content, NULL, 10);
 
                /*
@@ -299,16 +298,17 @@ entry(xmlNode *node, char *nodename, char *content)
                 *  - user gave a negative value (which doesn't make sense)
                 *  - user gave a value which strtol couldn't parse
                 *
-                *  since strtol() returns 0 on error, all we have to do is check
-                *  for to see if strtol() returned 0 or less to handle the error
-                *  cases. in case of error, we just choose not to override the
-                *  default value and everything should be fine
+                *  since strtol() returns 0 on error, all we have to do is
+                * check for to see if strtol() returned 0 or less to handle the
+                * error cases. in case of error, we just choose not to override
+                * the default value and everything should be fine
                 */
                bool valid_doubleclick_time = doubleclick_time_parsed > 0;
-               if(valid_doubleclick_time) {
+               if (valid_doubleclick_time) {
                        rc.doubleclick_time = doubleclick_time_parsed;
                }
-       } else if(is_attribute && !strcasecmp(nodename, "name.context.mouse")) {
+       } else if (is_attribute &&
+                  !strcasecmp(nodename, "name.context.mouse")) {
                current_mouse_context = content;
        }
 }
@@ -328,7 +328,8 @@ process_node(xmlNode *node)
        entry(node, name, content);
 }
 
-static void xml_tree_walk(xmlNode *node);
+static void
+xml_tree_walk(xmlNode *node);
 
 static void
 traverse(xmlNode *n)
@@ -354,8 +355,8 @@ xml_tree_walk(xmlNode *node)
                        traverse(n);
                        in_keybind = false;
                        continue;
-               } 
-               if(!strcasecmp((char *)n->name, "mousebind")) {
+               }
+               if (!strcasecmp((char *)n->name, "mousebind")) {
                        in_mousebind = true;
                        traverse(n);
                        in_mousebind = false;
@@ -474,7 +475,7 @@ rcxml_read(const char *filename)
        char *line = NULL;
        size_t len = 0;
        struct buf b;
-       static char rcxml[4096] = { 0 };
+       static char rcxml[4096] = {0};
 
        rcxml_init();
 
@@ -521,7 +522,8 @@ rcxml_finish(void)
        zfree(rc.theme_name);
 
        struct keybind *k, *k_tmp;
-       wl_list_for_each_safe (k, k_tmp, &rc.keybinds, link) {
+       wl_list_for_each_safe(k, k_tmp, &rc.keybinds, link)
+       {
                wl_list_remove(&k->link);
                zfree(k->command);
                zfree(k->action);
@@ -530,7 +532,8 @@ rcxml_finish(void)
        }
 
        struct mousebind *m, *m_tmp;
-       wl_list_for_each_safe(m, m_tmp, &rc.mousebinds, link) {
+       wl_list_for_each_safe(m, m_tmp, &rc.mousebinds, link)
+       {
                wl_list_remove(&m->link);
                zfree(m->command);
                zfree(m->action);