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

touchpad: change offset ints to device_coords

Browse source 
No functional changes, just makes the unit more explicit

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Peter Hutterer 2016-07-15 10:54:05 +10:00
parent d9c2535721
commit 7464fa9710
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -543,15 +543,15 @@ tp_init_softbuttons(struct tp_dispatch *tp,
{ {
int width, height; int width, height;
const struct input_absinfo *absinfo_x, *absinfo_y; const struct input_absinfo *absinfo_x, *absinfo_y;
int xoffset, yoffset; struct device_coords offset;
int xres, yres; int xres, yres;
int mb_le, mb_re; /* middle button left/right edge */ int mb_le, mb_re; /* middle button left/right edge */
absinfo_x = device->abs.absinfo_x; absinfo_x = device->abs.absinfo_x;
absinfo_y = device->abs.absinfo_y; absinfo_y = device->abs.absinfo_y;
xoffset = absinfo_x->minimum, offset.x = absinfo_x->minimum,
yoffset = absinfo_y->minimum, offset.y = absinfo_y->minimum,
xres = absinfo_x->resolution; xres = absinfo_x->resolution;
yres = absinfo_y->resolution; yres = absinfo_y->resolution;
width = device->abs.dimensions.x; width = device->abs.dimensions.x;
@ -563,11 +563,11 @@ tp_init_softbuttons(struct tp_dispatch *tp,
tp->buttons.bottom_area.top_edge = tp->buttons.bottom_area.top_edge =
absinfo_y->maximum - 10 * yres; absinfo_y->maximum - 10 * yres;
} else { } else {
tp->buttons.bottom_area.top_edge = height * .85 + yoffset; tp->buttons.bottom_area.top_edge = height * .85 + offset.y;
} }
tp->buttons.bottom_area.middlebutton_left_edge = INT_MAX; tp->buttons.bottom_area.middlebutton_left_edge = INT_MAX;
tp->buttons.bottom_area.rightbutton_left_edge = width/2 + xoffset; tp->buttons.bottom_area.rightbutton_left_edge = width/2 + offset.x;
/* if middlebutton emulation is enabled, don't init a software area */ /* if middlebutton emulation is enabled, don't init a software area */
if (device->middlebutton.want_enabled) if (device->middlebutton.want_enabled)
@ -587,11 +587,11 @@ tp_init_softbuttons(struct tp_dispatch *tp,
const int MIDDLE_BUTTON_WIDTH = 10; /* mm */ const int MIDDLE_BUTTON_WIDTH = 10; /* mm */
int half_width = MIDDLE_BUTTON_WIDTH/2 * xres; /* units */ int half_width = MIDDLE_BUTTON_WIDTH/2 * xres; /* units */
mb_le = xoffset + width/2 - half_width; mb_le = offset.x + width/2 - half_width;
mb_re = xoffset + width/2 + half_width; mb_re = offset.x + width/2 + half_width;
} else { } else {
mb_le = xoffset + width * 0.375; mb_le = offset.x + width * 0.375;
mb_re = xoffset + width * 0.625; mb_re = offset.x + width * 0.625;
} }
tp->buttons.bottom_area.middlebutton_left_edge = mb_le; tp->buttons.bottom_area.middlebutton_left_edge = mb_le;
@ -605,14 +605,14 @@ tp_init_top_softbuttons(struct tp_dispatch *tp,
{ {
int width; int width;
const struct input_absinfo *absinfo_x, *absinfo_y; const struct input_absinfo *absinfo_x, *absinfo_y;
int xoffset, yoffset; struct device_coords offset;
int yres; int yres;
absinfo_x = device->abs.absinfo_x; absinfo_x = device->abs.absinfo_x;
absinfo_y = device->abs.absinfo_y; absinfo_y = device->abs.absinfo_y;
xoffset = absinfo_x->minimum, offset.x = absinfo_x->minimum,
yoffset = absinfo_y->minimum; offset.y = absinfo_y->minimum;
yres = absinfo_y->resolution; yres = absinfo_y->resolution;
width = device->abs.dimensions.x; width = device->abs.dimensions.x;
@ -623,9 +623,9 @@ tp_init_top_softbuttons(struct tp_dispatch *tp,
area using a multiplier for the touchpad disabled case. */ area using a multiplier for the touchpad disabled case. */
double topsize_mm = 10 * topbutton_size_mult; double topsize_mm = 10 * topbutton_size_mult;
tp->buttons.top_area.bottom_edge = yoffset + topsize_mm * yres; tp->buttons.top_area.bottom_edge = offset.y + topsize_mm * yres;
tp->buttons.top_area.rightbutton_left_edge = width * .58 + xoffset; tp->buttons.top_area.rightbutton_left_edge = width * .58 + offset.x;
tp->buttons.top_area.leftbutton_right_edge = width * .42 + xoffset; tp->buttons.top_area.leftbutton_right_edge = width * .42 + offset.x;
} else { } else {
tp->buttons.top_area.bottom_edge = INT_MIN; tp->buttons.top_area.bottom_edge = INT_MIN;
} }