From a974300652fc5cea72db60e1e39b0f7da7e9f334 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sun, 7 Jun 2020 10:47:56 -0400 Subject: swaynag: allow specifying more buttons which execute and dismiss I don't love -z / -Z, but I figure this patch is far from being accepted for other reasons too. --- swaynag/config.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'swaynag/config.c') diff --git a/swaynag/config.c b/swaynag/config.c index f1161b39..d702cc95 100644 --- a/swaynag/config.c +++ b/swaynag/config.c @@ -52,6 +52,8 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag, static struct option opts[] = { {"button", required_argument, NULL, 'b'}, {"button-no-terminal", required_argument, NULL, 'B'}, + {"button-dismiss", required_argument, NULL, 'z'}, + {"button-dismiss-no-terminal", required_argument, NULL, 'Z'}, {"config", required_argument, NULL, 'c'}, {"debug", no_argument, NULL, 'd'}, {"edge", required_argument, NULL, 'e'}, @@ -90,6 +92,11 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag, "be defined.\n" " -B, --button-no-terminal Like --button, but does" "not run the action in a terminal.\n" + " -z, --button-dismiss Create a button with text that " + "dismisses swaynag, and executes action in a terminal when pressed. " + "Multiple buttons can be defined.\n" + " -Z, --button-dismiss-no-terminal Like " + "--button-dismiss, but does not run the action in a terminal.\n" " -c, --config Path to config file.\n" " -d, --debug Enable debugging.\n" " -e, --edge top|bottom Set the edge to use.\n" @@ -120,13 +127,15 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag, optind = 1; while (1) { - int c = getopt_long(argc, argv, "b:B:c:de:f:hlL:m:o:s:t:v", opts, NULL); + int c = getopt_long(argc, argv, "b:B:z:Z:c:de:f:hlL:m:o:s:t:v", opts, NULL); if (c == -1) { break; } switch (c) { case 'b': // Button case 'B': // Button (No Terminal) + case 'z': // Button (Dismiss) + case 'Z': // Button (Dismiss, No Terminal) if (swaynag) { if (optind >= argc) { fprintf(stderr, "Missing action for button %s\n", optarg); @@ -138,6 +147,7 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag, button->type = SWAYNAG_ACTION_COMMAND; button->action = strdup(argv[optind]); button->terminal = c == 'b'; + button->dismiss = c == 'z' || c == 'Z'; list_add(swaynag->buttons, button); } optind++; -- cgit v1.2.3