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

touchpad: move softbutton initialization to separate function

Browse source 
No functional changes

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2014-09-04 12:55:02 +10:00
parent 490ec84e73
commit 19648e29ab
2 changed files with 50 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
src/evdev-mt-touchpad-buttons.c
View file

@ -494,6 +494,52 @@ tp_release_all_buttons(struct tp_dispatch *tp,
}
}
void
tp_init_softbuttons(struct tp_dispatch *tp,
struct evdev_device *device)
{
int width, height;
const struct input_absinfo *absinfo_x, *absinfo_y;
int xoffset, yoffset;
int yres;
absinfo_x = device->abs.absinfo_x;
absinfo_y = device->abs.absinfo_y;
xoffset = absinfo_x->minimum,
yoffset = absinfo_y->minimum;
yres = absinfo_y->resolution;
width = abs(absinfo_x->maximum - absinfo_x->minimum);
height = abs(absinfo_y->maximum - absinfo_y->minimum);
/* button height: 10mm or 15% of the touchpad height,
whichever is smaller */
if (yres > 1 && (height * 0.15/yres) > 10) {
tp->buttons.bottom_area.top_edge =
absinfo_y->maximum - 10 * yres;
} else {
tp->buttons.bottom_area.top_edge = height * .85 + yoffset;
}
tp->buttons.bottom_area.rightbutton_left_edge = width/2 + xoffset;
if (tp->buttons.has_topbuttons) {
/* T440s has the top button line 5mm from the top,
event analysis has shown events to start down to ~10mm
from the top - which maps to 15% */
if (yres > 1) {
tp->buttons.top_area.bottom_edge =
yoffset + 10 * yres;
} else {
tp->buttons.top_area.bottom_edge = height * .15 + yoffset;
}
tp->buttons.top_area.rightbutton_left_edge = width * .58 + xoffset;
tp->buttons.top_area.leftbutton_right_edge = width * .42 + xoffset;
} else {
tp->buttons.top_area.bottom_edge = INT_MIN;
}
}
int
tp_init_buttons(struct tp_dispatch *tp,
struct evdev_device *device)
@ -535,36 +581,7 @@ tp_init_buttons(struct tp_dispatch *tp,
tp->buttons.use_clickfinger = true;
if (tp->buttons.is_clickpad && !tp->buttons.use_clickfinger) {
int xoffset = absinfo_x->minimum,
yoffset = absinfo_y->minimum;
int yres = absinfo_y->resolution;
/* button height: 10mm or 15% of the touchpad height,
whichever is smaller */
if (yres > 1 && (height * 0.15/yres) > 10) {
tp->buttons.bottom_area.top_edge =
absinfo_y->maximum - 10 * yres;
} else {
tp->buttons.bottom_area.top_edge = height * .85 + yoffset;
}
tp->buttons.bottom_area.rightbutton_left_edge = width/2 + xoffset;
if (tp->buttons.has_topbuttons) {
/* T440s has the top button line 5mm from the top,
event analysis has shown events to start down to ~10mm
from the top - which maps to 15% */
if (yres > 1) {
tp->buttons.top_area.bottom_edge =
yoffset + 10 * yres;
} else {
tp->buttons.top_area.bottom_edge = height * .15 + yoffset;
}
tp->buttons.top_area.rightbutton_left_edge = width * .58 + xoffset;
tp->buttons.top_area.leftbutton_right_edge = width * .42 + xoffset;
} else {
tp->buttons.top_area.bottom_edge = INT_MIN;
}
tp_init_softbuttons(tp, device);
} else {
tp->buttons.bottom_area.top_edge = INT_MAX;
tp->buttons.top_area.bottom_edge = INT_MIN;

3
src/evdev-mt-touchpad.h
View file

@ -245,6 +245,9 @@ tp_destroy_tap(struct tp_dispatch *tp);
int
tp_init_buttons(struct tp_dispatch *tp, struct evdev_device *device);
void
tp_init_softbuttons(struct tp_dispatch *tp, struct evdev_device *device);
void
tp_destroy_buttons(struct tp_dispatch *tp);