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

tablet: handle mouse-buttons from a tool

Browse source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Reviewed-by: Stephen Chandler Paul <thatslyude@gmail.com>
This commit is contained in:
Peter Hutterer 2015-02-19 17:18:58 +10:00
parent 9be6b3e864
commit 7d62532479
2 changed files with 118 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/evdev-tablet.c
View file

@ -275,12 +275,20 @@ tablet_update_button(struct tablet_dispatch *tablet,
uint32_t evcode, uint32_t evcode,
uint32_t enable) uint32_t enable)
{ {
switch (evcode) {
if (evcode >= BTN_MISC && evcode <= BTN_TASK) { case BTN_LEFT:
return; case BTN_RIGHT:
} else if (evcode >= BTN_TOUCH && evcode <= BTN_STYLUS2) { case BTN_MIDDLE:
/* noop */ case BTN_SIDE:
} else { case BTN_EXTRA:
case BTN_FORWARD:
case BTN_BACK:
case BTN_TASK:
case BTN_TOUCH:
case BTN_STYLUS:
case BTN_STYLUS2:
break;
default:
log_info(tablet->device->base.seat->libinput, log_info(tablet->device->base.seat->libinput,
"Unhandled button %s (%#x)\n", "Unhandled button %s (%#x)\n",
libevdev_event_code_get_name(EV_KEY, evcode), evcode); libevdev_event_code_get_name(EV_KEY, evcode), evcode);
@ -344,6 +352,14 @@ tablet_process_key(struct tablet_dispatch *tablet,
tablet_unset_status(tablet, TABLET_STYLUS_IN_CONTACT); tablet_unset_status(tablet, TABLET_STYLUS_IN_CONTACT);
/* Fall through */ /* Fall through */
case BTN_LEFT:
case BTN_RIGHT:
case BTN_MIDDLE:
case BTN_SIDE:
case BTN_EXTRA:
case BTN_FORWARD:
case BTN_BACK:
case BTN_TASK:
case BTN_STYLUS: case BTN_STYLUS:
case BTN_STYLUS2: case BTN_STYLUS2:
default: default:

96
test/tablet.c
View file

@ -1103,6 +1103,100 @@ START_TEST(tool_capabilities)
} }
END_TEST END_TEST
START_TEST(mouse_tool)
{
struct litest_device *dev = litest_current_device();
struct libinput *li = dev->libinput;
struct libinput_event *event;
struct libinput_event_tablet *tev;
struct libinput_tool *tool;
if (!libevdev_has_event_code(dev->evdev,
EV_KEY,
BTN_TOOL_MOUSE))
return;
litest_drain_events(li);
litest_event(dev, EV_KEY, BTN_TOOL_MOUSE, 1);
litest_event(dev, EV_MSC, MSC_SERIAL, 1000);
litest_event(dev, EV_SYN, SYN_REPORT, 0);
litest_wait_for_event_of_type(li,
LIBINPUT_EVENT_TABLET_PROXIMITY,
-1);
event = libinput_get_event(li);
tev = libinput_event_get_tablet_event(event);
tool = libinput_event_tablet_get_tool(tev);
ck_assert_notnull(tool);
ck_assert_int_eq(libinput_tool_get_type(tool),
LIBINPUT_TOOL_MOUSE);
libinput_event_destroy(event);
}
END_TEST
START_TEST(mouse_buttons)
{
struct litest_device *dev = litest_current_device();
struct libinput *li = dev->libinput;
struct libinput_event *event;
struct libinput_event_tablet *tev;
struct libinput_tool *tool;
int code;
if (!libevdev_has_event_code(dev->evdev,
EV_KEY,
BTN_TOOL_MOUSE))
return;
litest_drain_events(li);
litest_event(dev, EV_KEY, BTN_TOOL_MOUSE, 1);
litest_event(dev, EV_ABS, ABS_MISC, 0x806); /* 5-button mouse tool_id */
litest_event(dev, EV_MSC, MSC_SERIAL, 1000);
litest_event(dev, EV_SYN, SYN_REPORT, 0);
litest_wait_for_event_of_type(li,
LIBINPUT_EVENT_TABLET_PROXIMITY,
-1);
event = libinput_get_event(li);
tev = libinput_event_get_tablet_event(event);
tool = libinput_event_tablet_get_tool(tev);
ck_assert_notnull(tool);
libinput_tool_ref(tool);
libinput_event_destroy(event);
for (code = BTN_LEFT; code <= BTN_TASK; code++) {
bool has_button = libevdev_has_event_code(dev->evdev,
EV_KEY,
code);
ck_assert_int_eq(!!has_button,
!!libinput_tool_has_button(tool, code));
if (!has_button)
continue;
litest_event(dev, EV_KEY, code, 1);
litest_event(dev, EV_SYN, SYN_REPORT, 0);
libinput_dispatch(li);
litest_event(dev, EV_KEY, code, 0);
litest_event(dev, EV_SYN, SYN_REPORT, 0);
libinput_dispatch(li);
litest_assert_tablet_button_event(li,
code,
LIBINPUT_BUTTON_STATE_PRESSED);
litest_assert_tablet_button_event(li,
code,
LIBINPUT_BUTTON_STATE_RELEASED);
}
libinput_tool_unref(tool);
}
END_TEST
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
@ -1123,6 +1217,8 @@ main(int argc, char **argv)
litest_add_for_device("tablet:left_handed", no_left_handed, LITEST_WACOM_CINTIQ); litest_add_for_device("tablet:left_handed", no_left_handed, LITEST_WACOM_CINTIQ);
litest_add("tablet:normalization", normalization, LITEST_TABLET, LITEST_ANY); litest_add("tablet:normalization", normalization, LITEST_TABLET, LITEST_ANY);
litest_add("tablet:pad", pad_buttons_ignored, LITEST_TABLET, LITEST_ANY); litest_add("tablet:pad", pad_buttons_ignored, LITEST_TABLET, LITEST_ANY);
litest_add("tablet:mouse", mouse_tool, LITEST_TABLET, LITEST_ANY);
litest_add("tablet:mouse", mouse_buttons, LITEST_TABLET, LITEST_ANY);
return litest_run(argc, argv); return litest_run(argc, argv);
} }