mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-04-03 19:07:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
Download patch file Download diff file Expand all files Collapse all files

7
swaynag/config.c
View file

@ -332,9 +332,7 @@ int swaynag_load_config(char *path, struct swaynag *swaynag, list_t *types) {
return 0;
}
struct swaynag_type *type;
type = calloc(1, sizeof(struct swaynag_type));
type->name = strdup("<config>");
struct swaynag_type *type = swaynag_type_new("<config>");
list_add(types, type);
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);
type = swaynag_type_get(types, name);
if (!type) {
type = calloc(1, sizeof(struct swaynag_type));
type->name = strdup(name);
type = swaynag_type_new(name);
list_add(types, type);
}
free(name);