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.
32 lines
737 B
C
32 lines
737 B
C
#include <string.h>
|
|
#include <strings.h>
|
|
#include "sway/commands.h"
|
|
#include "list.h"
|
|
#include "stringop.h"
|
|
|
|
struct cmd_results *cmd_unmark(int argc, char **argv) {
|
|
swayc_t *view = current_container;
|
|
|
|
if (view->marks) {
|
|
if (argc) {
|
|
char *mark = join_args(argv, argc);
|
|
int index;
|
|
if ((index = list_seq_find(view->marks, (int (*)(const void *, const void *))strcmp, mark)) != -1) {
|
|
free(view->marks->items[index]);
|
|
list_del(view->marks, index);
|
|
|
|
if (view->marks->length == 0) {
|
|
list_free(view->marks);
|
|
view->marks = NULL;
|
|
}
|
|
}
|
|
free(mark);
|
|
} else {
|
|
list_foreach(view->marks, free);
|
|
list_free(view->marks);
|
|
view->marks = NULL;
|
|
}
|
|
}
|
|
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
|
|
}
|