mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

evdev: Use a has_keyboard flag instead of EVDEV_KEYBOARD bit

Browse Source
This commit is contained in:
Kristian Høgsberg
2013-12-16 15:07:59 -08:00
parent 77b0d23c00
commit 3d793c9053
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/evdev.c
+7 -7
View File
@@ -50,7 +50,7 @@ evdev_led_update(struct evdev_device *device, enum weston_led leds)
struct input_event ev[ARRAY_LENGTH(map) + 1]; struct input_event ev[ARRAY_LENGTH(map) + 1];
unsigned int i; unsigned int i;
if (!device->caps & EVDEV_KEYBOARD) if (!(device->seat_caps & EVDEV_SEAT_KEYBOARD))
return; return;
memset(ev, 0, sizeof(ev)); memset(ev, 0, sizeof(ev));
@@ -444,7 +444,7 @@ evdev_configure_device(struct evdev_device *device)
unsigned long abs_bits[NBITS(ABS_MAX)]; unsigned long abs_bits[NBITS(ABS_MAX)];
unsigned long rel_bits[NBITS(REL_MAX)]; unsigned long rel_bits[NBITS(REL_MAX)];
unsigned long key_bits[NBITS(KEY_MAX)]; unsigned long key_bits[NBITS(KEY_MAX)];
int has_key, has_abs, has_rel, has_mt, has_button; int has_key, has_abs, has_rel, has_mt, has_button, has_keyboard;
unsigned int i; unsigned int i;
has_key = 0; has_key = 0;
@@ -452,6 +452,7 @@ evdev_configure_device(struct evdev_device *device)
has_abs = 0; has_abs = 0;
has_mt = 0; has_mt = 0;
has_button = 0; has_button = 0;
has_keyboard = 0;
device->caps = 0; device->caps = 0;
ioctl(device->fd, EVIOCGBIT(0, sizeof(ev_bits)), ev_bits); ioctl(device->fd, EVIOCGBIT(0, sizeof(ev_bits)), ev_bits);
@@ -534,7 +535,7 @@ evdev_configure_device(struct evdev_device *device)
if (i >= BTN_MISC && i < KEY_OK) if (i >= BTN_MISC && i < KEY_OK)
continue; continue;
if (TEST_BIT(key_bits, i)) { if (TEST_BIT(key_bits, i)) {
device->caps |= EVDEV_KEYBOARD; has_keyboard = 1;
break; break;
} }
} }
@@ -549,9 +550,8 @@ evdev_configure_device(struct evdev_device *device)
} }
} }
} }
if (TEST_BIT(ev_bits, EV_LED)) { if (TEST_BIT(ev_bits, EV_LED))
device->caps |= EVDEV_KEYBOARD; has_keyboard = 1;
}
/* This rule tries to catch accelerometer devices and opt out. We may /* This rule tries to catch accelerometer devices and opt out. We may
* want to adjust the protocol later adding a proper event for dealing * want to adjust the protocol later adding a proper event for dealing
@@ -573,7 +573,7 @@ evdev_configure_device(struct evdev_device *device)
has_rel ? " relative-motion": "", has_rel ? " relative-motion": "",
has_button ? " button" : ""); has_button ? " button" : "");
} }
if ((device->caps & EVDEV_KEYBOARD)) { if (has_keyboard) {
if (weston_seat_init_keyboard(device->seat, NULL) < 0) if (weston_seat_init_keyboard(device->seat, NULL) < 0)
return -1; return -1;
device->seat_caps |= EVDEV_SEAT_KEYBOARD; device->seat_caps |= EVDEV_SEAT_KEYBOARD;
src/evdev.h
+1 -2
View File
@@ -42,8 +42,7 @@ enum evdev_event_type {
}; };
enum evdev_device_capability { enum evdev_device_capability {
EVDEV_KEYBOARD = (1 << 0), EVDEV_TOUCH = (1 << 0),
EVDEV_TOUCH = (1 << 1),
}; };
enum evdev_device_seat_capability { enum evdev_device_seat_capability {