Merge branch 'master' into next

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

diff --git a/i3bar/include/config.h b/i3bar/include/config.h
index c5fc218c15d7e195ed0d639fb8f220f788c94e49..4f6e8858f2f8798809fb17e3198d22e4f59cef56 100644 (file)
--- a/i3bar/include/config.h
+++ b/i3bar/include/config.h
@@ -1,3 +1,12 @@
+/*
+ * 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_
 
@@ -11,6 +20,7 @@ typedef enum {
 
 typedef struct config_t {
     int          hide_on_modifier;
+    int          modifier;
     position_t   position;
     int          verbose;
     struct xcb_color_strings_t colors;