nagbar: use less / vi as fallbacks for PAGER / EDITOR

[i3/i3] / src / ipc.c

diff --git a/src/ipc.c b/src/ipc.c
index 0535d12205a7786e865d44e8cb6e54aaeeface9b..1dd9512a55ec79cca14b29a8fc5d5ac0f1a48832 100644 (file)
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -148,7 +148,6 @@ IPC_HANDLER(command) {
     strncpy(command, (const char*)message, message_size);
     LOG("IPC: received: *%s*\n", command);
     const char *reply = parse_cmd((const char*)command);
-    tree_render();
     free(command);
 
     /* If no reply was provided, we just use the default success message */
@@ -203,7 +202,23 @@ void dump_node(yajl_gen gen, struct Con *con, bool inplace_restart) {
     y(integer, (con == focused));
 
     ystr("layout");
-    y(integer, con->layout);
+    switch (con->layout) {
+        case L_DEFAULT:
+            ystr("default");
+            break;
+        case L_STACKED:
+            ystr("stacked");
+            break;
+        case L_TABBED:
+            ystr("tabbed");
+            break;
+        case L_DOCKAREA:
+            ystr("dockarea");
+            break;
+        case L_OUTPUT:
+            ystr("output");
+            break;
+    }
 
     ystr("border");
     switch (con->border_style) {
@@ -422,7 +437,7 @@ IPC_HANDLER(get_outputs) {
 
         ystr("current_workspace");
         Con *ws = NULL;
-        if (output->con && (ws = con_get_fullscreen_con(output->con)))
+        if (output->con && (ws = con_get_fullscreen_con(output->con, CF_OUTPUT)))
             ystr(ws->name);
         else y(null);