mirror of
https://codeberg.org/dwl/dwl.git
synced 2024-12-26 11:16:30 +00:00
follow up wlroots input device events renaming
This commit is contained in:
parent
230d3432e9
commit
98f33cd01d
1 changed files with 7 additions and 8 deletions
15
dwl.c
15
dwl.c
|
@ -619,7 +619,7 @@ axisnotify(struct wl_listener *listener, void *data)
|
|||
{
|
||||
/* This event is forwarded by the cursor when a pointer emits an axis event,
|
||||
* for example when you move the scroll wheel. */
|
||||
struct wlr_event_pointer_axis *event = data;
|
||||
struct wlr_pointer_axis_event *event = data;
|
||||
wlr_idle_notify_activity(idle, seat);
|
||||
/* Notify the client with pointer focus of the axis event. */
|
||||
wlr_seat_pointer_notify_axis(seat,
|
||||
|
@ -630,7 +630,7 @@ axisnotify(struct wl_listener *listener, void *data)
|
|||
void
|
||||
buttonpress(struct wl_listener *listener, void *data)
|
||||
{
|
||||
struct wlr_event_pointer_button *event = data;
|
||||
struct wlr_pointer_button_event *event = data;
|
||||
struct wlr_keyboard *keyboard;
|
||||
uint32_t mods;
|
||||
Client *c;
|
||||
|
@ -1228,7 +1228,7 @@ keypress(struct wl_listener *listener, void *data)
|
|||
int i;
|
||||
/* This event is raised when a key is pressed or released. */
|
||||
Keyboard *kb = wl_container_of(listener, kb, key);
|
||||
struct wlr_event_keyboard_key *event = data;
|
||||
struct wlr_keyboard_key_event *event = data;
|
||||
|
||||
/* Translate libinput keycode -> xkbcommon */
|
||||
uint32_t keycode = event->keycode + 8;
|
||||
|
@ -1340,8 +1340,8 @@ motionabsolute(struct wl_listener *listener, void *data)
|
|||
* move the mouse over the window. You could enter the window from any edge,
|
||||
* so we have to warp the mouse there. There is also some hardware which
|
||||
* emits these events. */
|
||||
struct wlr_event_pointer_motion_absolute *event = data;
|
||||
wlr_cursor_warp_absolute(cursor, event->device, event->x, event->y);
|
||||
struct wlr_pointer_motion_absolute_event *event = data;
|
||||
wlr_cursor_warp_absolute(cursor, &event->pointer->base, event->x, event->y);
|
||||
motionnotify(event->time_msec);
|
||||
}
|
||||
|
||||
|
@ -1416,14 +1416,13 @@ motionrelative(struct wl_listener *listener, void *data)
|
|||
{
|
||||
/* This event is forwarded by the cursor when a pointer emits a _relative_
|
||||
* pointer motion event (i.e. a delta) */
|
||||
struct wlr_event_pointer_motion *event = data;
|
||||
struct wlr_pointer_motion_event *event = data;
|
||||
/* The cursor doesn't move unless we tell it to. The cursor automatically
|
||||
* handles constraining the motion to the output layout, as well as any
|
||||
* special configuration applied for the specific input device which
|
||||
* generated the event. You can pass NULL for the device if you want to move
|
||||
* the cursor around without any input. */
|
||||
wlr_cursor_move(cursor, event->device,
|
||||
event->delta_x, event->delta_y);
|
||||
wlr_cursor_move(cursor, &event->pointer->base, event->delta_x, event->delta_y);
|
||||
motionnotify(event->time_msec);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue