mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-04-12 08:21:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

config: add click method libinput option

Browse source
This commit is contained in:
Marvin Dostal 2024-01-06 23:03:31 +01:00
parent 72f3ce6b41
commit 909593cdd5
4 changed files with 22 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/config/libinput.h
View file

@ -28,6 +28,7 @@ struct libinput_category {
int accel_profile; /* -1 or libinput_config_accel_profile */ int accel_profile; /* -1 or libinput_config_accel_profile */
int middle_emu; /* -1 or libinput_config_middle_emulation_state */ int middle_emu; /* -1 or libinput_config_middle_emulation_state */
int dwt; /* -1 or libinput_config_dwt_state */ int dwt; /* -1 or libinput_config_dwt_state */
enum libinput_config_click_method click_method;
}; };
enum lab_libinput_device_type get_device_type(const char *s); enum lab_libinput_device_type get_device_type(const char *s);

1
src/config/libinput.c
View file

@ -22,6 +22,7 @@ libinput_category_init(struct libinput_category *l)
l->accel_profile = -1; l->accel_profile = -1;
l->middle_emu = -1; l->middle_emu = -1;
l->dwt = -1; l->dwt = -1;
l->click_method = LIBINPUT_CONFIG_CLICK_METHOD_BUTTON_AREAS;
} }
enum lab_libinput_device_type enum lab_libinput_device_type

13
src/config/rcxml.c
View file

@ -544,6 +544,19 @@ fill_libinput_category(char *nodename, char *content)
current_libinput_category->dwt = ret current_libinput_category->dwt = ret
? LIBINPUT_CONFIG_DWT_ENABLED ? LIBINPUT_CONFIG_DWT_ENABLED
: LIBINPUT_CONFIG_DWT_DISABLED; : LIBINPUT_CONFIG_DWT_DISABLED;
} else if (!strcasecmp(nodename, "clickMethod")) {
if (!strcmp(content, "none")) {
current_libinput_category->click_method =
LIBINPUT_CONFIG_CLICK_METHOD_NONE;
} else if (!strcmp(content, "clickfinger")) {
current_libinput_category->click_method =
LIBINPUT_CONFIG_CLICK_METHOD_CLICKFINGER;
} else if (!strcmp(content, "buttonAreas")) {
current_libinput_category->click_method =
LIBINPUT_CONFIG_CLICK_METHOD_BUTTON_AREAS;
} else {
wlr_log(WLR_ERROR, "invalid clickMethod");
}
} }
} }

7
src/seat.c
View file

@ -15,6 +15,7 @@
#include "input/keyboard.h" #include "input/keyboard.h"
#include "input/key-state.h" #include "input/key-state.h"
#include "labwc.h" #include "labwc.h"
#include "libinput.h"
#include "view.h" #include "view.h"
static void static void
@ -189,6 +190,12 @@ configure_libinput(struct wlr_input_device *wlr_input_device)
wlr_log(WLR_INFO, "dwt configured"); wlr_log(WLR_INFO, "dwt configured");
libinput_device_config_dwt_set_enabled(libinput_dev, dc->dwt); libinput_device_config_dwt_set_enabled(libinput_dev, dc->dwt);
} }
if (libinput_device_config_click_set_method(libinput_dev,
dc->click_method) > 0) {
wlr_log(WLR_INFO, "click method not configured");
} else {
wlr_log(WLR_INFO, "click method configured");
}
} }
static struct wlr_output * static struct wlr_output *