12 files changed, 135 insertions, 143 deletions

diff --git a/common/util.c b/common/util.c
index 27039dcb..60f2f160 100644
--- a/common/util.c
+++ b/common/util.c
@@ -1,17 +1,9 @@
 #define _POSIX_C_SOURCE 200809L
-#include <assert.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
 #include <float.h>
 #include <math.h>
-#include <stdint.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
-#include <xkbcommon/xkbcommon-names.h>
-#include <wlr/types/wlr_keyboard.h>
 #include "log.h"
 #include "util.h"
 
@@ -27,88 +19,6 @@ int numlen(int n) {
 	return log10(abs(n)) + (n > 0 ? 1 : 2);
 }
 
-static struct modifier_key {
-	char *name;
-	uint32_t mod;
-} modifiers[] = {
-	{ XKB_MOD_NAME_SHIFT, WLR_MODIFIER_SHIFT },
-	{ XKB_MOD_NAME_CAPS, WLR_MODIFIER_CAPS },
-	{ XKB_MOD_NAME_CTRL, WLR_MODIFIER_CTRL },
-	{ "Ctrl", WLR_MODIFIER_CTRL },
-	{ XKB_MOD_NAME_ALT, WLR_MODIFIER_ALT },
-	{ "Alt", WLR_MODIFIER_ALT },
-	{ XKB_MOD_NAME_NUM, WLR_MODIFIER_MOD2 },
-	{ "Mod3", WLR_MODIFIER_MOD3 },
-	{ XKB_MOD_NAME_LOGO, WLR_MODIFIER_LOGO },
-	{ "Mod5", WLR_MODIFIER_MOD5 },
-};
-
-uint32_t get_modifier_mask_by_name(const char *name) {
-	int i;
-	for (i = 0; i < (int)(sizeof(modifiers) / sizeof(struct modifier_key)); ++i) {
-		if (strcasecmp(modifiers[i].name, name) == 0) {
-			return modifiers[i].mod;
-		}
-	}
-
-	return 0;
-}
-
-const char *get_modifier_name_by_mask(uint32_t modifier) {
-	int i;
-	for (i = 0; i < (int)(sizeof(modifiers) / sizeof(struct modifier_key)); ++i) {
-		if (modifiers[i].mod == modifier) {
-			return modifiers[i].name;
-		}
-	}
-
-	return NULL;
-}
-
-int get_modifier_names(const char **names, uint32_t modifier_masks) {
-	int length = 0;
-	int i;
-	for (i = 0; i < (int)(sizeof(modifiers) / sizeof(struct modifier_key)); ++i) {
-		if ((modifier_masks & modifiers[i].mod) != 0) {
-			names[length] = modifiers[i].name;
-			++length;
-			modifier_masks ^= modifiers[i].mod;
-		}
-	}
-
-	return length;
-}
-
-pid_t get_parent_pid(pid_t child) {
-	pid_t parent = -1;
-	char file_name[100];
-	char *buffer = NULL;
-	char *token = NULL;
-	const char *sep = " ";
-	FILE *stat = NULL;
-	size_t buf_size = 0;
-
-	sprintf(file_name, "/proc/%d/stat", child);
-
-	if ((stat = fopen(file_name, "r"))) {
-		if (getline(&buffer, &buf_size, stat) != -1) {
-			token = strtok(buffer, sep); // pid
-			token = strtok(NULL, sep);   // executable name
-			token = strtok(NULL, sep);   // state
-			token = strtok(NULL, sep);   // parent pid
-			parent = strtol(token, NULL, 10);
-		}
-		free(buffer);
-		fclose(stat);
-	}
-
-	if (parent) {
-		return (parent == child) ? -1 : parent;
-	}
-
-	return -1;
-}
-
 uint32_t parse_color(const char *color) {
 	if (color[0] == '#') {
 		++color;
@@ -152,18 +62,3 @@ float parse_float(const char *value) {
 	}
 	return flt;
 }
-
-enum wlr_direction opposite_direction(enum wlr_direction d) {
-	switch (d) {
-	case WLR_DIRECTION_UP:
-		return WLR_DIRECTION_DOWN;
-	case WLR_DIRECTION_DOWN:
-		return WLR_DIRECTION_UP;
-	case WLR_DIRECTION_RIGHT:
-		return WLR_DIRECTION_LEFT;
-	case WLR_DIRECTION_LEFT:
-		return WLR_DIRECTION_RIGHT;
-	}
-	assert(false);
-	return 0;
-}
diff --git a/include/sway/input/keyboard.h b/include/sway/input/keyboard.h
index 65137a08..0c8ada0f 100644
--- a/include/sway/input/keyboard.h
+++ b/include/sway/input/keyboard.h
@@ -5,6 +5,27 @@
 
 #define SWAY_KEYBOARD_PRESSED_KEYS_CAP 32
 
+/**
+ * Get modifier mask from modifier name.
+ *
+ * Returns the modifer mask or 0 if the name isn't found.
+ */
+uint32_t get_modifier_mask_by_name(const char *name);
+
+/**
+ * Get modifier name from modifier mask.
+ *
+ * Returns the modifier name or NULL if it isn't found.
+ */
+const char *get_modifier_name_by_mask(uint32_t modifier);
+
+/**
+ * Get an array of modifier names from modifier_masks
+ *
+ * Populates the names array and return the number of names added.
+ */
+int get_modifier_names(const char **names, uint32_t modifier_masks);
+
 struct sway_shortcut_state {
 	/**
 	 * A list of pressed key ids (either keysyms or keycodes),
diff --git a/include/sway/output.h b/include/sway/output.h
index 9ebdb6c1..479897ef 100644
--- a/include/sway/output.h
+++ b/include/sway/output.h
@@ -152,4 +152,6 @@ void premultiply_alpha(float color[4], float opacity);
 
 void scale_box(struct wlr_box *box, float scale);
 
+enum wlr_direction opposite_direction(enum wlr_direction d);
+
 #endif
diff --git a/include/util.h b/include/util.h
index 84318fe7..e3269d6b 100644
--- a/include/util.h
+++ b/include/util.h
@@ -3,9 +3,6 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <unistd.h>
-#include <wlr/types/wlr_output_layout.h>
-#include <xkbcommon/xkbcommon.h>
 
 /**
  * Wrap i into the range [0, max[
@@ -13,39 +10,11 @@
 int wrap(int i, int max);
 
 /**
- * Count number of digits in int
+ * Count number of digits in int, including '-' sign if there is one
  */
 int numlen(int n);
 
 /**
- * Get modifier mask from modifier name.
- *
- * Returns the modifer mask or 0 if the name isn't found.
- */
-uint32_t get_modifier_mask_by_name(const char *name);
-
-/**
- * Get modifier name from modifier mask.
- *
- * Returns the modifier name or NULL if it isn't found.
- */
-const char *get_modifier_name_by_mask(uint32_t modifier);
-
-/**
- * Get an array of modifier names from modifier_masks
- *
- * Populates the names array and return the number of names added.
- */
-int get_modifier_names(const char **names, uint32_t modifier_masks);
-
-/**
- * Get the pid of a parent process given the pid of a child process.
- *
- * Returns the parent pid or NULL if the parent pid cannot be determined.
- */
-pid_t get_parent_pid(pid_t pid);
-
-/**
  * Given a string that represents an RGB(A) color, return a uint32_t
  * version of the color.
  */
@@ -65,6 +34,4 @@ bool parse_boolean(const char *boolean, bool current);
  */
 float parse_float(const char *value);
 
-enum wlr_direction opposite_direction(enum wlr_direction d);
-
 #endif
diff --git a/sway/commands/bar/modifier.c b/sway/commands/bar/modifier.c
index 62ec681f..c95250d1 100644
--- a/sway/commands/bar/modifier.c
+++ b/sway/commands/bar/modifier.c
@@ -1,8 +1,8 @@
 #include <string.h>
 #include "sway/commands.h"
+#include "sway/input/keyboard.h"
 #include "log.h"
 #include "stringop.h"
-#include "util.h"
 
 struct cmd_results *bar_cmd_modifier(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/bind.c b/sway/commands/bind.c
index ce087fd0..59116d67 100644
--- a/sway/commands/bind.c
+++ b/sway/commands/bind.c
@@ -8,6 +8,7 @@
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/input/cursor.h"
+#include "sway/input/keyboard.h"
 #include "sway/ipc-server.h"
 #include "list.h"
 #include "log.h"
diff --git a/sway/commands/floating_modifier.c b/sway/commands/floating_modifier.c
index 3674971a..fd606281 100644
--- a/sway/commands/floating_modifier.c
+++ b/sway/commands/floating_modifier.c
@@ -1,7 +1,7 @@
 #include "strings.h"
 #include "sway/commands.h"
 #include "sway/config.h"
-#include "util.h"
+#include "sway/input/keyboard.h"
 
 struct cmd_results *cmd_floating_modifier(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/config/bar.c b/sway/config/bar.c
index 0fdac5d8..2e28fa1e 100644
--- a/sway/config/bar.c
+++ b/sway/config/bar.c
@@ -11,12 +11,12 @@
 #include <strings.h>
 #include <signal.h>
 #include "sway/config.h"
+#include "sway/input/keyboard.h"
 #include "sway/output.h"
 #include "config.h"
-#include "stringop.h"
 #include "list.h"
 #include "log.h"
-#include "util.h"
+#include "stringop.h"
 
 static void terminate_swaybar(pid_t pid) {
 	sway_log(SWAY_DEBUG, "Terminating swaybar %d", pid);
diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
index c1fc60f7..12c57366 100644
--- a/sway/input/keyboard.c
+++ b/sway/input/keyboard.c
@@ -1,9 +1,11 @@
 #include <assert.h>
 #include <limits.h>
+#include <strings.h>
 #include <wlr/backend/multi.h>
 #include <wlr/backend/session.h>
 #include <wlr/types/wlr_idle.h>
 #include <wlr/interfaces/wlr_keyboard.h>
+#include <xkbcommon/xkbcommon-names.h>
 #include "sway/commands.h"
 #include "sway/desktop/transaction.h"
 #include "sway/input/input-manager.h"
@@ -12,6 +14,58 @@
 #include "sway/ipc-server.h"
 #include "log.h"
 
+static struct modifier_key {
+	char *name;
+	uint32_t mod;
+} modifiers[] = {
+	{ XKB_MOD_NAME_SHIFT, WLR_MODIFIER_SHIFT },
+	{ XKB_MOD_NAME_CAPS, WLR_MODIFIER_CAPS },
+	{ XKB_MOD_NAME_CTRL, WLR_MODIFIER_CTRL },
+	{ "Ctrl", WLR_MODIFIER_CTRL },
+	{ XKB_MOD_NAME_ALT, WLR_MODIFIER_ALT },
+	{ "Alt", WLR_MODIFIER_ALT },
+	{ XKB_MOD_NAME_NUM, WLR_MODIFIER_MOD2 },
+	{ "Mod3", WLR_MODIFIER_MOD3 },
+	{ XKB_MOD_NAME_LOGO, WLR_MODIFIER_LOGO },
+	{ "Mod5", WLR_MODIFIER_MOD5 },
+};
+
+uint32_t get_modifier_mask_by_name(const char *name) {
+	int i;
+	for (i = 0; i < (int)(sizeof(modifiers) / sizeof(struct modifier_key)); ++i) {
+		if (strcasecmp(modifiers[i].name, name) == 0) {
+			return modifiers[i].mod;
+		}
+	}
+
+	return 0;
+}
+
+const char *get_modifier_name_by_mask(uint32_t modifier) {
+	int i;
+	for (i = 0; i < (int)(sizeof(modifiers) / sizeof(struct modifier_key)); ++i) {
+		if (modifiers[i].mod == modifier) {
+			return modifiers[i].name;
+		}
+	}
+
+	return NULL;
+}
+
+int get_modifier_names(const char **names, uint32_t modifier_masks) {
+	int length = 0;
+	int i;
+	for (i = 0; i < (int)(sizeof(modifiers) / sizeof(struct modifier_key)); ++i) {
+		if ((modifier_masks & modifiers[i].mod) != 0) {
+			names[length] = modifiers[i].name;
+			++length;
+			modifier_masks ^= modifiers[i].mod;
+		}
+	}
+
+	return length;
+}
+
 /**
  * Remove all key ids associated to a keycode from the list of pressed keys
  */
diff --git a/sway/ipc-server.c b/sway/ipc-server.c
index 82e144b7..c99f34a9 100644
--- a/sway/ipc-server.c
+++ b/sway/ipc-server.c
@@ -23,6 +23,7 @@
 #include "sway/output.h"
 #include "sway/server.h"
 #include "sway/input/input-manager.h"
+#include "sway/input/keyboard.h"
 #include "sway/input/seat.h"
 #include "sway/tree/root.h"
 #include "sway/tree/view.h"
diff --git a/sway/tree/output.c b/sway/tree/output.c
index 7fbeeebd..50a2c535 100644
--- a/sway/tree/output.c
+++ b/sway/tree/output.c
@@ -1,4 +1,5 @@
 #define _POSIX_C_SOURCE 200809L
+#include <assert.h>
 #include <ctype.h>
 #include <string.h>
 #include <strings.h>
@@ -12,6 +13,21 @@
 #include "log.h"
 #include "util.h"
 
+enum wlr_direction opposite_direction(enum wlr_direction d) {
+	switch (d) {
+	case WLR_DIRECTION_UP:
+		return WLR_DIRECTION_DOWN;
+	case WLR_DIRECTION_DOWN:
+		return WLR_DIRECTION_UP;
+	case WLR_DIRECTION_RIGHT:
+		return WLR_DIRECTION_LEFT;
+	case WLR_DIRECTION_LEFT:
+		return WLR_DIRECTION_RIGHT;
+	}
+	assert(false);
+	return 0;
+}
+
 static void restore_workspaces(struct sway_output *output) {
 	// Workspace output priority
 	for (int i = 0; i < root->outputs->length; i++) {
diff --git a/sway/tree/root.c b/sway/tree/root.c
index 08ce7942..d4b97be3 100644
--- a/sway/tree/root.c
+++ b/sway/tree/root.c
@@ -169,6 +169,41 @@ struct pid_workspace {
 
 static struct wl_list pid_workspaces;
 
+/**
+ * Get the pid of a parent process given the pid of a child process.
+ *
+ * Returns the parent pid or NULL if the parent pid cannot be determined.
+ */
+static pid_t get_parent_pid(pid_t child) {
+	pid_t parent = -1;
+	char file_name[100];
+	char *buffer = NULL;
+	char *token = NULL;
+	const char *sep = " ";
+	FILE *stat = NULL;
+	size_t buf_size = 0;
+
+	sprintf(file_name, "/proc/%d/stat", child);
+
+	if ((stat = fopen(file_name, "r"))) {
+		if (getline(&buffer, &buf_size, stat) != -1) {
+			token = strtok(buffer, sep); // pid
+			token = strtok(NULL, sep);   // executable name
+			token = strtok(NULL, sep);   // state
+			token = strtok(NULL, sep);   // parent pid
+			parent = strtol(token, NULL, 10);
+		}
+		free(buffer);
+		fclose(stat);
+	}
+
+	if (parent) {
+		return (parent == child) ? -1 : parent;
+	}
+
+	return -1;
+}
+
 struct sway_workspace *root_workspace_for_pid(pid_t pid) {
 	if (!pid_workspaces.prev && !pid_workspaces.next) {
 		wl_list_init(&pid_workspaces);