From d7ff776552bef524e905d85c2a5e7651c8408658 Mon Sep 17 00:00:00 2001 From: M Stoeckl Date: Mon, 21 Jan 2019 12:39:16 -0500 Subject: 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 . --- include/sway/input/keyboard.h | 21 +++++++++++++++++++++ include/sway/output.h | 2 ++ include/util.h | 35 +---------------------------------- 3 files changed, 24 insertions(+), 34 deletions(-) (limited to 'include') 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 #include -#include -#include -#include /** * Wrap i into the range [0, max[ @@ -13,38 +10,10 @@ 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 -- cgit v1.2.3 From 4b1eaaf731b0e29497edc4c85153f2cf417fb5ce Mon Sep 17 00:00:00 2001 From: M Stoeckl Date: Mon, 21 Jan 2019 13:01:09 -0500 Subject: Removed unused wlroots dependency for sway(bg|bar|msg|nag) Also remove direct libm dependency where unused. --- client/meson.build | 3 +-- common/meson.build | 3 +-- include/cairo.h | 2 +- swaybar/meson.build | 3 +-- swaybg/meson.build | 4 +--- swaymsg/meson.build | 2 +- swaynag/meson.build | 2 -- 7 files changed, 6 insertions(+), 13 deletions(-) (limited to 'include') diff --git a/client/meson.build b/client/meson.build index 2bdda457..abe6f1eb 100644 --- a/client/meson.build +++ b/client/meson.build @@ -8,8 +8,7 @@ lib_sway_client = static_library( gdk_pixbuf, pango, pangocairo, - wlroots, - wayland_client, + wayland_client ], link_with: [lib_sway_common], include_directories: sway_inc diff --git a/common/meson.build b/common/meson.build index 3af1f1d5..8561d6cf 100644 --- a/common/meson.build +++ b/common/meson.build @@ -15,8 +15,7 @@ lib_sway_common = static_library( cairo, gdk_pixbuf, pango, - pangocairo, - wlroots + pangocairo ], include_directories: sway_inc ) diff --git a/include/cairo.h b/include/cairo.h index f28c072f..d1b9b8d7 100644 --- a/include/cairo.h +++ b/include/cairo.h @@ -4,7 +4,7 @@ #include "config.h" #include #include -#include +#include #if HAVE_GDK_PIXBUF #include #endif diff --git a/swaybar/meson.build b/swaybar/meson.build index b35f8169..469145ae 100644 --- a/swaybar/meson.build +++ b/swaybar/meson.build @@ -16,8 +16,7 @@ swaybar_deps = [ pangocairo, rt, wayland_client, - wayland_cursor, - wlroots, + wayland_cursor ] if have_tray if systemd.found() diff --git a/swaybg/meson.build b/swaybg/meson.build index 8704de6d..2b93da47 100644 --- a/swaybg/meson.build +++ b/swaybg/meson.build @@ -7,11 +7,9 @@ executable( client_protos, gdk_pixbuf, jsonc, - math, pango, pangocairo, - wayland_client, - wlroots, + wayland_client ], link_with: [lib_sway_common, lib_sway_client], install: true diff --git a/swaymsg/meson.build b/swaymsg/meson.build index b78e6cb0..3a27fa9f 100644 --- a/swaymsg/meson.build +++ b/swaymsg/meson.build @@ -2,7 +2,7 @@ executable( 'swaymsg', 'main.c', include_directories: [sway_inc], - dependencies: [jsonc, wlroots], + dependencies: [jsonc], link_with: [lib_sway_common], install: true ) diff --git a/swaynag/meson.build b/swaynag/meson.build index 2ba3ed95..9c29fd1a 100644 --- a/swaynag/meson.build +++ b/swaynag/meson.build @@ -11,12 +11,10 @@ executable( cairo, client_protos, gdk_pixbuf, - math, pango, pangocairo, wayland_client, wayland_cursor, - wlroots, ], link_with: [lib_sway_common, lib_sway_client], install: true -- cgit v1.2.3