diff options
| author | Benjamin Franzke <benjaminfranzke@googlemail.com> | 2011-07-21 10:45:03 +0000 |
|---|---|---|
| committer | Benjamin Franzke <benjaminfranzke@googlemail.com> | 2011-07-21 10:45:03 +0000 |
| commit | 464acd857467d1c5c2dea56d3532affceef096cc (patch) | |
| tree | a3dad515a3059d31e7106002592eb2c4954aa3fc | |
| parent | 86ec8e80d8585d3ad8bb73f9b81d9d15adfbbb70 (diff) | |
compositor-openwfd: Update to systemd seat input devicesopenwf
| -rw-r--r-- | compositor/compositor-openwfd.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/compositor/compositor-openwfd.c b/compositor/compositor-openwfd.c index f2cc844..672e723 100644 --- a/compositor/compositor-openwfd.c +++ b/compositor/compositor-openwfd.c @@ -589,8 +589,11 @@ vt_func(struct wlsc_compositor *compositor, int event) return; } +static const char default_seat[] = "seat0"; + static struct wlsc_compositor * -wfd_compositor_create(struct wl_display *display, int connector) +wfd_compositor_create(struct wl_display *display, + int connector, const char *seat) { struct wfd_compositor *ec; struct wl_event_loop *loop; @@ -644,7 +647,7 @@ wfd_compositor_create(struct wl_display *display, int connector) return NULL; } - evdev_input_add_devices(&ec->base, ec->udev); + evdev_input_add_devices(&ec->base, ec->udev, seat); loop = wl_display_get_event_loop(ec->base.wl_display); ec->wfd_source = @@ -663,18 +666,23 @@ WL_EXPORT struct wlsc_compositor * backend_init(struct wl_display *display, char *options) { int connector = 0, i; + const char *seat; char *p, *value; - static char * const tokens[] = { "connector", NULL }; + static char * const tokens[] = { "connector", "seat", NULL }; p = options; + seat = default_seat; while (i = getsubopt(&p, tokens, &value), i != -1) { switch (i) { case 0: connector = strtol(value, NULL, 0); break; + case 1: + seat = value; + break; } } - return wfd_compositor_create(display, connector); + return wfd_compositor_create(display, connector, seat); } |