diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2017-11-22 08:23:23 -0500 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2017-11-22 08:23:23 -0500 |
| commit | fc17c74516c7c843f15426bca754a16f963ad348 (patch) | |
| tree | 91dc83c932cea2100acd36bcc2b888be967a335d /rootston | |
| parent | b0683874e98a2dab7cc73734355bb8e0ad656113 (diff) | |
xwayland: clean up seat setting
Diffstat (limited to 'rootston')
| -rw-r--r-- | rootston/input.c | 1 | ||||
| -rw-r--r-- | rootston/main.c | 16 |
2 files changed, 3 insertions, 14 deletions
diff --git a/rootston/input.c b/rootston/input.c index 94524b5f..a3904a61 100644 --- a/rootston/input.c +++ b/rootston/input.c @@ -86,7 +86,6 @@ struct roots_input *input_create(struct roots_server *server, input->server = server; wl_list_init(&input->seats); - roots_seat_create(input, ROOTS_CONFIG_DEFAULT_SEAT_NAME); input->input_add.notify = input_add_notify; wl_signal_add(&server->backend->events.input_add, &input->input_add); diff --git a/rootston/main.c b/rootston/main.c index 38bbec53..144da2c5 100644 --- a/rootston/main.c +++ b/rootston/main.c @@ -13,19 +13,6 @@ struct roots_server server = { 0 }; static void ready(struct wl_listener *listener, void *data) { - struct roots_desktop *desktop = - wl_container_of(listener, desktop, xwayland_ready); - -#ifdef HAS_XWAYLAND - struct wlr_xwayland *xwayland = data; - if (xwayland) { - struct roots_seat *seat = - input_get_seat(desktop->server->input, - ROOTS_CONFIG_DEFAULT_SEAT_NAME); - wlr_xwayland_set_seat(xwayland, seat->seat); - } -#endif - if (server.config->startup_cmd != NULL) { const char *cmd = server.config->startup_cmd; pid_t pid = fork(); @@ -72,6 +59,9 @@ int main(int argc, char **argv) { ready(NULL, NULL); #else if (server.desktop->xwayland != NULL) { + struct roots_seat *xwayland_seat = + input_get_seat(server.input, ROOTS_CONFIG_DEFAULT_SEAT_NAME); + wlr_xwayland_set_seat(server.desktop->xwayland, xwayland_seat->seat); wl_signal_add(&server.desktop->xwayland->events.ready, &server.desktop->xwayland_ready); server.desktop->xwayland_ready.notify = ready; |