mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Multiple output coords by scale

This commit is contained in:
Drew DeVault 2018-02-25 17:52:39 -05:00
parent 8ad26c8afd
commit 94f8bdf081
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sway/desktop/output.c
View File

@ -37,7 +37,7 @@ static void rotate_child_position(double *sx, double *sy, double sw, double sh,
static void render_surface(struct wlr_surface *surface, static void render_surface(struct wlr_surface *surface,
struct wlr_output *wlr_output, struct timespec *when, struct wlr_output *wlr_output, struct timespec *when,
double lx, double ly, float rotation) { double ox, double oy, float rotation) {
if (!wlr_surface_has_buffer(surface)) { if (!wlr_surface_has_buffer(surface)) {
return; return;
} }
@ -46,17 +46,16 @@ static void render_surface(struct wlr_surface *surface,
int height = surface->current->height; int height = surface->current->height;
int render_width = width * wlr_output->scale; int render_width = width * wlr_output->scale;
int render_height = height * wlr_output->scale; int render_height = height * wlr_output->scale;
int owidth, oheight; ox *= wlr_output->scale;
wlr_output_effective_resolution(wlr_output, &owidth, &oheight); oy *= wlr_output->scale;
// FIXME: view coords are inconsistently assumed to be in output or layout coords
struct wlr_box layout_box = { struct wlr_box layout_box = {
.x = lx + wlr_output->lx, .y = ly + wlr_output->ly, .x = ox + wlr_output->lx, .y = oy + wlr_output->ly,
.width = render_width, .height = render_height, .width = render_width, .height = render_height,
}; };
if (wlr_output_layout_intersects(layout, wlr_output, &layout_box)) { if (wlr_output_layout_intersects(layout, wlr_output, &layout_box)) {
struct wlr_box render_box = { struct wlr_box render_box = {
.x = lx, .y = ly, .x = ox, .y = oy,
.width = render_width, .height = render_height .width = render_width, .height = render_height
}; };
float matrix[16]; float matrix[16];
@ -78,8 +77,8 @@ static void render_surface(struct wlr_surface *surface,
rotate_child_position(&sx, &sy, sw, sh, width, height, rotation); rotate_child_position(&sx, &sy, sw, sh, width, height, rotation);
render_surface(subsurface->surface, wlr_output, when, render_surface(subsurface->surface, wlr_output, when,
lx + sx, ox + sx,
ly + sy, oy + sy,
rotation); rotation);
} }
} }