mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #730 from martinetd/matrix_rotate

Browse source 
Rootston: fix rotation heading (was: wlr_matrix: fix matrix_rotate)
This commit is contained in:
emersion 2018-03-18 09:25:33 +01:00 • committed by GitHub
commit bfc9b13dcd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rootston/cursor.c
View file

@ -200,7 +200,7 @@ static void roots_cursor_update_position(struct roots_cursor *cursor,
uy = cursor->offs_y - oy; uy = cursor->offs_y - oy;
int vx = cursor->cursor->x - ox, int vx = cursor->cursor->x - ox,
vy = cursor->cursor->y - oy; vy = cursor->cursor->y - oy;
float angle = atan2(vx*uy - vy*ux, vx*ux + vy*uy); float angle = atan2(ux*vy - uy*vx, vx*ux + vy*uy);
int steps = 12; int steps = 12;
angle = round(angle/M_PI*steps) / (steps/M_PI); angle = round(angle/M_PI*steps) / (steps/M_PI);
view_rotate(view, cursor->view_rotation + angle); view_rotate(view, cursor->view_rotation + angle);

4
rootston/desktop.c
View file

@ -557,8 +557,8 @@ static bool view_at(struct roots_view *view, double lx, double ly,
double ox = view_sx - (double)box.width/2, double ox = view_sx - (double)box.width/2,
oy = view_sy - (double)box.height/2; oy = view_sy - (double)box.height/2;
// Rotated coordinates // Rotated coordinates
double rx = cos(view->rotation)*ox - sin(view->rotation)*oy, double rx = cos(view->rotation)*ox + sin(view->rotation)*oy,
ry = cos(view->rotation)*oy + sin(view->rotation)*ox; ry = cos(view->rotation)*oy - sin(view->rotation)*ox;
view_sx = rx + (double)box.width/2; view_sx = rx + (double)box.width/2;
view_sy = ry + (double)box.height/2; view_sy = ry + (double)box.height/2;
} }

16
rootston/output.c
View file

@ -29,8 +29,8 @@ static void rotate_child_position(double *sx, double *sy, double sw, double sh,
double ox = *sx - pw/2 + sw/2, double ox = *sx - pw/2 + sw/2,
oy = *sy - ph/2 + sh/2; oy = *sy - ph/2 + sh/2;
// Rotated coordinates // Rotated coordinates
double rx = cos(-rotation)*ox - sin(-rotation)*oy, double rx = cos(rotation)*ox - sin(rotation)*oy,
ry = cos(-rotation)*oy + sin(-rotation)*ox; ry = cos(rotation)*oy + sin(rotation)*ox;
*sx = rx + pw/2 - sw/2; *sx = rx + pw/2 - sw/2;
*sy = ry + ph/2 - sh/2; *sy = ry + ph/2 - sh/2;
} }
@ -227,7 +227,7 @@ static bool surface_intersect_output(struct wlr_surface *surface,
.x = lx, .y = ly, .x = lx, .y = ly,
.width = surface->current->width, .height = surface->current->height, .width = surface->current->width, .height = surface->current->height,
}; };
wlr_box_rotated_bounds(&layout_box, -rotation, &layout_box); wlr_box_rotated_bounds(&layout_box, rotation, &layout_box);
return wlr_output_layout_intersects(output_layout, wlr_output, &layout_box); return wlr_output_layout_intersects(output_layout, wlr_output, &layout_box);
} }
@ -275,7 +275,7 @@ static void render_surface(struct wlr_surface *surface, double lx, double ly,
} }
struct wlr_box rotated; struct wlr_box rotated;
wlr_box_rotated_bounds(&box, -rotation, &rotated); wlr_box_rotated_bounds(&box, rotation, &rotated);
pixman_region32_t damage; pixman_region32_t damage;
pixman_region32_init(&damage); pixman_region32_init(&damage);
@ -341,7 +341,7 @@ static void render_decorations(struct roots_view *view,
get_decoration_box(view, output, &box); get_decoration_box(view, output, &box);
struct wlr_box rotated; struct wlr_box rotated;
wlr_box_rotated_bounds(&box, -view->rotation, &rotated); wlr_box_rotated_bounds(&box, view->rotation, &rotated);
pixman_region32_t damage; pixman_region32_t damage;
pixman_region32_init(&damage); pixman_region32_init(&damage);
@ -616,7 +616,7 @@ static void damage_whole_surface(struct wlr_surface *surface,
return; return;
} }
wlr_box_rotated_bounds(&box, -rotation, &box); wlr_box_rotated_bounds(&box, rotation, &box);
wlr_output_damage_add_box(output->damage, &box); wlr_output_damage_add_box(output->damage, &box);
} }
@ -630,7 +630,7 @@ static void damage_whole_decoration(struct roots_view *view,
struct wlr_box box; struct wlr_box box;
get_decoration_box(view, output, &box); get_decoration_box(view, output, &box);
wlr_box_rotated_bounds(&box, -view->rotation, &box); wlr_box_rotated_bounds(&box, view->rotation, &box);
wlr_output_damage_add_box(output->damage, &box); wlr_output_damage_add_box(output->damage, &box);
} }
@ -689,7 +689,7 @@ static void damage_from_surface(struct wlr_surface *surface,
.width = (extents->x2 - extents->x1) * wlr_output->scale, .width = (extents->x2 - extents->x1) * wlr_output->scale,
.height = (extents->y2 - extents->y1) * wlr_output->scale, .height = (extents->y2 - extents->y1) * wlr_output->scale,
}; };
wlr_box_rotated_bounds(&damage_box, -rotation, &damage_box); wlr_box_rotated_bounds(&damage_box, rotation, &damage_box);
wlr_output_damage_add_box(output->damage, &damage_box); wlr_output_damage_add_box(output->damage, &damage_box);
} }
} }