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

config: prefix enums with LAB_LIBINPUT_DEVICE_

Browse source
This commit is contained in:
Johan Malm 2024-01-01 19:14:08 +00:00 • committed by Johan Malm
parent a7f8eef163
commit 673c745cff
3 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/config/libinput.h
View file

@ -8,12 +8,10 @@
enum device_type { enum device_type {
LAB_LIBINPUT_DEVICE_NONE = 0, LAB_LIBINPUT_DEVICE_NONE = 0,
LAB_LIBINPUT_DEVICE_DEFAULT,
// FIXME: Rename the entries below with a LAB_LIBINPUT_ prefix LAB_LIBINPUT_DEVICE_TOUCH,
DEFAULT_DEVICE, LAB_LIBINPUT_DEVICE_TOUCHPAD,
TOUCH_DEVICE, LAB_LIBINPUT_DEVICE_NON_TOUCH,
TOUCHPAD_DEVICE,
NON_TOUCH_DEVICE,
}; };
struct libinput_category { struct libinput_category {

12
src/config/libinput.c
View file

@ -10,7 +10,7 @@
static void static void
libinput_category_init(struct libinput_category *l) libinput_category_init(struct libinput_category *l)
{ {
l->type = DEFAULT_DEVICE; l->type = LAB_LIBINPUT_DEVICE_DEFAULT;
l->name = NULL; l->name = NULL;
l->pointer_speed = -2; l->pointer_speed = -2;
l->natural_scroll = -1; l->natural_scroll = -1;
@ -31,16 +31,16 @@ get_device_type(const char *s)
return LAB_LIBINPUT_DEVICE_NONE; return LAB_LIBINPUT_DEVICE_NONE;
} }
if (!strcasecmp(s, "default")) { if (!strcasecmp(s, "default")) {
return DEFAULT_DEVICE; return LAB_LIBINPUT_DEVICE_DEFAULT;
} }
if (!strcasecmp(s, "touch")) { if (!strcasecmp(s, "touch")) {
return TOUCH_DEVICE; return LAB_LIBINPUT_DEVICE_TOUCH;
} }
if (!strcasecmp(s, "touchpad")) { if (!strcasecmp(s, "touchpad")) {
return TOUCHPAD_DEVICE; return LAB_LIBINPUT_DEVICE_TOUCHPAD;
} }
if (!strcasecmp(s, "non-touch")) { if (!strcasecmp(s, "non-touch")) {
return NON_TOUCH_DEVICE; return LAB_LIBINPUT_DEVICE_NON_TOUCH;
} }
return LAB_LIBINPUT_DEVICE_NONE; return LAB_LIBINPUT_DEVICE_NONE;
} }
@ -64,7 +64,7 @@ libinput_category_get_default(void)
* 'default' profiles were created. * 'default' profiles were created.
*/ */
wl_list_for_each_reverse(l, &rc.libinput_categories, link) { wl_list_for_each_reverse(l, &rc.libinput_categories, link) {
if (l->type == DEFAULT_DEVICE) { if (l->type == LAB_LIBINPUT_DEVICE_DEFAULT) {
return l; return l;
} }
} }

6
src/seat.c
View file

@ -39,7 +39,7 @@ device_type_from_wlr_device(struct wlr_input_device *wlr_input_device)
switch (wlr_input_device->type) { switch (wlr_input_device->type) {
case WLR_INPUT_DEVICE_TOUCH: case WLR_INPUT_DEVICE_TOUCH:
case WLR_INPUT_DEVICE_TABLET_TOOL: case WLR_INPUT_DEVICE_TABLET_TOOL:
return TOUCH_DEVICE; return LAB_LIBINPUT_DEVICE_TOUCH;
default: default:
break; break;
} }
@ -50,11 +50,11 @@ device_type_from_wlr_device(struct wlr_input_device *wlr_input_device)
wlr_libinput_get_device_handle(wlr_input_device); wlr_libinput_get_device_handle(wlr_input_device);
if (libinput_device_config_tap_get_finger_count(libinput_device) > 0) { if (libinput_device_config_tap_get_finger_count(libinput_device) > 0) {
return TOUCHPAD_DEVICE; return LAB_LIBINPUT_DEVICE_TOUCHPAD;
} }
} }
return NON_TOUCH_DEVICE; return LAB_LIBINPUT_DEVICE_NON_TOUCH;
} }
/* /*