wayland: depend on xdg-output for output size/positioning information

This commit is contained in:
Daniel Eklöf 2019-03-14 19:41:06 +01:00
parent 2123956b14
commit fa586b9ac1

View file

@ -255,8 +255,6 @@ output_geometry(void *data, struct wl_output *wl_output, int32_t x, int32_t y,
int32_t transform) int32_t transform)
{ {
struct monitor *mon = data; struct monitor *mon = data;
mon->x = x;
mon->y = y;
mon->width_mm = physical_width; mon->width_mm = physical_width;
mon->height_mm = physical_height; mon->height_mm = physical_height;
} }
@ -265,9 +263,6 @@ static void
output_mode(void *data, struct wl_output *wl_output, uint32_t flags, output_mode(void *data, struct wl_output *wl_output, uint32_t flags,
int32_t width, int32_t height, int32_t refresh) int32_t width, int32_t height, int32_t refresh)
{ {
struct monitor *mon = data;
mon->width_px = width;
mon->height_px = height;
} }
static void static void
@ -295,12 +290,18 @@ xdg_output_handle_logical_position(void *data,
struct zxdg_output_v1 *xdg_output, struct zxdg_output_v1 *xdg_output,
int32_t x, int32_t y) int32_t x, int32_t y)
{ {
struct monitor *mon = data;
mon->x = x;
mon->y = y;
} }
static void static void
xdg_output_handle_logical_size(void *data, struct zxdg_output_v1 *xdg_output, xdg_output_handle_logical_size(void *data, struct zxdg_output_v1 *xdg_output,
int32_t width, int32_t height) int32_t width, int32_t height)
{ {
struct monitor *mon = data;
mon->width_px = width;
mon->height_px = height;
} }
static void static void