Coding style enforcement

This was done by hand, so I might have missed things. If anyone knows of
a good C style enforcement tool, let me know.

4 files changed, 18 insertions, 23 deletions

diff --git a/include/container.h b/include/container.h
index 5f386368..186ee8b6 100644
--- a/include/container.h
+++ b/include/container.h
@@ -30,7 +30,6 @@ struct sway_container {
         wlc_handle handle;
 
         enum swayc_types type;
-
         enum swayc_layouts layout;
 
         // Not including borders or margins
@@ -42,9 +41,7 @@ struct sway_container {
         int x, y;
 
         bool visible;
-
         bool is_floating;
-
         bool is_focused;
 
         int weight;
@@ -52,8 +49,6 @@ struct sway_container {
         char *name;
 
         list_t *children;
-
-        // Special list for floating windows in workspaces
         list_t *floating;
 
         struct sway_container *parent;
@@ -62,17 +57,17 @@ struct sway_container {
 
 
 swayc_t *new_output(wlc_handle handle);
-swayc_t *new_workspace(swayc_t * output, const char *name);
-//Creates container Around child (parent child) -> (parent (container child))
+swayc_t *new_workspace(swayc_t *output, const char *name);
+// Creates container Around child (parent child) -> (parent (container child))
 swayc_t *new_container(swayc_t *child, enum swayc_layouts layout);
-//Creates view as a sibling of current focused container, or as child of a workspace
+// Creates view as a sibling of current focused container, or as child of a workspace
 swayc_t *new_view(swayc_t *sibling, wlc_handle handle);
-//Creates view as a new floating view which is in the active workspace
+// Creates view as a new floating view which is in the active workspace
 swayc_t *new_floating_view(wlc_handle handle);
 
 
 swayc_t *destroy_output(swayc_t *output);
-//destroys workspace if empty and returns parent pointer, else returns NULL
+// Destroys workspace if empty and returns parent pointer, else returns NULL
 swayc_t *destroy_workspace(swayc_t *workspace);
 swayc_t *destroy_container(swayc_t *container);
 swayc_t *destroy_view(swayc_t *view);
@@ -80,7 +75,7 @@ swayc_t *destroy_view(swayc_t *view);
 swayc_t *find_container(swayc_t *container, bool (*test)(swayc_t *view, void *data), void *data);
 void container_map(swayc_t *, void (*f)(swayc_t *, void *), void *);
 
-//Mappings
+// Mappings
 void set_view_visibility(swayc_t *view, void *data);
 
 #endif
diff --git a/include/focus.h b/include/focus.h
index 185910f3..410ed134 100644
--- a/include/focus.h
+++ b/include/focus.h
@@ -10,12 +10,12 @@ enum movement_direction {
         MOVE_PARENT
 };
 
-//focused_container - the container found by following the `focused` pointer
-//from a given container to a container with `is_focused` boolean set
-//---
-//focused_view - the container found by following the `focused` pointer from a
-//given container to a view.
-//---
+// focused_container - the container found by following the `focused` pointer
+// from a given container to a container with `is_focused` boolean set
+// ---
+// focused_view - the container found by following the `focused` pointer from a
+// given container to a view.
+// ---
 
 swayc_t *get_focused_container(swayc_t *parent);
 swayc_t *get_focused_view(swayc_t *parent);
@@ -23,8 +23,8 @@ swayc_t *get_focused_view(swayc_t *parent);
 void set_focused_container(swayc_t *container);
 void set_focused_container_for(swayc_t *ancestor, swayc_t *container);
 
-//lock focused container/view. locked by windows with OVERRIDE attribute
-//and unlocked when they are destroyed
+// lock focused container/view. locked by windows with OVERRIDE attribute
+// and unlocked when they are destroyed
 
 extern bool locked_container_focus;
 extern bool locked_view_focus;
diff --git a/include/handlers.h b/include/handlers.h
index 6b642419..c25c3309 100644
--- a/include/handlers.h
+++ b/include/handlers.h
@@ -7,7 +7,7 @@
 extern struct wlc_interface interface;
 extern uint32_t keys_pressed[32];
 
-//set focus to current pointer location and return focused container
+// set focus to current pointer location and return focused container
 swayc_t *container_under_pointer(void);
 
 #endif
diff --git a/include/layout.h b/include/layout.h
index 26d00ce4..282f92ee 100644
--- a/include/layout.h
+++ b/include/layout.h
@@ -10,15 +10,15 @@ extern swayc_t root_container;
 void init_layout(void);
 
 void add_child(swayc_t *parent, swayc_t *child);
-//Returns parent container which needs to be rearranged.
+// Returns parent container which needs to be rearranged.
 swayc_t *add_sibling(swayc_t *sibling, swayc_t *child);
 swayc_t *replace_child(swayc_t *child, swayc_t *new_child);
 swayc_t *remove_child(swayc_t *child);
 
-//Layout
+// Layout
 void arrange_windows(swayc_t *container, int width, int height);
 
-//Focus
+// Focus
 void unfocus_all(swayc_t *container);
 void focus_view(swayc_t *view);
 void focus_view_for(swayc_t *ancestor, swayc_t *container);