mirror of
https://github.com/swaywm/sway.git
synced 2025-11-24 06:59:51 -05:00
WIP: Atomic layout updates ground work
This commit is contained in:
parent
0b798ed954
commit
59c9488701
16 changed files with 771 additions and 347 deletions
|
|
@ -5,7 +5,6 @@
|
|||
#include <string.h>
|
||||
#include <wlr/types/wlr_output.h>
|
||||
#include <wlr/types/wlr_output_layout.h>
|
||||
#include "sway/debug.h"
|
||||
#include "sway/tree/arrange.h"
|
||||
#include "sway/tree/container.h"
|
||||
#include "sway/tree/layout.h"
|
||||
|
|
@ -17,7 +16,217 @@
|
|||
|
||||
struct sway_container root_container;
|
||||
|
||||
void arrange_root() {
|
||||
static void apply_horiz_layout(struct sway_container *parent) {
|
||||
size_t num_children = parent->children->length;
|
||||
if (!num_children) {
|
||||
return;
|
||||
}
|
||||
size_t parent_offset = 0;
|
||||
if (parent->parent->pending.layout == L_TABBED) {
|
||||
parent_offset = container_titlebar_height();
|
||||
} else if (parent->parent->pending.layout == L_STACKED) {
|
||||
parent_offset = container_titlebar_height() *
|
||||
parent->parent->children->length;
|
||||
}
|
||||
size_t parent_height = parent->pending.swayc_height - parent_offset;
|
||||
|
||||
// Calculate total width of children
|
||||
double total_width = 0;
|
||||
for (size_t i = 0; i < num_children; ++i) {
|
||||
struct sway_container *child = parent->children->items[i];
|
||||
if (child->pending.swayc_width <= 0) {
|
||||
if (num_children > 1) {
|
||||
child->pending.swayc_width =
|
||||
parent->pending.swayc_width / (num_children - 1);
|
||||
} else {
|
||||
child->pending.swayc_width = parent->pending.swayc_width;
|
||||
}
|
||||
}
|
||||
total_width += child->pending.swayc_width;
|
||||
}
|
||||
double scale = parent->pending.swayc_width / total_width;
|
||||
|
||||
// Resize windows
|
||||
wlr_log(L_DEBUG, "Arranging %p horizontally", parent);
|
||||
double child_x = parent->pending.swayc_x;
|
||||
for (size_t i = 0; i < num_children; ++i) {
|
||||
struct sway_container *child = parent->children->items[i];
|
||||
wlr_log(L_DEBUG,
|
||||
"Calculating arrangement for %p:%d (will scale %f by %f)",
|
||||
child, child->type, child->pending.swayc_width, scale);
|
||||
child->pending.swayc_x = child_x;
|
||||
child->pending.swayc_y = parent->pending.swayc_y + parent_offset;
|
||||
child->pending.swayc_width = floor(child->pending.swayc_width * scale);
|
||||
child->pending.swayc_height = parent_height;
|
||||
child_x += child->pending.swayc_width;
|
||||
|
||||
// Make last child use remaining width of parent
|
||||
if (i == num_children - 1) {
|
||||
child->pending.swayc_width = parent->pending.swayc_x +
|
||||
parent->pending.swayc_width - child->pending.swayc_x;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void apply_vert_layout(struct sway_container *parent) {
|
||||
size_t num_children = parent->children->length;
|
||||
if (!num_children) {
|
||||
return;
|
||||
}
|
||||
size_t parent_offset = 0;
|
||||
if (parent->parent->pending.layout == L_TABBED) {
|
||||
parent_offset = container_titlebar_height();
|
||||
} else if (parent->parent->pending.layout == L_STACKED) {
|
||||
parent_offset =
|
||||
container_titlebar_height() * parent->parent->children->length;
|
||||
}
|
||||
size_t parent_height = parent->pending.swayc_height - parent_offset;
|
||||
|
||||
// Calculate total height of children
|
||||
double total_height = 0;
|
||||
for (size_t i = 0; i < num_children; ++i) {
|
||||
struct sway_container *child = parent->children->items[i];
|
||||
if (child->pending.swayc_height <= 0) {
|
||||
if (num_children > 1) {
|
||||
child->pending.swayc_height =
|
||||
parent_height / (num_children - 1);
|
||||
} else {
|
||||
child->pending.swayc_height = parent_height;
|
||||
}
|
||||
}
|
||||
total_height += child->pending.swayc_height;
|
||||
}
|
||||
double scale = parent_height / total_height;
|
||||
|
||||
// Resize
|
||||
wlr_log(L_DEBUG, "Arranging %p vertically", parent);
|
||||
double child_y = parent->pending.swayc_y + parent_offset;
|
||||
for (size_t i = 0; i < num_children; ++i) {
|
||||
struct sway_container *child = parent->children->items[i];
|
||||
wlr_log(L_DEBUG,
|
||||
"Calculating arrangement for %p:%d (will scale %f by %f)",
|
||||
child, child->type, child->pending.swayc_height, scale);
|
||||
child->pending.swayc_x = parent->pending.swayc_x;
|
||||
child->pending.swayc_y = child_y;
|
||||
child->pending.swayc_width = parent->pending.swayc_width;
|
||||
child->pending.swayc_height =
|
||||
floor(child->pending.swayc_height * scale);
|
||||
child_y += child->pending.swayc_height;
|
||||
|
||||
// Make last child use remaining height of parent
|
||||
if (i == num_children - 1) {
|
||||
child->pending.swayc_height = parent->pending.swayc_y +
|
||||
parent_offset + parent_height - child->pending.swayc_y;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void apply_tabbed_or_stacked_layout(struct sway_container *parent) {
|
||||
if (!parent->children->length) {
|
||||
return;
|
||||
}
|
||||
size_t parent_offset = 0;
|
||||
if (parent->parent->pending.layout == L_TABBED) {
|
||||
parent_offset = container_titlebar_height();
|
||||
} else if (parent->parent->pending.layout == L_STACKED) {
|
||||
parent_offset =
|
||||
container_titlebar_height() * parent->parent->children->length;
|
||||
}
|
||||
size_t parent_height = parent->pending.swayc_height - parent_offset;
|
||||
for (int i = 0; i < parent->children->length; ++i) {
|
||||
struct sway_container *child = parent->children->items[i];
|
||||
child->pending.swayc_x = parent->pending.swayc_x;
|
||||
child->pending.swayc_y = parent->pending.swayc_y + parent_offset;
|
||||
child->pending.swayc_width = parent->pending.swayc_width;
|
||||
child->pending.swayc_height = parent_height;
|
||||
}
|
||||
}
|
||||
|
||||
static void _arrange_children_of(struct sway_container *parent,
|
||||
struct sway_transaction *transaction) {
|
||||
if (config->reloading) {
|
||||
return;
|
||||
}
|
||||
wlr_log(L_DEBUG, "Arranging layout for %p %s %fx%f+%f,%f", parent,
|
||||
parent->name, parent->pending.swayc_width, parent->pending.swayc_height,
|
||||
parent->pending.swayc_x, parent->pending.swayc_y);
|
||||
|
||||
// Calculate x, y, width and height of children
|
||||
switch (parent->pending.layout) {
|
||||
case L_HORIZ:
|
||||
apply_horiz_layout(parent);
|
||||
break;
|
||||
case L_VERT:
|
||||
apply_vert_layout(parent);
|
||||
break;
|
||||
case L_TABBED:
|
||||
case L_STACKED:
|
||||
apply_tabbed_or_stacked_layout(parent);
|
||||
break;
|
||||
case L_NONE:
|
||||
apply_horiz_layout(parent);
|
||||
break;
|
||||
case L_FLOATING:
|
||||
sway_assert(false, "Didn't expect to see floating here");
|
||||
}
|
||||
|
||||
// Recurse into child containers
|
||||
for (int i = 0; i < parent->children->length; ++i) {
|
||||
struct sway_container *child = parent->children->items[i];
|
||||
if (child->type == C_VIEW) {
|
||||
view_autoconfigure(child->sway_view);
|
||||
} else {
|
||||
_arrange_children_of(child, transaction);
|
||||
}
|
||||
transaction_add_container(transaction, child);
|
||||
}
|
||||
}
|
||||
|
||||
static void _arrange_workspace(struct sway_container *workspace,
|
||||
struct sway_transaction *transaction) {
|
||||
if (config->reloading) {
|
||||
return;
|
||||
}
|
||||
struct sway_container *output = workspace->parent;
|
||||
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);
|
||||
workspace->pending.swayc_width = area->width;
|
||||
workspace->pending.swayc_height = area->height;
|
||||
workspace->pending.swayc_x = output->x + area->x;
|
||||
workspace->pending.swayc_y = output->y + area->y;
|
||||
transaction_add_container(transaction, workspace);
|
||||
wlr_log(L_DEBUG, "Arranging workspace '%s' at %f, %f", workspace->name,
|
||||
workspace->pending.swayc_x, workspace->pending.swayc_y);
|
||||
_arrange_children_of(workspace, transaction);
|
||||
}
|
||||
|
||||
static void _arrange_output(struct sway_container *output,
|
||||
struct sway_transaction *transaction) {
|
||||
if (config->reloading) {
|
||||
return;
|
||||
}
|
||||
const struct wlr_box *output_box = wlr_output_layout_get_box(
|
||||
root_container.sway_root->output_layout,
|
||||
output->sway_output->wlr_output);
|
||||
output->x = output_box->x;
|
||||
output->y = output_box->y;
|
||||
output->width = output_box->width;
|
||||
output->height = output_box->height;
|
||||
output->pending.swayc_x = output_box->x;
|
||||
output->pending.swayc_y = output_box->y;
|
||||
output->pending.swayc_width = output_box->width;
|
||||
output->pending.swayc_height = output_box->height;
|
||||
transaction_add_container(transaction, output);
|
||||
wlr_log(L_DEBUG, "Arranging output '%s' at %f,%f",
|
||||
output->name, output->pending.swayc_x, output->pending.swayc_y);
|
||||
for (int i = 0; i < output->children->length; ++i) {
|
||||
struct sway_container *workspace = output->children->items[i];
|
||||
_arrange_workspace(workspace, transaction);
|
||||
}
|
||||
}
|
||||
|
||||
static void _arrange_root(struct sway_transaction *transaction) {
|
||||
if (config->reloading) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -29,236 +238,60 @@ void arrange_root() {
|
|||
root_container.y = layout_box->y;
|
||||
root_container.width = layout_box->width;
|
||||
root_container.height = layout_box->height;
|
||||
root_container.pending.swayc_x = layout_box->x;
|
||||
root_container.pending.swayc_y = layout_box->y;
|
||||
root_container.pending.swayc_width = layout_box->width;
|
||||
root_container.pending.swayc_height = layout_box->height;
|
||||
transaction_add_container(transaction, &root_container);
|
||||
for (int i = 0; i < root_container.children->length; ++i) {
|
||||
struct sway_container *output = root_container.children->items[i];
|
||||
arrange_output(output);
|
||||
_arrange_output(output, transaction);
|
||||
}
|
||||
}
|
||||
|
||||
void arrange_output(struct sway_container *output) {
|
||||
if (config->reloading) {
|
||||
return;
|
||||
}
|
||||
if (!sway_assert(output->type == C_OUTPUT,
|
||||
"called arrange_output() on non-output container")) {
|
||||
return;
|
||||
}
|
||||
const struct wlr_box *output_box = wlr_output_layout_get_box(
|
||||
root_container.sway_root->output_layout,
|
||||
output->sway_output->wlr_output);
|
||||
output->x = output_box->x;
|
||||
output->y = output_box->y;
|
||||
output->width = output_box->width;
|
||||
output->height = output_box->height;
|
||||
wlr_log(L_DEBUG, "Arranging output '%s' at %f,%f",
|
||||
output->name, output->x, output->y);
|
||||
for (int i = 0; i < output->children->length; ++i) {
|
||||
struct sway_container *workspace = output->children->items[i];
|
||||
arrange_workspace(workspace);
|
||||
}
|
||||
container_damage_whole(output);
|
||||
}
|
||||
|
||||
void arrange_workspace(struct sway_container *workspace) {
|
||||
if (config->reloading) {
|
||||
return;
|
||||
}
|
||||
if (!sway_assert(workspace->type == C_WORKSPACE,
|
||||
"called arrange_workspace() on non-workspace container")) {
|
||||
return;
|
||||
}
|
||||
struct sway_container *output = workspace->parent;
|
||||
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);
|
||||
workspace->width = area->width;
|
||||
workspace->height = area->height;
|
||||
workspace->x = output->x + area->x;
|
||||
workspace->y = output->y + area->y;
|
||||
wlr_log(L_DEBUG, "Arranging workspace '%s' at %f, %f",
|
||||
workspace->name, workspace->x, workspace->y);
|
||||
arrange_children_of(workspace);
|
||||
container_damage_whole(workspace);
|
||||
}
|
||||
|
||||
static void apply_horiz_layout(struct sway_container *parent) {
|
||||
size_t num_children = parent->children->length;
|
||||
if (!num_children) {
|
||||
return;
|
||||
}
|
||||
size_t parent_offset = 0;
|
||||
if (parent->parent->layout == L_TABBED) {
|
||||
parent_offset = container_titlebar_height();
|
||||
} else if (parent->parent->layout == L_STACKED) {
|
||||
parent_offset =
|
||||
container_titlebar_height() * parent->parent->children->length;
|
||||
}
|
||||
size_t parent_height = parent->height - parent_offset;
|
||||
|
||||
// Calculate total width of children
|
||||
double total_width = 0;
|
||||
for (size_t i = 0; i < num_children; ++i) {
|
||||
struct sway_container *child = parent->children->items[i];
|
||||
if (child->width <= 0) {
|
||||
if (num_children > 1) {
|
||||
child->width = parent->width / (num_children - 1);
|
||||
} else {
|
||||
child->width = parent->width;
|
||||
}
|
||||
}
|
||||
total_width += child->width;
|
||||
}
|
||||
double scale = parent->width / total_width;
|
||||
|
||||
// Resize windows
|
||||
wlr_log(L_DEBUG, "Arranging %p horizontally", parent);
|
||||
double child_x = parent->x;
|
||||
struct sway_container *child;
|
||||
for (size_t i = 0; i < num_children; ++i) {
|
||||
child = parent->children->items[i];
|
||||
wlr_log(L_DEBUG,
|
||||
"Calculating arrangement for %p:%d (will scale %f by %f)",
|
||||
child, child->type, child->width, scale);
|
||||
child->x = child_x;
|
||||
child->y = parent->y + parent_offset;
|
||||
child->width = floor(child->width * scale);
|
||||
child->height = parent_height;
|
||||
child_x += child->width;
|
||||
}
|
||||
// Make last child use remaining width of parent
|
||||
child->width = parent->x + parent->width - child->x;
|
||||
}
|
||||
|
||||
static void apply_vert_layout(struct sway_container *parent) {
|
||||
size_t num_children = parent->children->length;
|
||||
if (!num_children) {
|
||||
return;
|
||||
}
|
||||
size_t parent_offset = 0;
|
||||
if (parent->parent->layout == L_TABBED) {
|
||||
parent_offset = container_titlebar_height();
|
||||
} else if (parent->parent->layout == L_STACKED) {
|
||||
parent_offset =
|
||||
container_titlebar_height() * parent->parent->children->length;
|
||||
}
|
||||
size_t parent_height = parent->height - parent_offset;
|
||||
|
||||
// Calculate total height of children
|
||||
double total_height = 0;
|
||||
for (size_t i = 0; i < num_children; ++i) {
|
||||
struct sway_container *child = parent->children->items[i];
|
||||
if (child->height <= 0) {
|
||||
if (num_children > 1) {
|
||||
child->height = parent_height / (num_children - 1);
|
||||
} else {
|
||||
child->height = parent_height;
|
||||
}
|
||||
}
|
||||
total_height += child->height;
|
||||
}
|
||||
double scale = parent_height / total_height;
|
||||
|
||||
// Resize
|
||||
wlr_log(L_DEBUG, "Arranging %p vertically", parent);
|
||||
double child_y = parent->y + parent_offset;
|
||||
struct sway_container *child;
|
||||
for (size_t i = 0; i < num_children; ++i) {
|
||||
child = parent->children->items[i];
|
||||
wlr_log(L_DEBUG,
|
||||
"Calculating arrangement for %p:%d (will scale %f by %f)",
|
||||
child, child->type, child->height, scale);
|
||||
child->x = parent->x;
|
||||
child->y = child_y;
|
||||
child->width = parent->width;
|
||||
child->height = floor(child->height * scale);
|
||||
child_y += child->height;
|
||||
}
|
||||
// Make last child use remaining height of parent
|
||||
child->height = parent->y + parent_offset + parent_height - child->y;
|
||||
}
|
||||
|
||||
static void apply_tabbed_or_stacked_layout(struct sway_container *parent) {
|
||||
if (!parent->children->length) {
|
||||
return;
|
||||
}
|
||||
size_t parent_offset = 0;
|
||||
if (parent->parent->layout == L_TABBED) {
|
||||
parent_offset = container_titlebar_height();
|
||||
} else if (parent->parent->layout == L_STACKED) {
|
||||
parent_offset =
|
||||
container_titlebar_height() * parent->parent->children->length;
|
||||
}
|
||||
size_t parent_height = parent->height - parent_offset;
|
||||
for (int i = 0; i < parent->children->length; ++i) {
|
||||
struct sway_container *child = parent->children->items[i];
|
||||
child->x = parent->x;
|
||||
child->y = parent->y + parent_offset;
|
||||
child->width = parent->width;
|
||||
child->height = parent_height;
|
||||
}
|
||||
}
|
||||
|
||||
void arrange_children_of(struct sway_container *parent) {
|
||||
if (config->reloading) {
|
||||
return;
|
||||
}
|
||||
if (!sway_assert(parent->type == C_WORKSPACE || parent->type == C_CONTAINER,
|
||||
"container is a %s", container_type_to_str(parent->type))) {
|
||||
return;
|
||||
}
|
||||
|
||||
struct sway_container *workspace = parent;
|
||||
if (workspace->type != C_WORKSPACE) {
|
||||
workspace = container_parent(workspace, C_WORKSPACE);
|
||||
}
|
||||
if (workspace->sway_workspace->fullscreen) {
|
||||
// Just arrange the fullscreen view and jump out
|
||||
view_autoconfigure(workspace->sway_workspace->fullscreen);
|
||||
return;
|
||||
}
|
||||
|
||||
wlr_log(L_DEBUG, "Arranging layout for %p %s %fx%f+%f,%f", parent,
|
||||
parent->name, parent->width, parent->height, parent->x, parent->y);
|
||||
|
||||
// Calculate x, y, width and height of children
|
||||
switch (parent->layout) {
|
||||
case L_HORIZ:
|
||||
apply_horiz_layout(parent);
|
||||
void arrange_windows(struct sway_container *container,
|
||||
struct sway_transaction *transaction) {
|
||||
switch (container->type) {
|
||||
case C_ROOT:
|
||||
_arrange_root(transaction);
|
||||
break;
|
||||
case L_VERT:
|
||||
apply_vert_layout(parent);
|
||||
case C_OUTPUT:
|
||||
_arrange_output(container, transaction);
|
||||
break;
|
||||
case L_TABBED:
|
||||
case L_STACKED:
|
||||
apply_tabbed_or_stacked_layout(parent);
|
||||
case C_WORKSPACE:
|
||||
_arrange_workspace(container, transaction);
|
||||
break;
|
||||
default:
|
||||
wlr_log(L_DEBUG, "TODO: arrange layout type %d", parent->layout);
|
||||
apply_horiz_layout(parent);
|
||||
case C_CONTAINER:
|
||||
_arrange_children_of(container, transaction);
|
||||
transaction_add_container(transaction, container);
|
||||
break;
|
||||
case C_VIEW:
|
||||
break;
|
||||
case C_TYPES:
|
||||
break;
|
||||
}
|
||||
|
||||
// Apply x, y, width and height to children and recurse if needed
|
||||
for (int i = 0; i < parent->children->length; ++i) {
|
||||
struct sway_container *child = parent->children->items[i];
|
||||
if (child->type == C_VIEW) {
|
||||
view_autoconfigure(child->sway_view);
|
||||
} else {
|
||||
arrange_children_of(child);
|
||||
}
|
||||
}
|
||||
|
||||
// If container is a workspace, process floating containers too
|
||||
if (parent->type == C_WORKSPACE) {
|
||||
struct sway_workspace *ws = workspace->sway_workspace;
|
||||
for (int i = 0; i < ws->floating->children->length; ++i) {
|
||||
struct sway_container *child = ws->floating->children->items[i];
|
||||
if (child->type != C_VIEW) {
|
||||
arrange_children_of(child);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
container_damage_whole(parent);
|
||||
update_debug_tree();
|
||||
transaction_add_damage(transaction, container_get_box(container));
|
||||
}
|
||||
|
||||
void arrange_and_commit(struct sway_container *container) {
|
||||
struct sway_transaction *transaction = transaction_create();
|
||||
arrange_windows(container, transaction);
|
||||
transaction_commit(transaction);
|
||||
}
|
||||
|
||||
// These functions are only temporary
|
||||
void arrange_root() {
|
||||
arrange_and_commit(&root_container);
|
||||
}
|
||||
|
||||
void arrange_output(struct sway_container *container) {
|
||||
arrange_and_commit(container);
|
||||
}
|
||||
|
||||
void arrange_workspace(struct sway_container *container) {
|
||||
arrange_and_commit(container);
|
||||
}
|
||||
|
||||
void arrange_children_of(struct sway_container *container) {
|
||||
arrange_and_commit(container);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -116,6 +116,7 @@ struct sway_container *container_create(enum sway_container_type type) {
|
|||
|
||||
if (type != C_VIEW) {
|
||||
c->children = create_list();
|
||||
//c->pending.children = create_list();
|
||||
}
|
||||
|
||||
wl_signal_init(&c->events.destroy);
|
||||
|
|
@ -162,6 +163,7 @@ static void _container_destroy(struct sway_container *cont) {
|
|||
wlr_texture_destroy(cont->title_urgent);
|
||||
|
||||
list_free(cont->children);
|
||||
//list_free(cont->pending.children);
|
||||
cont->children = NULL;
|
||||
free(cont);
|
||||
}
|
||||
|
|
@ -971,3 +973,12 @@ bool container_is_floating(struct sway_container *container) {
|
|||
}
|
||||
return container->parent == workspace->sway_workspace->floating;
|
||||
}
|
||||
|
||||
struct wlr_box *container_get_box(struct sway_container *container) {
|
||||
struct wlr_box *box = calloc(1, sizeof(struct wlr_box));
|
||||
box->x = container->x;
|
||||
box->y = container->y;
|
||||
box->width = container->width;
|
||||
box->height = container->height;
|
||||
return box;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -915,10 +915,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->width += amount;
|
||||
container->pending.swayc_width += amount;
|
||||
layout_match = container->layout == L_HORIZ;
|
||||
} else if (edge == RESIZE_EDGE_TOP || edge == RESIZE_EDGE_BOTTOM) {
|
||||
container->height += amount;
|
||||
container->pending.swayc_height += amount;
|
||||
layout_match = container->layout == L_VERT;
|
||||
}
|
||||
if (container->children) {
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ void view_init(struct sway_view *view, enum sway_view_type type,
|
|||
view->impl = impl;
|
||||
view->executed_criteria = create_list();
|
||||
view->marks = create_list();
|
||||
view->instructions = create_list();
|
||||
wl_signal_init(&view->events.unmap);
|
||||
}
|
||||
|
||||
|
|
@ -37,6 +38,11 @@ void view_destroy(struct sway_view *view) {
|
|||
view_unmap(view);
|
||||
}
|
||||
|
||||
if (!sway_assert(view->instructions->length == 0,
|
||||
"Tried to destroy view with pending instructions")) {
|
||||
return;
|
||||
}
|
||||
|
||||
list_free(view->executed_criteria);
|
||||
|
||||
for (int i = 0; i < view->marks->length; ++i) {
|
||||
|
|
@ -44,6 +50,8 @@ void view_destroy(struct sway_view *view) {
|
|||
}
|
||||
list_free(view->marks);
|
||||
|
||||
list_free(view->instructions);
|
||||
|
||||
wlr_texture_destroy(view->marks_focused);
|
||||
wlr_texture_destroy(view->marks_focused_inactive);
|
||||
wlr_texture_destroy(view->marks_unfocused);
|
||||
|
|
@ -119,11 +127,12 @@ const char *view_get_shell(struct sway_view *view) {
|
|||
return "unknown";
|
||||
}
|
||||
|
||||
void view_configure(struct sway_view *view, double lx, double ly, int width,
|
||||
uint32_t view_configure(struct sway_view *view, double lx, double ly, int width,
|
||||
int height) {
|
||||
if (view->impl->configure) {
|
||||
view->impl->configure(view, lx, ly, width, height);
|
||||
return view->impl->configure(view, lx, ly, width, height);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void view_autoconfigure_floating(struct sway_view *view) {
|
||||
|
|
@ -178,21 +187,23 @@ void view_autoconfigure(struct sway_view *view) {
|
|||
}
|
||||
}
|
||||
|
||||
view->border_top = view->border_bottom = true;
|
||||
view->border_left = view->border_right = true;
|
||||
struct sway_container_state *state = &view->swayc->pending;
|
||||
|
||||
state->border_top = state->border_bottom = true;
|
||||
state->border_left = state->border_right = true;
|
||||
if (config->hide_edge_borders == E_BOTH
|
||||
|| config->hide_edge_borders == E_VERTICAL
|
||||
|| (config->hide_edge_borders == E_SMART && !other_views)) {
|
||||
view->border_left = view->swayc->x != ws->x;
|
||||
int right_x = view->swayc->x + view->swayc->width;
|
||||
view->border_right = right_x != ws->x + ws->width;
|
||||
state->border_left = state->swayc_x != ws->x;
|
||||
int right_x = state->swayc_x + state->swayc_width;
|
||||
state->border_right = right_x != ws->x + ws->width;
|
||||
}
|
||||
if (config->hide_edge_borders == E_BOTH
|
||||
|| config->hide_edge_borders == E_HORIZONTAL
|
||||
|| (config->hide_edge_borders == E_SMART && !other_views)) {
|
||||
view->border_top = view->swayc->y != ws->y;
|
||||
int bottom_y = view->swayc->y + view->swayc->height;
|
||||
view->border_bottom = bottom_y != ws->y + ws->height;
|
||||
state->border_top = state->swayc_y != ws->y;
|
||||
int bottom_y = state->swayc_y + state->swayc_height;
|
||||
state->border_bottom = bottom_y != ws->y + ws->height;
|
||||
}
|
||||
|
||||
double x, y, width, height;
|
||||
|
|
@ -202,53 +213,54 @@ void view_autoconfigure(struct sway_view *view) {
|
|||
// In a tabbed or stacked container, the swayc's y is the top of the title
|
||||
// area. We have to offset the surface y by the height of the title bar, and
|
||||
// disable any top border because we'll always have the title bar.
|
||||
if (view->swayc->parent->layout == L_TABBED) {
|
||||
if (view->swayc->parent->pending.layout == L_TABBED) {
|
||||
y_offset = container_titlebar_height();
|
||||
view->border_top = false;
|
||||
} else if (view->swayc->parent->layout == L_STACKED) {
|
||||
state->border_top = false;
|
||||
} else if (view->swayc->parent->pending.layout == L_STACKED) {
|
||||
y_offset = container_titlebar_height()
|
||||
* view->swayc->parent->children->length;
|
||||
view->border_top = false;
|
||||
}
|
||||
|
||||
switch (view->border) {
|
||||
switch (state->border) {
|
||||
case B_NONE:
|
||||
x = view->swayc->x;
|
||||
y = view->swayc->y + y_offset;
|
||||
width = view->swayc->width;
|
||||
height = view->swayc->height - y_offset;
|
||||
x = state->swayc_x;
|
||||
y = state->swayc_y + y_offset;
|
||||
width = state->swayc_width;
|
||||
height = state->swayc_height - y_offset;
|
||||
break;
|
||||
case B_PIXEL:
|
||||
x = view->swayc->x + view->border_thickness * view->border_left;
|
||||
y = view->swayc->y + view->border_thickness * view->border_top + y_offset;
|
||||
width = view->swayc->width
|
||||
- view->border_thickness * view->border_left
|
||||
- view->border_thickness * view->border_right;
|
||||
height = view->swayc->height - y_offset
|
||||
- view->border_thickness * view->border_top
|
||||
- view->border_thickness * view->border_bottom;
|
||||
x = state->swayc_x + state->border_thickness * state->border_left;
|
||||
y = state->swayc_y + state->border_thickness * state->border_top + y_offset;
|
||||
width = state->swayc_width
|
||||
- state->border_thickness * state->border_left
|
||||
- state->border_thickness * state->border_right;
|
||||
height = state->swayc_height - y_offset
|
||||
- state->border_thickness * state->border_top
|
||||
- state->border_thickness * state->border_bottom;
|
||||
break;
|
||||
case B_NORMAL:
|
||||
// Height is: 1px border + 3px pad + title height + 3px pad + 1px border
|
||||
x = view->swayc->x + view->border_thickness * view->border_left;
|
||||
width = view->swayc->width
|
||||
- view->border_thickness * view->border_left
|
||||
- view->border_thickness * view->border_right;
|
||||
x = state->swayc_x + state->border_thickness * state->border_left;
|
||||
width = state->swayc_width
|
||||
- state->border_thickness * state->border_left
|
||||
- state->border_thickness * state->border_right;
|
||||
if (y_offset) {
|
||||
y = view->swayc->y + y_offset;
|
||||
height = view->swayc->height - y_offset
|
||||
- view->border_thickness * view->border_bottom;
|
||||
y = state->swayc_y + y_offset;
|
||||
height = state->swayc_height - y_offset
|
||||
- state->border_thickness * state->border_bottom;
|
||||
} else {
|
||||
y = view->swayc->y + container_titlebar_height();
|
||||
height = view->swayc->height - container_titlebar_height()
|
||||
- view->border_thickness * view->border_bottom;
|
||||
y = state->swayc_y + container_titlebar_height();
|
||||
height = state->swayc_height - container_titlebar_height()
|
||||
- state->border_thickness * state->border_bottom;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
view->x = x;
|
||||
view->y = y;
|
||||
view_configure(view, x, y, width, height);
|
||||
state->view_x = x;
|
||||
state->view_y = y;
|
||||
state->view_width = width;
|
||||
state->view_height = height;
|
||||
}
|
||||
|
||||
void view_set_activated(struct sway_view *view, bool activated) {
|
||||
|
|
@ -307,8 +319,8 @@ void view_set_fullscreen_raw(struct sway_view *view, bool fullscreen) {
|
|||
view_configure(view, view->saved_x, view->saved_y,
|
||||
view->saved_width, view->saved_height);
|
||||
} else {
|
||||
view->swayc->width = view->swayc->saved_width;
|
||||
view->swayc->height = view->swayc->saved_height;
|
||||
view->swayc->width = view->swayc->saved_width;
|
||||
view->swayc->height = view->swayc->saved_height;
|
||||
view_autoconfigure(view);
|
||||
}
|
||||
}
|
||||
|
|
@ -496,6 +508,8 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) {
|
|||
view->swayc = cont;
|
||||
view->border = config->border;
|
||||
view->border_thickness = config->border_thickness;
|
||||
view->swayc->pending.border = config->border;
|
||||
view->swayc->pending.border_thickness = config->border_thickness;
|
||||
|
||||
view_init_subsurfaces(view, wlr_surface);
|
||||
wl_signal_add(&wlr_surface->events.new_subsurface,
|
||||
|
|
@ -963,7 +977,7 @@ bool view_is_visible(struct sway_view *view) {
|
|||
}
|
||||
// Check the workspace is visible
|
||||
if (!is_sticky) {
|
||||
return workspace_is_visible(workspace);
|
||||
return workspace_is_visible(workspace);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -60,6 +60,12 @@ struct sway_container *workspace_create(struct sway_container *output,
|
|||
workspace->prev_layout = L_NONE;
|
||||
workspace->layout = container_get_default_layout(output);
|
||||
|
||||
workspace->pending.swayc_x = workspace->x;
|
||||
workspace->pending.swayc_y = workspace->y;
|
||||
workspace->pending.swayc_width = workspace->width;
|
||||
workspace->pending.swayc_height = workspace->height;
|
||||
workspace->pending.layout = workspace->layout;
|
||||
|
||||
struct sway_workspace *swayws = calloc(1, sizeof(struct sway_workspace));
|
||||
if (!swayws) {
|
||||
return NULL;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue