From 9b0196e7ede3e91b8a4829f1f66990f4c588014b Mon Sep 17 00:00:00 2001 From: Luminarys Date: Sat, 15 Aug 2015 14:02:03 -0500 Subject: 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); -- cgit v1.2.3-54-g00ecf