blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xwayland: clean up seat setting

This commit is contained in:
Tony Crisci 2017-11-22 08:23:23 -05:00
parent b0683874e9
commit fc17c74516
4 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/wlr/xwayland.h
View File

@ -21,6 +21,7 @@ struct wlr_xwayland {
struct wl_client *client; struct wl_client *client;
struct wl_display *wl_display; struct wl_display *wl_display;
struct wlr_compositor *compositor; struct wlr_compositor *compositor;
struct wlr_seat *seat;
time_t server_start; time_t server_start;
struct wl_event_source *sigusr1_source; struct wl_event_source *sigusr1_source;

1
rootston/input.c
View File

@ -86,7 +86,6 @@ struct roots_input *input_create(struct roots_server *server,
input->server = server; input->server = server;
wl_list_init(&input->seats); wl_list_init(&input->seats);
roots_seat_create(input, ROOTS_CONFIG_DEFAULT_SEAT_NAME);
input->input_add.notify = input_add_notify; input->input_add.notify = input_add_notify;
wl_signal_add(&server->backend->events.input_add, &input->input_add); wl_signal_add(&server->backend->events.input_add, &input->input_add);

16
rootston/main.c
View File

@ -13,19 +13,6 @@
struct roots_server server = { 0 }; struct roots_server server = { 0 };
static void ready(struct wl_listener *listener, void *data) { 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) { if (server.config->startup_cmd != NULL) {
const char *cmd = server.config->startup_cmd; const char *cmd = server.config->startup_cmd;
pid_t pid = fork(); pid_t pid = fork();
@ -72,6 +59,9 @@ int main(int argc, char **argv) {
ready(NULL, NULL); ready(NULL, NULL);
#else #else
if (server.desktop->xwayland != NULL) { 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, wl_signal_add(&server.desktop->xwayland->events.ready,
&server.desktop->xwayland_ready); &server.desktop->xwayland_ready);
server.desktop->xwayland_ready.notify = ready; server.desktop->xwayland_ready.notify = ready;

8
xwayland/xwayland.c
View File

@ -196,6 +196,10 @@ static int xserver_handle_ready(int signal_number, void *data) {
return 1; return 1;
} }
if (wlr_xwayland->seat) {
xwm_set_seat(wlr_xwayland->xwm, wlr_xwayland->seat);
}
wl_event_source_remove(wlr_xwayland->sigusr1_source); wl_event_source_remove(wlr_xwayland->sigusr1_source);
wlr_xwayland->sigusr1_source = NULL; wlr_xwayland->sigusr1_source = NULL;
@ -344,5 +348,9 @@ void wlr_xwayland_set_cursor(struct wlr_xwayland *wlr_xwayland,
void wlr_xwayland_set_seat(struct wlr_xwayland *xwayland, void wlr_xwayland_set_seat(struct wlr_xwayland *xwayland,
struct wlr_seat *seat) { struct wlr_seat *seat) {
xwayland->seat = seat;
if (xwayland->xwm) {
xwm_set_seat(xwayland->xwm, seat); xwm_set_seat(xwayland->xwm, seat);
} }
}