Give layout enum a name: layout_t

diff --git a/include/con.h b/include/con.h
index 7c60211515f9ffe878fc0a6a3d6568ac7abb4675..ec4ae3524d789f0546a7dc8dccc658dc7a0a0266 100644 (file)
--- a/include/con.h
+++ b/include/con.h
@@ -275,7 +275,7 @@ void con_set_border_style(Con *con, int border_style, int border_width);
  * new split container before).
  *
  */
-void con_set_layout(Con *con, int layout);
+void con_set_layout(Con *con, layout_t layout);
 
 /**
  * This function toggles the layout of a given container. toggle_mode can be

diff --git a/include/config.h b/include/config.h
index 7056af8587fe0ffba0cc2f3d69058157f8df2b07..4bdcdbadfd9f157c05a134ab485b83dc2f5b6473 100644 (file)
--- a/include/config.h
+++ b/include/config.h
@@ -95,7 +95,7 @@ struct Config {
     char *ipc_socket_path;
     const char *restart_state_path;
 
-    int default_layout;
+    layout_t default_layout;
     int container_stack_limit;
     int container_stack_limit_value;
     int default_border_width;

diff --git a/include/data.h b/include/data.h
index 13acc063284669a54013fc7716d23fc883c0b8d8..83f9d80b5c6d8ffbf0bd8e813e12a23a5aec3340 100644 (file)
--- a/include/data.h
+++ b/include/data.h
@@ -79,6 +79,19 @@ enum {
     BIND_MODE_SWITCH = (1 << 8)
 };
 
+/**
+ * Container layouts. See Con::layout.
+ */
+typedef enum {
+    L_DEFAULT = 0,
+    L_STACKED = 1,
+    L_TABBED = 2,
+    L_DOCKAREA = 3,
+    L_OUTPUT = 4,
+    L_SPLITV = 5,
+    L_SPLITH = 6
+} layout_t;
+
 /**
  * Stores a rectangle, for example the size of a window, the child window etc.
  * It needs to be packed so that the compiler will not add any padding bytes.
@@ -531,15 +544,7 @@ struct Con {
      * parent and opening new containers). Instead, it stores the requested
      * layout in workspace_layout and creates a new split container with that
      * layout whenever a new container is attached to the workspace. */
-    enum {
-        L_DEFAULT = 0,
-        L_STACKED = 1,
-        L_TABBED = 2,
-        L_DOCKAREA = 3,
-        L_OUTPUT = 4,
-        L_SPLITV = 5,
-        L_SPLITH = 6
-    } layout, last_split_layout, workspace_layout;
+    layout_t layout, last_split_layout, workspace_layout;
     border_style_t border_style;
     /** floating? (= not in tiling layout) This cannot be simply a bool
      * because we want to keep track of whether the status was set by the

diff --git a/src/commands.c b/src/commands.c
index 538e2dbc617fe87f8980fdbde66bb0bff1a4d3e7..d817d630b63f84b472677fe009135a1f96f24056 100644 (file)
--- a/src/commands.c
+++ b/src/commands.c
@@ -1547,7 +1547,7 @@ void cmd_layout(I3_CMD, char *layout_str) {
     if (strcmp(layout_str, "stacking") == 0)
         layout_str = "stacked";
     owindow *current;
-    int layout;
+    layout_t layout;
     /* default is a special case which will be handled in con_set_layout(). */
     if (strcmp(layout_str, "default") == 0)
         layout = L_DEFAULT;

diff --git a/src/con.c b/src/con.c
index 79872f9251d64fa7cd4aabd07b8a1be2a4d55bb5..fe26d6945ec2553f10b5217acb982836198d136f 100644 (file)
--- a/src/con.c
+++ b/src/con.c
@@ -1209,7 +1209,7 @@ void con_set_border_style(Con *con, int border_style, int border_width) {
  * new split container before).
  *
  */
-void con_set_layout(Con *con, int layout) {
+void con_set_layout(Con *con, layout_t layout) {
     DLOG("con_set_layout(%p, %d), con->type = %d\n",
          con, layout, con->type);
 

diff --git a/src/handlers.c b/src/handlers.c
index f4782ca97dffece262160c27d956d43ba9ea0add..fdc75abe604098816d16b8e36a77815d908e50f1 100644 (file)
--- a/src/handlers.c
+++ b/src/handlers.c
@@ -158,7 +158,7 @@ static void handle_enter_notify(xcb_enter_notify_event_t *event) {
     }
 
     /* see if the user entered the window on a certain window decoration */
-    int layout = (enter_child ? con->parent->layout : con->layout);
+    layout_t layout = (enter_child ? con->parent->layout : con->layout);
     if (layout == L_DEFAULT) {
         Con *child;
         TAILQ_FOREACH(child, &(con->nodes_head), nodes)