From b01a04f22b8eaacfbcee099797b4c664cfb97b97 Mon Sep 17 00:00:00 2001 From: Luminarys Date: Sat, 15 Aug 2015 13:22:03 -0500 Subject: [PATCH 1/5] Added layout debugger back in and fixed mutlimonitor layout issues --- sway/handlers.c | 11 +++++++++-- sway/layout.c | 1 + sway/workspace.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ sway/workspace.h | 1 + 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 From 618b3df0513dd2c63f6e64db1e125a609e1ec6b9 Mon Sep 17 00:00:00 2001 From: Luminarys Date: Sat, 15 Aug 2015 13:55:06 -0500 Subject: [PATCH 2/5] Fixed workspace switching in multimonitor layouts --- sway/container.c | 10 ++--- sway/handlers.c | 8 ++-- sway/layout.c | 2 +- sway/workspace.c | 110 ++++++++++++++++++++++++++--------------------- 4 files changed, 70 insertions(+), 60 deletions(-) diff --git a/sway/container.c b/sway/container.c index 1c17e92f..3fa9f490 100644 --- a/sway/container.c +++ b/sway/container.c @@ -69,7 +69,7 @@ swayc_t *new_workspace(swayc_t * output, const char *name) { workspace->layout = L_HORIZ; // TODO:default layout workspace->width = output->width; workspace->height = output->height; - workspace->name = strdup(name); + workspace->name = strdup(name); workspace->visible = true; add_child(output, workspace); @@ -82,10 +82,10 @@ swayc_t *new_container(swayc_t *child, enum swayc_layouts layout) { sway_log(L_DEBUG, "creating container %p around %p", cont, child); cont->layout = layout; - cont->width = child->width; + cont->width = child->width; cont->height = child->height; - cont->x = child->x; - cont->y = child->y; + cont->x = child->x; + cont->y = child->y; cont->visible = child->visible; swayc_t *parent = replace_child(child, cont); @@ -110,7 +110,7 @@ swayc_t *new_view(swayc_t *sibling, wlc_handle handle) { handle, title, type, sibling, sibling?sibling->type:0); //Setup values view->handle = handle; - view->name = strdup(title); + view->name = strdup(title); view->visible = true; //Case of focused workspace, just create as child of it diff --git a/sway/handlers.c b/sway/handlers.c index a85eb681..4b1216bc 100644 --- a/sway/handlers.c +++ b/sway/handlers.c @@ -15,7 +15,7 @@ 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 + //Determine the output that the view is under swayc_t *parent = view; while (parent->type != C_OUTPUT) { parent = parent->parent; @@ -192,9 +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, "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); diff --git a/sway/layout.c b/sway/layout.c index 4fd6aff9..3fd7f5c1 100644 --- a/sway/layout.c +++ b/sway/layout.c @@ -179,7 +179,7 @@ void arrange_windows(swayc_t *container, int width, int height) { } break; } - layout_log(&root_container, 0); + 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 3f4590e2..1f7aeb64 100644 --- a/sway/workspace.c +++ b/sway/workspace.c @@ -94,70 +94,80 @@ swayc_t *workspace_find_by_name(const char* name) { } void workspace_switch(swayc_t *workspace) { - if (workspace != active_workspace && active_workspace) { - sway_log(L_DEBUG, "workspace: changing from '%s' to '%s'", active_workspace->name, workspace->name); + swayc_t *parent = workspace; + while (parent->type != C_OUTPUT) { + parent = parent->parent; + } + // The current workspace of the output our target workspace is in + swayc_t *c_workspace = parent->focused; + if (workspace != c_workspace && c_workspace) { + sway_log(L_DEBUG, "workspace: changing from '%s' to '%s'", c_workspace->name, workspace->name); uint32_t mask = 1; - // set all c_views in the old workspace to the invisible mask - container_map(active_workspace, set_mask, &mask); - // and c_views in the new workspace to the visible mask + // set all c_views in the old workspace to the invisible mask if the workspace + // is in the same output & c_views in the new workspace to the visible mask + + container_map(c_workspace, set_mask, &mask); mask = 2; container_map(workspace, set_mask, &mask); - wlc_output_set_mask(wlc_get_focused_output(), 2); + + + //wlc_output_set_mask(wlc_get_focused_output(), 2); unfocus_all(&root_container); focus_view(workspace); - destroy_workspace(active_workspace); + + destroy_workspace(c_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); + 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"); - } + 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 */ From 9b0196e7ede3e91b8a4829f1f66990f4c588014b Mon Sep 17 00:00:00 2001 From: Luminarys Date: Sat, 15 Aug 2015 14:02:03 -0500 Subject: [PATCH 3/5] Style fixes --- sway/container.c | 8 ++++---- sway/handlers.c | 3 --- sway/workspace.c | 3 --- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/sway/container.c b/sway/container.c index 3fa9f490..c033f118 100644 --- a/sway/container.c +++ b/sway/container.c @@ -69,7 +69,7 @@ swayc_t *new_workspace(swayc_t * output, const char *name) { workspace->layout = L_HORIZ; // TODO:default layout workspace->width = output->width; workspace->height = output->height; - workspace->name = strdup(name); + workspace->name = strdup(name); workspace->visible = true; add_child(output, workspace); @@ -82,10 +82,10 @@ swayc_t *new_container(swayc_t *child, enum swayc_layouts layout) { sway_log(L_DEBUG, "creating container %p around %p", cont, child); cont->layout = layout; - cont->width = child->width; + cont->width = child->width; cont->height = child->height; - cont->x = child->x; - cont->y = child->y; + cont->x = child->x; + cont->y = child->y; cont->visible = child->visible; swayc_t *parent = replace_child(child, cont); diff --git a/sway/handlers.c b/sway/handlers.c index 4b1216bc..f95683d0 100644 --- a/sway/handlers.c +++ b/sway/handlers.c @@ -192,9 +192,6 @@ 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); diff --git a/sway/workspace.c b/sway/workspace.c index 1f7aeb64..9748c23f 100644 --- a/sway/workspace.c +++ b/sway/workspace.c @@ -106,14 +106,11 @@ void workspace_switch(swayc_t *workspace) { // set all c_views in the old workspace to the invisible mask if the workspace // is in the same output & c_views in the new workspace to the visible mask - container_map(c_workspace, set_mask, &mask); mask = 2; container_map(workspace, set_mask, &mask); wlc_output_set_mask(wlc_get_focused_output(), 2); - - //wlc_output_set_mask(wlc_get_focused_output(), 2); unfocus_all(&root_container); focus_view(workspace); From 9ba914747ea2d73aebaa67fae6a164612a4efe11 Mon Sep 17 00:00:00 2001 From: Luminarys Date: Sat, 15 Aug 2015 14:10:44 -0500 Subject: [PATCH 4/5] Removed alignment --- sway/container.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/sway/container.c b/sway/container.c index c033f118..1f0d02aa 100644 --- a/sway/container.c +++ b/sway/container.c @@ -44,9 +44,9 @@ swayc_t *new_output(wlc_handle handle) { const struct wlc_size* size = wlc_output_get_resolution(handle); swayc_t *output = new_swayc(C_OUTPUT); - output->width = size->w; - output->height = size->h; - output->handle = handle; + output->width = size->w; + output->height = size->h; + output->handle = handle; add_child(&root_container, output); @@ -66,10 +66,10 @@ swayc_t *new_workspace(swayc_t * output, const char *name) { sway_log(L_DEBUG, "Added workspace %s for output %d", name, output->handle); swayc_t *workspace = new_swayc(C_WORKSPACE); - workspace->layout = L_HORIZ; // TODO:default layout - workspace->width = output->width; - workspace->height = output->height; - workspace->name = strdup(name); + workspace->layout = L_HORIZ; // TODO:default layout + workspace->width = output->width; + workspace->height = output->height; + workspace->name = strdup(name); workspace->visible = true; add_child(output, workspace); @@ -81,12 +81,12 @@ swayc_t *new_container(swayc_t *child, enum swayc_layouts layout) { sway_log(L_DEBUG, "creating container %p around %p", cont, child); - cont->layout = layout; - cont->width = child->width; - cont->height = child->height; - cont->x = child->x; - cont->y = child->y; - cont->visible = child->visible; + cont->layout = layout; + cont->width = child->width; + cont->height = child->height; + cont->x = child->x; + cont->y = child->y; + cont->visible = child->visible; swayc_t *parent = replace_child(child, cont); if (parent) { @@ -109,8 +109,8 @@ swayc_t *new_view(swayc_t *sibling, wlc_handle handle) { sway_log(L_DEBUG, "Adding new view %d:%s:%d to container %p %d", handle, title, type, sibling, sibling?sibling->type:0); //Setup values - view->handle = handle; - view->name = strdup(title); + view->handle = handle; + view->name = strdup(title); view->visible = true; //Case of focused workspace, just create as child of it From b97d8756a811b3a93e73629a9e12fc78cdd3acf2 Mon Sep 17 00:00:00 2001 From: Luminarys Date: Sat, 15 Aug 2015 14:12:42 -0500 Subject: [PATCH 5/5] Minor style fix --- sway/container.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sway/container.c b/sway/container.c index 1f0d02aa..6054b4a3 100644 --- a/sway/container.c +++ b/sway/container.c @@ -82,7 +82,7 @@ swayc_t *new_container(swayc_t *child, enum swayc_layouts layout) { sway_log(L_DEBUG, "creating container %p around %p", cont, child); cont->layout = layout; - cont->width = child->width; + cont->width = child->width; cont->height = child->height; cont->x = child->x; cont->y = child->y;