Skip to content

wayland_common: consider output rotations in --geometry and --autofit #16908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

wayland_common: consider output rotations in --geometry and --autofit #16908

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions video/out/wayland_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ struct vo_wayland_output {
int phys_width;
int phys_height;
int scale;
enum wl_output_transform transform;
double refresh_rate;
char *make;
char *model;
Expand Down Expand Up @@ -1595,6 +1596,7 @@ static void output_handle_geometry(void *data, struct wl_output *wl_output,
output->geometry.y0 = y;
output->phys_width = phys_width;
output->phys_height = phys_height;
output->transform = transform;
}

static void output_handle_mode(void *data, struct wl_output *wl_output,
Expand All @@ -1607,8 +1609,14 @@ static void output_handle_mode(void *data, struct wl_output *wl_output,
if (!(flags & WL_OUTPUT_MODE_CURRENT))
return;

output->geometry.x1 = width;
output->geometry.y1 = height;
if (output->transform % 2) {
output->geometry.x1 = height;
output->geometry.y1 = width;
} else {
output->geometry.x1 = width;
output->geometry.y1 = height;
}

output->flags = flags;
output->refresh_rate = (double)refresh * 0.001;
}
Expand Down
Loading