From d7ff776552bef524e905d85c2a5e7651c8408658 Mon Sep 17 00:00:00 2001 From: M Stoeckl Date: Mon, 21 Jan 2019 12:39:16 -0500 Subject: [PATCH 1/3] 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 . --- common/util.c | 105 ------------------------------ include/sway/input/keyboard.h | 21 ++++++ include/sway/output.h | 2 + include/util.h | 35 +--------- sway/commands/bar/modifier.c | 2 +- sway/commands/bind.c | 1 + sway/commands/floating_modifier.c | 2 +- sway/config/bar.c | 4 +- sway/input/keyboard.c | 54 +++++++++++++++ sway/ipc-server.c | 1 + sway/tree/output.c | 16 +++++ sway/tree/root.c | 35 ++++++++++ 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 -#include -#include -#include #include #include -#include -#include #include #include #include -#include -#include #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 #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 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 #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 #include #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 #include +#include #include #include #include #include +#include #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 #include #include #include @@ -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); From c040defd5f5cf5beed264dd057097625d9c0d423 Mon Sep 17 00:00:00 2001 From: M Stoeckl Date: Mon, 21 Jan 2019 12:46:45 -0500 Subject: [PATCH 2/3] Fix edge case bug in numlen, dropping use of math.h functions (Specifically, numlen when called with INT_MIN gave an incorrect result, because abs(INT_MIN) == INT_MIN < 0.) --- common/util.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/common/util.c b/common/util.c index 60f2f160..bd7bed2d 100644 --- a/common/util.c +++ b/common/util.c @@ -12,11 +12,12 @@ int wrap(int i, int max) { } int numlen(int n) { - if (n == 0) { - return 1; + int j = n <= 0 ? 1 : 0; + while (n) { + j++; + n /= 10; } - // Account for the '-' in negative numbers. - return log10(abs(n)) + (n > 0 ? 1 : 2); + return j; } uint32_t parse_color(const char *color) { From 4b1eaaf731b0e29497edc4c85153f2cf417fb5ce Mon Sep 17 00:00:00 2001 From: M Stoeckl Date: Mon, 21 Jan 2019 13:01:09 -0500 Subject: [PATCH 3/3] 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(-) 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