diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2013-12-16 11:25:19 -0800 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2013-12-16 15:11:30 -0800 |
| commit | 015e73dc3371c96f5d0b3b50569e2cf6c4db51a0 (patch) | |
| tree | d9ec1643ba31316cc089b75ce0117bcb108828db /src | |
| parent | d24a64ea30f1b21dca17f91988d89b56baa06989 (diff) | |
evdev: Drop EVDEV_MOTION_REL flag
This is only used inside evdev_configure_device() and we now use a local
has_rel flag instead.
Diffstat (limited to 'src')
| -rw-r--r-- | src/evdev.c | 9 | ||||
| -rw-r--r-- | src/evdev.h | 3 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/evdev.c b/src/evdev.c index efc6894f..079ca097 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -444,10 +444,11 @@ evdev_configure_device(struct evdev_device *device) unsigned long abs_bits[NBITS(ABS_MAX)]; unsigned long rel_bits[NBITS(REL_MAX)]; unsigned long key_bits[NBITS(KEY_MAX)]; - int has_key, has_abs; + int has_key, has_abs, has_rel; unsigned int i; has_key = 0; + has_rel = 0; has_abs = 0; device->caps = 0; @@ -515,7 +516,7 @@ evdev_configure_device(struct evdev_device *device) ioctl(device->fd, EVIOCGBIT(EV_REL, sizeof(rel_bits)), rel_bits); if (TEST_BIT(rel_bits, REL_X) || TEST_BIT(rel_bits, REL_Y)) - device->caps |= EVDEV_MOTION_REL; + has_rel = 1; } if (TEST_BIT(ev_bits, EV_KEY)) { has_key = 1; @@ -562,14 +563,14 @@ evdev_configure_device(struct evdev_device *device) return 0; } - if ((device->caps & (EVDEV_MOTION_ABS | EVDEV_MOTION_REL)) && + if (((device->caps & EVDEV_MOTION_ABS) || has_rel) && (device->caps & EVDEV_BUTTON)) { weston_seat_init_pointer(device->seat); device->seat_caps |= EVDEV_SEAT_POINTER; weston_log("input device %s, %s is a pointer caps =%s%s%s\n", device->devname, device->devnode, device->caps & EVDEV_MOTION_ABS ? " absolute-motion" : "", - device->caps & EVDEV_MOTION_REL ? " relative-motion": "", + has_rel ? " relative-motion": "", device->caps & EVDEV_BUTTON ? " button" : ""); } if ((device->caps & EVDEV_KEYBOARD)) { diff --git a/src/evdev.h b/src/evdev.h index e146d1a4..5f831f1d 100644 --- a/src/evdev.h +++ b/src/evdev.h @@ -45,8 +45,7 @@ enum evdev_device_capability { EVDEV_KEYBOARD = (1 << 0), EVDEV_BUTTON = (1 << 1), EVDEV_MOTION_ABS = (1 << 2), - EVDEV_MOTION_REL = (1 << 3), - EVDEV_TOUCH = (1 << 4), + EVDEV_TOUCH = (1 << 3), }; enum evdev_device_seat_capability { |