aboutsummaryrefslogtreecommitdiff
path: root/sway/desktop/output.c
diff options
context:
space:
mode:
Diffstat (limited to 'sway/desktop/output.c')
-rw-r--r--sway/desktop/output.c957
1 files changed, 89 insertions, 868 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 1e7494b3..a206ac6b 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -56,33 +56,15 @@ static void rotate_child_position(double *sx, double *sy, double sw, double sh,
*sy = ry + ph/2 - sh/2;
}
-/**
- * Contains a surface's root geometry information. For instance, when rendering
- * a popup, this will contain the parent view's position and size.
- */
-struct root_geometry {
- double x, y;
- int width, height;
- float rotation;
-};
-
-struct render_data {
- struct root_geometry root_geo;
- struct sway_output *output;
- pixman_region32_t *damage;
- struct sway_view *view;
- float alpha;
-};
-
-static bool get_surface_box(struct root_geometry *geo,
+bool output_get_surface_box(struct root_geometry *geo,
struct sway_output *output, struct wlr_surface *surface, int sx, int sy,
struct wlr_box *surface_box) {
if (!wlr_surface_has_buffer(surface)) {
return false;
}
- int sw = surface->current->width;
- int sh = surface->current->height;
+ int sw = surface->current.width;
+ int sh = surface->current.height;
double _sx = sx, _sy = sy;
rotate_child_position(&_sx, &_sy, sw, sh, geo->width, geo->height,
@@ -110,24 +92,23 @@ static bool get_surface_box(struct root_geometry *geo,
return wlr_box_intersection(&output_box, &rotated_box, &intersection);
}
-static void surface_for_each_surface(struct wlr_surface *surface,
+void output_surface_for_each_surface(struct wlr_surface *surface,
double ox, double oy, struct root_geometry *geo,
wlr_surface_iterator_func_t iterator, void *user_data) {
geo->x = ox;
geo->y = oy;
- geo->width = surface->current->width;
- geo->height = surface->current->height;
+ geo->width = surface->current.width;
+ geo->height = surface->current.height;
geo->rotation = 0;
wlr_surface_for_each_surface(surface, iterator, user_data);
}
-static void output_view_for_each_surface(struct sway_view *view,
- struct root_geometry *geo, wlr_surface_iterator_func_t iterator,
- void *user_data) {
- struct render_data *data = user_data;
- geo->x = view->swayc->current.view_x - data->output->swayc->current.swayc_x;
- geo->y = view->swayc->current.view_y - data->output->swayc->current.swayc_y;
+void output_view_for_each_surface(struct sway_view *view,
+ struct sway_output *output, struct root_geometry *geo,
+ wlr_surface_iterator_func_t iterator, void *user_data) {
+ geo->x = view->swayc->current.view_x - output->swayc->current.swayc_x;
+ geo->y = view->swayc->current.view_y - output->swayc->current.swayc_y;
geo->width = view->swayc->current.view_width;
geo->height = view->swayc->current.view_height;
geo->rotation = 0; // TODO
@@ -135,20 +116,20 @@ static void output_view_for_each_surface(struct sway_view *view,
view_for_each_surface(view, iterator, user_data);
}
-static void layer_for_each_surface(struct wl_list *layer_surfaces,
+void output_layer_for_each_surface(struct wl_list *layer_surfaces,
struct root_geometry *geo, wlr_surface_iterator_func_t iterator,
void *user_data) {
struct sway_layer_surface *layer_surface;
wl_list_for_each(layer_surface, layer_surfaces, link) {
struct wlr_layer_surface *wlr_layer_surface =
layer_surface->layer_surface;
- surface_for_each_surface(wlr_layer_surface->surface,
+ output_surface_for_each_surface(wlr_layer_surface->surface,
layer_surface->geo.x, layer_surface->geo.y, geo, iterator,
user_data);
}
}
-static void unmanaged_for_each_surface(struct wl_list *unmanaged,
+void output_unmanaged_for_each_surface(struct wl_list *unmanaged,
struct sway_output *output, struct root_geometry *geo,
wlr_surface_iterator_func_t iterator, void *user_data) {
struct sway_xwayland_unmanaged *unmanaged_surface;
@@ -158,12 +139,12 @@ static void unmanaged_for_each_surface(struct wl_list *unmanaged,
double ox = unmanaged_surface->lx - output->swayc->current.swayc_x;
double oy = unmanaged_surface->ly - output->swayc->current.swayc_y;
- surface_for_each_surface(xsurface->surface, ox, oy, geo,
+ output_surface_for_each_surface(xsurface->surface, ox, oy, geo,
iterator, user_data);
}
}
-static void drag_icons_for_each_surface(struct wl_list *drag_icons,
+void output_drag_icons_for_each_surface(struct wl_list *drag_icons,
struct sway_output *output, struct root_geometry *geo,
wlr_surface_iterator_func_t iterator, void *user_data) {
struct sway_drag_icon *drag_icon;
@@ -172,7 +153,7 @@ static void drag_icons_for_each_surface(struct wl_list *drag_icons,
double oy = drag_icon->y - output->swayc->y;
if (drag_icon->wlr_drag_icon->mapped) {
- surface_for_each_surface(drag_icon->wlr_drag_icon->surface,
+ output_surface_for_each_surface(drag_icon->wlr_drag_icon->surface,
ox, oy, geo, iterator, user_data);
}
}
@@ -185,722 +166,7 @@ static void scale_box(struct wlr_box *box, float scale) {
box->height *= scale;
}
-static void scissor_output(struct wlr_output *wlr_output,
- pixman_box32_t *rect) {
- struct wlr_renderer *renderer = wlr_backend_get_renderer(wlr_output->backend);
- assert(renderer);
-
- struct wlr_box box = {
- .x = rect->x1,
- .y = rect->y1,
- .width = rect->x2 - rect->x1,
- .height = rect->y2 - rect->y1,
- };
-
- int ow, oh;
- wlr_output_transformed_resolution(wlr_output, &ow, &oh);
-
- enum wl_output_transform transform =
- wlr_output_transform_invert(wlr_output->transform);
- wlr_box_transform(&box, transform, ow, oh, &box);
-
- wlr_renderer_scissor(renderer, &box);
-}
-
-static void render_texture(struct wlr_output *wlr_output,
- pixman_region32_t *output_damage, struct wlr_texture *texture,
- const struct wlr_box *box, const float matrix[static 9], float alpha) {
- struct wlr_renderer *renderer =
- wlr_backend_get_renderer(wlr_output->backend);
-
- pixman_region32_t damage;
- pixman_region32_init(&damage);
- pixman_region32_union_rect(&damage, &damage, box->x, box->y,
- box->width, box->height);
- pixman_region32_intersect(&damage, &damage, output_damage);
- bool damaged = pixman_region32_not_empty(&damage);
- if (!damaged) {
- goto damage_finish;
- }
-
- int nrects;
- pixman_box32_t *rects = pixman_region32_rectangles(&damage, &nrects);
- for (int i = 0; i < nrects; ++i) {
- scissor_output(wlr_output, &rects[i]);
- wlr_render_texture_with_matrix(renderer, texture, matrix, alpha);
- }
-
-damage_finish:
- pixman_region32_fini(&damage);
-}
-
-static void render_surface_iterator(struct wlr_surface *surface, int sx, int sy,
- void *_data) {
- struct render_data *data = _data;
- struct wlr_output *wlr_output = data->output->wlr_output;
- float rotation = data->root_geo.rotation;
- pixman_region32_t *output_damage = data->damage;
- float alpha = data->alpha;
-
- struct wlr_texture *texture = wlr_surface_get_texture(surface);
- if (!texture) {
- return;
- }
-
- struct wlr_box box;
- bool intersects = get_surface_box(&data->root_geo, data->output, surface,
- sx, sy, &box);
- if (!intersects) {
- return;
- }
-
- scale_box(&box, wlr_output->scale);
-
- float matrix[9];
- enum wl_output_transform transform =
- wlr_output_transform_invert(surface->current->transform);
- wlr_matrix_project_box(matrix, &box, transform, rotation,
- wlr_output->transform_matrix);
-
- render_texture(wlr_output, output_damage, texture, &box, matrix, alpha);
-}
-
-static void render_layer(struct sway_output *output,
- pixman_region32_t *damage, struct wl_list *layer_surfaces) {
- struct render_data data = {
- .output = output,
- .damage = damage,
- .alpha = 1.0f,
- };
- layer_for_each_surface(layer_surfaces, &data.root_geo,
- render_surface_iterator, &data);
-}
-
-static void render_unmanaged(struct sway_output *output,
- pixman_region32_t *damage, struct wl_list *unmanaged) {
- struct render_data data = {
- .output = output,
- .damage = damage,
- .alpha = 1.0f,
- };
- unmanaged_for_each_surface(unmanaged, output, &data.root_geo,
- render_surface_iterator, &data);
-}
-
-static void render_drag_icons(struct sway_output *output,
- pixman_region32_t *damage, struct wl_list *drag_icons) {
- struct render_data data = {
- .output = output,
- .damage = damage,
- .alpha = 1.0f,
- };
- drag_icons_for_each_surface(drag_icons, output, &data.root_geo,
- render_surface_iterator, &data);
-}
-
-static void render_rect(struct wlr_output *wlr_output,
- pixman_region32_t *output_damage, const struct wlr_box *_box,
- float color[static 4]) {
- struct wlr_renderer *renderer =
- wlr_backend_get_renderer(wlr_output->backend);
-
- struct wlr_box box;
- memcpy(&box, _box, sizeof(struct wlr_box));
- box.x -= wlr_output->lx * wlr_output->scale;
- box.y -= wlr_output->ly * wlr_output->scale;
-
- pixman_region32_t damage;
- pixman_region32_init(&damage);
- pixman_region32_union_rect(&damage, &damage, box.x, box.y,
- box.width, box.height);
- pixman_region32_intersect(&damage, &damage, output_damage);
- bool damaged = pixman_region32_not_empty(&damage);
- if (!damaged) {
- goto damage_finish;
- }
-
- int nrects;
- pixman_box32_t *rects = pixman_region32_rectangles(&damage, &nrects);
- for (int i = 0; i < nrects; ++i) {
- scissor_output(wlr_output, &rects[i]);
- wlr_render_rect(renderer, &box, color,
- wlr_output->transform_matrix);
- }
-
-damage_finish:
- pixman_region32_fini(&damage);
-}
-
-static void premultiply_alpha(float color[4], float opacity) {
- color[3] *= opacity;
- color[0] *= color[3];
- color[1] *= color[3];
- color[2] *= color[3];
-}
-
-static void render_view_surfaces(struct sway_view *view,
- struct sway_output *output, pixman_region32_t *damage, float alpha) {
- struct render_data data = {
- .output = output,
- .damage = damage,
- .view = view,
- .alpha = alpha,
- };
- output_view_for_each_surface(
- view, &data.root_geo, render_surface_iterator, &data);
-}
-
-static void render_saved_view(struct sway_view *view,
- struct sway_output *output, pixman_region32_t *damage, float alpha) {
- struct wlr_output *wlr_output = output->wlr_output;
-
- int width, height;
- struct wlr_texture *texture =
- transaction_get_saved_texture(view, &width, &height);
- if (!texture) {
- return;
- }
- struct wlr_box box = {
- .x = view->swayc->current.view_x - output->swayc->current.swayc_x,
- .y = view->swayc->current.view_y - output->swayc->current.swayc_y,
- .width = width,
- .height = height,
- };
-
- struct wlr_box output_box = {
- .width = output->swayc->current.swayc_width,
- .height = output->swayc->current.swayc_height,
- };
-
- struct wlr_box intersection;
- bool intersects = wlr_box_intersection(&output_box, &box, &intersection);
- if (!intersects) {
- return;
- }
-
- scale_box(&box, wlr_output->scale);
-
- float matrix[9];
- wlr_matrix_project_box(matrix, &box, WL_OUTPUT_TRANSFORM_NORMAL, 0,
- wlr_output->transform_matrix);
-
- render_texture(wlr_output, damage, texture, &box, matrix, alpha);
-}
-
-/**
- * Render a view's surface and left/bottom/right borders.
- */
-static void render_view(struct sway_output *output, pixman_region32_t *damage,
- struct sway_container *con, struct border_colors *colors) {
- struct sway_view *view = con->sway_view;
- if (view->swayc->instructions->length) {
- render_saved_view(view, output, damage, view->swayc->alpha);
- } else {
- render_view_surfaces(view, output, damage, view->swayc->alpha);
- }
-
- struct wlr_box box;
- float output_scale = output->wlr_output->scale;
- float color[4];
- struct sway_container_state *state = &con->current;
-
- if (state->border != B_NONE) {
- if (state->border_left) {
- memcpy(&color, colors->child_border, sizeof(float) * 4);
- premultiply_alpha(color, con->alpha);
- box.x = state->swayc_x;
- box.y = state->view_y;
- box.width = state->border_thickness;
- box.height = state->view_height;
- scale_box(&box, output_scale);
- render_rect(output->wlr_output, damage, &box, color);
- }
-
- if (state->border_right) {
- if (state->parent->current.children->length == 1
- && state->parent->current.layout == L_HORIZ) {
- memcpy(&color, colors->indicator, sizeof(float) * 4);
- } else {
- memcpy(&color, colors->child_border, sizeof(float) * 4);
- }
- premultiply_alpha(color, con->alpha);
- box.x = state->view_x + state->view_width;
- box.y = state->view_y;
- box.width = state->border_thickness;
- box.height = state->view_height;
- scale_box(&box, output_scale);
- render_rect(output->wlr_output, damage, &box, color);
- }
-
- if (state->border_bottom) {
- if (state->parent->current.children->length == 1
- && con->current.parent->current.layout == L_VERT) {
- memcpy(&color, colors->indicator, sizeof(float) * 4);
- } else {
- memcpy(&color, colors->child_border, sizeof(float) * 4);
- }
- premultiply_alpha(color, con->alpha);
- box.x = state->swayc_x;
- box.y = state->view_y + state->view_height;
- box.width = state->swayc_width;
- box.height = state->border_thickness;
- scale_box(&box, output_scale);
- render_rect(output->wlr_output, damage, &box, color);
- }
- }
-}
-
-/**
- * Render a titlebar.
- *
- * Care must be taken not to render over the same pixel multiple times,
- * otherwise the colors will be incorrect when using opacity.
- *
- * The height is: 1px border, 3px padding, font height, 3px padding, 1px border
- * The left side for L_TABBED is: 1px border, 2px padding, title
- * The left side for other layouts is: 3px padding, title
- */
-static void render_titlebar(struct sway_output *output,
- pixman_region32_t *output_damage, struct sway_container *con,
- int x, int y, int width,
- struct border_colors *colors, struct wlr_texture *title_texture,
- struct wlr_texture *marks_texture) {
- struct wlr_box box;
- float color[4];
- struct sway_container_state *state = &con->current;
- float output_scale = output->wlr_output->scale;
- enum sway_container_layout layout = state->parent->current.layout;
- list_t *children = state->parent->current.children;
- bool is_last_child = children->items[children->length - 1] == con;
- double output_x = output->swayc->current.swayc_x;
- double output_y = output->swayc->current.swayc_y;
-
- // Single pixel bar above title
- memcpy(&color, colors->border, sizeof(float) * 4);
- premultiply_alpha(color, con->alpha);
- box.x = x;
- box.y = y;
- box.width = width;
- box.height = TITLEBAR_BORDER_THICKNESS;
- scale_box(&box, output_scale);
- render_rect(output->wlr_output, output_damage, &box, color);
-
- // Single pixel bar below title
- size_t left_offset = 0, right_offset = 0;
- bool connects_sides = false;
- if (layout == L_HORIZ || layout == L_VERT ||
- (layout == L_STACKED && is_last_child)) {
- if (con->type == C_VIEW) {
- left_offset = state->border_left * state->border_thickness;
- right_offset = state->border_right * state->border_thickness;
- connects_sides = true;
- }
- }
- box.x = x + left_offset;
- box.y = y + container_titlebar_height() - TITLEBAR_BORDER_THICKNESS;
- box.width = width - left_offset - right_offset;
- box.height = TITLEBAR_BORDER_THICKNESS;
- scale_box(&box, output_scale);
- render_rect(output->wlr_output, output_damage, &box, color);
-
- if (layout == L_TABBED) {
- // Single pixel left edge
- box.x = x;
- box.y = y + TITLEBAR_BORDER_THICKNESS;
- box.width = TITLEBAR_BORDER_THICKNESS;
- box.height =
- container_titlebar_height() - TITLEBAR_BORDER_THICKNESS * 2;
- scale_box(&box, output_scale);
- render_rect(output->wlr_output, output_damage, &box, color);
-
- // Single pixel right edge
- box.x = (x + width - TITLEBAR_BORDER_THICKNESS) * output_scale;
- render_rect(output->wlr_output, output_damage, &box, color);
- }
-
- size_t inner_width = width - TITLEBAR_H_PADDING * 2;
-
- // Marks
- size_t marks_width = 0;
- if (config->show_marks && marks_texture) {
- struct wlr_box texture_box;
- wlr_texture_get_size(marks_texture,
- &texture_box.width, &texture_box.height);
- texture_box.x = (x - output_x + width - TITLEBAR_H_PADDING)
- * output_scale - texture_box.width;
- texture_box.y = (y - output_y + TITLEBAR_V_PADDING) * output_scale;
-
- float matrix[9];
- wlr_matrix_project_box(matrix, &texture_box,
- WL_OUTPUT_TRANSFORM_NORMAL,
- 0.0, output->wlr_output->transform_matrix);
-
- if (inner_width * output_scale < texture_box.width) {
- texture_box.width = inner_width * output_scale;
- }
- render_texture(output->wlr_output, output_damage, marks_texture,
- &texture_box, matrix, con->alpha);
- marks_width = texture_box.width;
- }
-
- // Title text
- size_t title_width = 0;
- if (title_texture) {
- struct wlr_box texture_box;
- wlr_texture_get_size(title_texture,
- &texture_box.width, &texture_box.height);
- texture_box.x = (x - output_x + TITLEBAR_H_PADDING) * output_scale;
- texture_box.y = (y - output_y + TITLEBAR_V_PADDING) * output_scale;
-
- float matrix[9];
- wlr_matrix_project_box(matrix, &texture_box,
- WL_OUTPUT_TRANSFORM_NORMAL,
- 0.0, output->wlr_output->transform_matrix);
-
- if (inner_width * output_scale - marks_width < texture_box.width) {
- texture_box.width = inner_width * output_scale - marks_width;
- }
- render_texture(output->wlr_output, output_damage, title_texture,
- &texture_box, matrix, con->alpha);
- title_width = texture_box.width;
- }
-
- // Padding above title
- memcpy(&color, colors->background, sizeof(float) * 4);
- premultiply_alpha(color, con->alpha);
- box.x = x + (layout == L_TABBED) * TITLEBAR_BORDER_THICKNESS;
- box.y = y + TITLEBAR_BORDER_THICKNESS;
- box.width = width - (layout == L_TABBED) * TITLEBAR_BORDER_THICKNESS * 2;
- box.height = TITLEBAR_V_PADDING - TITLEBAR_BORDER_THICKNESS;
- scale_box(&box, output_scale);
- render_rect(output->wlr_output, output_damage, &box, color);
-
- // Padding below title
- box.y = (y + TITLEBAR_V_PADDING + config->font_height) * output_scale;
- render_rect(output->wlr_output, output_damage, &box, color);
-
- // Filler between title and marks
- box.width = inner_width * output_scale - title_width - marks_width;
- if (box.width > 0) {
- box.x = (x + TITLEBAR_H_PADDING) * output_scale + title_width;
- box.y = (y + TITLEBAR_V_PADDING) * output_scale;
- box.height = config->font_height * output_scale;
- render_rect(output->wlr_output, output_damage, &box, color);
- }
-
- // Padding left of title
- left_offset = (layout == L_TABBED) * TITLEBAR_BORDER_THICKNESS;
- box.x = x + left_offset;
- box.y = y + TITLEBAR_V_PADDING;
- box.width = TITLEBAR_H_PADDING - left_offset;
- box.height = config->font_height;
- scale_box(&box, output_scale);
- render_rect(output->wlr_output, output_damage, &box, color);
-
- // Padding right of marks
- right_offset = (layout == L_TABBED) * TITLEBAR_BORDER_THICKNESS;
- box.x = x + width - TITLEBAR_H_PADDING;
- box.y = y + TITLEBAR_V_PADDING;
- box.width = TITLEBAR_H_PADDING - right_offset;
- box.height = config->font_height;
- scale_box(&box, output_scale);
- render_rect(output->wlr_output, output_damage, &box, color);
-
- if (connects_sides) {
- // Left pixel in line with bottom bar
- box.x = x;
- box.y = y + container_titlebar_height() - TITLEBAR_BORDER_THICKNESS;
- box.width = state->border_thickness * state->border_left;
- box.height = TITLEBAR_BORDER_THICKNESS;
- scale_box(&box, output_scale);
- render_rect(output->wlr_output, output_damage, &box, color);
-
- // Right pixel in line with bottom bar
- box.x = x + width - state->border_thickness * state->border_right;
- box.y = y + container_titlebar_height() - TITLEBAR_BORDER_THICKNESS;
- box.width = state->border_thickness * state->border_right;
- box.height = TITLEBAR_BORDER_THICKNESS;
- scale_box(&box, output_scale);
- render_rect(output->wlr_output, output_damage, &box, color);
- }
-}
-
-/**
- * Render the top border line for a view using "border pixel".
- */
-static void render_top_border(struct sway_output *output,
- pixman_region32_t *output_damage, struct sway_container *con,
- struct border_colors *colors) {
- struct sway_container_state *state = &con->current;
- if (!state->border_top) {
- return;
- }
- struct wlr_box box;
- float color[4];
- float output_scale = output->wlr_output->scale;
-
- // Child border - top edge
- memcpy(&color, colors->child_border, sizeof(float) * 4);
- premultiply_alpha(color, con->alpha);
- box.x = state->swayc_x;
- box.y = state->swayc_y;
- box.width = state->swayc_width;
- box.height = state->border_thickness;
- scale_box(&box, output_scale);
- render_rect(output->wlr_output, output_damage, &box, color);
-}
-
-static void render_container(struct sway_output *output,
- pixman_region32_t *damage, struct sway_container *con, bool parent_focused);
-
-/**
- * Render a container's children using a L_HORIZ or L_VERT layout.
- *
- * Wrap child views in borders and leave child containers borderless because
- * they'll apply their own borders to their children.
- */
-static void render_container_simple(struct sway_output *output,
- pixman_region32_t *damage, struct sway_container *con,
- bool parent_focused) {
- struct sway_seat *seat = input_manager_current_seat(input_manager);
- struct sway_container *focus = seat_get_focus(seat);
-
- for (int i = 0; i < con->current.children->length; ++i) {
- struct sway_container *child = con->current.children->items[i];
-
- if (child->type == C_VIEW) {
- struct sway_view *view = child->sway_view;
- struct border_colors *colors;
- struct wlr_texture *title_texture;
- struct wlr_texture *marks_texture;
- struct sway_container_state *state = &child->current;
-
- if (focus == child || parent_focused) {
- colors = &config->border_colors.focused;
- title_texture = child->title_focused;
- marks_texture = view->marks_focused;
- } else if (seat_get_focus_inactive(seat, con) == child) {
- colors = &config->border_colors.focused_inactive;
- title_texture = child->title_focused_inactive;
- marks_texture = view->marks_focused_inactive;
- } else {
- colors = &config->border_colors.unfocused;
- title_texture = child->title_unfocused;
- marks_texture = view->marks_unfocused;
- }
-
- if (state->border == B_NORMAL) {
- render_titlebar(output, damage, child, state->swayc_x,
- state->swayc_y, state->swayc_width, colors,
- title_texture, marks_texture);
- } else {
- render_top_border(output, damage, child, colors);
- }
- render_view(output, damage, child, colors);
- } else {
- render_container(output, damage, child,
- parent_focused || focus == child);
- }
- }
-}
-
-/**
- * Render a container's children using the L_TABBED layout.
- */
-static void render_container_tabbed(struct sway_output *output,
- pixman_region32_t *damage, struct sway_container *con,
- bool parent_focused) {
- if (!con->current.children->length) {
- return;
- }
- struct sway_seat *seat = input_manager_current_seat(input_manager);
- struct sway_container *focus = seat_get_focus(seat);
- struct sway_container *current = seat_get_active_current_child(seat, con);
- struct border_colors *current_colors = &config->border_colors.unfocused;
- struct sway_container_state *pstate = &con->current;
-
- // Render tabs
- for (int i = 0; i < con->current.children->length; ++i) {
- struct sway_container *child = con->current.children->items[i];
- struct sway_view *view = child->type == C_VIEW ? child->sway_view : NULL;
- struct sway_container_state *cstate = &child->current;
- struct border_colors *colors;
- struct wlr_texture *title_texture;
- struct wlr_texture *marks_texture;
-
- if (focus == child || parent_focused) {
- colors = &config->border_colors.focused;
- title_texture = child->title_focused;
- marks_texture = view ? view->marks_focused : NULL;
- } else if (child == current) {
- colors = &config->border_colors.focused_inactive;
- title_texture = child->title_focused_inactive;
- marks_texture = view ? view->marks_focused_inactive : NULL;
- } else {
- colors = &config->border_colors.unfocused;
- title_texture = child->title_unfocused;
- marks_texture = view ? view->marks_unfocused : NULL;
- }
-
- int tab_width = pstate->swayc_width / pstate->children->length;
- int x = pstate->swayc_x + tab_width * i;
- // Make last tab use the remaining width of the parent
- if (i == pstate->children->length - 1) {
- tab_width = pstate->swayc_width - tab_width * i;
- }
-
- render_titlebar(output, damage, child, x, cstate->swayc_y, tab_width,
- colors, title_texture, marks_texture);
-
- if (child == current) {
- current_colors = colors;
- }
- }
-
- // Render surface and left/right/bottom borders
- if (current) {
- if (current->type == C_VIEW) {
- render_view(output, damage, current, current_colors);
- } else {
- render_container(output, damage, current,
- parent_focused || current == focus);
- }
- }
-}
-
-/**
- * Render a container's children using the L_STACKED layout.
- */
-static void render_container_stacked(struct sway_output *output,
- pixman_region32_t *damage, struct sway_container *con,
- bool parent_focused) {
- if (!con->current.children->length) {
- return;
- }
- struct sway_seat *seat = input_manager_current_seat(input_manager);
- struct sway_container *focus = seat_get_focus(seat);
- struct sway_container *current = seat_get_active_current_child(seat, con);
- struct border_colors *current_colors = &config->border_colors.unfocused;
- struct sway_container_state *pstate = &con->current;
-
- // Render titles
- for (int i = 0; i < con->current.children->length; ++i) {
- struct sway_container *child = con->current.children->items[i];
- struct sway_view *view = child->type == C_VIEW ? child->sway_view : NULL;
- struct sway_container_state *cstate = &child->current;
- struct border_colors *colors;
- struct wlr_texture *title_texture;
- struct wlr_texture *marks_texture;
-
- if (focus == child || parent_focused) {
- colors = &config->border_colors.focused;
- title_texture = child->title_focused;
- marks_texture = view ? view->marks_focused : NULL;
- } else if (child == current) {
- colors = &config->border_colors.focused_inactive;
- title_texture = child->title_focused_inactive;
- marks_texture = view ? view->marks_focused_inactive : NULL;
- } else {
- colors = &config->border_colors.unfocused;
- title_texture = child->title_unfocused;
- marks_texture = view ? view->marks_unfocused : NULL;
- }
-
- int y = pstate->swayc_y + container_titlebar_height() * i;
- render_titlebar(output, damage, child, cstate->swayc_x, y,
- cstate->swayc_width, colors, title_texture, marks_texture);
-
- if (child == current) {
- current_colors = colors;
- }
- }
-
- // Render surface and left/right/bottom borders
- if (current) {
- if (current->type == C_VIEW) {
- render_view(output, damage, current, current_colors);
- } else {
- render_container(output, damage, current,
- parent_focused || current == focus);
- }
- }
-}
-
-static void render_container(struct sway_output *output,
- pixman_region32_t *damage, struct sway_container *con,
- bool parent_focused) {
- switch (con->current.layout) {
- case L_NONE:
- case L_HORIZ:
- case L_VERT:
- render_container_simple(output, damage, con, parent_focused);
- break;
- case L_STACKED:
- render_container_stacked(output, damage, con, parent_focused);
- break;
- case L_TABBED:
- render_container_tabbed(output, damage, con, parent_focused);
- break;
- case L_FLOATING:
- sway_assert(false, "Didn't expect to see floating here");
- }
-}
-
-static void render_floating_container(struct sway_output *soutput,
- pixman_region32_t *damage, struct sway_container *con) {
- if (con->type == C_VIEW) {
- struct sway_view *view = con->sway_view;
- struct sway_seat *seat = input_manager_current_seat(input_manager);
- struct sway_container *focus = seat_get_focus(seat);
- struct border_colors *colors;
- struct wlr_texture *title_texture;
- struct wlr_texture *marks_texture;
-
- if (focus == con) {
- colors = &config->border_colors.focused;
- title_texture = con->title_focused;
- marks_texture = view->marks_focused;
- } else {
- colors = &config->border_colors.unfocused;
- title_texture = con->title_unfocused;
- marks_texture = view->marks_unfocused;
- }
-
- if (con->current.border == B_NORMAL) {
- render_titlebar(soutput, damage, con, con->current.swayc_x,
- con->current.swayc_y, con->current.swayc_width, colors,
- title_texture, marks_texture);
- } else if (con->current.border != B_NONE) {
- render_top_border(soutput, damage, con, colors);
- }
- render_view(soutput, damage, con, colors);
- } else {
- render_container(soutput, damage, con, false);
- }
-}
-
-static void render_floating(struct sway_output *soutput,
- pixman_region32_t *damage) {
- for (int i = 0; i < root_container.current.children->length; ++i) {
- struct sway_container *output =
- root_container.current.children->items[i];
- for (int j = 0; j < output->current.children->length; ++j) {
- struct sway_container *ws = output->current.children->items[j];
- if (!workspace_is_visible(ws)) {
- continue;
- }
- list_t *floating =
- ws->current.ws_floating->current.children;
- for (int k = 0; k < floating->length; ++k) {
- struct sway_container *floater = floating->items[k];
- render_floating_container(soutput, damage, floater);
- }
- }
- }
-}
-
-static struct sway_container *output_get_active_workspace(
- struct sway_output *output) {
+struct sway_container *output_get_active_workspace(struct sway_output *output) {
struct sway_seat *seat = input_manager_current_seat(input_manager);
struct sway_container *focus =
seat_get_focus_inactive(seat, output->swayc);
@@ -915,117 +181,58 @@ static struct sway_container *output_get_active_workspace(
return workspace;
}
-static void render_output(struct sway_output *output, struct timespec *when,
- pixman_region32_t *damage) {
- struct wlr_output *wlr_output = output->wlr_output;
-
- struct wlr_renderer *renderer =
- wlr_backend_get_renderer(wlr_output->backend);
- if (!sway_assert(renderer != NULL,
- "expected the output backend to have a renderer")) {
- return;
- }
-
- wlr_renderer_begin(renderer, wlr_output->width, wlr_output->height);
-
- bool damage_whole_before_swap = false;
- if (!pixman_region32_not_empty(damage)) {
- // Output isn't damaged but needs buffer swap
- goto renderer_end;
- }
-
- const char *damage_debug = getenv("SWAY_DAMAGE_DEBUG");
- if (damage_debug != NULL) {
- if (strcmp(damage_debug, "highlight") == 0) {
- wlr_renderer_clear(renderer, (float[]){1, 1, 0, 1});
- damage_whole_before_swap = true;
- } else if (strcmp(damage_debug, "rerender") == 0) {
- int width, height;
- wlr_output_transformed_resolution(wlr_output, &width, &height);
- pixman_region32_union_rect(damage, damage, 0, 0, width, height);
- }
+bool output_has_opaque_lockscreen(struct sway_output *output,
+ struct sway_seat *seat) {
+ if (!seat->exclusive_client) {
+ return false;
}
- struct sway_container *workspace = output_get_active_workspace(output);
- struct sway_view *fullscreen_view = workspace->current.ws_fullscreen;
-
- if (fullscreen_view) {
- float clear_color[] = {0.0f, 0.0f, 0.0f, 1.0f};
-
- int nrects;
- pixman_box32_t *rects = pixman_region32_rectangles(damage, &nrects);
- for (int i = 0; i < nrects; ++i) {
- scissor_output(wlr_output, &rects[i]);
- wlr_renderer_clear(renderer, clear_color);
+ struct wlr_layer_surface *wlr_layer_surface;
+ wl_list_for_each(wlr_layer_surface, &server.layer_shell->surfaces, link) {
+ if (wlr_layer_surface->output != output->wlr_output) {
+ continue;
}
-
- // TODO: handle views smaller than the output
- render_view_surfaces(fullscreen_view, output, damage, 1.0f);
-
- if (fullscreen_view->type == SWAY_VIEW_XWAYLAND) {
- render_unmanaged(output, damage,
- &root_container.sway_root->xwayland_unmanaged);
+ struct wlr_surface *wlr_surface = wlr_layer_surface->surface;
+ if (wlr_surface->resource->client != seat->exclusive_client) {
+ continue;
}
- } else {
- float clear_color[] = {0.25f, 0.25f, 0.25f, 1.0f};
-
- int nrects;
- pixman_box32_t *rects = pixman_region32_rectangles(damage, &nrects);
- for (int i = 0; i < nrects; ++i) {
- scissor_output(wlr_output, &rects[i]);
- wlr_renderer_clear(renderer, clear_color);
+ struct sway_layer_surface *sway_layer_surface =
+ layer_from_wlr_layer_surface(wlr_layer_surface);
+ pixman_box32_t output_box = {
+ .x2 = output->swayc->current.swayc_width,
+ .y2 = output->swayc->current.swayc_height,
+ };
+ pixman_region32_t surface_opaque_box;
+ pixman_region32_init(&surface_opaque_box);
+ pixman_region32_copy(&surface_opaque_box, &wlr_surface->opaque_region);
+ pixman_region32_translate(&surface_opaque_box,
+ sway_layer_surface->geo.x, sway_layer_surface->geo.y);
+ bool contains = pixman_region32_contains_rectangle(&surface_opaque_box,
+ &output_box);
+ pixman_region32_fini(&surface_opaque_box);
+ if (contains) {
+ return true;
}
-
- render_layer(output, damage,
- &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND]);
- render_layer(output, damage,
- &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM]);
-
- struct sway_seat *seat = input_manager_current_seat(input_manager);
- struct sway_container *focus = seat_get_focus(seat);
- render_container(output, damage, workspace, focus == workspace);
- render_floating(output, damage);
-
- render_unmanaged(output, damage,
- &root_container.sway_root->xwayland_unmanaged);
- render_layer(output, damage,
- &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP]);
- }
- render_layer(output, damage,
- &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY]);
- render_drag_icons(output, damage, &root_container.sway_root->drag_icons);
-
-renderer_end:
- if (root_container.sway_root->debug_tree) {
- wlr_render_texture(renderer, root_container.sway_root->debug_tree,
- wlr_output->transform_matrix, 0, 0, 1);
- }
-
- if (damage_whole_before_swap || root_container.sway_root->debug_tree) {
- int width, height;
- wlr_output_transformed_resolution(wlr_output, &width, &height);
- pixman_region32_union_rect(damage, damage, 0, 0, width, height);
}
-
- wlr_renderer_scissor(renderer, NULL);
- wlr_renderer_end(renderer);
- if (!wlr_output_damage_swap_buffers(output->damage, when, damage)) {
- return;
- }
- output->last_frame = *when;
+ return false;
}
struct send_frame_done_data {
struct root_geometry root_geo;
struct sway_output *output;
struct timespec *when;
+ struct wl_client *exclusive_client;
};
static void send_frame_done_iterator(struct wlr_surface *surface,
int sx, int sy, void *_data) {
struct send_frame_done_data *data = _data;
+ if (data->exclusive_client &&
+ data->exclusive_client != surface->resource->client) {
+ return;
+ }
- bool intersects = get_surface_box(&data->root_geo, data->output, surface,
+ bool intersects = output_get_surface_box(&data->root_geo, data->output, surface,
sx, sy, NULL);
if (intersects) {
wlr_surface_send_frame_done(surface, data->when);
@@ -1034,19 +241,19 @@ static void send_frame_done_iterator(struct wlr_surface *surface,
static void send_frame_done_layer(struct send_frame_done_data *data,
struct wl_list *layer_surfaces) {
- layer_for_each_surface(layer_surfaces, &data->root_geo,
+ output_layer_for_each_surface(layer_surfaces, &data->root_geo,
send_frame_done_iterator, data);
}
static void send_frame_done_unmanaged(struct send_frame_done_data *data,
struct wl_list *unmanaged) {
- unmanaged_for_each_surface(unmanaged, data->output, &data->root_geo,
+ output_unmanaged_for_each_surface(unmanaged, data->output, &data->root_geo,
send_frame_done_iterator, data);
}
static void send_frame_done_drag_icons(struct send_frame_done_data *data,
struct wl_list *drag_icons) {
- drag_icons_for_each_surface(drag_icons, data->output, &data->root_geo,
+ output_drag_icons_for_each_surface(drag_icons, data->output, &data->root_geo,
send_frame_done_iterator, data);
}
@@ -1061,7 +268,7 @@ static void send_frame_done_container_iterator(struct sway_container *con,
return;
}
- output_view_for_each_surface(con->sway_view, &data->root_geo,
+ output_view_for_each_surface(con->sway_view, data->output, &data->root_geo,
send_frame_done_iterator, data);
}
@@ -1072,9 +279,12 @@ static void send_frame_done_container(struct send_frame_done_data *data,
}
static void send_frame_done(struct sway_output *output, struct timespec *when) {
+ struct sway_seat *seat = input_manager_current_seat(input_manager);
struct send_frame_done_data data = {
.output = output,
.when = when,
+ .exclusive_client = output_has_opaque_lockscreen(output, seat) ?
+ seat->exclusive_client : NULL,
};
struct sway_container *workspace = output_get_active_workspace(output);
@@ -1125,7 +335,7 @@ static void damage_handle_frame(struct wl_listener *listener, void *data) {
}
if (needs_swap) {
- render_output(output, &now, &damage);
+ output_render(output, &now, &damage);
}
pixman_region32_fini(&damage);
@@ -1152,7 +362,7 @@ static void damage_surface_iterator(struct wlr_surface *surface, int sx, int sy,
bool whole = data->whole;
struct wlr_box box;
- bool intersects = get_surface_box(&data->root_geo, data->output, surface,
+ bool intersects = output_get_surface_box(&data->root_geo, data->output, surface,
sx, sy, &box);
if (!intersects) {
return;
@@ -1163,16 +373,22 @@ static void damage_surface_iterator(struct wlr_surface *surface, int sx, int sy,
int center_x = box.x + box.width/2;
int center_y = box.y + box.height/2;
- if (pixman_region32_not_empty(&surface->current->surface_damage)) {
+ if (pixman_region32_not_empty(&surface->buffer_damage)) {
+ enum wl_output_transform transform =
+ wlr_output_transform_invert(surface->current.transform);
+
pixman_region32_t damage;
pixman_region32_init(&damage);
- pixman_region32_copy(&damage, &surface->current->surface_damage);
- wlr_region_scale(&damage, &damage, output->wlr_output->scale);
- if (ceil(output->wlr_output->scale) > surface->current->scale) {
+ pixman_region32_copy(&damage, &surface->buffer_damage);
+ wlr_region_transform(&damage, &damage, transform,
+ surface->current.buffer_width, surface->current.buffer_height);
+ wlr_region_scale(&damage, &damage,
+ output->wlr_output->scale / (float)surface->current.scale);
+ if (ceil(output->wlr_output->scale) > surface->current.scale) {
// When scaling up a surface, it'll become blurry so we need to
// expand the damage region
wlr_region_expand(&damage, &damage,
- ceil(output->wlr_output->scale) - surface->current->scale);
+ ceil(output->wlr_output->scale) - surface->current.scale);
}
pixman_region32_translate(&damage, box.x, box.y);
wlr_region_rotated_bounds(&damage, &damage, rotation,
@@ -1196,7 +412,7 @@ void output_damage_surface(struct sway_output *output, double ox, double oy,
.whole = whole,
};
- surface_for_each_surface(surface, ox, oy, &data.root_geo,
+ output_surface_for_each_surface(surface, ox, oy, &data.root_geo,
damage_surface_iterator, &data);
}
@@ -1215,7 +431,7 @@ static void output_damage_view(struct sway_output *output,
.whole = whole,
};
- output_view_for_each_surface(view, &data.root_geo,
+ output_view_for_each_surface(view, output, &data.root_geo,
damage_surface_iterator, &data);
}
@@ -1247,11 +463,12 @@ static void output_damage_whole_container_iterator(struct sway_container *con,
void output_damage_whole_container(struct sway_output *output,
struct sway_container *con) {
+ // Pad the box by 1px, because the width is a double and might be a fraction
struct wlr_box box = {
- .x = con->current.swayc_x - output->wlr_output->lx,
- .y = con->current.swayc_y - output->wlr_output->ly,
- .width = con->current.swayc_width,
- .height = con->current.swayc_height,
+ .x = con->current.swayc_x - output->wlr_output->lx - 1,
+ .y = con->current.swayc_y - output->wlr_output->ly - 1,
+ .width = con->current.swayc_width + 2,
+ .height = con->current.swayc_height + 2,
};
scale_box(&box, output->wlr_output->scale);
wlr_output_damage_add_box(output->damage, &box);
@@ -1276,19 +493,21 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
output->wlr_output->data = NULL;
free(output);
- arrange_and_commit(&root_container);
+ arrange_windows(&root_container);
}
static void handle_mode(struct wl_listener *listener, void *data) {
struct sway_output *output = wl_container_of(listener, output, mode);
arrange_layers(output);
- arrange_and_commit(output->swayc);
+ arrange_windows(output->swayc);
+ transaction_commit_dirty();
}
static void handle_transform(struct wl_listener *listener, void *data) {
struct sway_output *output = wl_container_of(listener, output, transform);
arrange_layers(output);
- arrange_and_commit(output->swayc);
+ arrange_windows(output->swayc);
+ transaction_commit_dirty();
}
static void handle_scale_iterator(struct sway_container *view, void *data) {
@@ -1299,7 +518,8 @@ static void handle_scale(struct wl_listener *listener, void *data) {
struct sway_output *output = wl_container_of(listener, output, scale);
arrange_layers(output);
container_descendants(output->swayc, C_VIEW, handle_scale_iterator, NULL);
- arrange_and_commit(output->swayc);
+ arrange_windows(output->swayc);
+ transaction_commit_dirty();
}
struct sway_output *output_from_wlr_output(struct wlr_output *wlr_output) {
@@ -1309,7 +529,7 @@ struct sway_output *output_from_wlr_output(struct wlr_output *wlr_output) {
void handle_new_output(struct wl_listener *listener, void *data) {
struct sway_server *server = wl_container_of(listener, server, new_output);
struct wlr_output *wlr_output = data;
- wlr_log(L_DEBUG, "New output %p: %s", wlr_output, wlr_output->name);
+ wlr_log(WLR_DEBUG, "New output %p: %s", wlr_output, wlr_output->name);
struct sway_output *output = calloc(1, sizeof(struct sway_output));
if (!output) {
@@ -1368,5 +588,6 @@ void output_enable(struct sway_output *output) {
output->damage_destroy.notify = damage_handle_destroy;
arrange_layers(output);
- arrange_and_commit(&root_container);
+ arrange_windows(&root_container);
+ transaction_commit_dirty();
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-01 22:35:23 +0000