ipc: fix current_workspace

2010-11-21 22:12:34 +01:00
parent a71d782da9
commit fab8b84db7
3 changed files with 8 additions and 6 deletions
--- a/src/ipc.c
+++ b/src/ipc.c
@ -343,13 +343,11 @@ IPC_HANDLER(get_outputs) {
        y(integer, output->rect.height);
        y(map_close);

-        /*
-         * XXX
-         * No idea how to handle this, where should we get this data from?
-         * I think we might need to keep a reference to the CT_OUTPUT Con in Output
-         */
        ystr("current_workspace");
-        y(null);
+        Con *ws = NULL;
+        if (output->con && (ws = con_get_fullscreen_con(output->con)))
+            ystr(ws->name);
+        else y(null);

        y(map_close);
    }