alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

swaynag: revamp type configs

Browse source 
This revamps the type configs for swaynag. All sizing attributes for
swaynag are now `ssize_t` instead of `uint32_t` to allow for a default
value of `-1`, which allows for `0` to be a valid value. Additionally,
the initialization of the type configs has been changed from a simple
calloc to use a new function `swaynag_type_new`. `swaynag_type_new`
calloc's the memory, checks for an allocation failure, sets the name,
and all sizes to -1. The layering order has also been changed to
default, general config, type config, and as highest priority command
line arguments. Finally, `swaynag_type_merge` has been modified to
handle the layering and sizing changes.
This commit is contained in:
Brian Ashworth 2019-04-19 22:44:11 -04:00 committed by Drew DeVault
parent 59d9a991b4
commit 9099adbbe6
4 changed files with 59 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
include/swaynag/types.h
View file

@ -8,22 +8,26 @@ struct swaynag_type {
char *output; char *output;
uint32_t anchors; uint32_t anchors;
// Colors
uint32_t button_background; uint32_t button_background;
uint32_t background; uint32_t background;
uint32_t text; uint32_t text;
uint32_t border; uint32_t border;
uint32_t border_bottom; uint32_t border_bottom;
uint32_t bar_border_thickness; // Sizing
uint32_t message_padding; ssize_t bar_border_thickness;
uint32_t details_border_thickness; ssize_t message_padding;
uint32_t button_border_thickness; ssize_t details_border_thickness;
uint32_t button_gap; ssize_t button_border_thickness;
uint32_t button_gap_close; ssize_t button_gap;
uint32_t button_margin_right; ssize_t button_gap_close;
uint32_t button_padding; ssize_t button_margin_right;
ssize_t button_padding;
}; };
struct swaynag_type *swaynag_type_new(const char *name);
void swaynag_types_add_default(list_t *types); void swaynag_types_add_default(list_t *types);
struct swaynag_type *swaynag_type_get(list_t *types, char *name); struct swaynag_type *swaynag_type_get(list_t *types, char *name);

7
swaynag/config.c
View file

@ -332,9 +332,7 @@ int swaynag_load_config(char *path, struct swaynag *swaynag, list_t *types) {
return 0; return 0;
} }
struct swaynag_type *type; struct swaynag_type *type = swaynag_type_new("<config>");
type = calloc(1, sizeof(struct swaynag_type));
type->name = strdup("<config>");
list_add(types, type); list_add(types, type);
char *line = NULL; char *line = NULL;
@ -364,8 +362,7 @@ int swaynag_load_config(char *path, struct swaynag *swaynag, list_t *types) {
strncat(name, line + 1, close - line - 1); strncat(name, line + 1, close - line - 1);
type = swaynag_type_get(types, name); type = swaynag_type_get(types, name);
if (!type) { if (!type) {
type = calloc(1, sizeof(struct swaynag_type)); type = swaynag_type_new(name);
type->name = strdup(name);
list_add(types, type); list_add(types, type);
} }
free(name); free(name);

19
swaynag/main.c
View file

@ -63,9 +63,7 @@ int main(int argc, char **argv) {
} }
if (argc > 1) { if (argc > 1) {
struct swaynag_type *type_args; struct swaynag_type *type_args = swaynag_type_new("<args>");
type_args = calloc(1, sizeof(struct swaynag_type));
type_args->name = strdup("<args>");
list_add(types, type_args); list_add(types, type_args);
int result = swaynag_parse_options(argc, argv, &swaynag, types, int result = swaynag_parse_options(argc, argv, &swaynag, types,
@ -86,15 +84,14 @@ int main(int argc, char **argv) {
swaynag.type = swaynag_type_get(types, "error"); swaynag.type = swaynag_type_get(types, "error");
} }
// Construct a new type using the config defaults as base, then merging // Construct a new type with the defaults as the base, the general config
// config type defaults on top, then merging arguments on top of that, and // on top of that, followed by the type config, and finally any command
// finally merging defaults on top. // line arguments
struct swaynag_type *type = calloc(1, sizeof(struct swaynag_type)); struct swaynag_type *type = swaynag_type_new(swaynag.type->name);
type->name = strdup(swaynag.type->name);
swaynag_type_merge(type, swaynag_type_get(types, "<args>"));
swaynag_type_merge(type, swaynag.type);
swaynag_type_merge(type, swaynag_type_get(types, "<config>"));
swaynag_type_merge(type, swaynag_type_get(types, "<defaults>")); swaynag_type_merge(type, swaynag_type_get(types, "<defaults>"));
swaynag_type_merge(type, swaynag_type_get(types, "<config>"));
swaynag_type_merge(type, swaynag.type);
swaynag_type_merge(type, swaynag_type_get(types, "<args>"));
swaynag.type = type; swaynag.type = type;
swaynag_types_free(types); swaynag_types_free(types);

64
swaynag/types.c
View file

@ -6,15 +6,31 @@
#include <string.h> #include <string.h>
#include <strings.h> #include <strings.h>
#include "list.h" #include "list.h"
#include "log.h"
#include "swaynag/config.h" #include "swaynag/config.h"
#include "swaynag/types.h" #include "swaynag/types.h"
#include "util.h" #include "util.h"
#include "wlr-layer-shell-unstable-v1-client-protocol.h" #include "wlr-layer-shell-unstable-v1-client-protocol.h"
struct swaynag_type *swaynag_type_new(const char *name) {
struct swaynag_type *type = calloc(1, sizeof(struct swaynag_type));
if (!type) {
sway_abort("Failed to allocate type: %s", name);
}
type->name = strdup(name);
type->bar_border_thickness = -1;
type->message_padding = -1;
type->details_border_thickness = -1;
type->button_border_thickness = -1;
type->button_gap = -1;
type->button_gap_close = -1;
type->button_margin_right = -1;
type->button_padding = -1;
return type;
}
void swaynag_types_add_default(list_t *types) { void swaynag_types_add_default(list_t *types) {
struct swaynag_type *type_defaults; struct swaynag_type *type_defaults = swaynag_type_new("<defaults>");
type_defaults = calloc(1, sizeof(struct swaynag_type));
type_defaults->name = strdup("<defaults>");
type_defaults->font = strdup("pango:Monospace 10"); type_defaults->font = strdup("pango:Monospace 10");
type_defaults->anchors = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP type_defaults->anchors = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP
| ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT | ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT
@ -34,19 +50,15 @@ void swaynag_types_add_default(list_t *types) {
type_defaults->button_padding = 3; type_defaults->button_padding = 3;
list_add(types, type_defaults); list_add(types, type_defaults);
struct swaynag_type *type_error; struct swaynag_type *type_error = swaynag_type_new("error");
type_error = calloc(1, sizeof(struct swaynag_type));
type_error->button_background = 0x680A0AFF; type_error->button_background = 0x680A0AFF;
type_error->background = 0x900000FF; type_error->background = 0x900000FF;
type_error->text = 0xFFFFFFFF; type_error->text = 0xFFFFFFFF;
type_error->border = 0xD92424FF; type_error->border = 0xD92424FF;
type_error->border_bottom = 0x470909FF; type_error->border_bottom = 0x470909FF;
type_error->name = strdup("error");
list_add(types, type_error); list_add(types, type_error);
struct swaynag_type *type_warning; struct swaynag_type *type_warning = swaynag_type_new("warning");
type_warning = calloc(1, sizeof(struct swaynag_type));
type_warning->name = strdup("warning");
type_warning->button_background = 0xFFC100FF; type_warning->button_background = 0xFFC100FF;
type_warning->background = 0xFFA800FF; type_warning->background = 0xFFA800FF;
type_warning->text = 0x000000FF; type_warning->text = 0x000000FF;
@ -70,71 +82,69 @@ void swaynag_type_merge(struct swaynag_type *dest, struct swaynag_type *src) {
return; return;
} }
if (!dest->font && src->font) { if (src->font) {
dest->font = strdup(src->font); dest->font = strdup(src->font);
} }
if (!dest->output && src->output) { if (src->output) {
dest->output = strdup(src->output); dest->output = strdup(src->output);
} }
if (dest->anchors == 0 && src->anchors > 0) { if (src->anchors > 0) {
dest->anchors = src->anchors; dest->anchors = src->anchors;
} }
// Colors // Colors
if (dest->button_background == 0 && src->button_background > 0) { if (src->button_background > 0) {
dest->button_background = src->button_background; dest->button_background = src->button_background;
} }
if (dest->background == 0 && src->background > 0) { if (src->background > 0) {
dest->background = src->background; dest->background = src->background;
} }
if (dest->text == 0 && src->text > 0) { if (src->text > 0) {
dest->text = src->text; dest->text = src->text;
} }
if (dest->border == 0 && src->border > 0) { if (src->border > 0) {
dest->border = src->border; dest->border = src->border;
} }
if (dest->border_bottom == 0 && src->border_bottom > 0) { if (src->border_bottom > 0) {
dest->border_bottom = src->border_bottom; dest->border_bottom = src->border_bottom;
} }
// Sizing // Sizing
if (dest->bar_border_thickness == 0 && src->bar_border_thickness > 0) { if (src->bar_border_thickness > -1) {
dest->bar_border_thickness = src->bar_border_thickness; dest->bar_border_thickness = src->bar_border_thickness;
} }
if (dest->message_padding == 0 && src->message_padding > 0) { if (src->message_padding > -1) {
dest->message_padding = src->message_padding; dest->message_padding = src->message_padding;
} }
if (dest->details_border_thickness == 0 if (src->details_border_thickness > -1) {
&& src->details_border_thickness > 0) {
dest->details_border_thickness = src->details_border_thickness; dest->details_border_thickness = src->details_border_thickness;
} }
if (dest->button_border_thickness == 0 if (src->button_border_thickness > -1) {
&& src->button_border_thickness > 0) {
dest->button_border_thickness = src->button_border_thickness; dest->button_border_thickness = src->button_border_thickness;
} }
if (dest->button_gap == 0 && src->button_gap > 0) { if (src->button_gap > -1) {
dest->button_gap = src->button_gap; dest->button_gap = src->button_gap;
} }
if (dest->button_gap_close == 0 && src->button_gap_close > 0) { if (src->button_gap_close > -1) {
dest->button_gap_close = src->button_gap_close; dest->button_gap_close = src->button_gap_close;
} }
if (dest->button_margin_right == 0 && src->button_margin_right > 0) { if (src->button_margin_right > -1) {
dest->button_margin_right = src->button_margin_right; dest->button_margin_right = src->button_margin_right;
} }
if (dest->button_padding == 0 && src->button_padding > 0) { if (src->button_padding > -1) {
dest->button_padding = src->button_padding; dest->button_padding = src->button_padding;
} }
} }