fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2025-12-27 08:00:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into tablet-support

Browse source
This commit is contained in:
Peter Hutterer 2014-07-21 11:39:18 +10:00
commit 4d871c8e45
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/evdev-mt-touchpad.c
View file

@ -754,6 +754,9 @@ tp_init_palmdetect(struct tp_dispatch *tp,
{
int width;
tp->palm.right_edge = INT_MAX;
tp->palm.left_edge = INT_MIN;
/* We don't know how big the touchpad is */
if (device->abs.absinfo_x->resolution == 1)
return 0;
@ -763,11 +766,8 @@ tp_init_palmdetect(struct tp_dispatch *tp,
/* Enable palm detection on touchpads >= 80 mm. Anything smaller
probably won't need it, until we find out it does */
if (width/device->abs.absinfo_x->resolution < 80) {
tp->palm.right_edge = INT_MAX;
tp->palm.left_edge = INT_MIN;
if (width/device->abs.absinfo_x->resolution < 80)
return 0;
}
/* palm edges are 5% of the width on each side */
tp->palm.right_edge = device->abs.absinfo_x->maximum - width * 0.05;

7
src/libinput.h
View file

@ -1704,6 +1704,11 @@ libinput_device_get_size(struct libinput_device *device,
* in the right order.
*/
/**
* @ingroup config
*
* Status codes returned when applying configuration settings.
*/
enum libinput_config_status {
LIBINPUT_CONFIG_STATUS_SUCCESS = 0, /**< Config applied successfully */
LIBINPUT_CONFIG_STATUS_UNSUPPORTED, /**< Configuration not available on
@ -1712,7 +1717,7 @@ enum libinput_config_status {
};
/**
* @ingroup config Device configuration
* @ingroup config
*
* Return a string describing the error.
*