mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-29 05:40:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pointer: use enum wl_pointer_button_state

Browse source
This commit is contained in:
Simon Ser 2024-02-28 10:26:38 +01:00 • committed by Simon Zeni
parent 9f4cf242d9
commit 812451cd8f
8 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backend/libinput/pointer.c
View file

@ -69,13 +69,13 @@ void handle_pointer_button(struct libinput_event *event,
uint32_t seat_count = libinput_event_pointer_get_seat_button_count(pevent);
switch (libinput_event_pointer_get_button_state(pevent)) {
case LIBINPUT_BUTTON_STATE_PRESSED:
wlr_event.state = WLR_BUTTON_PRESSED;
wlr_event.state = WL_POINTER_BUTTON_STATE_PRESSED;
if (seat_count != 1) {
return;
}
break;
case LIBINPUT_BUTTON_STATE_RELEASED:
wlr_event.state = WLR_BUTTON_RELEASED;
wlr_event.state = WL_POINTER_BUTTON_STATE_RELEASED;
if (seat_count != 0) {
return;
}

14
backend/x11/input_device.c
View file

@ -29,7 +29,7 @@ static void send_key_event(struct wlr_x11_backend *x11, uint32_t key,
}
static void send_button_event(struct wlr_x11_output *output, uint32_t key,
enum wlr_button_state st, xcb_timestamp_t time) {
enum wl_pointer_button_state st, xcb_timestamp_t time) {
struct wlr_pointer_button_event ev = {
.pointer = &output->pointer,
.time_msec = time,
@ -155,15 +155,15 @@ void handle_x11_xinput_event(struct wlr_x11_backend *x11,
switch (ev->detail) {
case XCB_BUTTON_INDEX_1:
send_button_event(output, BTN_LEFT, WLR_BUTTON_PRESSED,
send_button_event(output, BTN_LEFT, WL_POINTER_BUTTON_STATE_PRESSED,
ev->time);
break;
case XCB_BUTTON_INDEX_2:
send_button_event(output, BTN_MIDDLE, WLR_BUTTON_PRESSED,
send_button_event(output, BTN_MIDDLE, WL_POINTER_BUTTON_STATE_PRESSED,
ev->time);
break;
case XCB_BUTTON_INDEX_3:
send_button_event(output, BTN_RIGHT, WLR_BUTTON_PRESSED,
send_button_event(output, BTN_RIGHT, WL_POINTER_BUTTON_STATE_PRESSED,
ev->time);
break;
case XCB_BUTTON_INDEX_4:
@ -188,15 +188,15 @@ void handle_x11_xinput_event(struct wlr_x11_backend *x11,
switch (ev->detail) {
case XCB_BUTTON_INDEX_1:
send_button_event(output, BTN_LEFT, WLR_BUTTON_RELEASED,
send_button_event(output, BTN_LEFT, WL_POINTER_BUTTON_STATE_RELEASED,
ev->time);
break;
case XCB_BUTTON_INDEX_2:
send_button_event(output, BTN_MIDDLE, WLR_BUTTON_RELEASED,
send_button_event(output, BTN_MIDDLE, WL_POINTER_BUTTON_STATE_RELEASED,
ev->time);
break;
case XCB_BUTTON_INDEX_3:
send_button_event(output, BTN_RIGHT, WLR_BUTTON_RELEASED,
send_button_event(output, BTN_RIGHT, WL_POINTER_BUTTON_STATE_RELEASED,
ev->time);
break;
}