mirror of
https://github.com/NickHu/sway
synced 2024-12-28 22:23:30 +01:00
069d37f987
This commit changes how commands decide what container to act on. Commands get the current container though `current_container`, a global defined in sway/commands.c. If a criteria is given before a command, then the following command will be run once for every container the criteria matches with a reference to the matching container in 'current_container'. Commands should use this instead of `get_focused_container()` from now on. This commit also fixes a few (minor) mistakes made in implementing marks such as non-escaped arrows in sway(5) and calling the "mark" command "floating" by accident. It also cleans up `criteria.c` in a few places.
74 lines
1.8 KiB
C
74 lines
1.8 KiB
C
#include <string.h>
|
|
#include <strings.h>
|
|
#include <stdbool.h>
|
|
#include "sway/commands.h"
|
|
#include "list.h"
|
|
#include "stringop.h"
|
|
|
|
struct cmd_results *cmd_mark(int argc, char **argv) {
|
|
struct cmd_results *error = NULL;
|
|
if (config->reading) return cmd_results_new(CMD_FAILURE, "mark", "Can't be used in config file.");
|
|
if ((error = checkarg(argc, "mark", EXPECTED_AT_LEAST, 1))) {
|
|
return error;
|
|
}
|
|
|
|
swayc_t *view = current_container;
|
|
bool add = false;
|
|
bool toggle = false;
|
|
|
|
if (strcmp(argv[0], "--add") == 0) {
|
|
--argc; ++argv;
|
|
add = true;
|
|
} else if (strcmp(argv[0], "--replace") == 0) {
|
|
--argc; ++argv;
|
|
}
|
|
|
|
if (argc && strcmp(argv[0], "--toggle") == 0) {
|
|
--argc; ++argv;
|
|
toggle = true;
|
|
}
|
|
|
|
if (argc) {
|
|
char *mark = join_args(argv, argc);
|
|
if (view->marks) {
|
|
if (add) {
|
|
int index;
|
|
if ((index = list_seq_find(view->marks, (int (*)(const void *, const void *))strcmp, mark)) != -1) {
|
|
if (toggle) {
|
|
free(view->marks->items[index]);
|
|
list_del(view->marks, index);
|
|
|
|
if (0 == view->marks->length) {
|
|
list_free(view->marks);
|
|
view->marks = NULL;
|
|
}
|
|
}
|
|
free(mark);
|
|
} else {
|
|
list_add(view->marks, mark);
|
|
}
|
|
} else {
|
|
if (toggle && list_seq_find(view->marks, (int (*)(const void *, const void *))strcmp, mark) != -1) {
|
|
// Delete the list
|
|
list_foreach(view->marks, free);
|
|
list_free(view->marks);
|
|
view->marks = NULL;
|
|
} else {
|
|
// Delete and replace with a new list
|
|
list_foreach(view->marks, free);
|
|
list_free(view->marks);
|
|
|
|
view->marks = create_list();
|
|
list_add(view->marks, mark);
|
|
}
|
|
}
|
|
} else {
|
|
view->marks = create_list();
|
|
list_add(view->marks, mark);
|
|
}
|
|
} else {
|
|
return cmd_results_new(CMD_FAILURE, "mark",
|
|
"Expected 'mark [--add|--replace] [--toggle] <mark>'");
|
|
}
|
|
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
|
|
}
|