From 8b9add06418c2a717d5ac0c72db88afc8f938dd0 Mon Sep 17 00:00:00 2001 From: Erik Reider Date: Thu, 18 May 2023 14:41:42 +0200 Subject: [PATCH] Removed unneeded one-liner cmd functions --- include/sway/commands.h | 2 -- sway/commands/blur.c | 6 +----- sway/commands/shadows.c | 6 +----- sway/layer_criteria.c | 5 +++-- 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/include/sway/commands.h b/include/sway/commands.h index 4cde776e..920e8596 100644 --- a/include/sway/commands.h +++ b/include/sway/commands.h @@ -100,9 +100,7 @@ struct sway_container *container_find_resize_parent(struct sway_container *con, /** * Effect handlers value parsers */ -bool cmd_blur_parse_value(char *arg); bool cmd_corner_radius_parse_value(char *arg, int* result); -bool cmd_shadows_parse_value(char *arg); /** * Handlers shared by exec and exec_always. diff --git a/sway/commands/blur.c b/sway/commands/blur.c index c9ef6860..5607d1e2 100644 --- a/sway/commands/blur.c +++ b/sway/commands/blur.c @@ -3,10 +3,6 @@ #include "sway/output.h" #include "util.h" -bool cmd_blur_parse_value(char *arg) { - return parse_boolean(arg, true); -} - struct cmd_results *cmd_blur(int argc, char **argv) { struct cmd_results *error = checkarg(argc, "blur", EXPECTED_AT_LEAST, 1); @@ -16,7 +12,7 @@ struct cmd_results *cmd_blur(int argc, char **argv) { struct sway_container *con = config->handler_context.container; - bool result = cmd_blur_parse_value(argv[0]); + bool result = parse_boolean(argv[0], true); if (con == NULL) { config->blur_enabled = result; } else { diff --git a/sway/commands/shadows.c b/sway/commands/shadows.c index 37a54618..ae7fc019 100644 --- a/sway/commands/shadows.c +++ b/sway/commands/shadows.c @@ -8,10 +8,6 @@ #include "stringop.h" #include "util.h" -bool cmd_shadows_parse_value(char *arg) { - return parse_boolean(arg, true); -} - struct cmd_results *cmd_shadows(int argc, char **argv) { struct cmd_results *error = checkarg(argc, "shadows", EXPECTED_AT_LEAST, 1); @@ -21,7 +17,7 @@ struct cmd_results *cmd_shadows(int argc, char **argv) { struct sway_container *con = config->handler_context.container; - bool result = cmd_shadows_parse_value(argv[0]); + bool result = parse_boolean(argv[0], true); if (con == NULL) { config->shadow_enabled = result; } else { diff --git a/sway/layer_criteria.c b/sway/layer_criteria.c index 0905a735..41e40411 100644 --- a/sway/layer_criteria.c +++ b/sway/layer_criteria.c @@ -3,6 +3,7 @@ #include "stringop.h" #include "sway/commands.h" #include "sway/layer_criteria.h" +#include "util.h" void layer_criteria_destroy(struct layer_criteria *criteria) { free(criteria->namespace); @@ -64,10 +65,10 @@ void layer_criteria_parse(struct sway_layer_surface *sway_layer, struct layer_cr } } if (strcmp(argv[0], "blur") == 0) { - sway_layer->deco_data.blur = cmd_blur_parse_value(argv[1]); + sway_layer->deco_data.blur = parse_boolean(argv[1], true); continue; } else if (strcmp(argv[0], "shadows") == 0) { - sway_layer->deco_data.shadow = cmd_shadows_parse_value(argv[1]); + sway_layer->deco_data.shadow = parse_boolean(argv[1], true); continue; } else if (strcmp(argv[0], "corner_radius") == 0) { int value;