diff options
author | Calvin Lee <cyrus296@gmail.com> | 2017-04-07 11:37:51 -0600 |
---|---|---|
committer | Calvin Lee <cyrus296@gmail.com> | 2017-04-07 11:37:51 -0600 |
commit | 154c6718c1f0e34e0f217150ba2770ee100e5b38 (patch) | |
tree | b929def6e7bcdbff10a7f1cc815f9a278821c666 /sway/commands/mark.c | |
parent | 4e12bf64ef946f25e602fd609b80349d100a86ed (diff) |
Add `-t get_marks` and use more i3-like marks
In i3 every mark is unique and one mark cannot be used in more than one
window, sway behavior has been amended to match this.
`swaymsg -t get_marks` will now return an array of all marks used in sway.
See #98
Diffstat (limited to 'sway/commands/mark.c')
-rw-r--r-- | sway/commands/mark.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/sway/commands/mark.c b/sway/commands/mark.c index 919883b0..c1d959df 100644 --- a/sway/commands/mark.c +++ b/sway/commands/mark.c @@ -5,6 +5,15 @@ #include "list.h" #include "stringop.h" +static void find_marks_callback(swayc_t *container, void *_mark) { + char *mark = (char *)_mark; + + int index; + if (container->marks && ((index = list_seq_find(container->marks, (int (*)(const void *, const void *))strcmp, mark)) != -1)) { + list_del(container->marks, index); + } +} + 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."); @@ -30,6 +39,10 @@ struct cmd_results *cmd_mark(int argc, char **argv) { if (argc) { char *mark = join_args(argv, argc); + + // Remove all existing marks of this type + container_map(&root_container, find_marks_callback, mark); + if (view->marks) { if (add) { int index; |