mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add touchpad device type

Browse source 
It is nice to have finer granularity for device types to allow for
configurations such as using `naturalScroll` on touchpads, but not on
regular pointer devices such as mice.
This commit is contained in:
Jared Baur 2023-12-15 07:36:29 -08:00 • committed by Johan Malm
parent e3cd189769
commit 6faee17d20
6 changed files with 30 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/config/libinput.c
View file

@ -32,6 +32,9 @@ get_device_type(const char *s)
if (!strcasecmp(s, "touch")) {
return TOUCH_DEVICE;
}
if (!strcasecmp(s, "touchpad")) {
return TOUCHPAD_DEVICE;
}
if (!strcasecmp(s, "non-touch")) {
return NON_TOUCH_DEVICE;
}

1
src/config/rcxml.c
View file

@ -460,6 +460,7 @@ fill_libinput_category(char *nodename, char *content)
if (!strcmp(nodename, "category")) {
if (!strcmp(content, "touch")
|| !strcmp(content, "touchpad")
|| !strcmp(content, "non-touch")
|| !strcmp(content, "default")) {
current_libinput_category->type = get_device_type(content);

24
src/seat.c
View file

@ -33,17 +33,28 @@ input_device_destroy(struct wl_listener *listener, void *data)
free(input);
}
static bool
is_touch_device(struct wlr_input_device *wlr_input_device)
static enum device_type
device_type_from_wlr_device(struct wlr_input_device *wlr_input_device)
{
switch (wlr_input_device->type) {
case WLR_INPUT_DEVICE_TOUCH:
case WLR_INPUT_DEVICE_TABLET_TOOL:
return true;
return TOUCH_DEVICE;
default:
break;
}
return false;
if (wlr_input_device->type == WLR_INPUT_DEVICE_POINTER &&
wlr_input_device_is_libinput(wlr_input_device)) {
struct libinput_device *libinput_device =
wlr_libinput_get_device_handle(wlr_input_device);
if (libinput_device_config_tap_get_finger_count(libinput_device) > 0) {
return TOUCHPAD_DEVICE;
}
}
return NON_TOUCH_DEVICE;
}
static void
@ -64,9 +75,8 @@ configure_libinput(struct wlr_input_device *wlr_input_device)
return;
}
enum device_type current_type;
current_type = is_touch_device(wlr_input_device)
? TOUCH_DEVICE : NON_TOUCH_DEVICE;
enum device_type current_type =
device_type_from_wlr_device(wlr_input_device);
struct libinput_category *device_category, *dc = NULL;
wl_list_for_each(device_category, &rc.libinput_categories, link) {