Fix wayland output absolute input handling

This commit is contained in:
Drew DeVault 2018-03-28 14:04:23 -04:00
parent 32bdcdf719
commit 3813121fef

View file

@ -64,6 +64,9 @@ static void pointer_handle_motion(void *data, struct wl_pointer *wl_pointer,
wl_egl_window_get_attached_size(wlr_wl_pointer->current_output->egl_window, wl_egl_window_get_attached_size(wlr_wl_pointer->current_output->egl_window,
&width, &height); &width, &height);
int owidth, oheight;
wlr_output_effective_resolution(wlr_output, &owidth, &oheight);
struct wlr_box box = { struct wlr_box box = {
.x = wl_fixed_to_int(surface_x), .x = wl_fixed_to_int(surface_x),
.y = wl_fixed_to_int(surface_y), .y = wl_fixed_to_int(surface_y),
@ -80,8 +83,15 @@ static void pointer_handle_motion(void *data, struct wl_pointer *wl_pointer,
struct wlr_event_pointer_motion_absolute wlr_event; struct wlr_event_pointer_motion_absolute wlr_event;
wlr_event.device = dev; wlr_event.device = dev;
wlr_event.time_msec = time; wlr_event.time_msec = time;
wlr_event.x = transformed.x / layout_box.width;
wlr_event.y = transformed.y / layout_box.height; double tx = transformed.x / (double)owidth;
double ty = transformed.y / (double)oheight;
double ox = wlr_output->lx / (double)layout_box.width;
double oy = wlr_output->ly / (double)layout_box.height;
wlr_event.x = tx * ((double)owidth / layout_box.width) + ox;
wlr_event.y = ty * ((double)oheight / layout_box.height) + oy;
wlr_signal_emit_safe(&dev->pointer->events.motion_absolute, &wlr_event); wlr_signal_emit_safe(&dev->pointer->events.motion_absolute, &wlr_event);
} }