Move sway-specific functions in common/util.c into sway/

Modifier handling functions were moved into sway/input/keyboard.c;
opposite_direction for enum wlr_direction into sway/tree/output.c;
and get_parent_pid into sway/tree/root.c .

3 files changed, 24 insertions, 34 deletions

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