aboutsummaryrefslogtreecommitdiffstats
path: root/include/swaynag
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <bosrsf04@gmail.com>2018-07-30 13:52:02 -0400
committerLibravatar Brian Ashworth <bosrsf04@gmail.com>2018-08-01 22:47:54 -0400
commit4f5cf330c8643a154215cbae5758b86022d6edb3 (patch)
treef999015864a36bf001e4ad25338abb470757f0b6 /include/swaynag
parentswaynag: fix hidpi (diff)
downloadsway-4f5cf330c8643a154215cbae5758b86022d6edb3.tar.gz
sway-4f5cf330c8643a154215cbae5758b86022d6edb3.tar.zst
sway-4f5cf330c8643a154215cbae5758b86022d6edb3.zip
swaynag: address some more of sircmpwn's comments
Fixes segfauls for any case where swaynag->outputs was not inititalized including -h/--help, -v/--version, and invalid arguments. Sets sane defaults for colors not given. Any color not given will fallback to the default color values for type error. Adds support for a hidpi cursor
Diffstat (limited to 'include/swaynag')
-rw-r--r--include/swaynag/swaynag.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/swaynag/swaynag.h b/include/swaynag/swaynag.h
index 09b95326..1bf8b640 100644
--- a/include/swaynag/swaynag.h
+++ b/include/swaynag/swaynag.h
@@ -19,6 +19,7 @@ enum swaynag_action_type {
19 19
20struct swaynag_pointer { 20struct swaynag_pointer {
21 struct wl_pointer *pointer; 21 struct wl_pointer *pointer;
22 uint32_t serial;
22 struct wl_cursor_theme *cursor_theme; 23 struct wl_cursor_theme *cursor_theme;
23 struct wl_cursor_image *cursor_image; 24 struct wl_cursor_image *cursor_image;
24 struct wl_surface *cursor_surface; 25 struct wl_surface *cursor_surface;
@@ -72,7 +73,7 @@ struct swaynag {
72 struct wl_shm *shm; 73 struct wl_shm *shm;
73 struct swaynag_pointer pointer; 74 struct swaynag_pointer pointer;
74 struct zxdg_output_manager_v1 *xdg_output_manager; 75 struct zxdg_output_manager_v1 *xdg_output_manager;
75 struct wl_list outputs; // struct swaynag_output 76 struct wl_list outputs; // swaynag_output::link
76 struct swaynag_output *output; 77 struct swaynag_output *output;
77 struct zwlr_layer_shell_v1 *layer_shell; 78 struct zwlr_layer_shell_v1 *layer_shell;
78 struct zwlr_layer_surface_v1 *layer_surface; 79 struct zwlr_layer_surface_v1 *layer_surface;