ipc: add window::mark event

3 files changed, 19 insertions, 5 deletions

diff --git a/sway/commands/mark.c b/sway/commands/mark.c
index 5a897e69..9ea8c301 100644
--- a/sway/commands/mark.c
+++ b/sway/commands/mark.c
@@ -58,7 +58,7 @@ struct cmd_results *cmd_mark(int argc, char **argv) {
         view_find_and_unmark(mark);
 
         if (!toggle || !had_mark) {
-                list_add(view->marks, strdup(mark));
+                view_add_mark(view, mark);
         }
 
         free(mark);
diff --git a/sway/ipc-json.c b/sway/ipc-json.c
index c49ea47e..4c2bcc98 100644
--- a/sway/ipc-json.c
+++ b/sway/ipc-json.c
@@ -201,6 +201,15 @@ static void ipc_json_describe_view(struct sway_container *c, json_object *object
         bool urgent = c->type == C_VIEW ?
                 view_is_urgent(c->sway_view) : container_has_urgent_child(c);
         json_object_object_add(object, "urgent", json_object_new_boolean(urgent));
+
+        if (c->type == C_VIEW) {
+                json_object *marks = json_object_new_array();
+                list_t *view_marks = c->sway_view->marks;
+                for (int i = 0; i < view_marks->length; ++i) {
+                        json_object_array_add(marks, json_object_new_string(view_marks->items[i]));
+                }
+                json_object_object_add(object, "marks", marks);
+        }
 }
 
 static void focus_inactive_children_iterator(struct sway_container *c, void *data) {
diff --git a/sway/tree/view.c b/sway/tree/view.c
index 7300f207..48b39e80 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -888,6 +888,7 @@ bool view_find_and_unmark(char *mark) {
                         free(view_mark);
                         list_del(view->marks, i);
                         view_update_marks_textures(view);
+                        ipc_event_window(container, "mark");
                         return true;
                 }
         }
@@ -895,11 +896,10 @@ bool view_find_and_unmark(char *mark) {
 }
 
 void view_clear_marks(struct sway_view *view) {
-        for (int i = 0; i < view->marks->length; ++i) {
-                free(view->marks->items[i]);
+        while (view->marks->length) {
+                list_del(view->marks, 0);
+                ipc_event_window(view->swayc, "mark");
         }
-        list_free(view->marks);
-        view->marks = create_list();
 }
 
 bool view_has_mark(struct sway_view *view, char *mark) {
@@ -912,6 +912,11 @@ bool view_has_mark(struct sway_view *view, char *mark) {
         return false;
 }
 
+void view_add_mark(struct sway_view *view, char *mark) {
+        list_add(view->marks, strdup(mark));
+        ipc_event_window(view->swayc, "mark");
+}
+
 static void update_marks_texture(struct sway_view *view,
                 struct wlr_texture **texture, struct border_colors *class) {
         struct sway_container *output = container_parent(view->swayc, C_OUTPUT);