Added layout debugger back in and fixed mutlimonitor layout issues

4 files changed, 61 insertions, 2 deletions

diff --git a/sway/handlers.c b/sway/handlers.c
index 393a2181..a85eb681 100644
--- a/sway/handlers.c
+++ b/sway/handlers.c
@@ -15,9 +15,14 @@ static struct wlc_origin mouse_origin;
 
 static bool pointer_test(swayc_t *view, void *_origin) {
 	const struct wlc_origin *origin = _origin;
+    //Determine the output that the view is under
+	swayc_t *parent = view;
+	while (parent->type != C_OUTPUT) {
+		parent = parent->parent;
+	}
 	if (view->type == C_VIEW && origin->x >= view->x && origin->y >= view->y
 			&& origin->x < view->x + view->width && origin->y < view->y + view->height
-			&& view->visible) {
+			&& view->visible && parent == root_container.focused) {
 		return true;
 	}
 	return false;
@@ -187,6 +192,9 @@ static bool handle_pointer_motion(wlc_handle view, uint32_t time, const struct w
 	swayc_t *c = find_container(&root_container, pointer_test, (void *)origin);
 	swayc_t *focused = get_focused_container(&root_container);
 	if (c && c != focused) {
+	    sway_log(L_DEBUG, "Mouse pointer at X: %d, Y: %d", origin->x, origin->y);
+	    sway_log(L_DEBUG, "Container to focus on is at X: %d, Y: %d, with W: %d, H: %d", c->x, c->y, c->width, c->height);
+	    sway_log(L_DEBUG, "Focused container is at X: %d, Y: %d, with W: %d, H: %d", c->x, c->y, c->width, c->height);
 		sway_log(L_DEBUG, "Switching focus to %p", c);
 		unfocus_all(&root_container);
 		focus_view(c);
@@ -254,4 +262,3 @@ struct wlc_interface interface = {
 		.ready = handle_wlc_ready 
 	}
 };
-
diff --git a/sway/layout.c b/sway/layout.c
index e2e91593..4fd6aff9 100644
--- a/sway/layout.c
+++ b/sway/layout.c
@@ -179,6 +179,7 @@ void arrange_windows(swayc_t *container, int width, int height) {
 		}
 		break;
 	}
+    layout_log(&root_container, 0);
 }
 
 swayc_t *get_swayc_for_handle(wlc_handle handle, swayc_t *parent) {
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 */
diff --git a/sway/workspace.h b/sway/workspace.h
index 523ce633..59a6d526 100644
--- a/sway/workspace.h
+++ b/sway/workspace.h
@@ -11,5 +11,6 @@ char *workspace_next_name(void);
 swayc_t *workspace_create(const char*);
 swayc_t *workspace_find_by_name(const char*);
 void workspace_switch(swayc_t*);
+void layout_log(const swayc_t *c, int depth);
 
 #endif