Merge branch 'master' into next

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

diff --git a/i3bar/include/config.h b/i3bar/include/config.h
index 4f6e8858f2f8798809fb17e3198d22e4f59cef56..4c01d68cec4d8aeb03be106081dd4f9576f034ab 100644 (file)
--- a/i3bar/include/config.h
+++ b/i3bar/include/config.h
@@ -19,7 +19,6 @@ typedef enum {
 } position_t;
 
 typedef struct config_t {
-    int          hide_on_modifier;
     int          modifier;
     position_t   position;
     int          verbose;
@@ -31,6 +30,12 @@ typedef struct config_t {
     char         *tray_output;
     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;
+
+    /* The current hidden_state of the bar, which indicates whether it is hidden or shown */
+    enum { S_HIDE = 0, S_SHOW = 1 } hidden_state;
 } config_t;
 
 config_t config;