4 files changed, 83 insertions, 4 deletions

diff --git a/sway/commands/bind.c b/sway/commands/bind.c
index 133fd089..8270b958 100644
--- a/sway/commands/bind.c
+++ b/sway/commands/bind.c
@@ -1,3 +1,4 @@
+#define _XOPEN_SOURCE 500
 #ifdef __linux__
 #include <linux/input-event-codes.h>
 #elif __FreeBSD__
@@ -5,9 +6,11 @@
 #endif
 #include <xkbcommon/xkbcommon.h>
 #include <xkbcommon/xkbcommon-names.h>
+#include <string.h>
 #include <strings.h>
 #include "sway/commands.h"
 #include "sway/config.h"
+#include "sway/ipc-server.h"
 #include "list.h"
 #include "log.h"
 #include "stringop.h"
@@ -27,6 +30,33 @@ void free_sway_binding(struct sway_binding *binding) {
         free(binding);
 }
 
+static struct sway_binding *sway_binding_dup(struct sway_binding *sb) {
+        struct sway_binding *new_sb = calloc(1, sizeof(struct sway_binding));
+        if (!new_sb) {
+                return NULL;
+        }
+
+        new_sb->type = sb->type;
+        new_sb->order = sb->order;
+        new_sb->flags = sb->flags;
+        new_sb->modifiers = sb->modifiers;
+        new_sb->command = strdup(sb->command);
+
+        new_sb->keys = create_list();
+        int i;
+        for (i = 0; i < sb->keys->length; ++i) {
+                xkb_keysym_t *key = malloc(sizeof(xkb_keysym_t));
+                if (!key) {
+                        free_sway_binding(new_sb);
+                        return NULL;
+                }
+                *key = *(xkb_keysym_t *)sb->keys->items[i];
+                list_add(new_sb->keys, key);
+        }
+
+        return new_sb;
+}
+
 /**
  * Returns true if the bindings have the same key and modifier combinations.
  * Note that keyboard layout is not considered, so the bindings might actually
@@ -275,11 +305,31 @@ struct cmd_results *cmd_bindcode(int argc, char **argv) {
 void seat_execute_command(struct sway_seat *seat, struct sway_binding *binding) {
         wlr_log(WLR_DEBUG, "running command for binding: %s",
                 binding->command);
+
+        struct sway_binding *binding_copy = binding;
+        bool reload = false;
+        // if this is a reload command we need to make a duplicate of the
+        // binding since it will be gone after the reload has completed.
+        if (strcasecmp(binding->command, "reload") == 0) {
+                reload = true;
+                binding_copy = sway_binding_dup(binding);
+                if (!binding_copy) {
+                        wlr_log(WLR_ERROR, "Failed to duplicate binding during reload");
+                        return;
+                }
+        }
+
         config->handler_context.seat = seat;
         struct cmd_results *results = execute_command(binding->command, NULL);
-        if (results->status != CMD_SUCCESS) {
+        if (results->status == CMD_SUCCESS) {
+                ipc_event_binding(binding_copy);
+        } else {
                 wlr_log(WLR_DEBUG, "could not run command for binding: %s (%s)",
                         binding->command, results->error);
         }
+
+        if (reload) { // free the binding if we made a copy
+                free_sway_binding(binding_copy);
+        }
         free_cmd_results(results);
 }
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/commands/move.c b/sway/commands/move.c
index 1aae3838..46ebcd83 100644
--- a/sway/commands/move.c
+++ b/sway/commands/move.c
@@ -98,7 +98,7 @@ static struct cmd_results *cmd_move_container(struct sway_container *current,
                 container_move_to(current, destination);
                 struct sway_container *focus = seat_get_focus_inactive(
                                 config->handler_context.seat, old_parent);
-                seat_set_focus(config->handler_context.seat, focus);
+                seat_set_focus_warp(config->handler_context.seat, focus, true, false);
                 container_reap_empty(old_parent);
                 container_reap_empty(destination->parent);
 
@@ -135,7 +135,7 @@ static struct cmd_results *cmd_move_container(struct sway_container *current,
                 struct sway_container *old_parent = current->parent;
                 struct sway_container *old_ws = container_parent(current, C_WORKSPACE);
                 container_move_to(current, focus);
-                seat_set_focus(config->handler_context.seat, old_parent);
+                seat_set_focus_warp(config->handler_context.seat, old_parent, true, false);
                 container_reap_empty(old_parent);
                 container_reap_empty(focus->parent);
 
diff --git a/sway/commands/reload.c b/sway/commands/reload.c
index cea6a94b..5c1b19b4 100644
--- a/sway/commands/reload.c
+++ b/sway/commands/reload.c
@@ -1,17 +1,46 @@
+#define _XOPEN_SOURCE 500
+#include <string.h>
 #include "sway/commands.h"
 #include "sway/config.h"
+#include "sway/ipc-server.h"
 #include "sway/tree/arrange.h"
+#include "list.h"
 
 struct cmd_results *cmd_reload(int argc, char **argv) {
         struct cmd_results *error = NULL;
         if ((error = checkarg(argc, "reload", EXPECTED_EQUAL_TO, 0))) {
                 return error;
         }
+
+        // store bar ids to check against new bars for barconfig_update events
+        list_t *bar_ids = create_list();
+        for (int i = 0; i < config->bars->length; ++i) {
+                struct bar_config *bar = config->bars->items[i];
+                list_add(bar_ids, strdup(bar->id));
+        }
+
         if (!load_main_config(config->current_config_path, true)) {
                 return cmd_results_new(CMD_FAILURE, "reload", "Error(s) reloading config.");
         }
+        ipc_event_workspace(NULL, NULL, "reload");
 
         load_swaybars();
+
+        for (int i = 0; i < config->bars->length; ++i) {
+                struct bar_config *bar = config->bars->items[i];
+                for (int j = 0; j < bar_ids->length; ++j) {
+                        if (strcmp(bar->id, bar_ids->items[j]) == 0) {
+                                ipc_event_barconfig_update(bar);
+                                break;
+                        }
+                }
+        }
+
+        for (int i = 0; i < bar_ids->length; ++i) {
+                free(bar_ids->items[i]);
+        }
+        list_free(bar_ids);
+
         arrange_windows(&root_container);
         return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }