Merge branch 'master' into next

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

diff --git a/i3bar/include/outputs.h b/i3bar/include/outputs.h
index 41712ac363a23fc00da22bf89605deafe6cf74ce..ad249786d4a805aef37baf943b2b13e04c5fb57a 100644 (file)
--- a/i3bar/include/outputs.h
+++ b/i3bar/include/outputs.h
@@ -1,9 +1,10 @@
 /*
- * i3bar - an xcb-based status- and ws-bar for i3
+ * vim:ts=4:sw=4:expandtab
  *
- * © 2010-2011 Axel Wagner and contributors
+ * i3bar - an xcb-based status- and ws-bar for i3
+ * © 2010-2012 Axel Wagner and contributors (see also: LICENSE)
  *
- * See file LICNSE for license information
+ * outputs.c: Maintaining the output-list
  *
  */
 #ifndef OUTPUTS_H_
@@ -28,7 +29,7 @@ void parse_outputs_json(char* json);
  * Initiate the output-list
  *
  */
-void init_outputs();
+void init_outputs(void);
 
 /*
  * Returns the output with the given name
@@ -39,6 +40,7 @@ i3_output* get_output_by_name(char* name);
 struct i3_output {
     char*          name;          /* Name of the output */
     bool           active;        /* If the output is active */
+    bool           primary;       /* If it is the primary output */
     int            ws;            /* The number of the currently visible ws */
     rect           rect;          /* The rect (relative to the root-win) */
 
@@ -47,6 +49,7 @@ struct i3_output {
     xcb_gcontext_t bargc;         /* The graphical context of the bar */
 
     struct ws_head *workspaces;   /* The workspaces on this output */
+    struct tc_head *trayclients;  /* The tray clients on this output */
 
     SLIST_ENTRY(i3_output) slist; /* Pointer for the SLIST-Macro */
 };