aboutsummaryrefslogtreecommitdiff
path: root/sway/desktop
diff options
context:
space:
mode:
Diffstat (limited to 'sway/desktop')
-rw-r--r--sway/desktop/output.c518
1 files changed, 324 insertions, 194 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 94562052..765647fd 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -269,17 +269,6 @@ static void render_unmanaged(struct sway_output *output,
render_surface_iterator, &data);
}
-static void render_view(struct sway_view *view, struct sway_output *output,
- pixman_region32_t *damage) {
- struct render_data data = {
- .output = output,
- .damage = damage,
- .alpha = view->swayc->alpha,
- };
- output_view_for_each_surface(
- view, &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]) {
@@ -310,93 +299,149 @@ 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) {
+ struct render_data data = {
+ .output = output,
+ .damage = damage,
+ .alpha = view->swayc->alpha,
+ };
+ output_view_for_each_surface(
+ view, &data.root_geo, render_surface_iterator, &data);
+}
+
/**
- * Render decorations for a view with "border normal".
- *
- * Care must be taken not to render over the same pixel multiple times,
- * otherwise the colors will be incorrect when using opacity.
+ * Render a view's surface and left/bottom/right borders.
*/
-static void render_container_simple_border_normal(struct sway_output *output,
- pixman_region32_t *output_damage,
- struct sway_container *con, struct border_colors *colors,
- struct wlr_texture *title_texture, struct wlr_texture *marks_texture) {
- struct wlr_box box;
- float color[4];
+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;
- float output_scale = output->wlr_output->scale;
+ render_view_surfaces(view, output, damage);
- if (view->border_left) {
- // Child border - left edge
- memcpy(&color, colors->child_border, sizeof(float) * 4);
- color[3] *= con->alpha;
- box.x = con->x;
- box.y = con->y + 1;
- box.width = view->border_thickness;
- box.height = con->height - 1
- - view->border_thickness * view->border_bottom;
- scale_box(&box, output_scale);
- render_rect(output->wlr_output, output_damage, &box, color);
- }
+ struct wlr_box box;
+ float output_scale = output->wlr_output->scale;
+ float color[4];
- if (view->border_right) {
- // Child border - right edge
- if (con->parent->children->length == 1
- && con->parent->layout == L_HORIZ) {
- memcpy(&color, colors->indicator, sizeof(float) * 4);
- } else {
+ if (view->border != B_NONE) {
+ if (view->border_left) {
memcpy(&color, colors->child_border, sizeof(float) * 4);
+ premultiply_alpha(color, con->alpha);
+ box.x = con->x;
+ box.y = view->y;
+ box.width = view->border_thickness;
+ box.height = view->height;
+ scale_box(&box, output_scale);
+ render_rect(output->wlr_output, damage, &box, color);
}
- color[3] *= con->alpha;
- box.x = con->x + con->width - view->border_thickness;
- box.y = con->y + 1;
- box.width = view->border_thickness;
- box.height = con->height - 1
- - view->border_thickness * view->border_bottom;
- scale_box(&box, output_scale);
- render_rect(output->wlr_output, output_damage, &box, color);
- }
- if (view->border_bottom) {
- // Child border - bottom edge
- if (con->parent->children->length == 1
- && con->parent->layout == L_VERT) {
- memcpy(&color, colors->indicator, sizeof(float) * 4);
- } else {
- memcpy(&color, colors->child_border, sizeof(float) * 4);
+ if (view->border_right) {
+ if (con->parent->children->length == 1
+ && con->parent->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 = view->x + view->width;
+ box.y = view->y;
+ box.width = view->border_thickness;
+ box.height = view->height;
+ scale_box(&box, output_scale);
+ render_rect(output->wlr_output, damage, &box, color);
+ }
+
+ if (view->border_bottom) {
+ if (con->parent->children->length == 1
+ && con->parent->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 = con->x;
+ box.y = view->y + view->height;
+ box.width = con->width;
+ box.height = view->border_thickness;
+ scale_box(&box, output_scale);
+ render_rect(output->wlr_output, damage, &box, color);
}
- color[3] *= con->alpha;
- box.x = con->x;
- box.y = con->y + con->height - view->border_thickness;
- box.width = con->width;
- box.height = view->border_thickness;
- scale_box(&box, output_scale);
- render_rect(output->wlr_output, 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_view *view = con->type == C_VIEW ? con->sway_view : NULL;
+ float output_scale = output->wlr_output->scale;
+ enum sway_container_layout layout = con->parent->layout;
+ bool is_last_child =
+ con->parent->children->items[con->parent->children->length - 1] == con;
// Single pixel bar above title
memcpy(&color, colors->border, sizeof(float) * 4);
- color[3] *= con->alpha;
- box.x = con->x;
- box.y = con->y;
- box.width = con->width;
- box.height = 1;
+ 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
- memcpy(&color, colors->border, sizeof(float) * 4);
- color[3] *= con->alpha;
- box.x = con->x + view->border_thickness;
- box.y = view->y - 1;
- box.width = con->width - view->border_thickness * 2;
- box.height = 1;
+ 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 (view) {
+ left_offset = view->border_left * view->border_thickness;
+ right_offset = view->border_right * view->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);
- // Setting these makes marks and title easier
- size_t inner_x = con->x + view->border_thickness * view->border_left;
- size_t inner_width = con->width - view->border_thickness * view->border_left
- - view->border_thickness * view->border_right;
+ 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;
@@ -404,14 +449,18 @@ static void render_container_simple_border_normal(struct sway_output *output,
struct wlr_box texture_box;
wlr_texture_get_size(marks_texture,
&texture_box.width, &texture_box.height);
- texture_box.x = (inner_x + inner_width) * output_scale - texture_box.width;
- texture_box.y = (con->y + view->border_thickness) * output_scale;
+ texture_box.x =
+ (x + width - TITLEBAR_H_PADDING) * output_scale - texture_box.width;
+ texture_box.y = (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;
@@ -423,8 +472,8 @@ static void render_container_simple_border_normal(struct sway_output *output,
struct wlr_box texture_box;
wlr_texture_get_size(title_texture,
&texture_box.width, &texture_box.height);
- texture_box.x = inner_x * output_scale;
- texture_box.y = (con->y + view->border_thickness) * output_scale;
+ texture_box.x = (x + TITLEBAR_H_PADDING) * output_scale;
+ texture_box.y = (y + TITLEBAR_V_PADDING) * output_scale;
float matrix[9];
wlr_matrix_project_box(matrix, &texture_box,
@@ -439,104 +488,89 @@ static void render_container_simple_border_normal(struct sway_output *output,
title_width = texture_box.width;
}
- // Title background - above the text
+ // Padding above title
memcpy(&color, colors->background, sizeof(float) * 4);
- color[3] *= con->alpha;
- box.x = inner_x;
- box.y = con->y + 1;
- box.width = inner_width;
- box.height = view->border_thickness - 1;
+ 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);
- // Title background - below the text
- box.y = (con->y + view->border_thickness + config->font_height)
- * output_scale;
+ // Padding below title
+ box.y = (y + TITLEBAR_V_PADDING + config->font_height) * output_scale;
render_rect(output->wlr_output, output_damage, &box, color);
- // Title background - filler between title and marks
+ // Filler between title and marks
box.width = inner_width * output_scale - title_width - marks_width;
if (box.width > 0) {
- box.x = inner_x * output_scale + title_width;
- box.y = (con->y + view->border_thickness) * output_scale;
+ 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);
}
-}
-/**
- * Render decorations for a view with "border pixel".
- *
- * Care must be taken not to render over the same pixel multiple times,
- * otherwise the colors will be incorrect when using opacity.
- */
-static void render_container_simple_border_pixel(struct sway_output *output,
- pixman_region32_t *output_damage, struct sway_container *con,
- struct border_colors *colors) {
- struct wlr_box box;
- float color[4];
- struct sway_view *view = con->sway_view;
- float output_scale = output->wlr_output->scale;
+ // 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);
- if (view->border_left) {
- // Child border - left edge
- memcpy(&color, colors->child_border, sizeof(float) * 4);
- color[3] *= con->alpha;
- box.x = con->x;
- box.y = con->y + view->border_thickness * view->border_top;
- box.width = view->border_thickness;
- box.height = con->height - view->border_thickness
- * (view->border_top + view->border_bottom);
- 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 (view->border_right) {
- // Child border - right edge
- if (con->parent->children->length == 1
- && con->parent->layout == L_HORIZ) {
- memcpy(&color, colors->indicator, sizeof(float) * 4);
- } else {
- memcpy(&color, colors->child_border, sizeof(float) * 4);
- }
- color[3] *= con->alpha;
- box.x = con->x + con->width - view->border_thickness;
- box.y = con->y + view->border_thickness * view->border_top;
- box.width = view->border_thickness;
- box.height = con->height - view->border_thickness
- * (view->border_top + view->border_bottom);
+ if (connects_sides) {
+ // Left pixel in line with bottom bar
+ box.x = x;
+ box.y = y + container_titlebar_height() - TITLEBAR_BORDER_THICKNESS;
+ box.width = view->border_thickness * view->border_left;
+ box.height = TITLEBAR_BORDER_THICKNESS;
scale_box(&box, output_scale);
render_rect(output->wlr_output, output_damage, &box, color);
- }
- if (view->border_top) {
- // Child border - top edge
- memcpy(&color, colors->child_border, sizeof(float) * 4);
- color[3] *= con->alpha;
- box.x = con->x;
- box.y = con->y;
- box.width = con->width;
- box.height = view->border_thickness;
+ // Right pixel in line with bottom bar
+ box.x = x + width - view->border_thickness * view->border_right;
+ box.y = y + container_titlebar_height() - TITLEBAR_BORDER_THICKNESS;
+ box.width = view->border_thickness * view->border_right;
+ box.height = TITLEBAR_BORDER_THICKNESS;
scale_box(&box, output_scale);
render_rect(output->wlr_output, output_damage, &box, color);
}
+}
- if (view->border_bottom) {
- // Child border - bottom edge
- if (con->parent->children->length == 1
- && con->parent->layout == L_VERT) {
- memcpy(&color, colors->indicator, sizeof(float) * 4);
- } else {
- memcpy(&color, colors->child_border, sizeof(float) * 4);
- }
- color[3] *= con->alpha;
- box.x = con->x;
- box.y = con->y + con->height - view->border_thickness;
- box.width = con->width;
- box.height = view->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_view *view = con->sway_view;
+ if (!view->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 = con->x;
+ box.y = con->y;
+ box.width = con->width;
+ box.height = view->border_thickness;
+ scale_box(&box, output_scale);
+ render_rect(output->wlr_output, output_damage, &box, color);
}
static void render_container(struct sway_output *output,
@@ -558,33 +592,30 @@ static void render_container_simple(struct sway_output *output,
struct sway_container *child = con->children->items[i];
if (child->type == C_VIEW) {
- if (child->sway_view->border != B_NONE) {
- 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 = child->sway_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 = child->sway_view->marks_focused_inactive;
- } else {
- colors = &config->border_colors.unfocused;
- title_texture = child->title_unfocused;
- marks_texture = child->sway_view->marks_unfocused;
- }
-
- if (child->sway_view->border == B_NORMAL) {
- render_container_simple_border_normal(output, damage,
- child, colors, title_texture, marks_texture);
- } else {
- render_container_simple_border_pixel(output, damage, child,
- colors);
- }
+ 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 = child->sway_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 = child->sway_view->marks_focused_inactive;
+ } else {
+ colors = &config->border_colors.unfocused;
+ title_texture = child->title_unfocused;
+ marks_texture = child->sway_view->marks_unfocused;
+ }
+
+ if (child->sway_view->border == B_NORMAL) {
+ render_titlebar(output, damage, child, child->x, child->y,
+ child->width, colors, title_texture, marks_texture);
+ } else {
+ render_top_border(output, damage, child, colors);
}
- render_view(child->sway_view, output, damage);
+ render_view(output, damage, child, colors);
} else {
render_container(output, damage, child,
parent_focused || focus == child);
@@ -596,16 +627,116 @@ static void render_container_simple(struct sway_output *output,
* 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) {
- // TODO
+ pixman_region32_t *damage, struct sway_container *con,
+ bool parent_focused) {
+ if (!con->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_child(seat, con);
+ struct border_colors *current_colors = NULL;
+
+ // Render tabs
+ for (int i = 0; i < con->children->length; ++i) {
+ struct sway_container *child = con->children->items[i];
+ struct border_colors *colors;
+ struct wlr_texture *title_texture;
+ struct wlr_texture *marks_texture;
+ struct sway_view *view =
+ child->type == C_VIEW ? child->sway_view : NULL;
+
+ 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 : NULL;
+ } else {
+ colors = &config->border_colors.unfocused;
+ title_texture = child->title_unfocused;
+ marks_texture = view ? view->marks_unfocused : NULL;
+ }
+
+ int tab_width = con->width / con->children->length;
+ int x = con->x + tab_width * i;
+ // Make last tab use the remaining width of the parent
+ if (i == con->children->length - 1) {
+ tab_width = con->width - tab_width * i;
+ }
+
+ render_titlebar(output, damage, child, x, child->y, tab_width, colors,
+ title_texture, marks_texture);
+
+ if (child == current) {
+ current_colors = colors;
+ }
+ }
+
+ // Render surface and left/right/bottom borders
+ 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) {
- // TODO
+ pixman_region32_t *damage, struct sway_container *con,
+ bool parent_focused) {
+ if (!con->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_child(seat, con);
+ struct border_colors *current_colors = NULL;
+
+ // Render titles
+ for (int i = 0; i < con->children->length; ++i) {
+ struct sway_container *child = con->children->items[i];
+ struct border_colors *colors;
+ struct wlr_texture *title_texture;
+ struct wlr_texture *marks_texture;
+ struct sway_view *view =
+ child->type == C_VIEW ? child->sway_view : NULL;
+
+ 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 = con->y + container_titlebar_height() * i;
+ render_titlebar(output, damage, child, child->x, y, child->width,
+ colors, title_texture, marks_texture);
+
+ if (child == current) {
+ current_colors = colors;
+ }
+ }
+
+ // Render surface and left/right/bottom borders
+ 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,
@@ -618,10 +749,10 @@ static void render_container(struct sway_output *output,
render_container_simple(output, damage, con, parent_focused);
break;
case L_STACKED:
- render_container_stacked(output, damage, con);
+ render_container_stacked(output, damage, con, parent_focused);
break;
case L_TABBED:
- render_container_tabbed(output, damage, con);
+ render_container_tabbed(output, damage, con, parent_focused);
break;
case L_FLOATING:
// TODO
@@ -678,7 +809,8 @@ static void render_output(struct sway_output *output, struct timespec *when,
}
// TODO: handle views smaller than the output
- render_view(workspace->sway_workspace->fullscreen, output, damage);
+ render_view_surfaces(
+ workspace->sway_workspace->fullscreen, output, damage);
if (workspace->sway_workspace->fullscreen->type == SWAY_VIEW_XWAYLAND) {
render_unmanaged(output, damage,
@@ -889,9 +1021,7 @@ static void output_damage_view(struct sway_output *output,
return;
}
- struct sway_container *workspace = container_parent(view->swayc,
- C_WORKSPACE);
- if (workspace->sway_workspace->fullscreen && !view->is_fullscreen) {
+ if (!view_is_visible(view)) {
return;
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-07 22:18:59 +0000