Merge branch 'master' into next

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

diff --git a/i3bar/include/config.h b/i3bar/include/config.h
index 5997b7f1be899842ce6ddacb3514abfe99f73ccb..4c01d68cec4d8aeb03be106081dd4f9576f034ab 100644 (file)
--- a/i3bar/include/config.h
+++ b/i3bar/include/config.h
@@ -1,17 +1,26 @@
+/*
+ * vim:ts=4:sw=4:expandtab
+ *
+ * i3bar - an xcb-based status- and ws-bar for i3
+ * © 2010-2011 Axel Wagner and contributors (see also: LICENSE)
+ *
+ * config.c: Parses the configuration (received from i3).
+ *
+ */
 #ifndef CONFIG_H_
 #define CONFIG_H_
 
 #include "common.h"
 
 typedef enum {
-    DOCKPOS_NONE = 0,
-    DOCKPOS_TOP,
-    DOCKPOS_BOT
-} dockpos_t;
+    POS_NONE = 0,
+    POS_TOP,
+    POS_BOT
+} position_t;
 
 typedef struct config_t {
-    int          hide_on_modifier;
-    dockpos_t    dockpos;
+    int          modifier;
+    position_t   position;
     int          verbose;
     struct xcb_color_strings_t colors;
     int          disable_ws;
@@ -19,6 +28,14 @@ typedef struct config_t {
     char         *command;
     char         *fontname;
     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;