3 files changed, 2 insertions, 24 deletions

diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c
index d8ce0db1..a5cd79ba 100644
--- a/sway/desktop/layer_shell.c
+++ b/sway/desktop/layer_shell.c
@@ -204,8 +204,8 @@ static void handle_surface_commit(struct wl_listener *listener, void *data) {
         if (wlr_output != NULL) {
                 struct sway_output *output = wlr_output->data;
                 struct wlr_box old_geo = layer->geo;
-                arrange_layers(output);
                 if (memcmp(&old_geo, &layer->geo, sizeof(struct wlr_box)) != 0) {
+                        arrange_layers(output);
                         // TODO DAMAGE apply whole surface from previous and new geos
                 } else {
                         // TODO DAMAGE from surface damage
diff --git a/sway/ipc-server.c b/sway/ipc-server.c
index 59fc05f9..8250b3a0 100644
--- a/sway/ipc-server.c
+++ b/sway/ipc-server.c
@@ -242,33 +242,10 @@ int ipc_client_handle_readable(int client_fd, uint32_t mask, void *data) {
 }
 
 static void ipc_send_event(const char *json_string, enum ipc_command_type event) {
-        static struct {
-                enum ipc_command_type event;
-                enum ipc_feature feature;
-        } security_mappings[] = {
-                { IPC_EVENT_WORKSPACE, IPC_FEATURE_EVENT_WORKSPACE },
-                { IPC_EVENT_OUTPUT, IPC_FEATURE_EVENT_OUTPUT },
-                { IPC_EVENT_MODE, IPC_FEATURE_EVENT_MODE },
-                { IPC_EVENT_WINDOW, IPC_FEATURE_EVENT_WINDOW },
-                { IPC_EVENT_BINDING, IPC_FEATURE_EVENT_BINDING },
-                { IPC_EVENT_INPUT, IPC_FEATURE_EVENT_INPUT }
-        };
-
-        uint32_t security_mask = 0;
-        for (size_t i = 0; i < sizeof(security_mappings) / sizeof(security_mappings[0]); ++i) {
-                if (security_mappings[i].event == event) {
-                        security_mask = security_mappings[i].feature;
-                        break;
-                }
-        }
-
         int i;
         struct ipc_client *client;
         for (i = 0; i < ipc_client_list->length; i++) {
                 client = ipc_client_list->items[i];
-                if (!(client->security_policy & security_mask)) {
-                        continue;
-                }
                 if ((client->subscribed_events & event_mask(event)) == 0) {
                         continue;
                 }
diff --git a/swaybar/status_line.c b/swaybar/status_line.c
index 5b131aee..3454f207 100644
--- a/swaybar/status_line.c
+++ b/swaybar/status_line.c
@@ -76,5 +76,6 @@ struct status_line *status_line_init(char *cmd) {
 void status_line_free(struct status_line *status) {
         close(status->read_fd);
         close(status->write_fd);
+        kill(status->pid, SIGTERM);
         free(status);
 }