diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2018-07-30 13:52:02 -0400 |
---|---|---|
committer | Brian Ashworth <bosrsf04@gmail.com> | 2018-08-01 22:47:54 -0400 |
commit | 4f5cf330c8643a154215cbae5758b86022d6edb3 (patch) | |
tree | f999015864a36bf001e4ad25338abb470757f0b6 /swaynag/types.c | |
parent | swaynag: fix hidpi (diff) | |
download | sway-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 'swaynag/types.c')
-rw-r--r-- | swaynag/types.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/swaynag/types.c b/swaynag/types.c index f429baf0..66b802cd 100644 --- a/swaynag/types.c +++ b/swaynag/types.c | |||
@@ -19,6 +19,11 @@ void swaynag_types_add_default(list_t *types) { | |||
19 | type_defaults->anchors = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP | 19 | type_defaults->anchors = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP |
20 | | ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT | 20 | | ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
21 | | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT; | 21 | | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT; |
22 | type_defaults->button_background = 0x680A0AFF; | ||
23 | type_defaults->background = 0x900000FF; | ||
24 | type_defaults->text = 0xFFFFFFFF; | ||
25 | type_defaults->border = 0xD92424FF; | ||
26 | type_defaults->border_bottom = 0x470909FF; | ||
22 | type_defaults->bar_border_thickness = 2; | 27 | type_defaults->bar_border_thickness = 2; |
23 | type_defaults->message_padding = 8; | 28 | type_defaults->message_padding = 8; |
24 | type_defaults->details_border_thickness = 3; | 29 | type_defaults->details_border_thickness = 3; |
@@ -32,11 +37,6 @@ void swaynag_types_add_default(list_t *types) { | |||
32 | struct swaynag_type *type_error; | 37 | struct swaynag_type *type_error; |
33 | type_error = calloc(1, sizeof(struct swaynag_type)); | 38 | type_error = calloc(1, sizeof(struct swaynag_type)); |
34 | type_error->name = strdup("error"); | 39 | type_error->name = strdup("error"); |
35 | type_error->button_background = 0x680A0AFF; | ||
36 | type_error->background = 0x900000FF; | ||
37 | type_error->text = 0xFFFFFFFF; | ||
38 | type_error->border = 0xD92424FF; | ||
39 | type_error->border_bottom = 0x470909FF; | ||
40 | list_add(types, type_error); | 40 | list_add(types, type_error); |
41 | 41 | ||
42 | struct swaynag_type *type_warning; | 42 | struct swaynag_type *type_warning; |