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

input: move <scrollFactor> to <libinput> section

Browse source 
This allows per-device configuration of scroll factor (e.g. setting
different scroll factors for mice and touchpads).
This commit is contained in:
tokyo4j 2024-08-08 17:29:43 +09:00 • committed by Hiroaki Yamamoto
parent 228a74ca48
commit b667107d1a
9 changed files with 45 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/config/rcxml.c
View file

@ -63,6 +63,8 @@ static struct window_rule *current_window_rule;
static struct action *current_window_rule_action;
static struct view_query *current_view_query;
static struct action *current_child_action;
/* for backword compatibility of <mouse><scrollFactor> */
static double mouse_scroll_factor = -1;
enum font_place {
FONT_PLACE_NONE = 0,
@ -733,6 +735,8 @@ fill_libinput_category(char *nodename, char *content)
current_libinput_category->have_calibration_matrix = false;
}
g_strfreev(elements);
} else if (!strcasecmp(nodename, "scrollFactor")) {
set_double(content, &current_libinput_category->scroll_factor);
}
}
@ -1011,7 +1015,8 @@ entry(xmlNode *node, char *nodename, char *content)
wlr_log(WLR_ERROR, "invalid doubleClickTime");
}
} else if (!strcasecmp(nodename, "scrollFactor.mouse")) {
set_double(content, &rc.scroll_factor);
/* This is deprecated. Show an error message in post_processing() */
set_double(content, &mouse_scroll_factor);
} else if (!strcasecmp(nodename, "name.context.mouse")) {
current_mouse_context = content;
current_mousebind = NULL;
@ -1345,7 +1350,6 @@ rcxml_init(void)
rc.raise_on_focus = false;
rc.doubleclick_time = 500;
rc.scroll_factor = 1.0;
rc.tablet.force_mouse_emulation = false;
rc.tablet.output_name = NULL;
@ -1596,12 +1600,21 @@ post_processing(void)
rc.font_osd.name = xstrdup("sans");
}
if (!libinput_category_get_default()) {
/* So we still allow tap to click by default */
/* So we set default values of <tap> and <scrollFactor> */
struct libinput_category *l = libinput_category_create();
/* Prevents unused variable warning when compiled without asserts */
(void)l;
assert(l && libinput_category_get_default() == l);
}
if (mouse_scroll_factor >= 0) {
wlr_log(WLR_ERROR, "<mouse><scrollFactor> is deprecated"
" and overwrites <libinput><scrollFactor>."
" Use only <libinput><scrollFactor>.");
struct libinput_category *l;
wl_list_for_each(l, &rc.libinput_categories, link) {
l->scroll_factor = mouse_scroll_factor;
}
}
int nr_workspaces = wl_list_length(&rc.workspace_config.workspaces);
if (nr_workspaces < rc.workspace_config.min_nr_workspaces) {
@ -1884,4 +1897,5 @@ rcxml_finish(void)
current_field = NULL;
current_window_rule = NULL;
current_window_rule_action = NULL;
mouse_scroll_factor = -1;
}