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: support scroll-factor

Browse source 
Fixes: issue #846
This commit is contained in:
Johan Malm 2023-03-25 15:57:47 +00:00 • committed by Johan Malm
parent 753aef9d78
commit a8e0248f47
5 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/labwc-config.5.scd
View file

@ -210,6 +210,9 @@ The rest of this man page describes configuration options.
*<mouse><doubleClickTime>* *<mouse><doubleClickTime>*
Set double click time in milliseconds. Default is 500. Set double click time in milliseconds. Default is 500.
*<mouse><scrollFactor>*
Set scroll factor. Default is 1.0.
*<mouse><context name=""><mousebind button="" direction=""><action>* *<mouse><context name=""><mousebind button="" direction=""><action>*
Multiple *<mousebind>* can exist within one *<context>*; and multiple Multiple *<mousebind>* can exist within one *<context>*; and multiple
*<action>* can exist within one *<mousebind>* *<action>* can exist within one *<mousebind>*

1
docs/rc.xml.all
View file

@ -199,6 +199,7 @@
<!-- time is in ms --> <!-- time is in ms -->
<doubleClickTime>500</doubleClickTime> <doubleClickTime>500</doubleClickTime>
<scrollFactor>1.0</scrollFactor>
<context name="Frame"> <context name="Frame">
<mousebind button="A-Left" action="Press"> <mousebind button="A-Left" action="Press">

1
include/config/rcxml.h
View file

@ -41,6 +41,7 @@ struct rcxml {
/* mouse */ /* mouse */
long doubleclick_time; /* in ms */ long doubleclick_time; /* in ms */
struct wl_list mousebinds; /* struct mousebind.link */ struct wl_list mousebinds; /* struct mousebind.link */
double scroll_factor;
/* libinput */ /* libinput */
struct wl_list libinput_categories; struct wl_list libinput_categories;

3
src/config/rcxml.c
View file

@ -420,6 +420,8 @@ entry(xmlNode *node, char *nodename, char *content)
} else { } else {
wlr_log(WLR_ERROR, "invalid doubleClickTime"); wlr_log(WLR_ERROR, "invalid doubleClickTime");
} }
} else if (!strcasecmp(nodename, "scrollFactor.mouse")) {
rc.scroll_factor = atof(content);
} else if (!strcasecmp(nodename, "name.context.mouse")) { } else if (!strcasecmp(nodename, "name.context.mouse")) {
current_mouse_context = content; current_mouse_context = content;
current_mousebind = NULL; current_mousebind = NULL;
@ -573,6 +575,7 @@ rcxml_init(void)
init_font_defaults(&rc.font_osd); init_font_defaults(&rc.font_osd);
rc.doubleclick_time = 500; rc.doubleclick_time = 500;
rc.scroll_factor = 1.0;
rc.repeat_rate = 25; rc.repeat_rate = 25;
rc.repeat_delay = 600; rc.repeat_delay = 600;
rc.screen_edge_strength = 20; rc.screen_edge_strength = 20;

3
src/cursor.c
View file

@ -1054,7 +1054,8 @@ cursor_axis(struct wl_listener *listener, void *data)
/* Notify the client with pointer focus of the axis event. */ /* Notify the client with pointer focus of the axis event. */
wlr_seat_pointer_notify_axis(seat->seat, event->time_msec, wlr_seat_pointer_notify_axis(seat->seat, event->time_msec,
event->orientation, event->delta, event->delta_discrete, event->orientation, rc.scroll_factor * event->delta,
round(rc.scroll_factor * event->delta_discrete),
event->source); event->source);
} }
} }