mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

compositor-openwfd: Update to systemd seat input devices

This commit is contained in:
Benjamin Franzke 2011-07-21 10:45:03 +00:00 committed by Kristian Høgsberg
parent 1ccd9d2a8d
commit 7fb56b3ebc
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
compositor/compositor-openwfd.c
View File

@ -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);
}