mirrors/cage
1
0
Fork 0
mirror of https://github.com/cage-kiosk/cage.git synced 2025-10-29 05:40:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Be explicit about output- and layout coordinates

Browse source
This commit is contained in:
Jente Hidskes 2019-12-29 16:07:14 +01:00
parent 21229984ff
commit 95b7782c72
No known key found for this signature in database
GPG key ID: 04BE5A29F32D91EA
6 changed files with 47 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

61
output.c
View file

@ -64,8 +64,9 @@ send_frame_done(struct wlr_surface *surface, int _unused, int _not_used, void *d
/* Used to move all of the data necessary to damage a surface. */ /* Used to move all of the data necessary to damage a surface. */
struct damage_data { struct damage_data {
struct cg_output *output; struct cg_output *output;
double x;
double y; /* Output-local coordinates. */
double ox, oy;
bool whole; bool whole;
}; };
@ -80,12 +81,9 @@ damage_surface(struct wlr_surface *surface, int sx, int sy, void *data)
return; return;
} }
double x = ddata->x + sx, y = ddata->y + sy;
wlr_output_layout_output_coords(output->server->output_layout, wlr_output, &x, &y);
struct wlr_box box = { struct wlr_box box = {
.x = x * wlr_output->scale, .x = (ddata->ox + sx) * wlr_output->scale,
.y = y * wlr_output->scale, .y = (ddata->oy + sy) * wlr_output->scale,
.width = surface->current.width * wlr_output->scale, .width = surface->current.width * wlr_output->scale,
.height = surface->current.height * wlr_output->scale, .height = surface->current.height * wlr_output->scale,
}; };
@ -118,7 +116,9 @@ struct render_data {
struct wlr_output *output; struct wlr_output *output;
struct timespec *when; struct timespec *when;
pixman_region32_t *damage; pixman_region32_t *damage;
double x, y;
/* Output-local coordinates. */
double ox, oy;
}; };
static void static void
@ -137,12 +137,9 @@ render_surface(struct wlr_surface *surface, int sx, int sy, void *data)
return; return;
} }
double x = rdata->x + sx, y = rdata->y + sy;
wlr_output_layout_output_coords(rdata->output_layout, output, &x, &y);
struct wlr_box box = { struct wlr_box box = {
.x = x * output->scale, .x = (rdata->ox + sx) * output->scale,
.y = y * output->scale, .y = (rdata->oy + sy) * output->scale,
.width = surface->current.width * output->scale, .width = surface->current.width * output->scale,
.height = surface->current.height * output->scale, .height = surface->current.height * output->scale,
}; };
@ -175,14 +172,16 @@ drag_icons_for_each_surface(struct cg_server *server, wlr_surface_iterator_func_
void *data) void *data)
{ {
struct render_data *rdata = data; struct render_data *rdata = data;
struct wlr_output *wlr_output = rdata->output;
struct cg_drag_icon *drag_icon; struct cg_drag_icon *drag_icon;
wl_list_for_each(drag_icon, &server->seat->drag_icons, link) { wl_list_for_each(drag_icon, &server->seat->drag_icons, link) {
if (!drag_icon->wlr_drag_icon->mapped) { if (!drag_icon->wlr_drag_icon->mapped) {
continue; continue;
} }
rdata->x = drag_icon->x; rdata->ox = drag_icon->x;
rdata->y = drag_icon->y; rdata->oy = drag_icon->y;
wlr_output_layout_output_coords(server->output_layout, wlr_output, &rdata->ox, &rdata->oy);
wlr_surface_for_each_surface(drag_icon->wlr_drag_icon->surface, wlr_surface_for_each_surface(drag_icon->wlr_drag_icon->surface,
iterator, iterator,
data); data);
@ -240,8 +239,9 @@ handle_output_damage_frame(struct wl_listener *listener, void *data)
struct cg_view *view; struct cg_view *view;
wl_list_for_each_reverse(view, &output->server->views, link) { wl_list_for_each_reverse(view, &output->server->views, link) {
rdata.x = view->x; rdata.ox = view->lx;
rdata.y = view->y; rdata.oy = view->ly;
wlr_output_layout_output_coords(output->server->output_layout, output->wlr_output, &rdata.ox, &rdata.oy);
view_for_each_surface(view, render_surface, &rdata); view_for_each_surface(view, render_surface, &rdata);
} }
@ -404,38 +404,41 @@ handle_new_output(struct wl_listener *listener, void *data)
} }
void void
output_damage_view_surface(struct cg_output *cg_output, struct cg_view *view) output_damage_view_surface(struct cg_output *output, struct cg_view *view)
{ {
struct damage_data data = { struct damage_data data = {
.output = cg_output, .output = output,
.x = view->x, .ox = view->lx,
.y = view->y, .oy = view->ly,
.whole = false, .whole = false,
}; };
wlr_output_layout_output_coords(output->server->output_layout, output->wlr_output, &data.ox, &data.oy);
view_for_each_surface(view, damage_surface, &data); view_for_each_surface(view, damage_surface, &data);
} }
void void
output_damage_view_whole(struct cg_output *cg_output, struct cg_view *view) output_damage_view_whole(struct cg_output *output, struct cg_view *view)
{ {
struct damage_data data = { struct damage_data data = {
.output = cg_output, .output = output,
.x = view->x, .ox = view->lx,
.y = view->y, .oy = view->ly,
.whole = true, .whole = true,
}; };
wlr_output_layout_output_coords(output->server->output_layout, output->wlr_output, &data.ox, &data.oy);
view_for_each_surface(view, damage_surface, &data); view_for_each_surface(view, damage_surface, &data);
} }
void void
output_damage_drag_icon(struct cg_output *cg_output, struct cg_drag_icon *drag_icon) output_damage_drag_icon(struct cg_output *output, struct cg_drag_icon *drag_icon)
{ {
struct damage_data data = { struct damage_data data = {
.output = cg_output, .output = output,
.x = drag_icon->x, .ox = drag_icon->x,
.y = drag_icon->y, .oy = drag_icon->y,
.whole = true, .whole = true,
}; };
wlr_output_layout_output_coords(output->server->output_layout, output->wlr_output, &data.ox, &data.oy);
wlr_surface_for_each_surface(drag_icon->wlr_drag_icon->surface, wlr_surface_for_each_surface(drag_icon->wlr_drag_icon->surface,
damage_surface, damage_surface,
&data); &data);

4
seat.c
View file

@ -43,8 +43,8 @@ static bool
view_at(struct cg_view *view, double lx, double ly, view_at(struct cg_view *view, double lx, double ly,
struct wlr_surface **surface, double *sx, double *sy) struct wlr_surface **surface, double *sx, double *sy)
{ {
double view_sx = lx - view->x; double view_sx = lx - view->lx;
double view_sy = ly - view->y; double view_sy = ly - view->ly;
double _sx, _sy; double _sx, _sy;
struct wlr_surface *_surface = view_wlr_surface_at(view, view_sx, view_sy, &_sx, &_sy); struct wlr_surface *_surface = view_wlr_surface_at(view, view_sx, view_sy, &_sx, &_sy);

5
seat.h
View file

@ -78,8 +78,9 @@ struct cg_drag_icon {
struct wl_list link; // seat::drag_icons struct wl_list link; // seat::drag_icons
struct cg_seat *seat; struct cg_seat *seat;
struct wlr_drag_icon *wlr_drag_icon; struct wlr_drag_icon *wlr_drag_icon;
double x;
double y; /* The drag icon has a position in layout coordinates. */
double x, y;
struct wl_listener destroy; struct wl_listener destroy;
}; };

8
view.c
View file

@ -164,8 +164,8 @@ view_maximize(struct cg_view *view)
{ {
struct wlr_box *layout_box = wlr_output_layout_get_box(view->server->output_layout, NULL); struct wlr_box *layout_box = wlr_output_layout_get_box(view->server->output_layout, NULL);
view->x = layout_box->x; view->lx = layout_box->x;
view->y = layout_box->y; view->ly = layout_box->y;
view->impl->maximize(view, layout_box->width, layout_box->height); view->impl->maximize(view, layout_box->width, layout_box->height);
} }
@ -177,8 +177,8 @@ view_center(struct cg_view *view)
int width, height; int width, height;
view->impl->get_geometry(view, &width, &height); view->impl->get_geometry(view, &width, &height);
view->x = (layout_box->width - width) / 2; view->lx = (layout_box->width - width) / 2;
view->y = (layout_box->height - height) / 2; view->ly = (layout_box->height - height) / 2;
} }
void void

4
view.h
View file

@ -26,7 +26,9 @@ struct cg_view {
struct wl_list link; // server::views struct wl_list link; // server::views
struct wl_list children; // cg_view_child::link struct wl_list children; // cg_view_child::link
struct wlr_surface *wlr_surface; struct wlr_surface *wlr_surface;
int x, y;
/* The view has a position in layout coordinates. */
int lx, ly;
enum cg_view_type type; enum cg_view_type type;
const struct cg_view_impl *impl; const struct cg_view_impl *impl;

6
xdg_shell.c
View file

@ -97,12 +97,12 @@ popup_unconstrain(struct cg_xdg_popup *popup)
struct wlr_box *popup_box = &popup->wlr_popup->geometry; struct wlr_box *popup_box = &popup->wlr_popup->geometry;
struct wlr_output_layout *output_layout = server->output_layout; struct wlr_output_layout *output_layout = server->output_layout;
struct wlr_output *wlr_output = wlr_output_layout_output_at(output_layout, view->x + popup_box->x, view->y + popup_box->y); struct wlr_output *wlr_output = wlr_output_layout_output_at(output_layout, view->lx + popup_box->x, view->ly + popup_box->y);
struct wlr_box *output_box = wlr_output_layout_get_box(output_layout, wlr_output); struct wlr_box *output_box = wlr_output_layout_get_box(output_layout, wlr_output);
struct wlr_box output_toplevel_box = { struct wlr_box output_toplevel_box = {
.x = output_box->x - view->x, .x = output_box->x - view->lx,
.y = output_box->y - view->y, .y = output_box->y - view->ly,
.width = output_box->width, .width = output_box->width,
.height = output_box->height .height = output_box->height
}; };