2018-07-07 19:30:52 +10:00
|
|
|
#define _POSIX_C_SOURCE 200809L
|
|
|
|
#include <assert.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <strings.h>
|
|
|
|
#include <time.h>
|
|
|
|
#include <wayland-server.h>
|
|
|
|
#include <wlr/render/wlr_renderer.h>
|
|
|
|
#include <wlr/types/wlr_box.h>
|
|
|
|
#include <wlr/types/wlr_buffer.h>
|
|
|
|
#include <wlr/types/wlr_matrix.h>
|
|
|
|
#include <wlr/types/wlr_output_damage.h>
|
|
|
|
#include <wlr/types/wlr_output_layout.h>
|
|
|
|
#include <wlr/types/wlr_output.h>
|
|
|
|
#include <wlr/types/wlr_surface.h>
|
|
|
|
#include <wlr/util/region.h>
|
|
|
|
#include "log.h"
|
2018-07-25 21:32:20 +10:00
|
|
|
#include "config.h"
|
2018-07-07 19:30:52 +10:00
|
|
|
#include "sway/config.h"
|
2018-07-15 01:24:22 +10:00
|
|
|
#include "sway/debug.h"
|
2018-07-07 19:30:52 +10:00
|
|
|
#include "sway/input/input-manager.h"
|
|
|
|
#include "sway/input/seat.h"
|
|
|
|
#include "sway/layers.h"
|
|
|
|
#include "sway/output.h"
|
|
|
|
#include "sway/server.h"
|
|
|
|
#include "sway/tree/arrange.h"
|
|
|
|
#include "sway/tree/container.h"
|
2018-08-26 12:05:16 +10:00
|
|
|
#include "sway/tree/root.h"
|
2018-07-07 19:30:52 +10:00
|
|
|
#include "sway/tree/view.h"
|
|
|
|
#include "sway/tree/workspace.h"
|
|
|
|
|
|
|
|
struct render_data {
|
|
|
|
pixman_region32_t *damage;
|
|
|
|
float alpha;
|
|
|
|
};
|
|
|
|
|
|
|
|
static void scale_box(struct wlr_box *box, float scale) {
|
|
|
|
box->x *= scale;
|
|
|
|
box->y *= scale;
|
|
|
|
box->width *= 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);
|
|
|
|
}
|
|
|
|
|
2018-07-28 04:16:36 +10:00
|
|
|
static void render_surface_iterator(struct sway_output *output,
|
2018-07-28 03:17:47 +10:00
|
|
|
struct wlr_surface *surface, struct wlr_box *_box, float rotation,
|
|
|
|
void *_data) {
|
|
|
|
struct render_data *data = _data;
|
|
|
|
struct wlr_output *wlr_output = output->wlr_output;
|
|
|
|
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 = *_box;
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2018-07-07 19:30:52 +10:00
|
|
|
static void render_layer(struct sway_output *output,
|
|
|
|
pixman_region32_t *damage, struct wl_list *layer_surfaces) {
|
|
|
|
struct render_data data = {
|
|
|
|
.damage = damage,
|
|
|
|
.alpha = 1.0f,
|
|
|
|
};
|
2018-07-28 03:53:15 +10:00
|
|
|
output_layer_for_each_surface(output, layer_surfaces,
|
2018-07-28 04:16:36 +10:00
|
|
|
render_surface_iterator, &data);
|
2018-07-07 19:30:52 +10:00
|
|
|
}
|
2018-07-28 03:17:47 +10:00
|
|
|
|
2018-07-25 06:16:06 +10:00
|
|
|
#ifdef HAVE_XWAYLAND
|
2018-07-07 19:30:52 +10:00
|
|
|
static void render_unmanaged(struct sway_output *output,
|
|
|
|
pixman_region32_t *damage, struct wl_list *unmanaged) {
|
|
|
|
struct render_data data = {
|
|
|
|
.damage = damage,
|
|
|
|
.alpha = 1.0f,
|
|
|
|
};
|
2018-07-28 03:17:47 +10:00
|
|
|
output_unmanaged_for_each_surface(output, unmanaged,
|
2018-07-28 04:16:36 +10:00
|
|
|
render_surface_iterator, &data);
|
2018-07-07 19:30:52 +10:00
|
|
|
}
|
2018-07-25 06:16:06 +10:00
|
|
|
#endif
|
2018-07-28 03:17:47 +10:00
|
|
|
|
2018-07-07 19:30:52 +10:00
|
|
|
static void render_drag_icons(struct sway_output *output,
|
|
|
|
pixman_region32_t *damage, struct wl_list *drag_icons) {
|
|
|
|
struct render_data data = {
|
|
|
|
.damage = damage,
|
|
|
|
.alpha = 1.0f,
|
|
|
|
};
|
2018-07-28 03:44:36 +10:00
|
|
|
output_drag_icons_for_each_surface(output, drag_icons,
|
2018-07-28 04:16:36 +10:00
|
|
|
render_surface_iterator, &data);
|
2018-07-07 19:30:52 +10:00
|
|
|
}
|
|
|
|
|
|
|
|
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];
|
|
|
|
}
|
|
|
|
|
2018-08-02 23:30:26 +10:00
|
|
|
static void render_view_toplevels(struct sway_view *view,
|
2018-07-07 19:30:52 +10:00
|
|
|
struct sway_output *output, pixman_region32_t *damage, float alpha) {
|
|
|
|
struct render_data data = {
|
|
|
|
.damage = damage,
|
|
|
|
.alpha = alpha,
|
|
|
|
};
|
2018-08-02 23:30:26 +10:00
|
|
|
// Render all toplevels without descending into popups
|
2018-08-18 15:10:06 +10:00
|
|
|
double ox =
|
|
|
|
view->swayc->current.view_x - output->wlr_output->lx - view->geometry.x;
|
|
|
|
double oy =
|
|
|
|
view->swayc->current.view_y - output->wlr_output->ly - view->geometry.y;
|
|
|
|
output_surface_for_each_surface(output, view->surface, ox, oy,
|
2018-08-02 23:30:26 +10:00
|
|
|
render_surface_iterator, &data);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void render_popup_iterator(struct sway_output *output,
|
|
|
|
struct wlr_surface *surface, struct wlr_box *box, float rotation,
|
|
|
|
void *data) {
|
|
|
|
// Render this popup's surface
|
|
|
|
render_surface_iterator(output, surface, box, rotation, data);
|
|
|
|
|
|
|
|
// Render this popup's child toplevels
|
|
|
|
output_surface_for_each_surface(output, surface, box->x, box->y,
|
|
|
|
render_surface_iterator, data);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void render_view_popups(struct sway_view *view,
|
|
|
|
struct sway_output *output, pixman_region32_t *damage, float alpha) {
|
|
|
|
struct render_data data = {
|
|
|
|
.damage = damage,
|
|
|
|
.alpha = alpha,
|
|
|
|
};
|
|
|
|
output_view_for_each_popup(output, view, render_popup_iterator, &data);
|
2018-07-07 19:30:52 +10:00
|
|
|
}
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
Correctly track saved surfaces during multiple transactions
Fixes #2364.
Suppose a view is 600px wide, and we tell it to resize to 601px during a
resize operation. We create a transaction, save the 600px buffer and
send the configure. This buffer is saved into the associated
instruction, and is rendered while we wait for the view to commit a
601px buffer.
Before the view commits the 601px buffer, suppose we tell it to resize
to 602px. The new transaction will also save the buffer, but it's still
the 600px buffer because we haven't received a new one yet.
Then suppose the view commits its original 601px buffer. This completes
the first transaction, so we apply the 601px width to the container.
There's still the second (now only) transaction remaining, so we render
the saved buffer from that. But this is still the 600px buffer, and we
believe it's 601px. Whoops.
The problem here is we can't stack buffers like this. So this commit
removes the saved buffer from the instructions, places it in the view
instead, and re-saves the latest buffer every time the view completes a
transaction and still has further pending transactions.
As saved buffers are now specific to views rather than instructions, the
functions for saving and removing the saved buffer have been moved to
view.c.
The calls to save and restore the buffer have been relocated to more
appropriate functions too, favouring transaction_commit and
transaction_apply rather than transaction_add_container and
transaction_destroy.
2018-08-01 16:23:11 +10:00
|
|
|
if (!view->saved_buffer || !view->saved_buffer->texture) {
|
2018-07-07 19:30:52 +10:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
struct wlr_box box = {
|
2018-08-18 15:11:46 +10:00
|
|
|
.x = view->swayc->current.view_x - output->swayc->current.swayc_x -
|
|
|
|
view->saved_geometry.x,
|
|
|
|
.y = view->swayc->current.view_y - output->swayc->current.swayc_y -
|
|
|
|
view->saved_geometry.y,
|
Correctly track saved surfaces during multiple transactions
Fixes #2364.
Suppose a view is 600px wide, and we tell it to resize to 601px during a
resize operation. We create a transaction, save the 600px buffer and
send the configure. This buffer is saved into the associated
instruction, and is rendered while we wait for the view to commit a
601px buffer.
Before the view commits the 601px buffer, suppose we tell it to resize
to 602px. The new transaction will also save the buffer, but it's still
the 600px buffer because we haven't received a new one yet.
Then suppose the view commits its original 601px buffer. This completes
the first transaction, so we apply the 601px width to the container.
There's still the second (now only) transaction remaining, so we render
the saved buffer from that. But this is still the 600px buffer, and we
believe it's 601px. Whoops.
The problem here is we can't stack buffers like this. So this commit
removes the saved buffer from the instructions, places it in the view
instead, and re-saves the latest buffer every time the view completes a
transaction and still has further pending transactions.
As saved buffers are now specific to views rather than instructions, the
functions for saving and removing the saved buffer have been moved to
view.c.
The calls to save and restore the buffer have been relocated to more
appropriate functions too, favouring transaction_commit and
transaction_apply rather than transaction_add_container and
transaction_destroy.
2018-08-01 16:23:11 +10:00
|
|
|
.width = view->saved_buffer_width,
|
|
|
|
.height = view->saved_buffer_height,
|
2018-07-07 19:30:52 +10:00
|
|
|
};
|
|
|
|
|
|
|
|
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);
|
|
|
|
|
Correctly track saved surfaces during multiple transactions
Fixes #2364.
Suppose a view is 600px wide, and we tell it to resize to 601px during a
resize operation. We create a transaction, save the 600px buffer and
send the configure. This buffer is saved into the associated
instruction, and is rendered while we wait for the view to commit a
601px buffer.
Before the view commits the 601px buffer, suppose we tell it to resize
to 602px. The new transaction will also save the buffer, but it's still
the 600px buffer because we haven't received a new one yet.
Then suppose the view commits its original 601px buffer. This completes
the first transaction, so we apply the 601px width to the container.
There's still the second (now only) transaction remaining, so we render
the saved buffer from that. But this is still the 600px buffer, and we
believe it's 601px. Whoops.
The problem here is we can't stack buffers like this. So this commit
removes the saved buffer from the instructions, places it in the view
instead, and re-saves the latest buffer every time the view completes a
transaction and still has further pending transactions.
As saved buffers are now specific to views rather than instructions, the
functions for saving and removing the saved buffer have been moved to
view.c.
The calls to save and restore the buffer have been relocated to more
appropriate functions too, favouring transaction_commit and
transaction_apply rather than transaction_add_container and
transaction_destroy.
2018-08-01 16:23:11 +10:00
|
|
|
render_texture(wlr_output, damage, view->saved_buffer->texture,
|
|
|
|
&box, matrix, alpha);
|
2018-07-07 19:30:52 +10:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* 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;
|
Correctly track saved surfaces during multiple transactions
Fixes #2364.
Suppose a view is 600px wide, and we tell it to resize to 601px during a
resize operation. We create a transaction, save the 600px buffer and
send the configure. This buffer is saved into the associated
instruction, and is rendered while we wait for the view to commit a
601px buffer.
Before the view commits the 601px buffer, suppose we tell it to resize
to 602px. The new transaction will also save the buffer, but it's still
the 600px buffer because we haven't received a new one yet.
Then suppose the view commits its original 601px buffer. This completes
the first transaction, so we apply the 601px width to the container.
There's still the second (now only) transaction remaining, so we render
the saved buffer from that. But this is still the 600px buffer, and we
believe it's 601px. Whoops.
The problem here is we can't stack buffers like this. So this commit
removes the saved buffer from the instructions, places it in the view
instead, and re-saves the latest buffer every time the view completes a
transaction and still has further pending transactions.
As saved buffers are now specific to views rather than instructions, the
functions for saving and removing the saved buffer have been moved to
view.c.
The calls to save and restore the buffer have been relocated to more
appropriate functions too, favouring transaction_commit and
transaction_apply rather than transaction_add_container and
transaction_destroy.
2018-08-01 16:23:11 +10:00
|
|
|
if (view->saved_buffer) {
|
2018-07-07 19:30:52 +10:00
|
|
|
render_saved_view(view, output, damage, view->swayc->alpha);
|
|
|
|
} else {
|
2018-08-02 23:30:26 +10:00
|
|
|
render_view_toplevels(view, output, damage, view->swayc->alpha);
|
2018-07-07 19:30:52 +10:00
|
|
|
}
|
|
|
|
|
2018-08-17 20:25:33 +10:00
|
|
|
if (view->swayc->current.using_csd) {
|
2018-07-17 10:14:33 +10:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2018-07-07 19:30:52 +10:00
|
|
|
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;
|
2018-09-03 23:03:49 +10:00
|
|
|
bool is_last_child = children->length == 0 ||
|
|
|
|
children->items[children->length - 1] == con;
|
2018-07-07 19:30:52 +10:00
|
|
|
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_ob_width = 0; // output-buffer-local
|
|
|
|
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_ob_width = texture_box.width;
|
|
|
|
|
|
|
|
// Gap between the marks and bottom padding, for when the marks texture
|
|
|
|
// height is smaller than the config's font height
|
|
|
|
memcpy(&color, colors->background, sizeof(float) * 4);
|
|
|
|
premultiply_alpha(color, con->alpha);
|
|
|
|
box.x = texture_box.x;
|
|
|
|
box.y = texture_box.y + texture_box.height;
|
|
|
|
box.width = texture_box.width;
|
|
|
|
box.height = config->font_height * output_scale - texture_box.height;
|
|
|
|
if (box.height > 0) {
|
|
|
|
render_rect(output->wlr_output, output_damage, &box, color);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Title text
|
|
|
|
size_t title_ob_width = 0; // output-buffer-local
|
|
|
|
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_ob_width < texture_box.width) {
|
|
|
|
texture_box.width = inner_width * output_scale - marks_ob_width;
|
|
|
|
}
|
|
|
|
render_texture(output->wlr_output, output_damage, title_texture,
|
|
|
|
&texture_box, matrix, con->alpha);
|
|
|
|
title_ob_width = texture_box.width;
|
|
|
|
|
|
|
|
// Gap between the title and bottom padding, for when the title texture
|
|
|
|
// height is smaller than the config's font height
|
|
|
|
memcpy(&color, colors->background, sizeof(float) * 4);
|
|
|
|
premultiply_alpha(color, con->alpha);
|
|
|
|
box.x = texture_box.x;
|
|
|
|
box.y = texture_box.y + texture_box.height;
|
|
|
|
box.width = texture_box.width;
|
|
|
|
box.height = config->font_height * output_scale - texture_box.height;
|
|
|
|
if (box.height > 0) {
|
|
|
|
render_rect(output->wlr_output, output_damage, &box, color);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// 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_ob_width - marks_ob_width;
|
|
|
|
if (box.width > 0) {
|
|
|
|
box.x = (x + TITLEBAR_H_PADDING) * output_scale + title_ob_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) {
|
|
|
|
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;
|
|
|
|
|
2018-07-15 22:43:33 +10:00
|
|
|
if (view_is_urgent(view)) {
|
|
|
|
colors = &config->border_colors.urgent;
|
|
|
|
title_texture = child->title_urgent;
|
|
|
|
marks_texture = view->marks_urgent;
|
|
|
|
} else if (state->focused || parent_focused) {
|
2018-07-07 19:30:52 +10:00
|
|
|
colors = &config->border_colors.focused;
|
|
|
|
title_texture = child->title_focused;
|
|
|
|
marks_texture = view->marks_focused;
|
2018-07-15 15:20:21 +10:00
|
|
|
} else if (con->current.focused_inactive_child == child) {
|
2018-07-07 19:30:52 +10:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2018-08-17 20:25:33 +10:00
|
|
|
if (!view->swayc->current.using_csd) {
|
2018-07-17 10:14:33 +10:00
|
|
|
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);
|
|
|
|
}
|
2018-07-07 19:30:52 +10:00
|
|
|
}
|
|
|
|
render_view(output, damage, child, colors);
|
|
|
|
} else {
|
|
|
|
render_container(output, damage, child,
|
2018-07-15 15:20:21 +10:00
|
|
|
parent_focused || child->current.focused);
|
2018-07-07 19:30:52 +10:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* 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_container_state *pstate = &con->current;
|
2018-07-15 15:20:21 +10:00
|
|
|
struct sway_container *current = pstate->focused_inactive_child;
|
|
|
|
struct border_colors *current_colors = &config->border_colors.unfocused;
|
2018-07-07 19:30:52 +10:00
|
|
|
|
2018-08-28 23:53:51 +10:00
|
|
|
int tab_width = (pstate->swayc_width) / pstate->children->length;
|
2018-07-10 07:33:13 +10:00
|
|
|
|
2018-07-07 19:30:52 +10:00
|
|
|
// Render tabs
|
2018-07-10 07:33:13 +10:00
|
|
|
for (int i = 0; i < pstate->children->length; ++i) {
|
|
|
|
struct sway_container *child = pstate->children->items[i];
|
2018-07-07 19:30:52 +10:00
|
|
|
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;
|
2018-07-16 18:22:27 +10:00
|
|
|
bool urgent = view ?
|
|
|
|
view_is_urgent(view) : container_has_urgent_child(child);
|
2018-07-07 19:30:52 +10:00
|
|
|
|
2018-07-16 18:22:27 +10:00
|
|
|
if (urgent) {
|
2018-07-15 22:43:33 +10:00
|
|
|
colors = &config->border_colors.urgent;
|
|
|
|
title_texture = child->title_urgent;
|
2018-07-16 18:22:27 +10:00
|
|
|
marks_texture = view ? view->marks_urgent : NULL;
|
2018-07-15 22:43:33 +10:00
|
|
|
} else if (cstate->focused || parent_focused) {
|
2018-07-07 19:30:52 +10:00
|
|
|
colors = &config->border_colors.focused;
|
|
|
|
title_texture = child->title_focused;
|
|
|
|
marks_texture = view ? view->marks_focused : NULL;
|
2018-07-15 15:20:21 +10:00
|
|
|
} else if (child == pstate->focused_inactive_child) {
|
2018-07-07 19:30:52 +10:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2018-07-10 07:33:13 +10:00
|
|
|
int x = cstate->swayc_x + tab_width * i;
|
|
|
|
|
2018-07-07 19:30:52 +10:00
|
|
|
// Make last tab use the remaining width of the parent
|
|
|
|
if (i == pstate->children->length - 1) {
|
2018-08-28 23:53:51 +10:00
|
|
|
tab_width = pstate->swayc_width - tab_width * i;
|
2018-07-07 19:30:52 +10:00
|
|
|
}
|
|
|
|
|
Prepare arrange code for type safe arguments
This commit changes the arrange code in a way that will support type
safe arguments.
The arrange_output et al functions are now public, however I opted not
to use them directly yet. I've kept the generic arrange_windows there
for convenience until type safety is fully implemented. This means this
patch has much less risk of breaking things as it would otherwise.
To be type safe, arrange_children_of cannot exist in its previous form
because the thing passed to it could be either a workspace or a
container. So it's now renamed to arrange_children and accepts a list_t,
as well as the parent layout and parent's box.
There was some code which checked the grandparent's layout to see if it
was tabbed or stacked and adjusted the Y offset of the grandchild
accordingly. Accessing the grandparent layout isn't easy when using type
safe arguments, and it seemed odd to even need to do this. I determined
that this was needed because a child of a tabbed container would have a
swayc Y matching the top of the tab bar. I've changed this so a child of
a tabbed container will have a swayc Y matching the bottom of the tab
bar, which means we don't need to access the grandparent layout. Some
tweaks to the rendering and autoconfigure code have been made to
implement this, and the container_at code appears to work without
needing any changes.
arrange_children_of (now arrange_children) would check if the parent had
gaps and would copy them to the child, effectively making the
workspace's gaps recurse into all children. We can't do this any more
without passing has_gaps, gaps_inner and gaps_outer as arguments to
arrange_children, so I've changed the add_gaps function to retrieve it
from the workspace directly.
apply_tabbed_or_stacked_layout has been split into two functions, as it
had different logic depending on the layout.
Lastly, arrange.h had an unnecessary include of transaction.h. I've
removed it, which means I've had to add it to several other files.
2018-08-26 10:16:49 +10:00
|
|
|
render_titlebar(output, damage, child, x, pstate->swayc_y, tab_width,
|
2018-07-07 19:30:52 +10:00
|
|
|
colors, title_texture, marks_texture);
|
|
|
|
|
|
|
|
if (child == current) {
|
|
|
|
current_colors = colors;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Render surface and left/right/bottom borders
|
2018-07-15 15:20:21 +10:00
|
|
|
if (current->type == C_VIEW) {
|
|
|
|
render_view(output, damage, current, current_colors);
|
|
|
|
} else {
|
|
|
|
render_container(output, damage, current,
|
|
|
|
parent_focused || current->current.focused);
|
2018-07-07 19:30:52 +10:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* 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_container_state *pstate = &con->current;
|
2018-07-15 15:20:21 +10:00
|
|
|
struct sway_container *current = pstate->focused_inactive_child;
|
|
|
|
struct border_colors *current_colors = &config->border_colors.unfocused;
|
2018-07-07 19:30:52 +10:00
|
|
|
|
2018-07-10 07:33:13 +10:00
|
|
|
size_t titlebar_height = container_titlebar_height();
|
|
|
|
|
2018-07-07 19:30:52 +10:00
|
|
|
// Render titles
|
2018-07-10 07:33:13 +10:00
|
|
|
for (int i = 0; i < pstate->children->length; ++i) {
|
|
|
|
struct sway_container *child = pstate->children->items[i];
|
2018-07-07 19:30:52 +10:00
|
|
|
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;
|
2018-07-16 18:22:27 +10:00
|
|
|
bool urgent = view ?
|
|
|
|
view_is_urgent(view) : container_has_urgent_child(child);
|
2018-07-07 19:30:52 +10:00
|
|
|
|
2018-07-16 18:22:27 +10:00
|
|
|
if (urgent) {
|
2018-07-15 22:43:33 +10:00
|
|
|
colors = &config->border_colors.urgent;
|
|
|
|
title_texture = child->title_urgent;
|
2018-07-16 18:22:27 +10:00
|
|
|
marks_texture = view ? view->marks_urgent : NULL;
|
2018-07-15 22:43:33 +10:00
|
|
|
} else if (cstate->focused || parent_focused) {
|
2018-07-07 19:30:52 +10:00
|
|
|
colors = &config->border_colors.focused;
|
|
|
|
title_texture = child->title_focused;
|
|
|
|
marks_texture = view ? view->marks_focused : NULL;
|
2018-07-15 15:20:21 +10:00
|
|
|
} else if (child == pstate->focused_inactive_child) {
|
2018-07-07 19:30:52 +10:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
Prepare arrange code for type safe arguments
This commit changes the arrange code in a way that will support type
safe arguments.
The arrange_output et al functions are now public, however I opted not
to use them directly yet. I've kept the generic arrange_windows there
for convenience until type safety is fully implemented. This means this
patch has much less risk of breaking things as it would otherwise.
To be type safe, arrange_children_of cannot exist in its previous form
because the thing passed to it could be either a workspace or a
container. So it's now renamed to arrange_children and accepts a list_t,
as well as the parent layout and parent's box.
There was some code which checked the grandparent's layout to see if it
was tabbed or stacked and adjusted the Y offset of the grandchild
accordingly. Accessing the grandparent layout isn't easy when using type
safe arguments, and it seemed odd to even need to do this. I determined
that this was needed because a child of a tabbed container would have a
swayc Y matching the top of the tab bar. I've changed this so a child of
a tabbed container will have a swayc Y matching the bottom of the tab
bar, which means we don't need to access the grandparent layout. Some
tweaks to the rendering and autoconfigure code have been made to
implement this, and the container_at code appears to work without
needing any changes.
arrange_children_of (now arrange_children) would check if the parent had
gaps and would copy them to the child, effectively making the
workspace's gaps recurse into all children. We can't do this any more
without passing has_gaps, gaps_inner and gaps_outer as arguments to
arrange_children, so I've changed the add_gaps function to retrieve it
from the workspace directly.
apply_tabbed_or_stacked_layout has been split into two functions, as it
had different logic depending on the layout.
Lastly, arrange.h had an unnecessary include of transaction.h. I've
removed it, which means I've had to add it to several other files.
2018-08-26 10:16:49 +10:00
|
|
|
int y = pstate->swayc_y + titlebar_height * i;
|
|
|
|
render_titlebar(output, damage, child, pstate->swayc_x, y,
|
|
|
|
pstate->swayc_width, colors, title_texture, marks_texture);
|
2018-07-07 19:30:52 +10:00
|
|
|
|
|
|
|
if (child == current) {
|
|
|
|
current_colors = colors;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Render surface and left/right/bottom borders
|
2018-07-15 15:20:21 +10:00
|
|
|
if (current->type == C_VIEW) {
|
|
|
|
render_view(output, damage, current, current_colors);
|
|
|
|
} else {
|
|
|
|
render_container(output, damage, current,
|
|
|
|
parent_focused || current->current.focused);
|
2018-07-07 19:30:52 +10:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
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 border_colors *colors;
|
|
|
|
struct wlr_texture *title_texture;
|
|
|
|
struct wlr_texture *marks_texture;
|
|
|
|
|
2018-07-15 22:43:33 +10:00
|
|
|
if (view_is_urgent(view)) {
|
|
|
|
colors = &config->border_colors.urgent;
|
|
|
|
title_texture = con->title_urgent;
|
|
|
|
marks_texture = view->marks_urgent;
|
|
|
|
} else if (con->current.focused) {
|
2018-07-07 19:30:52 +10:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2018-08-17 20:25:33 +10:00
|
|
|
if (!view->swayc->current.using_csd) {
|
2018-07-17 10:14:33 +10:00
|
|
|
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);
|
|
|
|
}
|
2018-07-07 19:30:52 +10:00
|
|
|
}
|
|
|
|
render_view(soutput, damage, con, colors);
|
|
|
|
} else {
|
2018-07-26 18:36:46 +10:00
|
|
|
render_container(soutput, damage, con, con->current.focused);
|
2018-07-07 19:30:52 +10:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
2018-08-19 15:07:07 +10:00
|
|
|
list_t *floating = ws->current.ws_floating;
|
2018-07-07 19:30:52 +10:00
|
|
|
for (int k = 0; k < floating->length; ++k) {
|
|
|
|
struct sway_container *floater = floating->items[k];
|
|
|
|
render_floating_container(soutput, damage, floater);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void output_render(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);
|
|
|
|
|
|
|
|
if (!pixman_region32_not_empty(damage)) {
|
|
|
|
// Output isn't damaged but needs buffer swap
|
|
|
|
goto renderer_end;
|
|
|
|
}
|
|
|
|
|
2018-08-19 11:29:59 +10:00
|
|
|
if (debug.damage == DAMAGE_HIGHLIGHT) {
|
2018-08-18 16:58:50 +10:00
|
|
|
wlr_renderer_clear(renderer, (float[]){1, 1, 0, 1});
|
2018-08-19 11:29:59 +10:00
|
|
|
} else if (debug.damage == DAMAGE_RERENDER) {
|
2018-08-18 16:58:50 +10:00
|
|
|
int width, height;
|
|
|
|
wlr_output_transformed_resolution(wlr_output, &width, &height);
|
|
|
|
pixman_region32_union_rect(damage, damage, 0, 0, width, height);
|
2018-07-07 19:30:52 +10:00
|
|
|
}
|
|
|
|
|
|
|
|
struct sway_container *workspace = output_get_active_workspace(output);
|
2018-07-25 20:56:23 +10:00
|
|
|
struct sway_container *fullscreen_con = workspace->current.ws_fullscreen;
|
2018-07-25 17:50:06 +10:00
|
|
|
|
|
|
|
if (output_has_opaque_overlay_layer_surface(output)) {
|
|
|
|
goto render_overlay;
|
|
|
|
}
|
|
|
|
|
2018-07-25 20:56:23 +10:00
|
|
|
if (fullscreen_con) {
|
2018-07-07 19:30:52 +10:00
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
|
|
|
// TODO: handle views smaller than the output
|
2018-07-25 20:56:23 +10:00
|
|
|
if (fullscreen_con->type == C_VIEW) {
|
Correctly track saved surfaces during multiple transactions
Fixes #2364.
Suppose a view is 600px wide, and we tell it to resize to 601px during a
resize operation. We create a transaction, save the 600px buffer and
send the configure. This buffer is saved into the associated
instruction, and is rendered while we wait for the view to commit a
601px buffer.
Before the view commits the 601px buffer, suppose we tell it to resize
to 602px. The new transaction will also save the buffer, but it's still
the 600px buffer because we haven't received a new one yet.
Then suppose the view commits its original 601px buffer. This completes
the first transaction, so we apply the 601px width to the container.
There's still the second (now only) transaction remaining, so we render
the saved buffer from that. But this is still the 600px buffer, and we
believe it's 601px. Whoops.
The problem here is we can't stack buffers like this. So this commit
removes the saved buffer from the instructions, places it in the view
instead, and re-saves the latest buffer every time the view completes a
transaction and still has further pending transactions.
As saved buffers are now specific to views rather than instructions, the
functions for saving and removing the saved buffer have been moved to
view.c.
The calls to save and restore the buffer have been relocated to more
appropriate functions too, favouring transaction_commit and
transaction_apply rather than transaction_add_container and
transaction_destroy.
2018-08-01 16:23:11 +10:00
|
|
|
if (fullscreen_con->sway_view->saved_buffer) {
|
2018-07-25 20:56:23 +10:00
|
|
|
render_saved_view(fullscreen_con->sway_view,
|
|
|
|
output, damage, 1.0f);
|
2018-07-26 08:28:05 +10:00
|
|
|
} else {
|
2018-08-02 23:30:26 +10:00
|
|
|
render_view_toplevels(fullscreen_con->sway_view,
|
2018-07-25 20:56:23 +10:00
|
|
|
output, damage, 1.0f);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
render_container(output, damage, fullscreen_con,
|
|
|
|
fullscreen_con->current.focused);
|
2018-07-11 20:33:36 +10:00
|
|
|
}
|
2018-07-25 07:37:41 +10:00
|
|
|
#ifdef HAVE_XWAYLAND
|
2018-07-25 20:56:23 +10:00
|
|
|
render_unmanaged(output, damage,
|
|
|
|
&root_container.sway_root->xwayland_unmanaged);
|
2018-07-25 07:37:41 +10:00
|
|
|
#endif
|
2018-07-07 19:30:52 +10:00
|
|
|
} 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);
|
|
|
|
}
|
|
|
|
|
|
|
|
render_layer(output, damage,
|
|
|
|
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND]);
|
|
|
|
render_layer(output, damage,
|
|
|
|
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM]);
|
|
|
|
|
2018-07-15 15:20:21 +10:00
|
|
|
render_container(output, damage, workspace, workspace->current.focused);
|
2018-07-07 19:30:52 +10:00
|
|
|
render_floating(output, damage);
|
2018-07-25 07:37:41 +10:00
|
|
|
#ifdef HAVE_XWAYLAND
|
2018-07-07 19:30:52 +10:00
|
|
|
render_unmanaged(output, damage,
|
|
|
|
&root_container.sway_root->xwayland_unmanaged);
|
2018-07-25 07:37:41 +10:00
|
|
|
#endif
|
2018-07-07 19:30:52 +10:00
|
|
|
render_layer(output, damage,
|
|
|
|
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP]);
|
|
|
|
}
|
2018-07-25 17:50:06 +10:00
|
|
|
|
2018-08-02 23:30:26 +10:00
|
|
|
struct sway_seat *seat = input_manager_current_seat(input_manager);
|
|
|
|
struct sway_container *focus = seat_get_focus(seat);
|
|
|
|
if (focus && focus->type == C_VIEW) {
|
|
|
|
render_view_popups(focus->sway_view, output, damage, focus->alpha);
|
|
|
|
}
|
|
|
|
|
2018-07-25 17:50:06 +10:00
|
|
|
render_overlay:
|
2018-07-07 19:30:52 +10:00
|
|
|
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:
|
2018-08-18 16:58:50 +10:00
|
|
|
if (debug.render_tree) {
|
|
|
|
wlr_renderer_scissor(renderer, NULL);
|
2018-07-07 19:30:52 +10:00
|
|
|
wlr_render_texture(renderer, root_container.sway_root->debug_tree,
|
2018-08-18 16:58:50 +10:00
|
|
|
wlr_output->transform_matrix, 0, 40, 1);
|
2018-07-07 19:30:52 +10:00
|
|
|
}
|
2018-08-19 11:29:59 +10:00
|
|
|
if (debug.damage == DAMAGE_HIGHLIGHT) {
|
2018-07-07 19:30:52 +10:00
|
|
|
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;
|
|
|
|
}
|