From 640232eb225058a18f20190235f679caf678e1f7 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Fri, 6 Apr 2018 16:13:26 -0400 Subject: [PATCH] Revert "Break everything^W^WUse wlr_box for sway_container" --- include/sway/tree/container.h | 10 +- include/sway/tree/layout.h | 3 +- sway/commands/layout.c | 2 +- sway/commands/move.c | 7 +- sway/commands/resize.c | 8 +- sway/desktop/desktop.c | 2 +- sway/desktop/output.c | 15 +-- sway/input/seat.c | 4 +- sway/ipc-json.c | 8 +- sway/tree/container.c | 8 +- sway/tree/layout.c | 204 +++++++++++++++++----------------- sway/tree/view.c | 10 +- sway/tree/workspace.c | 8 +- 13 files changed, 145 insertions(+), 144 deletions(-) diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index e7a071be..4c60530f 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h @@ -68,10 +68,12 @@ struct sway_container { enum sway_container_layout prev_layout; enum sway_container_layout workspace_layout; - // For C_ROOT, this is the extents of the whole layout box. - // For C_OUTPUT, this is the output position in layout coordinates. - // For other types, this is the position in output-local coordinates. - struct wlr_box box; + // For C_ROOT, this has no meaning + // For C_OUTPUT, this is the output position in layout coordinates + // For other types, this is the position in output-local coordinates + double x, y; + // does not include borders or gaps. + double width, height; list_t *children; diff --git a/include/sway/tree/layout.h b/include/sway/tree/layout.h index b2b98ee4..fc5ce21f 100644 --- a/include/sway/tree/layout.h +++ b/include/sway/tree/layout.h @@ -61,7 +61,8 @@ enum sway_container_layout container_get_default_layout( void container_sort_workspaces(struct sway_container *output); -void arrange_windows(struct sway_container *container, int width, int height); +void arrange_windows(struct sway_container *container, + double width, double height); struct sway_container *container_get_in_direction(struct sway_container *container, struct sway_seat *seat, enum movement_direction dir); diff --git a/sway/commands/layout.c b/sway/commands/layout.c index 162173c5..4c49a627 100644 --- a/sway/commands/layout.c +++ b/sway/commands/layout.c @@ -49,7 +49,7 @@ struct cmd_results *cmd_layout(int argc, char **argv) { } } - arrange_windows(parent, parent->box.width, parent->box.height); + arrange_windows(parent, parent->width, parent->height); return cmd_results_new(CMD_SUCCESS, NULL, NULL); } diff --git a/sway/commands/move.c b/sway/commands/move.c index e8668ce7..c954ab94 100644 --- a/sway/commands/move.c +++ b/sway/commands/move.c @@ -95,8 +95,7 @@ static struct cmd_results *cmd_move_container(struct sway_container *current, } struct sway_container *source = container_parent(current, C_OUTPUT); struct sway_container *destination = output_in_direction(argv[3], - source->sway_output->wlr_output, - current->box.x, current->box.y); + source->sway_output->wlr_output, current->x, current->y); if (!destination) { return cmd_results_new(CMD_FAILURE, "move workspace", "Can't find output with name/direction '%s'", argv[3]); @@ -125,8 +124,8 @@ static struct cmd_results *cmd_move_workspace(struct sway_container *current, return cmd_results_new(CMD_INVALID, "move", expected_syntax); } struct sway_container *source = container_parent(current, C_OUTPUT); - int center_x = current->box.width / 2 + current->box.x, - center_y = current->box.height / 2 + current->box.y; + int center_x = current->width / 2 + current->x, + center_y = current->height / 2 + current->y; struct sway_container *destination = output_in_direction(argv[3], source->sway_output->wlr_output, center_x, center_y); if (!destination) { diff --git a/sway/commands/resize.c b/sway/commands/resize.c index 8e295f65..93c1fe7d 100644 --- a/sway/commands/resize.c +++ b/sway/commands/resize.c @@ -48,11 +48,11 @@ static enum resize_axis parse_resize_axis(const char *axis) { } static int parallel_coord(struct sway_container *c, enum resize_axis a) { - return a == RESIZE_AXIS_HORIZONTAL ? c->box.x : c->box.y; + return a == RESIZE_AXIS_HORIZONTAL ? c->x : c->y; } static int parallel_size(struct sway_container *c, enum resize_axis a) { - return a == RESIZE_AXIS_HORIZONTAL ? c->box.width : c->box.height; + return a == RESIZE_AXIS_HORIZONTAL ? c->width : c->height; } static void resize_tiled(int amount, enum resize_axis axis) { @@ -196,10 +196,10 @@ static void resize(int amount, enum resize_axis axis, enum resize_unit unit) { float pct = amount / 100.0f; switch (axis) { case RESIZE_AXIS_HORIZONTAL: - amount = (float)current->box.width * pct; + amount = (float)current->width * pct; break; case RESIZE_AXIS_VERTICAL: - amount = (float)current->box.height * pct; + amount = (float)current->height * pct; break; default: sway_assert(0, "invalid resize axis"); diff --git a/sway/desktop/desktop.c b/sway/desktop/desktop.c index f0a14445..3a13191f 100644 --- a/sway/desktop/desktop.c +++ b/sway/desktop/desktop.c @@ -8,7 +8,7 @@ void desktop_damage_whole_surface(struct wlr_surface *surface, double lx, struct sway_container *cont = root_container.children->items[i]; if (cont->type == C_OUTPUT) { output_damage_whole_surface(cont->sway_output, - lx - cont->box.x, ly - cont->box.y, surface); + lx - cont->x, ly - cont->y, surface); } } } diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 49ffe74c..aa18f1b8 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -192,22 +192,17 @@ static void render_view(struct sway_container *view, void *data) { int window_offset_x = view->sway_view->wlr_xdg_surface_v6->geometry.x; int window_offset_y = view->sway_view->wlr_xdg_surface_v6->geometry.y; render_surface(surface, wlr_output, when, - view->box.x - window_offset_x, - view->box.y - window_offset_y, - 0, alpha); - render_xdg_v6_popups(sway_view->wlr_xdg_surface_v6, wlr_output, when, - view->box.x - window_offset_x, - view->box.y - window_offset_y, - 0, alpha); + view->x - window_offset_x, view->y - window_offset_y, 0, alpha); + render_xdg_v6_popups(sway_view->wlr_xdg_surface_v6, wlr_output, + when, view->x - window_offset_x, view->y - window_offset_y, 0, alpha); break; } case SWAY_VIEW_WL_SHELL: render_wl_shell_surface(sway_view->wlr_wl_shell_surface, wlr_output, - when, view->box.x, view->box.y, 0, alpha, false); + when, view->x, view->y, 0, alpha, false); break; case SWAY_VIEW_XWAYLAND: - render_surface(surface, wlr_output, when, - view->box.x, view->box.y, 0, alpha); + render_surface(surface, wlr_output, when, view->x, view->y, 0, alpha); break; } } diff --git a/sway/input/seat.c b/sway/input/seat.c index 44a471bd..ad3584a0 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -415,8 +415,8 @@ void seat_set_focus_warp(struct sway_seat *seat, if (new_output && last_output && new_output != last_output && config->mouse_warping && warp) { struct wlr_output *output = new_output->sway_output->wlr_output; - int x = container->box.x + output->lx + container->box.width / 2; - int y = container->box.y + output->ly + container->box.height / 2; + double x = container->x + output->lx + container->width / 2.0; + double y = container->y + output->ly + container->height / 2.0; if (!wlr_output_layout_contains_point( root_container.sway_root->output_layout, output, seat->cursor->cursor->x, seat->cursor->cursor->y)) { diff --git a/sway/ipc-json.c b/sway/ipc-json.c index 951adada..f9c6c90b 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c @@ -47,10 +47,10 @@ json_object *ipc_json_get_version() { static json_object *ipc_json_create_rect(struct sway_container *c) { json_object *rect = json_object_new_object(); - json_object_object_add(rect, "x", json_object_new_int(c->box.x)); - json_object_object_add(rect, "y", json_object_new_int(c->box.y)); - json_object_object_add(rect, "width", json_object_new_int(c->box.width)); - json_object_object_add(rect, "height", json_object_new_int(c->box.height)); + json_object_object_add(rect, "x", json_object_new_int((int32_t)c->x)); + json_object_object_add(rect, "y", json_object_new_int((int32_t)c->y)); + json_object_object_add(rect, "width", json_object_new_int((int32_t)c->width)); + json_object_object_add(rect, "height", json_object_new_int((int32_t)c->height)); return rect; } diff --git a/sway/tree/container.c b/sway/tree/container.c index 04fcee81..ab8363bc 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -333,8 +333,8 @@ struct sway_container *container_view_create(struct sway_container *sibling, // Setup values swayc->sway_view = sway_view; swayc->name = title ? strdup(title) : NULL; - swayc->box.width = 0; - swayc->box.height = 0; + swayc->width = 0; + swayc->height = 0; if (sibling->type == C_WORKSPACE) { // Case of focused workspace, just create as child of it @@ -418,8 +418,8 @@ struct sway_container *container_at(struct sway_container *parent, soutput->sway_output->wlr_output); double ox = lx - output_box->x; double oy = ly - output_box->y; - double view_sx = ox - swayc->box.x; - double view_sy = oy - swayc->box.y; + double view_sx = ox - swayc->x; + double view_sy = oy - swayc->y; double _sx, _sy; struct wlr_surface *_surface; diff --git a/sway/tree/layout.c b/sway/tree/layout.c index 9580d3a7..343f349a 100644 --- a/sway/tree/layout.c +++ b/sway/tree/layout.c @@ -24,10 +24,10 @@ static void output_layout_handle_change(struct wl_listener *listener, root_container.sway_root->output_layout; const struct wlr_box *layout_box = wlr_output_layout_get_box(output_layout, NULL); - root_container.box.x = layout_box->x; - root_container.box.y = layout_box->y; - root_container.box.width = layout_box->width; - root_container.box.height = layout_box->height; + root_container.x = layout_box->x; + root_container.y = layout_box->y; + root_container.width = layout_box->width; + root_container.height = layout_box->height; for (int i = 0 ; i < root_container.children->length; ++i) { struct sway_container *output_container = @@ -42,10 +42,10 @@ static void output_layout_handle_change(struct wl_listener *listener, if (!output_box) { continue; } - output_container->box.x = output_box->x; - output_container->box.y = output_box->y; - output_container->box.width = output_box->width; - output_container->box.height = output_box->height; + output_container->x = output_box->x; + output_container->y = output_box->y; + output_container->width = output_box->width; + output_container->height = output_box->height; } arrange_windows(&root_container, -1, -1); @@ -112,9 +112,9 @@ struct sway_container *container_add_sibling(struct sway_container *fixed, void container_add_child(struct sway_container *parent, struct sway_container *child) { - wlr_log(L_DEBUG, "Adding id:%zd (%d, %dx%d) to id:%zd (%d, %dx%d)", - child->id, child->type, child->box.width, child->box.height, - parent->id, parent->type, parent->box.width, parent->box.height); + wlr_log(L_DEBUG, "Adding %p (%d, %fx%f) to %p (%d, %fx%f)", + child, child->type, child->width, child->height, + parent, parent->type, parent->width, parent->height); list_add(parent->children, child); child->parent = parent; } @@ -138,7 +138,7 @@ void container_move_to(struct sway_container *container, return; } struct sway_container *old_parent = container_remove_child(container); - container->box.width = container->box.height = 0; + container->width = container->height = 0; struct sway_container *new_parent; if (destination->type == C_VIEW) { new_parent = container_add_sibling(destination, container); @@ -187,10 +187,11 @@ enum sway_container_layout container_get_default_layout( return config->default_layout; } else if (config->default_orientation != L_NONE) { return config->default_orientation; - } else if (con->box.width >= con->box.height) { + } else if (con->width >= con->height) { return L_HORIZ; + } else { + return L_VERT; } - return L_VERT; } static int sort_workspace_cmp_qsort(const void *_a, const void *_b) { @@ -215,23 +216,25 @@ void container_sort_workspaces(struct sway_container *output) { list_stable_sort(output->children, sort_workspace_cmp_qsort); } -static void apply_horiz_layout(struct sway_container *container, - const int x, const int y, const int width, - const int height, const int start, const int end); +static void apply_horiz_layout(struct sway_container *container, const double x, + const double y, const double width, + const double height, const int start, + const int end); -static void apply_vert_layout(struct sway_container *container, - const int x, const int y, const int width, - const int height, const int start, const int end); +static void apply_vert_layout(struct sway_container *container, const double x, + const double y, const double width, + const double height, const int start, + const int end); void arrange_windows(struct sway_container *container, - int width, int height) { + double width, double height) { if (config->reloading) { return; } int i; if (width == -1 || height == -1) { - width = container->box.width; - height = container->box.height; + width = container->width; + height = container->height; } // pixels are indivisible. if we don't round the pixels, then the view // calculations will be off (e.g. 50.5 + 50.5 = 101, but in reality it's @@ -239,17 +242,17 @@ void arrange_windows(struct sway_container *container, width = floor(width); height = floor(height); - wlr_log(L_DEBUG, "Arranging layout for %p %s %dx%d+%d,%d", container, - container->name, container->box.width, container->box.height, - container->box.x, container->box.y); + wlr_log(L_DEBUG, "Arranging layout for %p %s %fx%f+%f,%f", container, + container->name, container->width, container->height, container->x, + container->y); - int x = 0, y = 0; + double x = 0, y = 0; switch (container->type) { case C_ROOT: for (i = 0; i < container->children->length; ++i) { struct sway_container *output = container->children->items[i]; - wlr_log(L_DEBUG, "Arranging output '%s' at %d,%d", - output->name, output->box.x, output->box.y); + wlr_log(L_DEBUG, "Arranging output '%s' at %f,%f", + output->name, output->x, output->y); arrange_windows(output, -1, -1); } return; @@ -258,8 +261,8 @@ void arrange_windows(struct sway_container *container, int _width, _height; wlr_output_effective_resolution( container->sway_output->wlr_output, &_width, &_height); - width = container->box.width = _width; - height = container->box.height = _height; + width = container->width = _width; + height = container->height = _height; } // arrange all workspaces: for (i = 0; i < container->children->length; ++i) { @@ -274,32 +277,31 @@ void arrange_windows(struct sway_container *container, struct wlr_box *area = &output->sway_output->usable_area; wlr_log(L_DEBUG, "Usable area for ws: %dx%d@%d,%d", area->width, area->height, area->x, area->y); - container->box.width = width = area->width; - container->box.height = height = area->height; - container->box.x = x = area->x; - container->box.y = y = area->y; - wlr_log(L_DEBUG, "Arranging workspace '%s' at %d,%d", - container->name, container->box.x, container->box.y); + container->width = width = area->width; + container->height = height = area->height; + container->x = x = area->x; + container->y = y = area->y; + wlr_log(L_DEBUG, "Arranging workspace '%s' at %f, %f", + container->name, container->x, container->y); } // children are properly handled below break; case C_VIEW: { - container->box.width = width; - container->box.height = height; - view_configure(container->sway_view, - container->box.x, container->box.y, - container->box.width, container->box.height); - wlr_log(L_DEBUG, "Set view to %d x %d @ %d, %d", - container->box.width, container->box.height, - container->box.x, container->box.y); + container->width = width; + container->height = height; + view_configure(container->sway_view, container->x, container->y, + container->width, container->height); + wlr_log(L_DEBUG, "Set view to %.f x %.f @ %.f, %.f", + container->width, container->height, + container->x, container->y); } return; default: - container->box.width = width; - container->box.height = height; - x = container->box.x; - y = container->box.y; + container->width = width; + container->height = height; + x = container->x; + y = container->y; break; } @@ -321,49 +323,50 @@ void arrange_windows(struct sway_container *container, } static void apply_horiz_layout(struct sway_container *container, - const int x, const int y, const int width, const int height, + const double x, const double y, + const double width, const double height, const int start, const int end) { double scale = 0; // Calculate total width for (int i = start; i < end; ++i) { - struct sway_container *child = container->children->items[i]; - int old_width = child->box.width; - if (old_width <= 0) { + double *old_width = + &((struct sway_container *)container->children->items[i])->width; + if (*old_width <= 0) { if (end - start > 1) { - old_width = width / (end - start - 1); + *old_width = width / (end - start - 1); } else { - old_width = width; + *old_width = width; } } - scale += old_width; + scale += *old_width; } scale = width / scale; // Resize windows - int child_x = x; + double child_x = x; if (scale > 0.1) { wlr_log(L_DEBUG, "Arranging %p horizontally", container); for (int i = start; i < end; ++i) { struct sway_container *child = container->children->items[i]; wlr_log(L_DEBUG, - "Calculating arrangement for %p:%d (will scale %d by %f)", + "Calculating arrangement for %p:%d (will scale %f by %f)", child, child->type, width, scale); if (child->type == C_VIEW) { - view_configure(child->sway_view, child_x, y, - child->box.width, child->box.height); + view_configure(child->sway_view, child_x, y, child->width, + child->height); } else { - child->box.x = child_x; - child->box.y = y; + child->x = child_x; + child->y = y; } if (i == end - 1) { - int remaining_width = x + width - child_x; + double remaining_width = x + width - child_x; arrange_windows(child, remaining_width, height); } else { - arrange_windows(child, child->box.width * scale, height); + arrange_windows(child, child->width * scale, height); } - child_x += child->box.width; + child_x += child->width; } // update focused view border last because it may @@ -377,49 +380,50 @@ static void apply_horiz_layout(struct sway_container *container, } void apply_vert_layout(struct sway_container *container, - const int x, const int y, const int width, const int height, - const int start, const int end) { + const double x, const double y, + const double width, const double height, const int start, + const int end) { int i; double scale = 0; // Calculate total height for (i = start; i < end; ++i) { - struct sway_container *child = container->children->items[i]; - int old_height = child->box.height; - if (old_height <= 0) { + double *old_height = + &((struct sway_container *)container->children->items[i])->height; + if (*old_height <= 0) { if (end - start > 1) { - old_height = height / (end - start - 1); + *old_height = height / (end - start - 1); } else { - old_height = height; + *old_height = height; } } - scale += old_height; + scale += *old_height; } scale = height / scale; // Resize - int child_y = y; + double child_y = y; if (scale > 0.1) { wlr_log(L_DEBUG, "Arranging %p vertically", container); for (i = start; i < end; ++i) { struct sway_container *child = container->children->items[i]; wlr_log(L_DEBUG, - "Calculating arrangement for %p:%d (will scale %d by %f)", + "Calculating arrangement for %p:%d (will scale %f by %f)", child, child->type, height, scale); if (child->type == C_VIEW) { - view_configure(child->sway_view, x, child_y, - child->box.width, child->box.height); + view_configure(child->sway_view, x, child_y, child->width, + child->height); } else { - child->box.x = x; - child->box.y = child_y; + child->x = x; + child->y = child_y; } if (i == end - 1) { - int remaining_height = y + height - child_y; + double remaining_height = y + height - child_y; arrange_windows(child, width, remaining_height); } else { - arrange_windows(child, width, child->box.height * scale); + arrange_windows(child, width, child->height * scale); } - child_y += child->box.height; + child_y += child->height; } // update focused view border last because it may @@ -492,18 +496,18 @@ static void get_layout_center_position(struct sway_container *container, int *x, int *y) { // FIXME view coords are inconsistently referred to in layout/output systems if (container->type == C_OUTPUT) { - *x = container->box.x + container->box.width / 2; - *y = container->box.y + container->box.height / 2; + *x = container->x + container->width/2; + *y = container->y + container->height/2; } else { struct sway_container *output = container_parent(container, C_OUTPUT); if (container->type == C_WORKSPACE) { // Workspace coordinates are actually wrong/arbitrary, but should // be same as output. - *x = output->box.x; - *y = output->box.y; + *x = output->x; + *y = output->y; } else { - *x = output->box.x + container->box.x; - *y = output->box.y + container->box.y; + *x = output->x + container->x; + *y = output->y + container->y; } } } @@ -674,14 +678,14 @@ struct sway_container *container_replace_child(struct sway_container *child, child->parent = NULL; // Set geometry for new child - new_child->box.x = child->box.x; - new_child->box.y = child->box.y; - new_child->box.width = child->box.width; - new_child->box.height = child->box.height; + new_child->x = child->x; + new_child->y = child->y; + new_child->width = child->width; + new_child->height = child->height; // reset geometry for child - child->box.width = 0; - child->box.height = 0; + child->width = 0; + child->height = 0; return parent; } @@ -697,10 +701,10 @@ struct sway_container *container_split(struct sway_container *child, wlr_log(L_DEBUG, "creating container %p around %p", cont, child); cont->prev_layout = L_NONE; - cont->box.width = child->box.width; - cont->box.height = child->box.height; - cont->box.x = child->box.x; - cont->box.y = child->box.y; + cont->width = child->width; + cont->height = child->height; + cont->x = child->x; + cont->y = child->y; if (child->type == C_WORKSPACE) { struct sway_seat *seat = input_manager_get_default_seat(input_manager); @@ -733,10 +737,10 @@ void container_recursive_resize(struct sway_container *container, bool layout_match = true; wlr_log(L_DEBUG, "Resizing %p with amount: %f", container, amount); if (edge == RESIZE_EDGE_LEFT || edge == RESIZE_EDGE_RIGHT) { - container->box.width += amount; + container->width += amount; layout_match = container->layout == L_HORIZ; } else if (edge == RESIZE_EDGE_TOP || edge == RESIZE_EDGE_BOTTOM) { - container->box.height += amount; + container->height += amount; layout_match = container->layout == L_VERT; } if (container->children) { diff --git a/sway/tree/view.c b/sway/tree/view.c index 8ceb0d6c..9855c5e1 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -96,8 +96,8 @@ void view_damage_from(struct sway_view *view) { static void view_get_layout_box(struct sway_view *view, struct wlr_box *box) { struct sway_container *output = container_parent(view->swayc, C_OUTPUT); - box->x = output->box.x + view->swayc->box.x; - box->y = output->box.y + view->swayc->box.y; + box->x = output->x + view->swayc->x; + box->y = output->y + view->swayc->y; box->width = view->width; box->height = view->height; } @@ -216,13 +216,13 @@ void view_unmap(struct sway_view *view) { } void view_update_position(struct sway_view *view, double ox, double oy) { - if (view->swayc->box.x == ox && view->swayc->box.y == oy) { + if (view->swayc->x == ox && view->swayc->y == oy) { return; } view_damage_whole(view); - view->swayc->box.x = ox; - view->swayc->box.y = oy; + view->swayc->x = ox; + view->swayc->y = oy; view_damage_whole(view); } diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c index 9e1a8a37..316f01e4 100644 --- a/sway/tree/workspace.c +++ b/sway/tree/workspace.c @@ -50,10 +50,10 @@ struct sway_container *workspace_create(struct sway_container *output, wlr_log(L_DEBUG, "Added workspace %s for output %s", name, output->name); struct sway_container *workspace = container_create(C_WORKSPACE); - workspace->box.x = output->box.x; - workspace->box.y = output->box.y; - workspace->box.width = output->box.width; - workspace->box.height = output->box.height; + workspace->x = output->x; + workspace->y = output->y; + workspace->width = output->width; + workspace->height = output->height; workspace->name = !name ? NULL : strdup(name); workspace->prev_layout = L_NONE; workspace->layout = container_get_default_layout(output);