semfault/dwl
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wlroots-next' into scenegraph-wlroots-next

Browse source
This commit is contained in:
Leonardo Hernández Hernández 2022-03-18 17:21:41 -06:00
parent a7c4f6100a 98f33cd01d
commit c8290f8c55
No known key found for this signature in database
GPG key ID: E538897EE11B9624
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
dwl.c
View file

@ -490,7 +490,7 @@ axisnotify(struct wl_listener *listener, void *data)
{ {
/* This event is forwarded by the cursor when a pointer emits an axis event, /* This event is forwarded by the cursor when a pointer emits an axis event,
* for example when you move the scroll wheel. */ * 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); wlr_idle_notify_activity(idle, seat);
/* Notify the client with pointer focus of the axis event. */ /* Notify the client with pointer focus of the axis event. */
wlr_seat_pointer_notify_axis(seat, wlr_seat_pointer_notify_axis(seat,
@ -501,7 +501,7 @@ axisnotify(struct wl_listener *listener, void *data)
void void
buttonpress(struct wl_listener *listener, void *data) 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; struct wlr_keyboard *keyboard;
uint32_t mods; uint32_t mods;
Client *c; Client *c;
@ -1108,7 +1108,7 @@ keypress(struct wl_listener *listener, void *data)
int i; int i;
/* This event is raised when a key is pressed or released. */ /* This event is raised when a key is pressed or released. */
Keyboard *kb = wl_container_of(listener, kb, key); 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 */ /* Translate libinput keycode -> xkbcommon */
uint32_t keycode = event->keycode + 8; uint32_t keycode = event->keycode + 8;
@ -1234,8 +1234,8 @@ motionabsolute(struct wl_listener *listener, void *data)
* move the mouse over the window. You could enter the window from any edge, * 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 * so we have to warp the mouse there. There is also some hardware which
* emits these events. */ * emits these events. */
struct wlr_event_pointer_motion_absolute *event = data; struct wlr_pointer_motion_absolute_event *event = data;
wlr_cursor_warp_absolute(cursor, event->device, event->x, event->y); wlr_cursor_warp_absolute(cursor, &event->pointer->base, event->x, event->y);
motionnotify(event->time_msec); motionnotify(event->time_msec);
} }
@ -1286,14 +1286,13 @@ motionrelative(struct wl_listener *listener, void *data)
{ {
/* This event is forwarded by the cursor when a pointer emits a _relative_ /* This event is forwarded by the cursor when a pointer emits a _relative_
* pointer motion event (i.e. a delta) */ * 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 /* 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 * handles constraining the motion to the output layout, as well as any
* special configuration applied for the specific input device which * special configuration applied for the specific input device which
* generated the event. You can pass NULL for the device if you want to move * generated the event. You can pass NULL for the device if you want to move
* the cursor around without any input. */ * the cursor around without any input. */
wlr_cursor_move(cursor, event->device, wlr_cursor_move(cursor, &event->pointer->base, event->delta_x, event->delta_y);
event->delta_x, event->delta_y);
motionnotify(event->time_msec); motionnotify(event->time_msec);
} }