Added layout debugger back in and fixed mutlimonitor layout issues

1 files changed, 50 insertions, 0 deletions

diff --git a/sway/workspace.c b/sway/workspace.c
index cd5472e3..3f4590e2 100644
--- a/sway/workspace.c
+++ b/sway/workspace.c
@@ -111,3 +111,53 @@ void workspace_switch(swayc_t *workspace) {
 	}
 	active_workspace = workspace;
 }
+
+/* XXX:DEBUG:XXX */
+static void container_log(const swayc_t *c) {
+    fprintf(stderr, "focus:%c|",
+        c == get_focused_container(&root_container) ? 'F' : //Focused
+        c == active_workspace ? 'W' : //active workspace
+        c == &root_container  ? 'R' : //root
+        'X');//not any others
+    fprintf(stderr,"(%p)",c);
+    fprintf(stderr,"(p:%p)",c->parent);
+    fprintf(stderr,"(f:%p)",c->focused);
+    fprintf(stderr,"Type:");
+    fprintf(stderr,
+        c->type == C_ROOT      ? "Root|" :
+        c->type == C_OUTPUT    ? "Output|" :
+        c->type == C_WORKSPACE ? "Workspace|" :
+        c->type == C_CONTAINER ? "Container|" :
+        c->type == C_VIEW      ? "View|" :
+                                 "Unknown|");
+    fprintf(stderr,"layout:");
+    fprintf(stderr,
+        c->layout == L_NONE     ? "NONE|" :
+        c->layout == L_HORIZ    ? "Horiz|":
+        c->layout == L_VERT     ? "Vert|":
+        c->layout == L_STACKED  ? "Stacked|":
+        c->layout == L_FLOATING ? "Floating|":
+                                  "Unknown|");
+    fprintf(stderr, "w:%d|h:%d|", c->width, c->height);
+    fprintf(stderr, "x:%d|y:%d|", c->x, c->y);
+    fprintf(stderr, "vis:%c|", c->visible?'t':'f');
+    fprintf(stderr, "wgt:%d|", c->weight);
+    fprintf(stderr, "name:%.16s|", c->name);
+    fprintf(stderr, "children:%d\n",c->children?c->children->length:0);
+}
+void layout_log(const swayc_t *c, int depth) {
+    int i;
+    int e = c->children?c->children->length:0;
+    for (i = 0; i < depth; ++i) fputc(' ', stderr);
+    container_log(c);
+    if (e) {
+        for (i = 0; i < depth; ++i) fputc(' ', stderr);
+        fprintf(stderr,"(\n");
+        for (i = 0; i < e; ++i) {
+            layout_log(c->children->items[i], depth + 1);
+        }
+        for (i = 0; i < depth; ++i) fputc(' ', stderr);
+        fprintf(stderr,")\n");
+    }
+}
+/* XXX:DEBUG:XXX */