Update copyright notices and get rid of ranges

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

diff --git a/i3bar/include/outputs.h b/i3bar/include/outputs.h
index c6402a5b620b987569769862e2d5b02890bb9cba..e6605e1f73da2b7892e6be88b7360c31118f94e4 100644 (file)
--- a/i3bar/include/outputs.h
+++ b/i3bar/include/outputs.h
@@ -1,13 +1,13 @@
 /*
- * 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 Axel Wagner and contributors (see also: LICENSE)
  *
- * See file LICNSE for license information
+ * outputs.c: Maintaining the outputs list
  *
  */
-#ifndef OUTPUTS_H_
-#define OUTPUTS_H_
+#pragma once
 
 #include <xcb/xcb.h>
 
@@ -16,19 +16,19 @@
 typedef struct i3_output i3_output;
 
 SLIST_HEAD(outputs_head, i3_output);
-struct outputs_head *outputs;
+struct outputs_head* outputs;
 
 /*
- * Start parsing the received json-string
+ * Start parsing the received JSON string
  *
  */
 void parse_outputs_json(char* json);
 
 /*
- * Initiate the output-list
+ * Initiate the outputs list
  *
  */
-void init_outputs();
+void init_outputs(void);
 
 /*
  * Returns the output with the given name
@@ -37,19 +37,19 @@ void init_outputs();
 i3_output* get_output_by_name(char* name);
 
 struct i3_output {
-    char*          name;          /* Name of the output */
-    bool           active;        /* If the output is active */
-    int            ws;            /* The number of the currently visible ws */
-    rect           rect;          /* The rect (relative to the root-win) */
+    char* name;   /* Name of the output */
+    bool active;  /* If the output is active */
+    bool primary; /* If it is the primary output */
+    bool visible; /* If the bar is visible on this output */
+    int ws;       /* The number of the currently visible ws */
+    rect rect;    /* The rect (relative to the root window) */
 
-    xcb_window_t   bar;           /* The id of the bar of the output */
-    xcb_pixmap_t   buffer;        /* An extra pixmap for double-buffering */
-    xcb_gcontext_t bargc;         /* The graphical context of the bar */
+    xcb_window_t bar;     /* The id of the bar of the output */
+    xcb_pixmap_t buffer;  /* An extra pixmap for double-buffering */
+    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 */
+    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 */
 };
-
-#endif