config: minor cleanup of click method configuration code

This commit is contained in:
Marvin Dostal 2024-02-18 16:06:33 +01:00
parent c1982e4009
commit 6ea6689136

View file

@ -189,19 +189,19 @@ 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 (dc->click_method < 0 if ((libinput_device_config_click_get_methods(libinput_dev)
|| & dc->click_method) == 0
(libinput_device_config_click_get_methods(libinput_dev) || dc->click_method < 0) {
& dc->click_method) == 0) {
wlr_log(WLR_INFO, "click method not configured"); wlr_log(WLR_INFO, "click method not configured");
} else { } else {
wlr_log(WLR_INFO, "click method configured"); wlr_log(WLR_INFO, "click method configured");
// Note, the documentation claims that: // Note, the documentation claims that:
// > @note [...] The device may require changing to a neutral // > [...] The device may require changing to a neutral state
// > state first before activating the new method. // > first before activating the new method.
// //
// However, just setting the method worked without issues. // However, just setting the method seems to work without
// issues.
libinput_device_config_click_set_method(libinput_dev, dc->click_method); libinput_device_config_click_set_method(libinput_dev, dc->click_method);
} }