mirror of
https://gitlab.freedesktop.org/libinput/libinput.git
synced 2026-02-04 04:40:25 +01:00
test: add an apple magicmouse device
This device has a touchpad on the mouse but it's labeled as mouse. For litest we only label it as LITEST_MOUSE feature and test the touchpad directly on the device. 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
parent
5f55d71774
commit
9bb0cfd878
8 changed files with 135 additions and 0 deletions
|
|
@ -1806,6 +1806,7 @@ evdev_read_model_flags(struct evdev_device *device)
|
|||
MODEL(LENOVO_T450_TOUCHPAD),
|
||||
MODEL(PRECISE_TOUCHPAD),
|
||||
MODEL(TRACKBALL),
|
||||
MODEL(APPLE_MAGICMOUSE),
|
||||
{ NULL, EVDEV_MODEL_DEFAULT },
|
||||
#undef MODEL
|
||||
};
|
||||
|
|
@ -2424,6 +2425,12 @@ evdev_pre_configure_model_quirks(struct evdev_device *device)
|
|||
libevdev_disable_event_code(device->evdev, EV_KEY, 0x119);
|
||||
libevdev_disable_event_code(device->evdev, EV_KEY, 0x11a);
|
||||
}
|
||||
/* The Apple MagicMouse has a touchpad built-in but the kernel still
|
||||
* emulates a full 2/3 button mouse for us. Ignore anything from the
|
||||
* ABS interface
|
||||
*/
|
||||
if (device->model_flags & EVDEV_MODEL_APPLE_MAGICMOUSE)
|
||||
libevdev_disable_event_type(device->evdev, EV_ABS);
|
||||
}
|
||||
|
||||
struct evdev_device *
|
||||
|
|
|
|||
|
|
@ -116,6 +116,7 @@ enum evdev_device_model {
|
|||
EVDEV_MODEL_LENOVO_T450_TOUCHPAD= (1 << 17),
|
||||
EVDEV_MODEL_PRECISE_TOUCHPAD = (1 << 18),
|
||||
EVDEV_MODEL_TRACKBALL = (1 << 19),
|
||||
EVDEV_MODEL_APPLE_MAGICMOUSE = (1 << 20),
|
||||
};
|
||||
|
||||
struct mt_slot {
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ liblitest_la_SOURCES = \
|
|||
litest-device-alps-dualpoint.c \
|
||||
litest-device-anker-mouse-kbd.c \
|
||||
litest-device-apple-internal-keyboard.c \
|
||||
litest-device-apple-magicmouse.c \
|
||||
litest-device-asus-rog-gladius.c \
|
||||
litest-device-atmel-hover.c \
|
||||
litest-device-bcm5974.c \
|
||||
|
|
|
|||
|
|
@ -1331,6 +1331,21 @@ START_TEST(device_quirks_cyborg_rat_mode_button)
|
|||
}
|
||||
END_TEST
|
||||
|
||||
START_TEST(device_quirks_apple_magicmouse)
|
||||
{
|
||||
struct litest_device *dev = litest_current_device();
|
||||
struct libinput *li = dev->libinput;
|
||||
|
||||
litest_drain_events(li);
|
||||
|
||||
/* ensure we get no events from the touch */
|
||||
litest_touch_down(dev, 0, 50, 50);
|
||||
litest_touch_move_to(dev, 0, 50, 50, 80, 80, 10, 0);
|
||||
litest_touch_up(dev, 0);
|
||||
litest_assert_empty_queue(li);
|
||||
}
|
||||
END_TEST
|
||||
|
||||
void
|
||||
litest_setup_tests(void)
|
||||
{
|
||||
|
|
@ -1389,4 +1404,5 @@ litest_setup_tests(void)
|
|||
|
||||
litest_add_for_device("device:quirks", device_quirks_no_abs_mt_y, LITEST_ANKER_MOUSE_KBD);
|
||||
litest_add_for_device("device:quirks", device_quirks_cyborg_rat_mode_button, LITEST_CYBORG_RAT);
|
||||
litest_add_for_device("device:quirks", device_quirks_apple_magicmouse, LITEST_MAGICMOUSE);
|
||||
}
|
||||
|
|
|
|||
104
test/litest-device-apple-magicmouse.c
Normal file
104
test/litest-device-apple-magicmouse.c
Normal file
|
|
@ -0,0 +1,104 @@
|
|||
/*
|
||||
* Copyright © 2016 Red Hat, Inc.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the next
|
||||
* paragraph) shall be included in all copies or substantial portions of the
|
||||
* Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
* DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#if HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include "litest.h"
|
||||
#include "litest-int.h"
|
||||
|
||||
static void litest_magicmouse_setup(void)
|
||||
{
|
||||
struct litest_device *d = litest_create_device(LITEST_MAGICMOUSE);
|
||||
litest_set_current_device(d);
|
||||
}
|
||||
|
||||
static struct input_event down[] = {
|
||||
{ .type = EV_ABS, .code = ABS_MT_SLOT, .value = LITEST_AUTO_ASSIGN },
|
||||
{ .type = EV_ABS, .code = ABS_MT_TRACKING_ID, .value = LITEST_AUTO_ASSIGN },
|
||||
{ .type = EV_ABS, .code = ABS_MT_TOUCH_MAJOR, .value = 272 },
|
||||
{ .type = EV_ABS, .code = ABS_MT_TOUCH_MINOR, .value = 400 },
|
||||
{ .type = EV_ABS, .code = ABS_MT_POSITION_X, .value = LITEST_AUTO_ASSIGN },
|
||||
{ .type = EV_ABS, .code = ABS_MT_POSITION_Y, .value = LITEST_AUTO_ASSIGN },
|
||||
{ .type = EV_ABS, .code = ABS_MT_PRESSURE, .value = LITEST_AUTO_ASSIGN },
|
||||
{ .type = EV_SYN, .code = SYN_REPORT, .value = 0 },
|
||||
{ .type = -1, .code = -1 },
|
||||
};
|
||||
|
||||
static struct input_event move[] = {
|
||||
{ .type = EV_ABS, .code = ABS_MT_SLOT, .value = LITEST_AUTO_ASSIGN },
|
||||
{ .type = EV_ABS, .code = ABS_MT_TOUCH_MAJOR, .value = 272 },
|
||||
{ .type = EV_ABS, .code = ABS_MT_TOUCH_MINOR, .value = 400 },
|
||||
{ .type = EV_ABS, .code = ABS_MT_POSITION_X, .value = LITEST_AUTO_ASSIGN },
|
||||
{ .type = EV_ABS, .code = ABS_MT_POSITION_Y, .value = LITEST_AUTO_ASSIGN },
|
||||
{ .type = EV_ABS, .code = ABS_MT_PRESSURE, .value = LITEST_AUTO_ASSIGN },
|
||||
{ .type = EV_SYN, .code = SYN_REPORT, .value = 0 },
|
||||
{ .type = -1, .code = -1 },
|
||||
};
|
||||
|
||||
static struct litest_device_interface interface = {
|
||||
.touch_down_events = down,
|
||||
.touch_move_events = move,
|
||||
};
|
||||
|
||||
static struct input_id input_id = {
|
||||
.bustype = 0x5,
|
||||
.vendor = 0x5ac,
|
||||
.product = 0x30d,
|
||||
};
|
||||
|
||||
static int events[] = {
|
||||
EV_KEY, BTN_LEFT,
|
||||
EV_KEY, BTN_RIGHT,
|
||||
EV_KEY, BTN_MIDDLE,
|
||||
EV_REL, REL_X,
|
||||
EV_REL, REL_Y,
|
||||
EV_REL, REL_WHEEL,
|
||||
EV_REL, REL_HWHEEL,
|
||||
-1 , -1,
|
||||
};
|
||||
|
||||
static struct input_absinfo absinfo[] = {
|
||||
{ ABS_MT_SLOT, 0, 15, 0, 0, 0 },
|
||||
{ ABS_MT_TOUCH_MAJOR, 0, 1020, 0, 0, 0 },
|
||||
{ ABS_MT_TOUCH_MINOR, 0, 1020, 0, 0, 0 },
|
||||
{ ABS_MT_ORIENTATION, -31, 32, 1, 0, 0 },
|
||||
{ ABS_MT_POSITION_X, -1100, 1258, 4, 0, 26 },
|
||||
{ ABS_MT_POSITION_Y, -1589, 2047, 4, 0, 26 },
|
||||
{ ABS_MT_TRACKING_ID, 0, 65535, 0, 0, 0 },
|
||||
{ .value = -1 }
|
||||
};
|
||||
|
||||
struct litest_test_device litest_magicmouse_device = {
|
||||
.type = LITEST_MAGICMOUSE,
|
||||
.features = LITEST_RELATIVE | LITEST_BUTTON | LITEST_WHEEL,
|
||||
.shortname = "magicmouse",
|
||||
.setup = litest_magicmouse_setup,
|
||||
.interface = &interface,
|
||||
|
||||
.name = "Apple Magic Mouse",
|
||||
.id = &input_id,
|
||||
.events = events,
|
||||
.absinfo = absinfo,
|
||||
};
|
||||
|
|
@ -383,6 +383,7 @@ extern struct litest_test_device litest_multitouch_fuzz_screen_device;
|
|||
extern struct litest_test_device litest_wacom_intuos3_pad_device;
|
||||
extern struct litest_test_device litest_wacom_intuos5_pad_device;
|
||||
extern struct litest_test_device litest_keyboard_all_codes_device;
|
||||
extern struct litest_test_device litest_magicmouse_device;
|
||||
|
||||
struct litest_test_device* devices[] = {
|
||||
&litest_synaptics_clickpad_device,
|
||||
|
|
@ -432,6 +433,7 @@ struct litest_test_device* devices[] = {
|
|||
&litest_wacom_intuos3_pad_device,
|
||||
&litest_wacom_intuos5_pad_device,
|
||||
&litest_keyboard_all_codes_device,
|
||||
&litest_magicmouse_device,
|
||||
NULL,
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -200,6 +200,7 @@ enum litest_device_type {
|
|||
LITEST_WACOM_INTUOS3_PAD,
|
||||
LITEST_WACOM_INTUOS5_PAD,
|
||||
LITEST_KEYBOARD_ALL_CODES,
|
||||
LITEST_MAGICMOUSE,
|
||||
};
|
||||
|
||||
enum litest_device_feature {
|
||||
|
|
|
|||
|
|
@ -38,6 +38,9 @@ libinput:touchpad:input:b0005v05ACp*
|
|||
libinput:name:*Apple Inc. Apple Internal Keyboard*:dmi:*
|
||||
LIBINPUT_MODEL_APPLE_INTERNAL_KEYBOARD=1
|
||||
|
||||
libinput:mouse:input:b0005v05ACp030D*
|
||||
LIBINPUT_MODEL_APPLE_MAGICMOUSE=1
|
||||
|
||||
##########################################
|
||||
# Cyborg
|
||||
##########################################
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue