mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-01 22:58:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

chase: use wayland pointer enums rather than wlr ones

Browse source 
https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4575
This commit is contained in:
Consolatis 2024-03-19 01:32:05 +01:00 • committed by Johan Malm
parent d8d45dc2cb
commit 5c6e1ed878
6 changed files with 25 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/input/cursor.c
View file

@ -1153,7 +1153,7 @@ cursor_button(struct wl_listener *listener, void *data)
bool notify;
switch (event->state) {
case WLR_BUTTON_PRESSED:
case WL_POINTER_BUTTON_STATE_PRESSED:
notify = cursor_process_button_press(seat, event->button,
event->time_msec);
if (notify) {
@ -1161,7 +1161,7 @@ cursor_button(struct wl_listener *listener, void *data)
event->button, event->state);
}
break;
case WLR_BUTTON_RELEASED:
case WL_POINTER_BUTTON_STATE_RELEASED:
notify = cursor_process_button_release(seat, event->button,
event->time_msec);
if (notify) {
@ -1207,19 +1207,19 @@ cursor_emulate_move_absolute(struct seat *seat, struct wlr_input_device *device,
void
cursor_emulate_button(struct seat *seat, uint32_t button,
enum wlr_button_state state, uint32_t time_msec)
enum wl_pointer_button_state state, uint32_t time_msec)
{
idle_manager_notify_activity(seat->seat);
bool notify;
switch (state) {
case WLR_BUTTON_PRESSED:
case WL_POINTER_BUTTON_STATE_PRESSED:
notify = cursor_process_button_press(seat, button, time_msec);
if (notify) {
wlr_seat_pointer_notify_button(seat->seat, time_msec, button, state);
}
break;
case WLR_BUTTON_RELEASED:
case WL_POINTER_BUTTON_STATE_RELEASED:
notify = cursor_process_button_release(seat, button, time_msec);
if (notify) {
wlr_seat_pointer_notify_button(seat->seat, time_msec, button, state);
@ -1272,14 +1272,14 @@ handle_cursor_axis(struct server *server, struct cursor_context *ctx,
&server->seat.keyboard_group->keyboard);
enum direction direction = LAB_DIRECTION_INVALID;
if (event->orientation == WLR_AXIS_ORIENTATION_HORIZONTAL) {
if (event->orientation == WL_POINTER_AXIS_HORIZONTAL_SCROLL) {
int rel = compare_delta(event, &server->seat.smooth_scroll_offset.x);
if (rel < 0) {
direction = LAB_DIRECTION_LEFT;
} else if (rel > 0) {
direction = LAB_DIRECTION_RIGHT;
}
} else if (event->orientation == WLR_AXIS_ORIENTATION_VERTICAL) {
} else if (event->orientation == WL_POINTER_AXIS_VERTICAL_SCROLL) {
int rel = compare_delta(event, &server->seat.smooth_scroll_offset.y);
if (rel < 0) {
direction = LAB_DIRECTION_UP;