fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-05-08 06:38:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

evdev-touchpad: Set some options using weston.ini

Browse source 
This patch adds 3 new options to weston.ini to allow
the user to change default constant_accel_factor,
min_accel_factor and max_accel_factor. If no options
are set, it falls back using defaults as it did before.

v2: create weston_config_section_get_double and use it
instead of manualy converting string to double.

v3: add default values in weston_config_get_double
instead of using conditionals.

v4: don't pass diagonal as pointer.
This commit is contained in:
Armin K 2013-07-31 01:41:03 +02:00 • committed by Jonas Ådahl
parent 5a49ec0e83
commit b0044ab4e2
1 changed files with 35 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/evdev-touchpad.c
View file

@ -26,10 +26,12 @@
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>
#include <stdbool.h> #include <stdbool.h>
#include <unistd.h>
#include <linux/input.h> #include <linux/input.h>
#include "filter.h" #include "filter.h"
#include "evdev.h" #include "evdev.h"
#include "../shared/config-parser.h"
/* Default values */ /* Default values */
#define DEFAULT_CONSTANT_ACCEL_NUMERATOR 50 #define DEFAULT_CONSTANT_ACCEL_NUMERATOR 50
@ -670,6 +672,38 @@ struct evdev_dispatch_interface touchpad_interface = {
touchpad_destroy touchpad_destroy
}; };
static void
touchpad_parse_config(struct touchpad_dispatch *touchpad, double diagonal)
{
struct weston_config *config;
struct weston_config_section *s;
int config_fd;
double constant_accel_factor;
double min_accel_factor;
double max_accel_factor;
config_fd = open_config_file("weston.ini");
config = weston_config_parse(config_fd);
close(config_fd);
s = weston_config_get_section(config, "touchpad", NULL, NULL);
weston_config_section_get_double(s, "constant_accel_factor",
&constant_accel_factor,
DEFAULT_CONSTANT_ACCEL_NUMERATOR);
weston_config_section_get_double(s, "min_accel_factor",
&min_accel_factor,
DEFAULT_MIN_ACCEL_FACTOR);
weston_config_section_get_double(s, "max_accel_factor",
&max_accel_factor,
DEFAULT_MAX_ACCEL_FACTOR);
touchpad->constant_accel_factor =
constant_accel_factor / diagonal;
touchpad->min_accel_factor = min_accel_factor;
touchpad->max_accel_factor = max_accel_factor;
}
static int static int
touchpad_init(struct touchpad_dispatch *touchpad, touchpad_init(struct touchpad_dispatch *touchpad,
struct evdev_device *device) struct evdev_device *device)
@ -710,11 +744,7 @@ touchpad_init(struct touchpad_dispatch *touchpad,
height = abs(device->abs.max_y - device->abs.min_y); height = abs(device->abs.max_y - device->abs.min_y);
diagonal = sqrt(width*width + height*height); diagonal = sqrt(width*width + height*height);
touchpad->constant_accel_factor = touchpad_parse_config(touchpad, diagonal);
DEFAULT_CONSTANT_ACCEL_NUMERATOR / diagonal;
touchpad->min_accel_factor = DEFAULT_MIN_ACCEL_FACTOR;
touchpad->max_accel_factor = DEFAULT_MAX_ACCEL_FACTOR;
touchpad->hysteresis.margin_x = touchpad->hysteresis.margin_x =
diagonal / DEFAULT_HYSTERESIS_MARGIN_DENOMINATOR; diagonal / DEFAULT_HYSTERESIS_MARGIN_DENOMINATOR;