isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 10:00:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

clutter/evdev: Handle management of pad devices

Browse Source
This commit is contained in:
Carlos Garnacho 2016-05-10 17:04:18 +02:00
parent d5459427d5
commit 2f7602f297
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clutter/clutter/evdev/clutter-device-manager-evdev.c
View File

@ -183,6 +183,7 @@ static const char *device_type_str[] = {
"pen", /* CLUTTER_PEN_DEVICE */ "pen", /* CLUTTER_PEN_DEVICE */
"eraser", /* CLUTTER_ERASER_DEVICE */ "eraser", /* CLUTTER_ERASER_DEVICE */
"cursor", /* CLUTTER_CURSOR_DEVICE */ "cursor", /* CLUTTER_CURSOR_DEVICE */
"pad", /* CLUTTER_PAD_DEVICE */
}; };
#endif /* CLUTTER_ENABLE_DEBUG */ #endif /* CLUTTER_ENABLE_DEBUG */

16
clutter/clutter/evdev/clutter-input-device-evdev.c
View File

@ -141,13 +141,22 @@ _clutter_input_device_evdev_new (ClutterDeviceManager *manager,
ClutterInputDeviceType type; ClutterInputDeviceType type;
ClutterDeviceManagerEvdev *manager_evdev; ClutterDeviceManagerEvdev *manager_evdev;
gchar *vendor, *product; gchar *vendor, *product;
gint device_id; gint device_id, n_rings = 0, n_strips = 0, n_groups = 1;
type = _clutter_input_device_evdev_determine_type (libinput_device); type = _clutter_input_device_evdev_determine_type (libinput_device);
vendor = g_strdup_printf ("%.4x", libinput_device_get_id_vendor (libinput_device)); vendor = g_strdup_printf ("%.4x", libinput_device_get_id_vendor (libinput_device));
product = g_strdup_printf ("%.4x", libinput_device_get_id_product (libinput_device)); product = g_strdup_printf ("%.4x", libinput_device_get_id_product (libinput_device));
manager_evdev = CLUTTER_DEVICE_MANAGER_EVDEV (manager); manager_evdev = CLUTTER_DEVICE_MANAGER_EVDEV (manager);
device_id = _clutter_device_manager_evdev_acquire_device_id (manager_evdev); device_id = _clutter_device_manager_evdev_acquire_device_id (manager_evdev);
if (libinput_device_has_capability (libinput_device,
LIBINPUT_DEVICE_CAP_TABLET_PAD))
{
n_rings = libinput_device_tablet_pad_get_num_rings (libinput_device);
n_strips = libinput_device_tablet_pad_get_num_strips (libinput_device);
n_groups = libinput_device_tablet_pad_get_num_mode_groups (libinput_device);
}
device = g_object_new (CLUTTER_TYPE_INPUT_DEVICE_EVDEV, device = g_object_new (CLUTTER_TYPE_INPUT_DEVICE_EVDEV,
"id", device_id, "id", device_id,
"name", libinput_device_get_name (libinput_device), "name", libinput_device_get_name (libinput_device),
@ -157,6 +166,9 @@ _clutter_input_device_evdev_new (ClutterDeviceManager *manager,
"enabled", TRUE, "enabled", TRUE,
"vendor-id", vendor, "vendor-id", vendor,
"product-id", product, "product-id", product,
"n-rings", n_rings,
"n-strips", n_strips,
"n-mode-groups", n_groups,
NULL); NULL);
device->seat = seat; device->seat = seat;
@ -243,6 +255,8 @@ _clutter_input_device_evdev_determine_type (struct libinput_device *ldev)
return CLUTTER_TOUCHPAD_DEVICE; return CLUTTER_TOUCHPAD_DEVICE;
else if (libinput_device_has_capability (ldev, LIBINPUT_DEVICE_CAP_TABLET_TOOL)) else if (libinput_device_has_capability (ldev, LIBINPUT_DEVICE_CAP_TABLET_TOOL))
return CLUTTER_TABLET_DEVICE; return CLUTTER_TABLET_DEVICE;
else if (libinput_device_has_capability (ldev, LIBINPUT_DEVICE_CAP_TABLET_PAD))
return CLUTTER_PAD_DEVICE;
else if (libinput_device_has_capability (ldev, LIBINPUT_DEVICE_CAP_POINTER)) else if (libinput_device_has_capability (ldev, LIBINPUT_DEVICE_CAP_POINTER))
return CLUTTER_POINTER_DEVICE; return CLUTTER_POINTER_DEVICE;
else if (libinput_device_has_capability (ldev, LIBINPUT_DEVICE_CAP_TOUCH)) else if (libinput_device_has_capability (ldev, LIBINPUT_DEVICE_CAP_TOUCH))