aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/sway/tree/view.h16
-rw-r--r--sway/commands.c2
-rw-r--r--sway/commands/mark.c68
-rw-r--r--sway/commands/unmark.c32
-rw-r--r--sway/criteria.c12
-rw-r--r--sway/meson.build2
-rw-r--r--sway/tree/view.c49
7 files changed, 178 insertions, 3 deletions
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index f12386dc..7ed4d3df 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -60,7 +60,8 @@ struct sway_view {
bool border_left;
bool border_right;
- list_t *executed_criteria;
+ list_t *executed_criteria; // struct criteria *
+ list_t *marks; // char *
union {
struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6;
@@ -253,4 +254,17 @@ void view_update_title(struct sway_view *view, bool force);
*/
void view_execute_criteria(struct sway_view *view);
+/**
+ * Find any view that has the given mark and remove the mark from the view.
+ * Returns true if it matched a view.
+ */
+bool view_find_and_unmark(char *mark);
+
+/**
+ * Remove all marks from the view.
+ */
+void view_clear_marks(struct sway_view *view);
+
+bool view_has_mark(struct sway_view *view, char *mark);
+
#endif
diff --git a/sway/commands.c b/sway/commands.c
index 60c64776..31d241a8 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -175,6 +175,7 @@ static struct cmd_handler command_handlers[] = {
{ "focus", cmd_focus },
{ "kill", cmd_kill },
{ "layout", cmd_layout },
+ { "mark", cmd_mark },
{ "move", cmd_move },
{ "opacity", cmd_opacity },
{ "reload", cmd_reload },
@@ -185,6 +186,7 @@ static struct cmd_handler command_handlers[] = {
{ "splitt", cmd_splitt },
{ "splitv", cmd_splitv },
{ "title_format", cmd_title_format },
+ { "unmark", cmd_unmark },
};
static int handler_compare(const void *_a, const void *_b) {
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);
+}
diff --git a/sway/criteria.c b/sway/criteria.c
index 248260ec..4295cacc 100644
--- a/sway/criteria.c
+++ b/sway/criteria.c
@@ -75,8 +75,16 @@ static bool criteria_matches_view(struct criteria *criteria,
}
if (criteria->con_mark) {
- // TODO
- return false;
+ bool exists = false;
+ for (int i = 0; i < view->marks->length; ++i) {
+ if (regex_cmp(view->marks->items[i], criteria->con_mark) == 0) {
+ exists = true;
+ break;
+ }
+ }
+ if (!exists) {
+ return false;
+ }
}
if (criteria->con_id) { // Internal ID
diff --git a/sway/meson.build b/sway/meson.build
index 67c2a422..ed14b51a 100644
--- a/sway/meson.build
+++ b/sway/meson.build
@@ -43,6 +43,7 @@ sway_sources = files(
'commands/fullscreen.c',
'commands/hide_edge_borders.c',
'commands/kill.c',
+ 'commands/mark.c',
'commands/opacity.c',
'commands/include.c',
'commands/input.c',
@@ -62,6 +63,7 @@ sway_sources = files(
'commands/split.c',
'commands/swaybg_command.c',
'commands/title_format.c',
+ 'commands/unmark.c',
'commands/workspace.c',
'commands/ws_auto_back_and_forth.c',
diff --git a/sway/tree/view.c b/sway/tree/view.c
index 8da72667..ec7f3031 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -23,6 +23,7 @@ void view_init(struct sway_view *view, enum sway_view_type type,
view->type = type;
view->impl = impl;
view->executed_criteria = create_list();
+ view->marks = create_list();
wl_signal_init(&view->events.unmap);
}
@@ -37,6 +38,11 @@ void view_destroy(struct sway_view *view) {
list_free(view->executed_criteria);
+ for (int i = 0; i < view->marks->length; ++i) {
+ free(view->marks->items[i]);
+ }
+ list_free(view->marks);
+
container_destroy(view->swayc);
if (view->impl->destroy) {
@@ -721,3 +727,46 @@ void view_update_title(struct sway_view *view, bool force) {
container_notify_child_title_changed(view->swayc->parent);
config_update_font_height(false);
}
+
+static bool find_by_mark_iterator(struct sway_container *con,
+ void *data) {
+ char *mark = data;
+ return con->type == C_VIEW && view_has_mark(con->sway_view, mark);
+}
+
+bool view_find_and_unmark(char *mark) {
+ struct sway_container *container = container_find(&root_container,
+ find_by_mark_iterator, mark);
+ if (!container) {
+ return false;
+ }
+ struct sway_view *view = container->sway_view;
+
+ for (int i = 0; i < view->marks->length; ++i) {
+ char *view_mark = view->marks->items[i];
+ if (strcmp(view_mark, mark) == 0) {
+ free(view_mark);
+ list_del(view->marks, i);
+ return true;
+ }
+ }
+ return false;
+}
+
+void view_clear_marks(struct sway_view *view) {
+ for (int i = 0; i < view->marks->length; ++i) {
+ free(view->marks->items[i]);
+ }
+ list_free(view->marks);
+ view->marks = create_list();
+}
+
+bool view_has_mark(struct sway_view *view, char *mark) {
+ for (int i = 0; i < view->marks->length; ++i) {
+ char *item = view->marks->items[i];
+ if (strcmp(item, mark) == 0) {
+ return true;
+ }
+ }
+ return false;
+}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 01:47:46 +0000