summaryrefslogtreecommitdiff
path: root/src/lib/elput/elput_evdev.c
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2017-05-26 16:34:10 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2017-05-26 16:27:43 -0400
commite34088d74e22ddc4bd41dcbd52db07015a29f9e0 (patch)
tree8746e79276e27a5c65f0fc76fe1ad04cc65e0356 /src/lib/elput/elput_evdev.c
parente8fe0bcc47ff44a5afaf8442407248887f716b89 (diff)
elput: rename and make public Elput_Device_Caps enum
Diffstat (limited to '')
-rw-r--r--src/lib/elput/elput_evdev.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/elput/elput_evdev.c b/src/lib/elput/elput_evdev.c
index 46f8068f79..b4118fe82f 100644
--- a/src/lib/elput/elput_evdev.c
+++ b/src/lib/elput/elput_evdev.c
@@ -1563,27 +1563,27 @@ _evdev_device_create(Elput_Seat *seat, struct libinput_device *device)
1563 (libinput_device_keyboard_has_key(device, KEY_ENTER))) 1563 (libinput_device_keyboard_has_key(device, KEY_ENTER)))
1564 { 1564 {
1565 _keyboard_init(seat, seat->manager->cached.keymap); 1565 _keyboard_init(seat, seat->manager->cached.keymap);
1566 edev->caps |= EVDEV_SEAT_KEYBOARD; 1566 edev->caps |= ELPUT_DEVICE_CAPS_KEYBOARD;
1567 } 1567 }
1568 1568
1569 if ((libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_POINTER) && 1569 if ((libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_POINTER) &&
1570 (libinput_device_pointer_has_button(device, BTN_LEFT)))) 1570 (libinput_device_pointer_has_button(device, BTN_LEFT))))
1571 edev->caps |= EVDEV_SEAT_POINTER; 1571 edev->caps |= ELPUT_DEVICE_CAPS_POINTER;
1572 if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_TABLET_TOOL)) 1572 if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_TABLET_TOOL))
1573 edev->caps |= EVDEV_SEAT_POINTER | EVDEV_SEAT_TABLET_TOOL; 1573 edev->caps |= ELPUT_DEVICE_CAPS_POINTER | ELPUT_DEVICE_CAPS_TABLET_TOOL;
1574 if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_TABLET_PAD)) 1574 if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_TABLET_PAD))
1575 edev->caps |= EVDEV_SEAT_POINTER | EVDEV_SEAT_TABLET_PAD; 1575 edev->caps |= ELPUT_DEVICE_CAPS_POINTER | ELPUT_DEVICE_CAPS_TABLET_PAD;
1576 if (edev->caps & EVDEV_SEAT_POINTER) 1576 if (edev->caps & ELPUT_DEVICE_CAPS_POINTER)
1577 { 1577 {
1578 _pointer_init(seat); 1578 _pointer_init(seat);
1579 edev->caps |= EVDEV_SEAT_POINTER; 1579 edev->caps |= ELPUT_DEVICE_CAPS_POINTER;
1580 } 1580 }
1581 1581
1582 if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_TOUCH)) 1582 if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_TOUCH))
1583 edev->caps |= EVDEV_SEAT_TOUCH; 1583 edev->caps |= ELPUT_DEVICE_CAPS_TOUCH;
1584 if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_GESTURE)) 1584 if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_GESTURE))
1585 edev->caps |= EVDEV_SEAT_TOUCH | EVDEV_SEAT_GESTURE; 1585 edev->caps |= ELPUT_DEVICE_CAPS_TOUCH | ELPUT_DEVICE_CAPS_GESTURE;
1586 if (edev->caps & EVDEV_SEAT_TOUCH) 1586 if (edev->caps & ELPUT_DEVICE_CAPS_TOUCH)
1587 _touch_init(seat); 1587 _touch_init(seat);
1588 1588
1589 if (!edev->caps) goto err; 1589 if (!edev->caps) goto err;
@@ -1612,11 +1612,11 @@ _evdev_device_destroy(Elput_Device *edev)
1612{ 1612{
1613 if (!edev) return; 1613 if (!edev) return;
1614 1614
1615 if (edev->caps & EVDEV_SEAT_POINTER) 1615 if (edev->caps & ELPUT_DEVICE_CAPS_POINTER)
1616 _pointer_release(edev->seat); 1616 _pointer_release(edev->seat);
1617 if (edev->caps & EVDEV_SEAT_KEYBOARD) 1617 if (edev->caps & ELPUT_DEVICE_CAPS_KEYBOARD)
1618 _keyboard_release(edev->seat); 1618 _keyboard_release(edev->seat);
1619 if (edev->caps & EVDEV_SEAT_TOUCH) 1619 if (edev->caps & ELPUT_DEVICE_CAPS_TOUCH)
1620 _touch_release(edev->seat); 1620 _touch_release(edev->seat);
1621 1621
1622 libinput_device_unref(edev->device); 1622 libinput_device_unref(edev->device);