Merge branch 'next' into master

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

diff --git a/i3bar/include/workspaces.h b/i3bar/include/workspaces.h
index b9cefa8405bff15ac3a82ccb01d67f53c10c2eac..e1f9e8878a57a374bb77c4b60d1f7179e7128599 100644 (file)
--- a/i3bar/include/workspaces.h
+++ b/i3bar/include/workspaces.h
@@ -2,29 +2,29 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3bar - an xcb-based status- and ws-bar for i3
- * © 2010-2012 Axel Wagner and contributors (see also: LICENSE)
+ * © 2010 Axel Wagner and contributors (see also: LICENSE)
  *
- * workspaces.c: Maintaining the workspace-lists
+ * workspaces.c: Maintaining the workspace lists
  *
  */
 #pragma once
 
-#include <xcb/xproto.h>
-
 #include "common.h"
 
+#include <xcb/xproto.h>
+
 typedef struct i3_ws i3_ws;
 
 TAILQ_HEAD(ws_head, i3_ws);
 
 /*
- * Start parsing the received json-string
+ * Start parsing the received JSON string
  *
  */
 void parse_workspaces_json(char *json);
 
 /*
- * free() all workspace data-structures
+ * free() all workspace data structures
  *
  */
 void free_workspaces(void);
@@ -36,9 +36,10 @@ struct i3_ws {
     int name_width;           /* The rendered width of the name */
     bool visible;             /* If the ws is currently visible on an output */
     bool focused;             /* If the ws is currently focused */
-    bool urgent;              /* If the urgent-hint of the ws is set */
+    bool urgent;              /* If the urgent hint of the ws is set */
     rect rect;                /* The rect of the ws (not used (yet)) */
     struct i3_output *output; /* The current output of the ws */
 
-    TAILQ_ENTRY(i3_ws) tailq; /* Pointer for the TAILQ-Macro */
+    TAILQ_ENTRY(i3_ws)
+    tailq; /* Pointer for the TAILQ-Macro */
 };