aboutsummaryrefslogtreecommitdiff
path: root/sway/desktop
diff options
context:
space:
mode:
Diffstat (limited to 'sway/desktop')
-rw-r--r--sway/desktop/output.c83
-rw-r--r--sway/desktop/xdg_shell.c4
-rw-r--r--sway/desktop/xdg_shell_v6.c4
-rw-r--r--sway/desktop/xwayland.c28
4 files changed, 30 insertions, 89 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index fb80fd87..8600d049 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -65,6 +65,13 @@ struct root_geometry {
float rotation;
};
+struct render_data {
+ struct root_geometry root_geo;
+ struct sway_output *output;
+ pixman_region32_t *damage;
+ float alpha;
+};
+
static bool get_surface_box(struct root_geometry *geo,
struct sway_output *output, struct wlr_surface *surface, int sx, int sy,
struct wlr_box *surface_box) {
@@ -116,8 +123,9 @@ static void surface_for_each_surface(struct wlr_surface *surface,
static void output_view_for_each_surface(struct sway_view *view,
struct root_geometry *geo, wlr_surface_iterator_func_t iterator,
void *user_data) {
- geo->x = view->x;
- geo->y = view->y;
+ struct render_data *data = user_data;
+ geo->x = view->x - data->output->wlr_output->lx;
+ geo->y = view->y - data->output->wlr_output->ly;
geo->width = view->surface->current->width;
geo->height = view->surface->current->height;
geo->rotation = 0; // TODO
@@ -160,13 +168,6 @@ static void scale_box(struct wlr_box *box, float scale) {
box->height *= scale;
}
-struct render_data {
- struct root_geometry root_geo;
- struct sway_output *output;
- pixman_region32_t *damage;
- float alpha;
-};
-
static void scissor_output(struct wlr_output *wlr_output,
pixman_box32_t *rect) {
struct wlr_renderer *renderer = wlr_backend_get_renderer(wlr_output->backend);
@@ -275,7 +276,10 @@ static void render_rect(struct wlr_output *wlr_output,
struct wlr_renderer *renderer =
wlr_backend_get_renderer(wlr_output->backend);
- struct wlr_box box = *_box;
+ 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);
@@ -450,8 +454,10 @@ static void render_titlebar(struct sway_output *output,
wlr_texture_get_size(marks_texture,
&texture_box.width, &texture_box.height);
texture_box.x =
- (x + width - TITLEBAR_H_PADDING) * output_scale - texture_box.width;
- texture_box.y = (y + TITLEBAR_V_PADDING) * output_scale;
+ (x - output->wlr_output->lx + width - TITLEBAR_H_PADDING)
+ * output_scale - texture_box.width;
+ texture_box.y = (y - output->wlr_output->ly + TITLEBAR_V_PADDING)
+ * output_scale;
float matrix[9];
wlr_matrix_project_box(matrix, &texture_box,
@@ -472,8 +478,10 @@ static void render_titlebar(struct sway_output *output,
struct wlr_box texture_box;
wlr_texture_get_size(title_texture,
&texture_box.width, &texture_box.height);
- texture_box.x = (x + TITLEBAR_H_PADDING) * output_scale;
- texture_box.y = (y + TITLEBAR_V_PADDING) * output_scale;
+ texture_box.x = (x - output->wlr_output->lx + TITLEBAR_H_PADDING)
+ * output_scale;
+ texture_box.y = (y - output->wlr_output->ly + TITLEBAR_V_PADDING)
+ * output_scale;
float matrix[9];
wlr_matrix_project_box(matrix, &texture_box,
@@ -771,28 +779,8 @@ static bool floater_intersects_output(struct sway_container *floater,
output->sway_output->wlr_output, &box);
}
-static void container_translate(struct sway_container *con, int x, int y) {
- con->x += x;
- con->y += y;
- if (con->type == C_VIEW) {
- con->sway_view->x += x;
- con->sway_view->y += y;
- } else {
- for (int i = 0; i < con->children->length; ++i) {
- struct sway_container *child = con->children->items[i];
- container_translate(child, x, y);
- }
- }
-}
-
static void render_floating_container(struct sway_output *soutput,
pixman_region32_t *damage, struct sway_container *con) {
- // We need to translate the floating container's coordinates from layout
- // coordinates into output-local coordinates. This needs to happen for all
- // children of the floating container too.
- struct sway_container *output = container_parent(con, C_OUTPUT);
- container_translate(con, -output->x, -output->y);
-
if (con->type == C_VIEW) {
struct sway_view *view = con->sway_view;
struct sway_seat *seat = input_manager_current_seat(input_manager);
@@ -821,8 +809,6 @@ static void render_floating_container(struct sway_output *soutput,
} else {
render_container(soutput, damage, con, false);
}
- // Undo the translation
- container_translate(con, output->x, output->y);
}
static void render_floating(struct sway_output *soutput,
@@ -1123,15 +1109,7 @@ static void output_damage_view(struct sway_output *output,
void output_damage_from_view(struct sway_output *output,
struct sway_view *view) {
- if (container_self_or_parent_floating(view->swayc)) {
- view->x -= output->swayc->x;
- view->y -= output->swayc->y;
- output_damage_view(output, view, false);
- view->x += output->swayc->x;
- view->y += output->swayc->y;
- } else {
- output_damage_view(output, view, false);
- }
+ output_damage_view(output, view, false);
}
static void output_damage_whole_container_iterator(struct sway_container *con,
@@ -1148,24 +1126,13 @@ static void output_damage_whole_container_iterator(struct sway_container *con,
void output_damage_whole_container(struct sway_output *output,
struct sway_container *con) {
struct wlr_box box = {
- .x = con->x,
- .y = con->y,
+ .x = con->x - output->wlr_output->lx,
+ .y = con->y - output->wlr_output->ly,
.width = con->width,
.height = con->height,
};
- if (container_is_floating(con)) {
- box.x -= output->wlr_output->lx;
- box.y -= output->wlr_output->ly;
- }
scale_box(&box, output->wlr_output->scale);
wlr_output_damage_add_box(output->damage, &box);
-
- if (con->type == C_VIEW) {
- output_damage_whole_container_iterator(con, output);
- } else {
- container_descendants(con, C_VIEW,
- output_damage_whole_container_iterator, output);
- }
}
static void damage_handle_destroy(struct wl_listener *listener, void *data) {
diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c
index 73d9477f..412488b3 100644
--- a/sway/desktop/xdg_shell.c
+++ b/sway/desktop/xdg_shell.c
@@ -87,7 +87,7 @@ static const char *get_string_prop(struct sway_view *view, enum sway_view_prop p
}
}
-static void configure(struct sway_view *view, double ox, double oy, int width,
+static void configure(struct sway_view *view, double lx, double ly, int width,
int height) {
struct sway_xdg_shell_view *xdg_shell_view =
xdg_shell_view_from_view(view);
@@ -98,7 +98,7 @@ static void configure(struct sway_view *view, double ox, double oy, int width,
xdg_shell_view->pending_width = width;
xdg_shell_view->pending_height = height;
wlr_xdg_toplevel_set_size(view->wlr_xdg_surface, width, height);
- view_update_position(view, ox, oy);
+ view_update_position(view, lx, ly);
}
static void set_activated(struct sway_view *view, bool activated) {
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c
index 6c98744c..b3653913 100644
--- a/sway/desktop/xdg_shell_v6.c
+++ b/sway/desktop/xdg_shell_v6.c
@@ -86,7 +86,7 @@ static const char *get_string_prop(struct sway_view *view, enum sway_view_prop p
}
}
-static void configure(struct sway_view *view, double ox, double oy, int width,
+static void configure(struct sway_view *view, double lx, double ly, int width,
int height) {
struct sway_xdg_shell_v6_view *xdg_shell_v6_view =
xdg_shell_v6_view_from_view(view);
@@ -97,7 +97,7 @@ static void configure(struct sway_view *view, double ox, double oy, int width,
xdg_shell_v6_view->pending_width = width;
xdg_shell_v6_view->pending_height = height;
wlr_xdg_toplevel_v6_set_size(view->wlr_xdg_surface_v6, width, height);
- view_update_position(view, ox, oy);
+ view_update_position(view, lx, ly);
}
static void set_activated(struct sway_view *view, bool activated) {
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index 783868bc..fc488162 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -152,9 +152,7 @@ static uint32_t get_int_prop(struct sway_view *view, enum sway_view_prop prop) {
}
}
-// The x and y arguments are output-local for tiled views, and layout
-// coordinates for floating views.
-static void configure(struct sway_view *view, double x, double y, int width,
+static void configure(struct sway_view *view, double lx, double ly, int width,
int height) {
struct sway_xwayland_view *xwayland_view = xwayland_view_from_view(view);
if (xwayland_view == NULL) {
@@ -162,30 +160,6 @@ static void configure(struct sway_view *view, double x, double y, int width,
}
struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
- double lx, ly;
- if (container_is_floating(view->swayc)) {
- lx = x;
- ly = y;
- } else {
- struct sway_container *output = container_parent(view->swayc, C_OUTPUT);
- if (!sway_assert(output, "view must be within tree to set position")) {
- return;
- }
- struct sway_container *root = container_parent(output, C_ROOT);
- if (!sway_assert(root, "output must be within tree to set position")) {
- return;
- }
- struct wlr_output_layout *layout = root->sway_root->output_layout;
- struct wlr_output_layout_output *loutput =
- wlr_output_layout_get(layout, output->sway_output->wlr_output);
- if (!sway_assert(loutput,
- "output must be within layout to set position")) {
- return;
- }
- lx = x + loutput->x;
- ly = y + loutput->y;
- }
-
xwayland_view->pending_width = width;
xwayland_view->pending_height = height;
wlr_xwayland_surface_configure(xsurface, lx, ly, width, height);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 12:42:53 +0000