mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-03 09:01:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

seat: refactor obtaining libinput category for device

Browse source 
No functional change intended.
This commit is contained in:
Johan Malm 2024-01-01 17:46:30 +00:00 • committed by Johan Malm
parent 94cec51d9f
commit a7f8eef163
1 changed files with 31 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/seat.c
View file

@ -57,6 +57,36 @@ device_type_from_wlr_device(struct wlr_input_device *wlr_input_device)
return NON_TOUCH_DEVICE; return NON_TOUCH_DEVICE;
} }
/*
* Get applicable profile (category) by matching first by name and secondly be
* type (e.g. 'touch' and 'non-touch'). If not suitable match is found based on
* those two criteria we fallback on 'default'.
*/
static struct libinput_category *
get_category(struct wlr_input_device *device)
{
/* By name */
struct libinput_category *category;
wl_list_for_each_reverse(category, &rc.libinput_categories, link) {
if (category->name) {
if (!strcasecmp(device->name, category->name)) {
return category;
}
}
}
/* By type */
enum device_type type = device_type_from_wlr_device(device);
wl_list_for_each_reverse(category, &rc.libinput_categories, link) {
if (category->type == type) {
return category;
}
}
/* Use default profile as a fallback */
return libinput_category_get_default();
}
static void static void
configure_libinput(struct wlr_input_device *wlr_input_device) configure_libinput(struct wlr_input_device *wlr_input_device)
{ {
@ -75,24 +105,7 @@ configure_libinput(struct wlr_input_device *wlr_input_device)
return; return;
} }
enum device_type current_type = struct libinput_category *dc = get_category(wlr_input_device);
device_type_from_wlr_device(wlr_input_device);
struct libinput_category *device_category, *dc = NULL;
wl_list_for_each_reverse(device_category, &rc.libinput_categories, link) {
if (device_category->name) {
if (!strcasecmp(wlr_input_device->name,
device_category->name)) {
dc = device_category;
break;
}
} else if (device_category->type == current_type) {
dc = device_category;
} else if (device_category->type == DEFAULT_DEVICE && !dc) {
/* Match default category as last-resort */
dc = device_category;
}
}
/* /*
* The above logic should have always matched SOME category * The above logic should have always matched SOME category