Merge pull request #2757 from Jereq/next

[i3/i3] / i3bar / src / ipc.c

diff --git a/i3bar/src/ipc.c b/i3bar/src/ipc.c
index 3489866301183377627a8d5555abf6d5251634b9..042e230a522ce3eeb43f535993f3fbe16ba978ed 100644 (file)
--- a/i3bar/src/ipc.c
+++ b/i3bar/src/ipc.c
@@ -7,6 +7,8 @@
  * ipc.c: Communicating with i3
  *
  */
+#include "common.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -21,8 +23,6 @@
 #include <sanitizer/lsan_interface.h>
 #endif
 
-#include "common.h"
-
 ev_io *i3_connection;
 
 const char *sock_path;
@@ -63,16 +63,26 @@ void got_subscribe_reply(char *reply) {
  *
  */
 void got_output_reply(char *reply) {
+    DLOG("Clearing old output configuration...\n");
+    i3_output *o_walk;
+    SLIST_FOREACH(o_walk, outputs, slist) {
+        destroy_window(o_walk);
+    }
+    FREE_SLIST(outputs, i3_output);
+
     DLOG("Parsing outputs JSON...\n");
     parse_outputs_json(reply);
     DLOG("Reconfiguring windows...\n");
     reconfig_windows(false);
 
-    i3_output *o_walk;
     SLIST_FOREACH(o_walk, outputs, slist) {
         kick_tray_clients(o_walk);
     }
 
+    if (!config.disable_ws) {
+        i3_send_msg(I3_IPC_MESSAGE_TYPE_GET_WORKSPACES, NULL);
+    }
+
     draw_bars(false);
 }
 
@@ -178,6 +188,11 @@ void got_bar_config_update(char *event) {
     init_xcb_late(config.fontname);
     init_colors(&(config.colors));
 
+    /* restart status command process */
+    kill_child();
+    start_child(config.command);
+    FREE(config.command);
+
     draw_bars(false);
 }