* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <linux/input.h>
#include "compositor.h"
#include "evdev.h"
-#include "launcher-util.h"
-
-struct evdev_input {
- struct weston_input_device base;
- struct wl_list devices_list;
- struct udev_monitor *udev_monitor;
- struct wl_event_source *udev_monitor_source;
- char *seat_id;
-};
-#define MAX_SLOTS 16
-
-struct evdev_input_device {
- struct evdev_input *master;
- struct wl_list link;
- struct wl_event_source *source;
- struct weston_output *output;
- char *devnode;
- int fd;
- struct {
- int min_x, max_x, min_y, max_y;
- int old_x, old_y, reset_x, reset_y;
- int32_t x, y;
- } abs;
-
- struct {
- int slot;
- int32_t x[MAX_SLOTS];
- int32_t y[MAX_SLOTS];
- } mt;
- struct mtdev *mtdev;
-
- struct {
- int dx, dy;
- } rel;
-
- int type; /* event type flags */
-
- int is_touchpad, is_mt;
-};
+#define DEFAULT_AXIS_STEP_DISTANCE wl_fixed_from_int(10)
+
+void
+evdev_led_update(struct evdev_device *device, enum weston_led leds)
+{
+ static const struct {
+ enum weston_led weston;
+ int evdev;
+ } map[] = {
+ { LED_NUM_LOCK, LED_NUML },
+ { LED_CAPS_LOCK, LED_CAPSL },
+ { LED_SCROLL_LOCK, LED_SCROLLL },
+ };
+ struct input_event ev[ARRAY_LENGTH(map)];
+ unsigned int i;
+
+ if (!device->caps & EVDEV_KEYBOARD)
+ return;
-/* event type flags */
-#define EVDEV_ABSOLUTE_MOTION (1 << 0)
-#define EVDEV_ABSOLUTE_MT_DOWN (1 << 1)
-#define EVDEV_ABSOLUTE_MT_MOTION (1 << 2)
-#define EVDEV_ABSOLUTE_MT_UP (1 << 3)
-#define EVDEV_RELATIVE_MOTION (1 << 4)
+ memset(ev, 0, sizeof(ev));
+ for (i = 0; i < ARRAY_LENGTH(map); i++) {
+ ev[i].type = EV_LED;
+ ev[i].code = map[i].evdev;
+ ev[i].value = !!(leds & map[i].weston);
+ }
+
+ i = write(device->fd, ev, sizeof ev);
+ (void)i; /* no, we really don't care about the return value */
+}
static inline void
-evdev_process_key(struct evdev_input_device *device,
- struct input_event *e, int time)
+evdev_process_key(struct evdev_device *device, struct input_event *e, int time)
{
if (e->value == 2)
return;
switch (e->code) {
- case BTN_TOOL_PEN:
- case BTN_TOOL_RUBBER:
- case BTN_TOOL_BRUSH:
- case BTN_TOOL_PENCIL:
- case BTN_TOOL_AIRBRUSH:
- case BTN_TOOL_FINGER:
- case BTN_TOOL_MOUSE:
- case BTN_TOOL_LENS:
- if (device->is_touchpad)
- {
- device->abs.reset_x = 1;
- device->abs.reset_y = 1;
- }
- break;
- case BTN_TOUCH:
- /* Multitouch touchscreen devices might not send individually
- * button events each time a new finger is down. So we don't
- * send notification for such devices and we solve the button
- * case emulating on compositor side. */
- if (device->is_mt)
- break;
-
- /* Treat BTN_TOUCH from devices that only have BTN_TOUCH as
- * BTN_LEFT */
- e->code = BTN_LEFT;
- /* Intentional fallthrough! */
case BTN_LEFT:
case BTN_RIGHT:
case BTN_MIDDLE:
case BTN_FORWARD:
case BTN_BACK:
case BTN_TASK:
- notify_button(&device->master->base.input_device,
- time, e->code, e->value);
+ notify_button(device->seat,
+ time, e->code,
+ e->value ? WL_POINTER_BUTTON_STATE_PRESSED :
+ WL_POINTER_BUTTON_STATE_RELEASED);
break;
default:
- notify_key(&device->master->base.input_device,
- time, e->code, e->value);
+ notify_key(device->seat,
+ time, e->code,
+ e->value ? WL_KEYBOARD_KEY_STATE_PRESSED :
+ WL_KEYBOARD_KEY_STATE_RELEASED,
+ STATE_UPDATE_AUTOMATIC);
break;
}
}
static void
-evdev_process_touch(struct evdev_input_device *device,
- struct input_event *e)
+evdev_process_touch(struct evdev_device *device, struct input_event *e)
{
const int screen_width = device->output->current->width;
const int screen_height = device->output->current->height;
break;
case ABS_MT_TRACKING_ID:
if (e->value >= 0)
- device->type |= EVDEV_ABSOLUTE_MT_DOWN;
+ device->pending_events |= EVDEV_ABSOLUTE_MT_DOWN;
else
- device->type |= EVDEV_ABSOLUTE_MT_UP;
+ device->pending_events |= EVDEV_ABSOLUTE_MT_UP;
break;
case ABS_MT_POSITION_X:
device->mt.x[device->mt.slot] =
(e->value - device->abs.min_x) * screen_width /
(device->abs.max_x - device->abs.min_x) +
device->output->x;
- device->type |= EVDEV_ABSOLUTE_MT_MOTION;
+ device->pending_events |= EVDEV_ABSOLUTE_MT_MOTION;
break;
case ABS_MT_POSITION_Y:
device->mt.y[device->mt.slot] =
(e->value - device->abs.min_y) * screen_height /
(device->abs.max_y - device->abs.min_y) +
device->output->y;
- device->type |= EVDEV_ABSOLUTE_MT_MOTION;
+ device->pending_events |= EVDEV_ABSOLUTE_MT_MOTION;
break;
}
}
static inline void
-evdev_process_absolute_motion(struct evdev_input_device *device,
+evdev_process_absolute_motion(struct evdev_device *device,
struct input_event *e)
{
const int screen_width = device->output->current->width;
const int screen_height = device->output->current->height;
- switch (e->code) {
- case ABS_X:
- device->abs.x =
- (e->value - device->abs.min_x) * screen_width /
- (device->abs.max_x - device->abs.min_x) +
- device->output->x;
- device->type |= EVDEV_ABSOLUTE_MOTION;
- break;
- case ABS_Y:
- device->abs.y =
- (e->value - device->abs.min_y) * screen_height /
- (device->abs.max_y - device->abs.min_y) +
- device->output->y;
- device->type |= EVDEV_ABSOLUTE_MOTION;
- break;
- }
-}
-
-static inline void
-evdev_process_absolute_motion_touchpad(struct evdev_input_device *device,
- struct input_event *e)
-{
- /* FIXME: Make this configurable somehow. */
- const int touchpad_speed = 700;
-
- switch (e->code) {
- case ABS_X:
- e->value -= device->abs.min_x;
- if (device->abs.reset_x)
- device->abs.reset_x = 0;
- else {
- device->rel.dx =
- (e->value - device->abs.old_x) *
- touchpad_speed /
- (device->abs.max_x - device->abs.min_x);
+ if (device->quirks & EVDEV_QUIRK_SWAP_AXES) {
+ switch (e->code) {
+ case ABS_X:
+ device->abs.y =
+ (e->value - device->abs.min_y) * screen_height /
+ (device->abs.max_y - device->abs.min_y) +
+ device->output->y;
+ device->pending_events |= EVDEV_ABSOLUTE_MOTION;
+ break;
+ case ABS_Y:
+ device->abs.x =
+ (e->value - device->abs.min_x) * screen_width /
+ (device->abs.max_x - device->abs.min_x) +
+ device->output->x;
+ device->pending_events |= EVDEV_ABSOLUTE_MOTION;
+ break;
}
- device->abs.old_x = e->value;
- device->type |= EVDEV_RELATIVE_MOTION;
- break;
- case ABS_Y:
- e->value -= device->abs.min_y;
- if (device->abs.reset_y)
- device->abs.reset_y = 0;
- else {
- device->rel.dy =
- (e->value - device->abs.old_y) *
- touchpad_speed /
- /* maybe use x size here to have the same scale? */
- (device->abs.max_y - device->abs.min_y);
+
+ } else {
+ switch (e->code) {
+ case ABS_X:
+ device->abs.x =
+ (e->value - device->abs.min_x) * screen_width /
+ (device->abs.max_x - device->abs.min_x) +
+ device->output->x;
+ device->pending_events |= EVDEV_ABSOLUTE_MOTION;
+ break;
+ case ABS_Y:
+ device->abs.y =
+ (e->value - device->abs.min_y) * screen_height /
+ (device->abs.max_y - device->abs.min_y) +
+ device->output->y;
+ device->pending_events |= EVDEV_ABSOLUTE_MOTION;
+ break;
}
- device->abs.old_y = e->value;
- device->type |= EVDEV_RELATIVE_MOTION;
- break;
}
}
static inline void
-evdev_process_relative(struct evdev_input_device *device,
- struct input_event *e, uint32_t time)
+evdev_process_relative(struct evdev_device *device,
+ struct input_event *e, uint32_t time)
{
switch (e->code) {
case REL_X:
- device->rel.dx += e->value;
- device->type |= EVDEV_RELATIVE_MOTION;
+ device->rel.dx += wl_fixed_from_int(e->value);
+ device->pending_events |= EVDEV_RELATIVE_MOTION;
break;
case REL_Y:
- device->rel.dy += e->value;
- device->type |= EVDEV_RELATIVE_MOTION;
+ device->rel.dy += wl_fixed_from_int(e->value);
+ device->pending_events |= EVDEV_RELATIVE_MOTION;
break;
case REL_WHEEL:
- notify_axis(&device->master->base.input_device,
- time,
- WL_INPUT_DEVICE_AXIS_VERTICAL_SCROLL, e->value);
+ switch (e->value) {
+ case -1:
+ /* Scroll down */
+ case 1:
+ /* Scroll up */
+ notify_axis(device->seat,
+ time,
+ WL_POINTER_AXIS_VERTICAL_SCROLL,
+ -1 * e->value * DEFAULT_AXIS_STEP_DISTANCE);
+ break;
+ default:
+ break;
+ }
break;
case REL_HWHEEL:
- notify_axis(&device->master->base.input_device,
- time,
- WL_INPUT_DEVICE_AXIS_HORIZONTAL_SCROLL, e->value);
- break;
+ switch (e->value) {
+ case -1:
+ /* Scroll left */
+ case 1:
+ /* Scroll right */
+ notify_axis(device->seat,
+ time,
+ WL_POINTER_AXIS_HORIZONTAL_SCROLL,
+ e->value * DEFAULT_AXIS_STEP_DISTANCE);
+ break;
+ default:
+ break;
+
+ }
}
}
static inline void
-evdev_process_absolute(struct evdev_input_device *device,
- struct input_event *e)
+evdev_process_absolute(struct evdev_device *device, struct input_event *e)
{
- if (device->is_touchpad) {
- evdev_process_absolute_motion_touchpad(device, e);
- } else if (device->is_mt) {
+ if (device->is_mt) {
evdev_process_touch(device, e);
} else {
evdev_process_absolute_motion(device, e);
case REL_Y:
return 1;
}
+ break;
case EV_ABS:
switch (e->code) {
case ABS_X:
}
static void
-evdev_flush_motion(struct evdev_input_device *device, uint32_t time)
+evdev_flush_motion(struct evdev_device *device, uint32_t time)
{
- struct wl_input_device *master = &device->master->base.input_device;
+ struct weston_seat *master = device->seat;
- if (!device->type)
+ if (!(device->pending_events & EVDEV_SYN))
return;
- if (device->type & EVDEV_RELATIVE_MOTION) {
+ device->pending_events &= ~EVDEV_SYN;
+ if (device->pending_events & EVDEV_RELATIVE_MOTION) {
notify_motion(master, time,
- master->x + wl_fixed_from_int(device->rel.dx),
- master->y + wl_fixed_from_int(device->rel.dy));
- device->type &= ~EVDEV_RELATIVE_MOTION;
+ master->seat.pointer->x + device->rel.dx,
+ master->seat.pointer->y + device->rel.dy);
+ device->pending_events &= ~EVDEV_RELATIVE_MOTION;
device->rel.dx = 0;
device->rel.dy = 0;
}
- if (device->type & EVDEV_ABSOLUTE_MT_DOWN) {
+ if (device->pending_events & EVDEV_ABSOLUTE_MT_DOWN) {
notify_touch(master, time,
device->mt.slot,
wl_fixed_from_int(device->mt.x[device->mt.slot]),
wl_fixed_from_int(device->mt.y[device->mt.slot]),
- WL_INPUT_DEVICE_TOUCH_DOWN);
- device->type &= ~EVDEV_ABSOLUTE_MT_DOWN;
- device->type &= ~EVDEV_ABSOLUTE_MT_MOTION;
+ WL_TOUCH_DOWN);
+ device->pending_events &= ~EVDEV_ABSOLUTE_MT_DOWN;
+ device->pending_events &= ~EVDEV_ABSOLUTE_MT_MOTION;
}
- if (device->type & EVDEV_ABSOLUTE_MT_MOTION) {
+ if (device->pending_events & EVDEV_ABSOLUTE_MT_MOTION) {
notify_touch(master, time,
device->mt.slot,
wl_fixed_from_int(device->mt.x[device->mt.slot]),
wl_fixed_from_int(device->mt.y[device->mt.slot]),
- WL_INPUT_DEVICE_TOUCH_MOTION);
- device->type &= ~EVDEV_ABSOLUTE_MT_DOWN;
- device->type &= ~EVDEV_ABSOLUTE_MT_MOTION;
+ WL_TOUCH_MOTION);
+ device->pending_events &= ~EVDEV_ABSOLUTE_MT_DOWN;
+ device->pending_events &= ~EVDEV_ABSOLUTE_MT_MOTION;
}
- if (device->type & EVDEV_ABSOLUTE_MT_UP) {
+ if (device->pending_events & EVDEV_ABSOLUTE_MT_UP) {
notify_touch(master, time, device->mt.slot, 0, 0,
- WL_INPUT_DEVICE_TOUCH_UP);
- device->type &= ~EVDEV_ABSOLUTE_MT_UP;
+ WL_TOUCH_UP);
+ device->pending_events &= ~EVDEV_ABSOLUTE_MT_UP;
}
- if (device->type & EVDEV_ABSOLUTE_MOTION) {
+ if (device->pending_events & EVDEV_ABSOLUTE_MOTION) {
notify_motion(master, time,
wl_fixed_from_int(device->abs.x),
wl_fixed_from_int(device->abs.y));
- device->type &= ~EVDEV_ABSOLUTE_MOTION;
+ device->pending_events &= ~EVDEV_ABSOLUTE_MOTION;
}
}
static void
-evdev_process_events(struct evdev_input_device *device,
+fallback_process(struct evdev_dispatch *dispatch,
+ struct evdev_device *device,
+ struct input_event *event,
+ uint32_t time)
+{
+ switch (event->type) {
+ case EV_REL:
+ evdev_process_relative(device, event, time);
+ break;
+ case EV_ABS:
+ evdev_process_absolute(device, event);
+ break;
+ case EV_KEY:
+ evdev_process_key(device, event, time);
+ break;
+ case EV_SYN:
+ device->pending_events |= EVDEV_SYN;
+ break;
+ }
+}
+
+static void
+fallback_destroy(struct evdev_dispatch *dispatch)
+{
+ free(dispatch);
+}
+
+struct evdev_dispatch_interface fallback_interface = {
+ fallback_process,
+ fallback_destroy
+};
+
+static struct evdev_dispatch *
+fallback_dispatch_create(void)
+{
+ struct evdev_dispatch *dispatch = malloc(sizeof *dispatch);
+ if (dispatch == NULL)
+ return NULL;
+
+ dispatch->interface = &fallback_interface;
+
+ return dispatch;
+}
+
+static void
+evdev_process_events(struct evdev_device *device,
struct input_event *ev, int count)
{
+ struct evdev_dispatch *dispatch = device->dispatch;
struct input_event *e, *end;
uint32_t time = 0;
- device->type = 0;
+ device->pending_events = 0;
e = ev;
end = e + count;
* events and send as a bunch */
if (!is_motion_event(e))
evdev_flush_motion(device, time);
- switch (e->type) {
- case EV_REL:
- evdev_process_relative(device, e, time);
- break;
- case EV_ABS:
- evdev_process_absolute(device, e);
- break;
- case EV_KEY:
- evdev_process_key(device, e, time);
- break;
- }
+
+ dispatch->interface->process(dispatch, device, e, time);
}
evdev_flush_motion(device, time);
}
static int
-evdev_input_device_data(int fd, uint32_t mask, void *data)
+evdev_device_data(int fd, uint32_t mask, void *data)
{
struct weston_compositor *ec;
- struct evdev_input_device *device = data;
+ struct evdev_device *device = data;
struct input_event ev[32];
int len;
- ec = device->master->base.compositor;
+ ec = device->seat->compositor;
if (!ec->focus)
return 1;
len = read(fd, &ev, sizeof ev);
if (len < 0 || len % sizeof ev[0] != 0) {
- /* FIXME: call device_removed when errno is ENODEV. */
+ /* FIXME: call evdev_device_destroy when errno is ENODEV. */
return 1;
}
return 1;
}
-/* copied from udev/extras/input_id/input_id.c */
-/* we must use this kernel-compatible implementation */
-#define BITS_PER_LONG (sizeof(unsigned long) * 8)
-#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
-#define OFF(x) ((x)%BITS_PER_LONG)
-#define BIT(x) (1UL<<OFF(x))
-#define LONG(x) ((x)/BITS_PER_LONG)
-#define TEST_BIT(array, bit) ((array[LONG(bit)] >> OFF(bit)) & 1)
-/* end copied */
-
static int
-evdev_configure_device(struct evdev_input_device *device)
+evdev_handle_device(struct evdev_device *device)
{
struct input_absinfo absinfo;
unsigned long ev_bits[NBITS(EV_MAX)];
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;
+ unsigned int i;
has_key = 0;
has_abs = 0;
+ device->caps = 0;
ioctl(device->fd, EVIOCGBIT(0, sizeof(ev_bits)), ev_bits);
if (TEST_BIT(ev_bits, EV_ABS)) {
ioctl(device->fd, EVIOCGABS(ABS_X), &absinfo);
device->abs.min_x = absinfo.minimum;
device->abs.max_x = absinfo.maximum;
+ device->caps |= EVDEV_MOTION_ABS;
}
if (TEST_BIT(abs_bits, ABS_Y)) {
ioctl(device->fd, EVIOCGABS(ABS_Y), &absinfo);
device->abs.min_y = absinfo.minimum;
device->abs.max_y = absinfo.maximum;
+ device->caps |= EVDEV_MOTION_ABS;
}
if (TEST_BIT(abs_bits, ABS_MT_SLOT)) {
+ ioctl(device->fd, EVIOCGABS(ABS_MT_POSITION_X),
+ &absinfo);
+ if (device->quirks & EVDEV_QUIRK_SWAP_AXES) {
+ device->abs.min_y = absinfo.minimum;
+ device->abs.max_y = absinfo.maximum;
+ } else {
+ device->abs.min_x = absinfo.minimum;
+ device->abs.max_x = absinfo.maximum;
+ }
+ ioctl(device->fd, EVIOCGABS(ABS_MT_POSITION_Y),
+ &absinfo);
+ if (device->quirks & EVDEV_QUIRK_SWAP_AXES) {
+ device->abs.min_x = absinfo.minimum;
+ device->abs.max_x = absinfo.maximum;
+ } else {
+ device->abs.min_y = absinfo.minimum;
+ device->abs.max_y = absinfo.maximum;
+ }
device->is_mt = 1;
device->mt.slot = 0;
+ device->caps |= EVDEV_TOUCH;
}
}
+ if (TEST_BIT(ev_bits, EV_REL)) {
+ 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;
+ }
if (TEST_BIT(ev_bits, EV_KEY)) {
has_key = 1;
ioctl(device->fd, EVIOCGBIT(EV_KEY, sizeof(key_bits)),
key_bits);
if (TEST_BIT(key_bits, BTN_TOOL_FINGER) &&
- !TEST_BIT(key_bits, BTN_TOOL_PEN))
- device->is_touchpad = 1;
+ !TEST_BIT(key_bits, BTN_TOOL_PEN) &&
+ has_abs)
+ device->dispatch = evdev_touchpad_create(device);
+ for (i = KEY_ESC; i < KEY_MAX; i++) {
+ if (i >= BTN_MISC && i < KEY_OK)
+ continue;
+ if (TEST_BIT(key_bits, i)) {
+ device->caps |= EVDEV_KEYBOARD;
+ break;
+ }
+ }
+ for (i = BTN_MISC; i < KEY_OK; i++) {
+ if (TEST_BIT(key_bits, i)) {
+ device->caps |= EVDEV_BUTTON;
+ break;
+ }
+ }
+ }
+ if (TEST_BIT(ev_bits, EV_LED)) {
+ device->caps |= EVDEV_KEYBOARD;
}
/* This rule tries to catch accelerometer devices and opt out. We may
* want to adjust the protocol later adding a proper event for dealing
* with accelerometers and implement here accordingly */
- if (has_abs && !has_key)
- return -1;
+ if (has_abs && !has_key && !device->is_mt) {
+ weston_log("input device %s, %s "
+ "ignored: unsupported device type\n",
+ device->devname, device->devnode);
+ return 0;
+ }
+
+ return 1;
+}
+
+static int
+evdev_configure_device(struct evdev_device *device)
+{
+ if ((device->caps &
+ (EVDEV_MOTION_ABS | EVDEV_MOTION_REL | EVDEV_BUTTON))) {
+ weston_seat_init_pointer(device->seat);
+ weston_log("input device %s, %s is a pointer\n",
+ device->devname, device->devnode);
+ }
+ if ((device->caps & EVDEV_KEYBOARD)) {
+ if (weston_seat_init_keyboard(device->seat, NULL) < 0)
+ return -1;
+ weston_log("input device %s, %s is a keyboard\n",
+ device->devname, device->devnode);
+ }
+ if ((device->caps & EVDEV_TOUCH)) {
+ weston_seat_init_touch(device->seat);
+ weston_log("input device %s, %s is a touch device\n",
+ device->devname, device->devnode);
+ }
return 0;
}
-static struct evdev_input_device *
-evdev_input_device_create(struct evdev_input *master,
- struct wl_display *display, const char *path)
+struct evdev_device *
+evdev_device_create(struct weston_seat *seat, const char *path, int device_fd)
{
- struct evdev_input_device *device;
+ struct evdev_device *device;
struct weston_compositor *ec;
+ char devname[256] = "unknown";
device = malloc(sizeof *device);
if (device == NULL)
return NULL;
+ memset(device, 0, sizeof *device);
- ec = master->base.compositor;
+ ec = seat->compositor;
device->output =
container_of(ec->output_list.next, struct weston_output, link);
- device->master = master;
- device->is_touchpad = 0;
+ device->seat = seat;
device->is_mt = 0;
device->mtdev = NULL;
device->devnode = strdup(path);
device->mt.slot = -1;
device->rel.dx = 0;
device->rel.dy = 0;
+ device->dispatch = NULL;
+ device->fd = device_fd;
+
+ ioctl(device->fd, EVIOCGNAME(sizeof(devname)), devname);
+ device->devname = strdup(devname);
- /* Use non-blocking mode so that we can loop on read on
- * evdev_input_device_data() until all events on the fd are
- * read. mtdev_get() also expects this. */
- device->fd = weston_launcher_open(ec, path, O_RDONLY | O_NONBLOCK);
- if (device->fd < 0)
- goto err0;
+ if (!evdev_handle_device(device)) {
+ free(device->devnode);
+ free(device->devname);
+ free(device);
+ return EVDEV_UNHANDLED_DEVICE;
+ }
if (evdev_configure_device(device) == -1)
goto err1;
+ /* If the dispatch was not set up use the fallback. */
+ if (device->dispatch == NULL)
+ device->dispatch = fallback_dispatch_create();
+ if (device->dispatch == NULL)
+ goto err1;
+
+
if (device->is_mt) {
device->mtdev = mtdev_new_open(device->fd);
if (!device->mtdev)
- fprintf(stderr, "mtdev failed to open for %s\n", path);
+ weston_log("mtdev failed to open for %s\n", path);
}
device->source = wl_event_loop_add_fd(ec->input_loop, device->fd,
WL_EVENT_READABLE,
- evdev_input_device_data, device);
+ evdev_device_data, device);
if (device->source == NULL)
- goto err1;
-
- wl_list_insert(master->devices_list.prev, &device->link);
+ goto err2;
return device;
+err2:
+ device->dispatch->interface->destroy(device->dispatch);
err1:
- close(device->fd);
-err0:
+ free(device->devname);
free(device->devnode);
free(device);
return NULL;
}
-static const char default_seat[] = "seat0";
-
-static void
-device_added(struct udev_device *udev_device, struct evdev_input *master)
+void
+evdev_device_destroy(struct evdev_device *device)
{
- struct weston_compositor *c;
- const char *devnode;
- const char *device_seat;
+ struct evdev_dispatch *dispatch;
- device_seat = udev_device_get_property_value(udev_device, "ID_SEAT");
- if (!device_seat)
- device_seat = default_seat;
+ dispatch = device->dispatch;
+ if (dispatch)
+ dispatch->interface->destroy(dispatch);
- if (strcmp(device_seat, master->seat_id))
- return;
-
- c = master->base.compositor;
- devnode = udev_device_get_devnode(udev_device);
- evdev_input_device_create(master, c->wl_display, devnode);
-}
-
-static void
-device_removed(struct evdev_input_device *device)
-{
wl_event_source_remove(device->source);
wl_list_remove(&device->link);
if (device->mtdev)
mtdev_close_delete(device->mtdev);
close(device->fd);
+ free(device->devname);
free(device->devnode);
free(device);
}
-static void
-evdev_notify_keyboard_focus(struct evdev_input *input)
+void
+evdev_notify_keyboard_focus(struct weston_seat *seat,
+ struct wl_list *evdev_devices)
{
- struct evdev_input_device *device;
+ struct evdev_device *device;
struct wl_array keys;
unsigned int i, set;
- char evdev_keys[(KEY_CNT + 7) / 8], all_keys[(KEY_CNT + 7) / 8];
+ char evdev_keys[(KEY_CNT + 7) / 8];
+ char all_keys[(KEY_CNT + 7) / 8];
uint32_t *k;
int ret;
+ if (!seat->seat.keyboard)
+ return;
+
memset(all_keys, 0, sizeof all_keys);
- wl_list_for_each(device, &input->devices_list, link) {
+ wl_list_for_each(device, evdev_devices, link) {
memset(evdev_keys, 0, sizeof evdev_keys);
ret = ioctl(device->fd,
EVIOCGKEY(sizeof evdev_keys), evdev_keys);
if (ret < 0) {
- fprintf(stderr, "failed to get keys for device %s\n",
+ weston_log("failed to get keys for device %s\n",
device->devnode);
continue;
}
}
}
- notify_keyboard_focus(&input->base.input_device, &keys);
+ notify_keyboard_focus_in(seat, &keys, STATE_UPDATE_AUTOMATIC);
wl_array_release(&keys);
}
-
-void
-evdev_add_devices(struct udev *udev, struct weston_input_device *input_base)
-{
- struct evdev_input *input = (struct evdev_input *) input_base;
- struct udev_enumerate *e;
- struct udev_list_entry *entry;
- struct udev_device *device;
- const char *path, *sysname;
-
- e = udev_enumerate_new(udev);
- udev_enumerate_add_match_subsystem(e, "input");
- udev_enumerate_scan_devices(e);
- udev_list_entry_foreach(entry, udev_enumerate_get_list_entry(e)) {
- path = udev_list_entry_get_name(entry);
- device = udev_device_new_from_syspath(udev, path);
-
- sysname = udev_device_get_sysname(device);
- if (strncmp("event", sysname, 5) != 0) {
- udev_device_unref(device);
- continue;
- }
-
- device_added(device, input);
-
- udev_device_unref(device);
- }
- udev_enumerate_unref(e);
-
- evdev_notify_keyboard_focus(input);
-
- if (wl_list_empty(&input->devices_list)) {
- fprintf(stderr,
- "warning: no input devices on entering Weston. "
- "Possible causes:\n"
- "\t- no permissions to read /dev/input/event*\n"
- "\t- seats misconfigured "
- "(Weston backend option 'seat', "
- "udev device property ID_SEAT)\n");
- }
-}
-
-static int
-evdev_udev_handler(int fd, uint32_t mask, void *data)
-{
- struct evdev_input *master = data;
- struct udev_device *udev_device;
- struct evdev_input_device *device, *next;
- const char *action;
- const char *devnode;
-
- udev_device = udev_monitor_receive_device(master->udev_monitor);
- if (!udev_device)
- return 1;
-
- action = udev_device_get_action(udev_device);
- if (action) {
- if (strncmp("event", udev_device_get_sysname(udev_device), 5) != 0)
- return 0;
-
- if (!strcmp(action, "add")) {
- device_added(udev_device, master);
- }
- else if (!strcmp(action, "remove")) {
- devnode = udev_device_get_devnode(udev_device);
- wl_list_for_each_safe(device, next,
- &master->devices_list, link)
- if (!strcmp(device->devnode, devnode)) {
- device_removed(device);
- break;
- }
- }
- }
- udev_device_unref(udev_device);
-
- return 0;
-}
-
-int
-evdev_enable_udev_monitor(struct udev *udev, struct weston_input_device *input_base)
-{
- struct evdev_input *master = (struct evdev_input *) input_base;
- struct wl_event_loop *loop;
- struct weston_compositor *c = master->base.compositor;
- int fd;
-
- master->udev_monitor = udev_monitor_new_from_netlink(udev, "udev");
- if (!master->udev_monitor) {
- fprintf(stderr, "udev: failed to create the udev monitor\n");
- return 0;
- }
-
- udev_monitor_filter_add_match_subsystem_devtype(master->udev_monitor,
- "input", NULL);
-
- if (udev_monitor_enable_receiving(master->udev_monitor)) {
- fprintf(stderr, "udev: failed to bind the udev monitor\n");
- udev_monitor_unref(master->udev_monitor);
- return 0;
- }
-
- loop = wl_display_get_event_loop(c->wl_display);
- fd = udev_monitor_get_fd(master->udev_monitor);
- master->udev_monitor_source =
- wl_event_loop_add_fd(loop, fd, WL_EVENT_READABLE,
- evdev_udev_handler, master);
- if (!master->udev_monitor_source) {
- udev_monitor_unref(master->udev_monitor);
- return 0;
- }
-
- return 1;
-}
-
-void
-evdev_disable_udev_monitor(struct weston_input_device *input_base)
-{
- struct evdev_input *input = (struct evdev_input *) input_base;
-
- if (!input->udev_monitor)
- return;
-
- udev_monitor_unref(input->udev_monitor);
- input->udev_monitor = NULL;
- wl_event_source_remove(input->udev_monitor_source);
- input->udev_monitor_source = NULL;
-}
-
-void
-evdev_input_create(struct weston_compositor *c, struct udev *udev,
- const char *seat)
-{
- struct evdev_input *input;
-
- input = malloc(sizeof *input);
- if (input == NULL)
- return;
-
- memset(input, 0, sizeof *input);
- weston_input_device_init(&input->base, c);
-
- wl_list_init(&input->devices_list);
- input->seat_id = strdup(seat);
- if (!evdev_enable_udev_monitor(udev, &input->base)) {
- free(input->seat_id);
- free(input);
- return;
- }
-
- evdev_add_devices(udev, &input->base);
-
- c->input_device = &input->base.input_device;
-}
-
-void
-evdev_remove_devices(struct weston_input_device *input_base)
-{
- struct evdev_input *input = (struct evdev_input *) input_base;
- struct evdev_input_device *device, *next;
-
- wl_list_for_each_safe(device, next, &input->devices_list, link)
- device_removed(device);
-
- notify_keyboard_focus(&input->base.input_device, NULL);
-}
-
-void
-evdev_input_destroy(struct weston_input_device *input_base)
-{
- struct evdev_input *input = (struct evdev_input *) input_base;
-
- evdev_remove_devices(input_base);
- evdev_disable_udev_monitor(&input->base);
-
- wl_list_remove(&input->base.link);
- free(input->seat_id);
- free(input);
-}
projects / profile / ivi / weston.git / blobdiff