diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-05-14 22:47:10 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-05-15 11:18:27 +1000 |
commit | 22d38600d0edbb35029b3076c14e0e119dbf3dd2 (patch) | |
tree | ad548731ca215e2ec0f56cde86a6ff16df8cb323 /sway/commands | |
parent | f1f54bbc882775d431d14f99355d339ef9dab5a8 (diff) |
Implement marks
Diffstat (limited to 'sway/commands')
-rw-r--r-- | sway/commands/mark.c | 68 | ||||
-rw-r--r-- | sway/commands/unmark.c | 32 |
2 files changed, 100 insertions, 0 deletions
diff --git a/sway/commands/mark.c b/sway/commands/mark.c new file mode 100644 index 00000000..782e8ab9 --- /dev/null +++ b/sway/commands/mark.c @@ -0,0 +1,68 @@ +#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.current_container; + if (container->type != C_VIEW) { + return cmd_results_new(CMD_INVALID, "mark", + "Only views can have marks"); + } + struct sway_view *view = container->sway_view; + + 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, "mark", + "Unrecognized argument '%s'", *argv); + } + ++argv; + --argc; + } + + if (!argc) { + return cmd_results_new(CMD_INVALID, "mark", + "Expected '[--add|--replace] [--toggle] <identifier>'"); + } + + char *mark = join_args(argv, argc); + bool had_mark = view_has_mark(view, mark); + + if (!add) { + // Replacing + view_clear_marks(view); + } + + view_find_and_unmark(mark); + + if (!toggle || (toggle && !had_mark)) { + list_add(view->marks, strdup(mark)); + } + + free(mark); + view_execute_criteria(view); + + return cmd_results_new(CMD_SUCCESS, NULL, NULL); +} diff --git a/sway/commands/unmark.c b/sway/commands/unmark.c new file mode 100644 index 00000000..a7d39432 --- /dev/null +++ b/sway/commands/unmark.c @@ -0,0 +1,32 @@ +#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" + +struct cmd_results *cmd_unmark(int argc, char **argv) { + if (argc == 0) { + // Remove all marks from the current container + struct sway_container *container = + config->handler_context.current_container; + if (container->type != C_VIEW) { + return cmd_results_new(CMD_INVALID, "unmark", + "Only views can have marks"); + } + view_clear_marks(container->sway_view); + } else { + // Remove a single mark from whichever container has it + char *mark = join_args(argv, argc); + if (!view_find_and_unmark(mark)) { + free(mark); + return cmd_results_new(CMD_INVALID, "unmark", + "No view exists with that mark"); + } + free(mark); + } + + return cmd_results_new(CMD_SUCCESS, NULL, NULL); +} |