Merge branch 'master' into next

[i3/i3] / i3bar / include / config.h

diff --git a/i3bar/include/config.h b/i3bar/include/config.h
index 4c01d68cec4d8aeb03be106081dd4f9576f034ab..e0b0efee1631dc91f2944159cee4246a6fca5f21 100644 (file)
--- a/i3bar/include/config.h
+++ b/i3bar/include/config.h
@@ -7,8 +7,7 @@
  * config.c: Parses the configuration (received from i3).
  *
  */
-#ifndef CONFIG_H_
-#define CONFIG_H_
+#pragma once
 
 #include "common.h"
 
@@ -18,12 +17,16 @@ typedef enum {
     POS_BOT
 } position_t;
 
+/* Bar display mode (hide unless modifier is pressed or show in dock mode or always hide in invisible mode) */
+typedef enum { M_DOCK = 0, M_HIDE = 1, M_INVISIBLE = 2 } bar_display_mode_t;
+
 typedef struct config_t {
     int          modifier;
     position_t   position;
     int          verbose;
     struct xcb_color_strings_t colors;
-    int          disable_ws;
+    bool         disable_binding_mode_indicator;
+    bool         disable_ws;
     char         *bar_id;
     char         *command;
     char         *fontname;
@@ -31,8 +34,7 @@ typedef struct config_t {
     int          num_outputs;
     char         **outputs;
 
-    /* Bar display mode (hide unless modifier is pressed or show in dock mode or always hide in invisible mode) */
-    enum { M_DOCK = 0, M_HIDE = 1, M_INVISIBLE = 2 } hide_on_modifier;
+    bar_display_mode_t hide_on_modifier;
 
     /* The current hidden_state of the bar, which indicates whether it is hidden or shown */
     enum { S_HIDE = 0, S_SHOW = 1 } hidden_state;
@@ -51,5 +53,3 @@ void parse_config_json(char *json);
  *
  */
 void free_colors(struct xcb_color_strings_t *colors);
-
-#endif