mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-24 06:59:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #522 from emersion/fix-drm-output-transform-cursor

Browse source 
Fix cursor on transformed output with DRM backend
This commit is contained in:
Tony Crisci 2017-12-27 05:48:45 -05:00 • committed by GitHub
commit 6c2242e66b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
types/wlr_output.c
View file

@ -726,11 +726,22 @@ void wlr_output_cursor_destroy(struct wlr_output_cursor *cursor) {
free(cursor);
}
enum wl_output_transform wlr_output_transform_invert(
enum wl_output_transform transform) {
if ((transform & WL_OUTPUT_TRANSFORM_90) &&
!(transform & WL_OUTPUT_TRANSFORM_FLIPPED)) {
transform ^= WL_OUTPUT_TRANSFORM_180;
enum wl_output_transform tr) {
if ((tr & WL_OUTPUT_TRANSFORM_90) && !(tr & WL_OUTPUT_TRANSFORM_FLIPPED)) {
tr ^= WL_OUTPUT_TRANSFORM_180;
}
return transform;
return tr;
}
enum wl_output_transform wlr_output_transform_compose(
enum wl_output_transform tr_a, enum wl_output_transform tr_b) {
uint32_t flipped = (tr_a ^ tr_b) & WL_OUTPUT_TRANSFORM_FLIPPED;
uint32_t rotated =
(tr_a + tr_b) & (WL_OUTPUT_TRANSFORM_90 | WL_OUTPUT_TRANSFORM_180);
if ((tr_a & WL_OUTPUT_TRANSFORM_FLIPPED) && (tr_b & WL_OUTPUT_TRANSFORM_FLIPPED)) {
rotated = wlr_output_transform_invert(rotated);
}
return flipped | rotated;
}