From 22d38600d0edbb35029b3076c14e0e119dbf3dd2 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 14 May 2018 22:47:10 +1000 Subject: Implement marks --- sway/commands/unmark.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 sway/commands/unmark.c (limited to 'sway/commands/unmark.c') 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 +#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); +} -- cgit v1.2.3 From 4d1edfcba90854bd7f37ecb1b36fe4f05c37dda3 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 15 May 2018 11:24:16 +1000 Subject: Change unmark implemention to match i3's --- sway/commands/unmark.c | 49 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 11 deletions(-) (limited to 'sway/commands/unmark.c') diff --git a/sway/commands/unmark.c b/sway/commands/unmark.c index a7d39432..ea2a5709 100644 --- a/sway/commands/unmark.c +++ b/sway/commands/unmark.c @@ -7,26 +7,53 @@ #include "log.h" #include "stringop.h" +static void remove_all_marks_iterator(struct sway_container *con, void *data) { + if (con->type == C_VIEW) { + view_clear_marks(con->sway_view); + } +} + +// unmark Remove all marks from all views +// unmark foo Remove single mark from whichever view has it +// [criteria] unmark Remove all marks from matched view +// [criteria] unmark foo Remove single mark from matched view + struct cmd_results *cmd_unmark(int argc, char **argv) { - if (argc == 0) { - // Remove all marks from the current container + // Determine the view + struct sway_view *view = NULL; + if (config->handler_context.using_criteria) { 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"); + view = container->sway_view; + } + + // Determine the mark + char *mark = NULL; + if (argc > 0) { + mark = join_args(argv, argc); + } + + if (view && mark) { + // Remove the mark from the given view + if (view_has_mark(view, mark)) { + view_find_and_unmark(mark); } - free(mark); + } else if (view && !mark) { + // Clear all marks from the given view + view_clear_marks(view); + } else if (!view && mark) { + // Remove mark from whichever view has it + view_find_and_unmark(mark); + } else { + // Remove all marks from all views + container_for_each_descendant_dfs(&root_container, + remove_all_marks_iterator, NULL); } + free(mark); return cmd_results_new(CMD_SUCCESS, NULL, NULL); } -- cgit v1.2.3