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

Removed unneeded one-liner cmd functions

Browse source
This commit is contained in:
Erik Reider 2023-05-18 14:41:42 +02:00
parent c7d4943a62
commit 8b9add0641
4 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/sway/commands.h
View file

@ -100,9 +100,7 @@ struct sway_container *container_find_resize_parent(struct sway_container *con,
/** /**
* Effect handlers value parsers * Effect handlers value parsers
*/ */
bool cmd_blur_parse_value(char *arg);
bool cmd_corner_radius_parse_value(char *arg, int* result); bool cmd_corner_radius_parse_value(char *arg, int* result);
bool cmd_shadows_parse_value(char *arg);
/** /**
* Handlers shared by exec and exec_always. * Handlers shared by exec and exec_always.

6
sway/commands/blur.c
View file

@ -3,10 +3,6 @@
#include "sway/output.h" #include "sway/output.h"
#include "util.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 *cmd_blur(int argc, char **argv) {
struct cmd_results *error = checkarg(argc, "blur", EXPECTED_AT_LEAST, 1); 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; 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) { if (con == NULL) {
config->blur_enabled = result; config->blur_enabled = result;
} else { } else {

6
sway/commands/shadows.c
View file

@ -8,10 +8,6 @@
#include "stringop.h" #include "stringop.h"
#include "util.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 *cmd_shadows(int argc, char **argv) {
struct cmd_results *error = checkarg(argc, "shadows", EXPECTED_AT_LEAST, 1); 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; 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) { if (con == NULL) {
config->shadow_enabled = result; config->shadow_enabled = result;
} else { } else {

5
sway/layer_criteria.c
View file

@ -3,6 +3,7 @@
#include "stringop.h" #include "stringop.h"
#include "sway/commands.h" #include "sway/commands.h"
#include "sway/layer_criteria.h" #include "sway/layer_criteria.h"
#include "util.h"
void layer_criteria_destroy(struct layer_criteria *criteria) { void layer_criteria_destroy(struct layer_criteria *criteria) {
free(criteria->namespace); 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) { 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; continue;
} else if (strcmp(argv[0], "shadows") == 0) { } 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; continue;
} else if (strcmp(argv[0], "corner_radius") == 0) { } else if (strcmp(argv[0], "corner_radius") == 0) {
int value; int value;