nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-21 22:52:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: require libinput v1.19

Browse Source 
This version has been published back in 2021.
This commit is contained in:
Simon Ser 2024-07-04 22:51:07 +02:00
parent ee24201e26
commit 0a79bc28c7
4 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/libinput/events.c
View File

@ -167,12 +167,8 @@ void handle_libinput_event(struct wlr_libinput_backend *backend,
handle_pointer_button(event, &dev->pointer); handle_pointer_button(event, &dev->pointer);
break; break;
case LIBINPUT_EVENT_POINTER_AXIS: case LIBINPUT_EVENT_POINTER_AXIS:
#if !HAVE_LIBINPUT_SCROLL_VALUE120
/* This event must be ignored in favour of the SCROLL_* events */ /* This event must be ignored in favour of the SCROLL_* events */
handle_pointer_axis(event, &dev->pointer);
#endif
break; break;
#if HAVE_LIBINPUT_SCROLL_VALUE120
case LIBINPUT_EVENT_POINTER_SCROLL_WHEEL: case LIBINPUT_EVENT_POINTER_SCROLL_WHEEL:
handle_pointer_axis_value120(event, &dev->pointer, handle_pointer_axis_value120(event, &dev->pointer,
WL_POINTER_AXIS_SOURCE_WHEEL); WL_POINTER_AXIS_SOURCE_WHEEL);
@ -185,7 +181,6 @@ void handle_libinput_event(struct wlr_libinput_backend *backend,
handle_pointer_axis_value120(event, &dev->pointer, handle_pointer_axis_value120(event, &dev->pointer,
WL_POINTER_AXIS_SOURCE_CONTINUOUS); WL_POINTER_AXIS_SOURCE_CONTINUOUS);
break; break;
#endif
case LIBINPUT_EVENT_TOUCH_DOWN: case LIBINPUT_EVENT_TOUCH_DOWN:
handle_touch_down(event, &dev->touch); handle_touch_down(event, &dev->touch);
break; break;
@ -243,14 +238,12 @@ void handle_libinput_event(struct wlr_libinput_backend *backend,
case LIBINPUT_EVENT_GESTURE_PINCH_END: case LIBINPUT_EVENT_GESTURE_PINCH_END:
handle_pointer_pinch_end(event, &dev->pointer); handle_pointer_pinch_end(event, &dev->pointer);
break; break;
#if HAVE_LIBINPUT_HOLD_GESTURES
case LIBINPUT_EVENT_GESTURE_HOLD_BEGIN: case LIBINPUT_EVENT_GESTURE_HOLD_BEGIN:
handle_pointer_hold_begin(event, &dev->pointer); handle_pointer_hold_begin(event, &dev->pointer);
break; break;
case LIBINPUT_EVENT_GESTURE_HOLD_END: case LIBINPUT_EVENT_GESTURE_HOLD_END:
handle_pointer_hold_end(event, &dev->pointer); handle_pointer_hold_end(event, &dev->pointer);
break; break;
#endif
default: default:
wlr_log(WLR_DEBUG, "Unknown libinput event %d", event_type); wlr_log(WLR_DEBUG, "Unknown libinput event %d", event_type);
break; break;

5
backend/libinput/meson.build
View File

@ -5,7 +5,7 @@ endif
libinput = dependency( libinput = dependency(
'libinput', 'libinput',
version: '>=1.14.0', version: '>=1.19.0',
required: 'libinput' in backends, required: 'libinput' in backends,
not_found_message: '\n'.join(msg), not_found_message: '\n'.join(msg),
) )
@ -28,7 +28,4 @@ wlr_files += files(
features += { 'libinput-backend': true } features += { 'libinput-backend': true }
wlr_deps += libinput wlr_deps += libinput
# libinput hold gestures and high resolution scroll are available since 1.19.0
internal_config.set10('HAVE_LIBINPUT_HOLD_GESTURES', libinput.version().version_compare('>=1.19.0'))
internal_config.set10('HAVE_LIBINPUT_SCROLL_VALUE120', libinput.version().version_compare('>=1.19.0'))
internal_config.set10('HAVE_LIBINPUT_BUSTYPE', libinput.version().version_compare('>=1.26.0')) internal_config.set10('HAVE_LIBINPUT_BUSTYPE', libinput.version().version_compare('>=1.26.0'))

2
backend/libinput/pointer.c
View File

@ -136,7 +136,6 @@ void handle_pointer_axis(struct libinput_event *event,
wl_signal_emit_mutable(&pointer->events.frame, pointer); wl_signal_emit_mutable(&pointer->events.frame, pointer);
} }
#if HAVE_LIBINPUT_SCROLL_VALUE120
void handle_pointer_axis_value120(struct libinput_event *event, void handle_pointer_axis_value120(struct libinput_event *event,
struct wlr_pointer *pointer, enum wl_pointer_axis_source source) { struct wlr_pointer *pointer, enum wl_pointer_axis_source source) {
struct libinput_event_pointer *pevent = struct libinput_event_pointer *pevent =
@ -173,7 +172,6 @@ void handle_pointer_axis_value120(struct libinput_event *event,
} }
wl_signal_emit_mutable(&pointer->events.frame, pointer); wl_signal_emit_mutable(&pointer->events.frame, pointer);
} }
#endif
void handle_pointer_swipe_begin(struct libinput_event *event, void handle_pointer_swipe_begin(struct libinput_event *event,
struct wlr_pointer *pointer) { struct wlr_pointer *pointer) {

2
include/backend/libinput.h
View File

@ -71,10 +71,8 @@ void handle_pointer_button(struct libinput_event *event,
struct wlr_pointer *pointer); struct wlr_pointer *pointer);
void handle_pointer_axis(struct libinput_event *event, void handle_pointer_axis(struct libinput_event *event,
struct wlr_pointer *pointer); struct wlr_pointer *pointer);
#if HAVE_LIBINPUT_SCROLL_VALUE120
void handle_pointer_axis_value120(struct libinput_event *event, void handle_pointer_axis_value120(struct libinput_event *event,
struct wlr_pointer *pointer, enum wl_pointer_axis_source source); struct wlr_pointer *pointer, enum wl_pointer_axis_source source);
#endif
void handle_pointer_swipe_begin(struct libinput_event *event, void handle_pointer_swipe_begin(struct libinput_event *event,
struct wlr_pointer *pointer); struct wlr_pointer *pointer);
void handle_pointer_swipe_update(struct libinput_event *event, void handle_pointer_swipe_update(struct libinput_event *event,