diff --git a/libweston/backend-rdp/rdp.c b/libweston/backend-rdp/rdp.c index 3e6e97bf4..af85465c0 100644 --- a/libweston/backend-rdp/rdp.c +++ b/libweston/backend-rdp/rdp.c @@ -1290,7 +1290,7 @@ rdp_translate_and_notify_mouse_position(RdpPeerContext *peerContext, UINT16 x, U weston_input_event_init(&event.base, &time, peerContext->item.seat); weston_pointer_motion_event_init(&event, WESTON_POINTER_MOTION_ABS, &pos, NULL, NULL); - notify_motion_absolute(peerContext->item.seat, &event); + notify_motion(peerContext->item.seat, &event); return TRUE; } return FALSE; @@ -1529,7 +1529,7 @@ xf_extendedMouseEvent(rdpInput *input, UINT16 flags, UINT16 x, UINT16 y) weston_input_event_init(&event.base, &time, peerContext->item.seat); weston_pointer_motion_event_init(&event, WESTON_POINTER_MOTION_ABS, &pos, NULL, NULL); - notify_motion_absolute(peerContext->item.seat, &event); + notify_motion(peerContext->item.seat, &event); need_frame = true; } diff --git a/libweston/backend-vnc/vnc.c b/libweston/backend-vnc/vnc.c index c400c2140..bbb0a6f7f 100644 --- a/libweston/backend-vnc/vnc.c +++ b/libweston/backend-vnc/vnc.c @@ -454,7 +454,7 @@ vnc_pointer_event(struct nvnc_client *client, uint16_t x, uint16_t y, weston_input_event_init(&event.base, &time, peer->seat); weston_pointer_motion_event_init(&event, WESTON_POINTER_MOTION_ABS, &pos, NULL, NULL); - notify_motion_absolute(peer->seat, &event); + notify_motion(peer->seat, &event); } changed_button_mask = peer->last_button_mask ^ button_mask; diff --git a/libweston/backend-wayland/wayland.c b/libweston/backend-wayland/wayland.c index c28e8c618..22b438913 100644 --- a/libweston/backend-wayland/wayland.c +++ b/libweston/backend-wayland/wayland.c @@ -1722,7 +1722,7 @@ input_handle_motion(void *data, struct wl_pointer *pointer, weston_input_event_init(&event.base, &ts, &input->base); weston_pointer_motion_event_init(&event, WESTON_POINTER_MOTION_ABS, &pos, NULL, NULL); - notify_motion_absolute(&input->base, &event); + notify_motion(&input->base, &event); want_frame = true; } diff --git a/libweston/backend.h b/libweston/backend.h index 8442e9325..a441f183b 100644 --- a/libweston/backend.h +++ b/libweston/backend.h @@ -253,9 +253,6 @@ notify_keyboard_focus_out(struct weston_seat *seat); void notify_motion(struct weston_seat *seat, const struct weston_pointer_motion_event *event); -void -notify_motion_absolute(struct weston_seat *seat, const struct weston_pointer_motion_event *event); - void notify_modifiers(struct weston_seat *seat, uint32_t serial); diff --git a/libweston/input.c b/libweston/input.c index c20a4c0ea..0371df001 100644 --- a/libweston/input.c +++ b/libweston/input.c @@ -2285,17 +2285,6 @@ run_modifier_bindings(struct weston_seat *seat, uint32_t old, uint32_t new) } } -WL_EXPORT void -notify_motion_absolute(struct weston_seat *seat, - const struct weston_pointer_motion_event *event) -{ - struct weston_compositor *ec = seat->compositor; - struct weston_pointer *pointer = weston_seat_get_pointer(seat); - - weston_compositor_wake(ec); - pointer->grab->interface->motion(pointer->grab, event); -} - static unsigned int peek_next_activate_serial(struct weston_compositor *c) { diff --git a/libweston/libinput-device.c b/libweston/libinput-device.c index 945dde060..f0666ef2e 100644 --- a/libweston/libinput-device.c +++ b/libweston/libinput-device.c @@ -178,7 +178,7 @@ handle_pointer_motion_absolute( weston_input_event_init(&event.base, &time, device->seat); weston_pointer_motion_event_init(&event, WESTON_POINTER_MOTION_ABS, &pos, NULL, NULL); - notify_motion_absolute(device->seat, &event); + notify_motion(device->seat, &event); return true; }