mirror of
https://github.com/gwenhael-le-moine/sway-patched-tray-menu.git
synced 2024-12-27 21:58:16 +01:00
2a684cad5f
Patch tested by compiling with `__attribute__ ((format (printf, 2, 3)))` applied to `cmd_results_new`. String usage constants have been converted from pointers to arrays when encountered. General handler format strings were sometimes modified to include the old input string, especially for unknown command errors.
68 lines
1.8 KiB
C
68 lines
1.8 KiB
C
#define _POSIX_C_SOURCE 200809L
|
|
#include <string.h>
|
|
#include "sway/commands.h"
|
|
#include "sway/config.h"
|
|
#include "sway/tree/view.h"
|
|
#include "list.h"
|
|
#include "log.h"
|
|
#include "stringop.h"
|
|
|
|
// mark foo Same as mark --replace foo
|
|
// mark --add foo Add this mark to view's list
|
|
// mark --replace foo Replace view's marks with this single one
|
|
// mark --add --toggle foo Toggle current mark and persist other marks
|
|
// mark --replace --toggle foo Toggle current mark and remove other marks
|
|
|
|
struct cmd_results *cmd_mark(int argc, char **argv) {
|
|
struct cmd_results *error = NULL;
|
|
if ((error = checkarg(argc, "mark", EXPECTED_AT_LEAST, 1))) {
|
|
return error;
|
|
}
|
|
struct sway_container *container = config->handler_context.container;
|
|
if (!container) {
|
|
return cmd_results_new(CMD_INVALID, "Only containers can have marks");
|
|
}
|
|
|
|
bool add = false, toggle = false;
|
|
while (argc > 0 && strncmp(*argv, "--", 2) == 0) {
|
|
if (strcmp(*argv, "--add") == 0) {
|
|
add = true;
|
|
} else if (strcmp(*argv, "--replace") == 0) {
|
|
add = false;
|
|
} else if (strcmp(*argv, "--toggle") == 0) {
|
|
toggle = true;
|
|
} else {
|
|
return cmd_results_new(CMD_INVALID,
|
|
"Unrecognized argument '%s'", *argv);
|
|
}
|
|
++argv;
|
|
--argc;
|
|
}
|
|
|
|
if (!argc) {
|
|
return cmd_results_new(CMD_INVALID,
|
|
"Expected '[--add|--replace] [--toggle] <identifier>'");
|
|
}
|
|
|
|
char *mark = join_args(argv, argc);
|
|
bool had_mark = container_has_mark(container, mark);
|
|
|
|
if (!add) {
|
|
// Replacing
|
|
container_clear_marks(container);
|
|
}
|
|
|
|
container_find_and_unmark(mark);
|
|
|
|
if (!toggle || !had_mark) {
|
|
container_add_mark(container, mark);
|
|
}
|
|
|
|
free(mark);
|
|
container_update_marks_textures(container);
|
|
if (container->view) {
|
|
view_execute_criteria(container->view);
|
|
}
|
|
|
|
return cmd_results_new(CMD_SUCCESS, NULL);
|
|
}
|