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

tablet: group the pressure related bit into a substruct

Browse source 
No functional changes

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2020-09-09 12:54:32 +10:00
parent 1303adbf1b
commit 0e9fe09f1e
3 changed files with 30 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/evdev-tablet.c
View file

@ -371,10 +371,10 @@ normalize_pressure(const struct input_absinfo *absinfo,
* we have to clip to 0 for those. * we have to clip to 0 for those.
*/ */
if (tool->has_pressure_offset) if (tool->pressure.has_offset)
offset = tool->pressure_offset; offset = tool->pressure.offset;
else else
offset = tool->pressure_threshold.upper; offset = tool->pressure.threshold.upper;
range = absinfo->maximum - offset; range = absinfo->maximum - offset;
value = (absinfo->value - offset) / range; value = (absinfo->value - offset) / range;
@ -1081,8 +1081,8 @@ tool_set_pressure_thresholds(struct tablet_dispatch *tablet,
struct quirk_range r; struct quirk_range r;
int lo = 0, hi = 1; int lo = 0, hi = 1;
tool->pressure_offset = 0; tool->pressure.offset = 0;
tool->has_pressure_offset = false; tool->pressure.has_offset = false;
pressure = libevdev_get_abs_info(device->evdev, ABS_PRESSURE); pressure = libevdev_get_abs_info(device->evdev, ABS_PRESSURE);
if (!pressure) if (!pressure)
@ -1091,7 +1091,7 @@ tool_set_pressure_thresholds(struct tablet_dispatch *tablet,
quirks = evdev_libinput_context(device)->quirks; quirks = evdev_libinput_context(device)->quirks;
q = quirks_fetch_for_device(quirks, device->udev_device); q = quirks_fetch_for_device(quirks, device->udev_device);
tool->pressure_offset = pressure->minimum; tool->pressure.offset = pressure->minimum;
/* 5 and 1% of the pressure range */ /* 5 and 1% of the pressure range */
hi = axis_range_percentage(pressure, 5); hi = axis_range_percentage(pressure, 5);
@ -1107,8 +1107,8 @@ tool_set_pressure_thresholds(struct tablet_dispatch *tablet,
} }
} }
out: out:
tool->pressure_threshold.upper = hi; tool->pressure.threshold.upper = hi;
tool->pressure_threshold.lower = lo; tool->pressure.threshold.lower = lo;
quirks_unref(q); quirks_unref(q);
} }
@ -1251,7 +1251,7 @@ sanitize_pressure_distance(struct tablet_dispatch *tablet,
!bit_is_set(tablet->changed_axes, LIBINPUT_TABLET_TOOL_AXIS_PRESSURE)) !bit_is_set(tablet->changed_axes, LIBINPUT_TABLET_TOOL_AXIS_PRESSURE))
return; return;
tool_in_contact = (pressure->value > tool->pressure_offset); tool_in_contact = (pressure->value > tool->pressure.offset);
/* Keep distance and pressure mutually exclusive */ /* Keep distance and pressure mutually exclusive */
if (distance && if (distance &&
@ -1324,9 +1324,9 @@ detect_pressure_offset(struct tablet_dispatch *tablet,
* higher-than-needed pressure offset and then we'd be tied into a * higher-than-needed pressure offset and then we'd be tied into a
* high pressure offset for the rest of the session. * high pressure offset for the rest of the session.
*/ */
if (tool->has_pressure_offset) { if (tool->pressure.has_offset) {
if (offset < tool->pressure_offset) if (offset < tool->pressure.offset)
tool->pressure_offset = offset; tool->pressure.offset = offset;
return; return;
} }
@ -1358,9 +1358,9 @@ detect_pressure_offset(struct tablet_dispatch *tablet,
tablet_tool_type_to_string(tool->type), tablet_tool_type_to_string(tool->type),
tool->serial, tool->serial,
HTTP_DOC_LINK); HTTP_DOC_LINK);
tool->pressure_offset = offset; tool->pressure.offset = offset;
tool->has_pressure_offset = true; tool->pressure.has_offset = true;
tool->pressure_threshold.lower = pressure->minimum; tool->pressure.threshold.lower = pressure->minimum;
} }
static void static void
@ -1391,13 +1391,13 @@ detect_tool_contact(struct tablet_dispatch *tablet,
} }
pressure = p->value; pressure = p->value;
if (tool->has_pressure_offset) if (tool->pressure.has_offset)
pressure -= (tool->pressure_offset - p->minimum); pressure -= (tool->pressure.offset - p->minimum);
if (pressure <= tool->pressure_threshold.lower && if (pressure <= tool->pressure.threshold.lower &&
tablet_has_status(tablet, TABLET_TOOL_IN_CONTACT)) { tablet_has_status(tablet, TABLET_TOOL_IN_CONTACT)) {
tablet_set_status(tablet, TABLET_TOOL_LEAVING_CONTACT); tablet_set_status(tablet, TABLET_TOOL_LEAVING_CONTACT);
} else if (pressure >= tool->pressure_threshold.upper && } else if (pressure >= tool->pressure.threshold.upper &&
!tablet_has_status(tablet, TABLET_TOOL_IN_CONTACT)) { !tablet_has_status(tablet, TABLET_TOOL_IN_CONTACT)) {
tablet_set_status(tablet, TABLET_TOOL_ENTERING_CONTACT); tablet_set_status(tablet, TABLET_TOOL_ENTERING_CONTACT);
} }

8
src/evdev-totem.c
View file

@ -88,10 +88,10 @@ totem_new_tool(struct totem_dispatch *totem)
.refcount = 1, .refcount = 1,
}; };
tool->pressure_offset = 0; tool->pressure.offset = 0;
tool->has_pressure_offset = false; tool->pressure.has_offset = false;
tool->pressure_threshold.lower = 0; tool->pressure.threshold.lower = 0;
tool->pressure_threshold.upper = 1; tool->pressure.threshold.upper = 1;
set_bit(tool->axis_caps, LIBINPUT_TABLET_TOOL_AXIS_X); set_bit(tool->axis_caps, LIBINPUT_TABLET_TOOL_AXIS_X);
set_bit(tool->axis_caps, LIBINPUT_TABLET_TOOL_AXIS_Y); set_bit(tool->axis_caps, LIBINPUT_TABLET_TOOL_AXIS_Y);

12
src/libinput-private.h
View file

@ -378,11 +378,13 @@ struct libinput_tablet_tool {
int refcount; int refcount;
void *user_data; void *user_data;
/* The pressure threshold assumes a pressure_offset of 0 */ struct {
struct threshold pressure_threshold; /* The pressure threshold assumes a pressure_offset of 0 */
/* pressure_offset includes axis->minimum */ struct threshold threshold;
int pressure_offset; /* pressure_offset includes axis->minimum */
bool has_pressure_offset; int offset;
bool has_offset;
} pressure;
}; };
struct libinput_tablet_pad_mode_group { struct libinput_tablet_pad_mode_group {