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

config: support libinput sendEventsMode

Browse source 
This allows to enable / disable libinput devices.

Co-Authored-By: @Consolatis
This commit is contained in:
Sachin Bhat 2023-06-26 07:36:54 +08:00 • committed by Consolatis
parent 9456b50983
commit 6fb06c54c2
6 changed files with 78 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/config/libinput.c
View file

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

26
src/config/rcxml.c
View file

@ -461,6 +461,29 @@ get_accel_profile(const char *s)
return -1;
}
static int
get_send_events_mode(const char *s)
{
if (!s) {
goto err;
}
int ret = parse_bool(s, -1);
if (ret >= 0) {
return ret
? LIBINPUT_CONFIG_SEND_EVENTS_ENABLED
: LIBINPUT_CONFIG_SEND_EVENTS_DISABLED;
}
if (!strcasecmp(s, "disabledOnExternalMouse")) {
return LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE;
}
err:
wlr_log(WLR_INFO, "Not a recognised send events mode");
return -1;
}
static void
fill_libinput_category(char *nodename, char *content)
{
@ -576,6 +599,9 @@ fill_libinput_category(char *nodename, char *content)
} else {
wlr_log(WLR_ERROR, "invalid clickMethod");
}
} else if (!strcasecmp(nodename, "sendEventsMode")) {
current_libinput_category->send_events_mode =
get_send_events_mode(content);
}
}

28
src/seat.c
View file

@ -91,6 +91,24 @@ get_category(struct wlr_input_device *device)
static void
configure_libinput(struct wlr_input_device *wlr_input_device)
{
/*
* TODO: We do not check any return values for the various
* libinput_device_config_*_set_*() calls. It would
* be nice if we could inform the users via log file
* that some libinput setting could not be applied.
*
* TODO: We are currently using int32_t with -1 as default
* to desribe the not-configured state. This is not
* really optimal as we can't properly deal with
* enum values that are 0. After some discussion via
* IRC the best way forward seem to be to use a
* uint32_t instead and UINT32_MAX as indicator for
* a not-configured state. This allows to properly
* test the enum being a member of a bitset via
* mask & value == value. All libinput enums are
* way below UINT32_MAX.
*/
if (!wlr_input_device) {
wlr_log(WLR_ERROR, "no wlr_input_device");
return;
@ -209,6 +227,16 @@ configure_libinput(struct wlr_input_device *wlr_input_device)
libinput_device_config_click_set_method(libinput_dev, dc->click_method);
}
if ((dc->send_events_mode != LIBINPUT_CONFIG_SEND_EVENTS_ENABLED
&& (libinput_device_config_send_events_get_modes(libinput_dev)
& dc->send_events_mode) == 0)
|| dc->send_events_mode < 0) {
wlr_log(WLR_INFO, "send events mode not configured");
} else {
wlr_log(WLR_INFO, "send events mode configured");
libinput_device_config_send_events_set_mode(libinput_dev, dc->send_events_mode);
}
}
static struct wlr_output *