From b7927078e9b2dec995eaec8240a87b683349aefb Mon Sep 17 00:00:00 2001 From: emersion Date: Thu, 28 Sep 2017 23:26:31 +0200 Subject: [PATCH 1/4] x11 -> xwayland, window -> surface, fix some calloc sizes and wrong types --- examples/compositor.c | 7 +- include/rootston/view.h | 6 +- include/wlr/xwayland.h | 10 +- rootston/xwayland.c | 15 +-- xwayland/xwayland.c | 6 +- xwayland/xwm.c | 251 +++++++++++++++++++++------------------- xwayland/xwm.h | 4 +- 7 files changed, 159 insertions(+), 140 deletions(-) diff --git a/examples/compositor.c b/examples/compositor.c index 7d6efdb6..b1b55190 100644 --- a/examples/compositor.c +++ b/examples/compositor.c @@ -320,10 +320,11 @@ static void handle_output_frame(struct output_state *output, } } } - struct wlr_x11_window *x11_window; - wl_list_for_each(x11_window, &sample->xwayland->displayable_windows, link) { + struct wlr_xwayland_surface *xwayland_surface; + wl_list_for_each(xwayland_surface, &sample->xwayland->displayable_surfaces, + link) { output_frame_handle_surface(sample, wlr_output, ts, - x11_window->surface->resource, 200, 200); + xwayland_surface->surface->resource, 200, 200); } wlr_renderer_end(sample->renderer); diff --git a/include/rootston/view.h b/include/rootston/view.h index 8d4d69c5..9cc2fe04 100644 --- a/include/rootston/view.h +++ b/include/rootston/view.h @@ -27,7 +27,7 @@ struct roots_xdg_surface_v6 { struct wl_listener request_show_window_menu; }; -struct roots_x11_surface { +struct roots_xwayland_surface { struct roots_view *view; // TODO: Maybe destroy listener should go in roots_view struct wl_listener destroy; @@ -48,12 +48,12 @@ struct roots_view { union { struct wlr_wl_shell_surface *wl_shell_surface; struct wlr_xdg_surface_v6 *xdg_surface_v6; - struct wlr_x11_window *x11_window; + struct wlr_xwayland_surface *xwayland_surface; }; union { struct roots_wl_shell_surface *roots_wl_shell_surface; struct roots_xdg_surface_v6 *roots_xdg_surface_v6; - struct roots_x11_surface *roots_x11_surface; + struct roots_xwayland_surface *roots_xwayland_surface; }; struct wlr_surface *wlr_surface; struct wl_list link; diff --git a/include/wlr/xwayland.h b/include/wlr/xwayland.h index 3c893c72..2b9d4e81 100644 --- a/include/wlr/xwayland.h +++ b/include/wlr/xwayland.h @@ -20,7 +20,7 @@ struct wlr_xwayland { struct wl_event_source *sigusr1_source; struct wl_listener destroy_listener; struct wlr_xwm *xwm; - struct wl_list displayable_windows; + struct wl_list displayable_surfaces; struct { struct wl_signal new_surface; @@ -29,7 +29,7 @@ struct wlr_xwayland { void *data; }; -struct wlr_x11_window { +struct wlr_xwayland_surface { xcb_window_t window_id; uint32_t surface_id; struct wl_list link; @@ -49,8 +49,8 @@ struct wlr_x11_window { void wlr_xwayland_destroy(struct wlr_xwayland *wlr_xwayland); struct wlr_xwayland *wlr_xwayland_create(struct wl_display *wl_display, - struct wlr_compositor *compositor); -void wlr_x11_window_activate(struct wlr_xwayland *wlr_xwayland, - struct wlr_x11_window *window); + struct wlr_compositor *compositor); +void wlr_xwayland_surface_activate(struct wlr_xwayland *wlr_xwayland, + struct wlr_xwayland_surface *surface); #endif diff --git a/rootston/xwayland.c b/rootston/xwayland.c index f9ad2a22..88965f0d 100644 --- a/rootston/xwayland.c +++ b/rootston/xwayland.c @@ -10,7 +10,7 @@ #include "rootston/server.h" static void handle_destroy(struct wl_listener *listener, void *data) { - struct roots_wl_shell_surface *roots_surface = + struct roots_xwayland_surface *roots_surface = wl_container_of(listener, roots_surface, destroy); wl_list_remove(&roots_surface->destroy.link); view_destroy(roots_surface->view); @@ -18,19 +18,20 @@ static void handle_destroy(struct wl_listener *listener, void *data) { } static void x11_activate(struct roots_view *view, bool active) { - wlr_x11_window_activate(view->desktop->xwayland, view->x11_window); + wlr_xwayland_surface_activate(view->desktop->xwayland, + view->xwayland_surface); } void handle_xwayland_surface(struct wl_listener *listener, void *data) { struct roots_desktop *desktop = wl_container_of(listener, desktop, xwayland_surface); - struct wlr_x11_window *surface = data; + struct wlr_xwayland_surface *surface = data; // TODO: get and log title, class, etc wlr_log(L_DEBUG, "new xwayland surface"); - struct roots_x11_surface *roots_surface = - calloc(1, sizeof(struct roots_wl_shell_surface)); + struct roots_xwayland_surface *roots_surface = + calloc(1, sizeof(struct roots_xwayland_surface)); wl_list_init(&roots_surface->destroy.link); roots_surface->destroy.notify = handle_destroy; wl_signal_add(&surface->events.destroy, &roots_surface->destroy); @@ -38,8 +39,8 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) { struct roots_view *view = calloc(1, sizeof(struct roots_view)); view->type = ROOTS_XWAYLAND_VIEW; view->x = view->y = 200; - view->x11_window = surface; - view->roots_x11_surface = roots_surface; + view->xwayland_surface = surface; + view->roots_xwayland_surface = roots_surface; view->wlr_surface = surface->surface; view->desktop = desktop; view->activate = x11_activate; diff --git a/xwayland/xwayland.c b/xwayland/xwayland.c index 6a521393..d3bb41a0 100644 --- a/xwayland/xwayland.c +++ b/xwayland/xwayland.c @@ -86,7 +86,7 @@ static void exec_xwayland(struct wlr_xwayland *wlr_xwayland) { _exit(EXIT_FAILURE); } - if (clearenv()) { + if (clearenv()) { wlr_log_errno(L_ERROR, "clearenv failed"); _exit(EXIT_FAILURE); } @@ -105,7 +105,7 @@ static void exec_xwayland(struct wlr_xwayland *wlr_xwayland) { } static bool wlr_xwayland_init(struct wlr_xwayland *wlr_xwayland, - struct wl_display *wl_display, struct wlr_compositor *compositor); + struct wl_display *wl_display, struct wlr_compositor *compositor); static void wlr_xwayland_finish(struct wlr_xwayland *wlr_xwayland); static void xwayland_destroy_event(struct wl_listener *listener, void *data) { @@ -193,7 +193,7 @@ static bool wlr_xwayland_init(struct wlr_xwayland *wlr_xwayland, wlr_xwayland->x_fd[0] = wlr_xwayland->x_fd[1] = -1; wlr_xwayland->wl_fd[0] = wlr_xwayland->wl_fd[1] = -1; wlr_xwayland->wm_fd[0] = wlr_xwayland->wm_fd[1] = -1; - wl_list_init(&wlr_xwayland->displayable_windows); + wl_list_init(&wlr_xwayland->displayable_surfaces); wl_signal_init(&wlr_xwayland->events.new_surface); wlr_xwayland->display = open_display_sockets(wlr_xwayland->x_fd); diff --git a/xwayland/xwm.c b/xwayland/xwm.c index bda9f882..1feb4bd0 100644 --- a/xwayland/xwm.c +++ b/xwayland/xwm.c @@ -7,51 +7,52 @@ /* General helpers */ // TODO: replace this with hash table? -static struct wlr_x11_window *lookup_window(struct wl_list *list, xcb_window_t window_id) { - struct wlr_x11_window *window; - wl_list_for_each(window, list, link) { - if (window->window_id == window_id) { - return window; +static struct wlr_xwayland_surface *lookup_surface(struct wl_list *list, + xcb_window_t window_id) { + struct wlr_xwayland_surface *surface; + wl_list_for_each(surface, list, link) { + if (surface->window_id == window_id) { + return surface; } } return NULL; } -static struct wlr_x11_window *lookup_window_any(struct wlr_xwm *xwm, xcb_window_t window_id) { - struct wlr_x11_window *window; - if ((window = lookup_window(&xwm->xwayland->displayable_windows, window_id)) || - (window = lookup_window(&xwm->unpaired_windows, window_id)) || - (window = lookup_window(&xwm->new_windows, window_id))) { - return window; +static struct wlr_xwayland_surface *lookup_surface_any(struct wlr_xwm *xwm, + xcb_window_t window_id) { + struct wlr_xwayland_surface *surface; + if ((surface = lookup_surface(&xwm->xwayland->displayable_surfaces, window_id)) || + (surface = lookup_surface(&xwm->unpaired_surfaces, window_id)) || + (surface = lookup_surface(&xwm->new_surfaces, window_id))) { + return surface; } return NULL; } -static struct wlr_x11_window *wlr_x11_window_create(struct wlr_xwm *xwm, - xcb_window_t window_id, int16_t x, int16_t y, +static struct wlr_xwayland_surface *wlr_xwayland_surface_create( + struct wlr_xwm *xwm, xcb_window_t window_id, int16_t x, int16_t y, uint16_t width, uint16_t height, bool override_redirect) { - struct wlr_x11_window *window; - - window = calloc(1, sizeof(struct wlr_x11_window)); - if (!window) { - wlr_log(L_ERROR, "Could not allocate wlr x11 window"); + struct wlr_xwayland_surface *surface = + calloc(1, sizeof(struct wlr_xwayland_surface)); + if (!surface) { + wlr_log(L_ERROR, "Could not allocate wlr xwayland surface"); return NULL; } - window->window_id = window_id; - window->x = x; - window->y = y; - window->width = width; - window->height = height; - window->override_redirect = override_redirect; - wl_list_insert(&xwm->new_windows, &window->link); - wl_signal_init(&window->events.destroy); - return window; + surface->window_id = window_id; + surface->x = x; + surface->y = y; + surface->width = width; + surface->height = height; + surface->override_redirect = override_redirect; + wl_list_insert(&xwm->new_surfaces, &surface->link); + wl_signal_init(&surface->events.destroy); + return surface; } -static void wlr_x11_window_destroy(struct wlr_x11_window *window) { - wl_signal_emit(&window->events.destroy, window); - wl_list_remove(&window->link); - free(window); +static void wlr_xwayland_surface_destroy(struct wlr_xwayland_surface *surface) { + wl_signal_emit(&surface->events.destroy, surface); + wl_list_remove(&surface->link); + free(surface); } /* xcb helpers */ @@ -69,106 +70,117 @@ static bool xcb_call(struct wlr_xwm *xwm, const char *func, uint32_t line, return false; } -static void map_shell_surface(struct wlr_xwm *xwm, struct wlr_x11_window *window, +static void map_shell_surface(struct wlr_xwm *xwm, + struct wlr_xwayland_surface *xwayland_surface, struct wlr_surface *surface) { // get xcb geometry for depth = alpha channel - window->surface = surface; + xwayland_surface->surface = surface; - wl_list_remove(&window->link); - wl_list_insert(&xwm->xwayland->displayable_windows, &window->link); - wl_signal_emit(&xwm->xwayland->events.new_surface, window); + wl_list_remove(&xwayland_surface->link); + wl_list_insert(&xwm->xwayland->displayable_surfaces, + &xwayland_surface->link); + wl_signal_emit(&xwm->xwayland->events.new_surface, xwayland_surface); } /* xcb event handlers */ -static void handle_create_notify(struct wlr_xwm *xwm, xcb_create_notify_event_t *ev) { +static void handle_create_notify(struct wlr_xwm *xwm, + xcb_create_notify_event_t *ev) { wlr_log(L_DEBUG, "XCB_CREATE_NOTIFY (%u)", ev->window); - wlr_x11_window_create(xwm, ev->window, ev->x, ev->y, + wlr_xwayland_surface_create(xwm, ev->window, ev->x, ev->y, ev->width, ev->height, ev->override_redirect); } -static void handle_destroy_notify(struct wlr_xwm *xwm, xcb_destroy_notify_event_t *ev) { - struct wlr_x11_window *window; +static void handle_destroy_notify(struct wlr_xwm *xwm, + xcb_destroy_notify_event_t *ev) { wlr_log(L_DEBUG, "XCB_DESTROY_NOTIFY (%u)", ev->window); - if (!(window = lookup_window_any(xwm, ev->window))) { + struct wlr_xwayland_surface *surface = lookup_surface_any(xwm, ev->window); + if (surface == NULL) { return; } - wlr_x11_window_destroy(window); + wlr_xwayland_surface_destroy(surface); } -static void handle_configure_request(struct wlr_xwm *xwm, xcb_configure_request_event_t *ev) { - struct wlr_x11_window *window; +static void handle_configure_request(struct wlr_xwm *xwm, + xcb_configure_request_event_t *ev) { wlr_log(L_DEBUG, "XCB_CONFIGURE_REQUEST (%u) [%ux%u+%d,%d]", ev->window, ev->width, ev->height, ev->x, ev->y); - if (!(window = lookup_window_any(xwm, ev->window))) { + struct wlr_xwayland_surface *surface = lookup_surface_any(xwm, ev->window); + if (surface == NULL) { return; } - window->x = ev->x; - window->y = ev->y; - window->width = ev->width; - window->height = ev->height; + surface->x = ev->x; + surface->y = ev->y; + surface->width = ev->width; + surface->height = ev->height; // handle parent/sibling? - uint32_t values[] = { ev->x, ev->y, ev->width, ev->height, 0 }; + uint32_t values[] = {ev->x, ev->y, ev->width, ev->height, 0}; uint32_t mask = XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y | XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT | XCB_CONFIG_WINDOW_BORDER_WIDTH; xcb_configure_window(xwm->xcb_conn, ev->window, mask, values); } -static void handle_map_request(struct wlr_xwm *xwm, xcb_map_request_event_t *ev) { +static void handle_map_request(struct wlr_xwm *xwm, + xcb_map_request_event_t *ev) { wlr_log(L_DEBUG, "XCB_MAP_REQUEST (%u)", ev->window); + const uint32_t value_list = XCB_EVENT_MASK_FOCUS_CHANGE | + XCB_EVENT_MASK_PROPERTY_CHANGE; XCB_CALL(xwm, xcb_change_window_attributes_checked(xwm->xcb_conn, - ev->window, XCB_CW_EVENT_MASK, - &(uint32_t){XCB_EVENT_MASK_FOCUS_CHANGE | XCB_EVENT_MASK_PROPERTY_CHANGE})); + ev->window, XCB_CW_EVENT_MASK, &value_list)); XCB_CALL(xwm, xcb_map_window_checked(xwm->xcb_conn, ev->window)); } static void handle_map_notify(struct wlr_xwm *xwm, xcb_map_notify_event_t *ev) { - struct wlr_x11_window *window; wlr_log(L_DEBUG, "XCB_MAP_NOTIFY (%u)", ev->window); - if ((window = lookup_window_any(xwm, ev->window))) { - window->override_redirect = ev->override_redirect; + struct wlr_xwayland_surface *surface = lookup_surface_any(xwm, ev->window); + if (surface != NULL) { + surface->override_redirect = ev->override_redirect; } else { - wlr_x11_window_create(xwm, ev->window, 0, 0, 1, 1, ev->override_redirect); + wlr_xwayland_surface_create(xwm, ev->window, 0, 0, 1, 1, + ev->override_redirect); } } -static void handle_unmap_notify(struct wlr_xwm *xwm, xcb_unmap_notify_event_t *ev) { - struct wlr_x11_window *window; +static void handle_unmap_notify(struct wlr_xwm *xwm, + xcb_unmap_notify_event_t *ev) { wlr_log(L_DEBUG, "XCB_UNMAP_NOTIFY (%u)", ev->window); - if (!(window = lookup_window_any(xwm, ev->window))) { + struct wlr_xwayland_surface *surface = lookup_surface_any(xwm, ev->window); + if (surface == NULL) { return; } - // remove pointer to surface only? - wlr_x11_window_destroy(window); + // TODO: remove pointer to surface only? + wlr_xwayland_surface_destroy(surface); } -static void handle_property_notify(struct wlr_xwm *xwm, xcb_property_notify_event_t *ev) { +static void handle_property_notify(struct wlr_xwm *xwm, + xcb_property_notify_event_t *ev) { wlr_log(L_DEBUG, "XCB_PROPERTY_NOTIFY (%u)", ev->window); // TODO lookup window & get properties } -static void handle_client_message(struct wlr_xwm *xwm, xcb_client_message_event_t *ev) { +static void handle_client_message(struct wlr_xwm *xwm, + xcb_client_message_event_t *ev) { wlr_log(L_DEBUG, "XCB_CLIENT_MESSAGE (%u)", ev->window); if (ev->type == xwm->atoms[WL_SURFACE_ID]) { - struct wlr_x11_window *window; - struct wl_resource *resource; - window = lookup_window(&xwm->new_windows, ev->window); - if (!window) { + struct wlr_xwayland_surface *surface = lookup_surface( + &xwm->new_surfaces, ev->window); + if (surface == NULL) { wlr_log(L_DEBUG, "client message WL_SURFACE_ID but no new window %u ?", ev->window); return; } - window->surface_id = ev->data.data32[0]; + surface->surface_id = ev->data.data32[0]; /* Check if we got notified after wayland surface create event */ - resource = wl_client_get_object(xwm->xwayland->client, window->surface_id); + struct wl_resource *resource = wl_client_get_object( + xwm->xwayland->client, surface->surface_id); if (resource) { - map_shell_surface(xwm, window, wl_resource_get_user_data(resource)); + map_shell_surface(xwm, surface, wl_resource_get_user_data(resource)); } else { - wl_list_remove(&window->link); - wl_list_insert(&xwm->unpaired_windows, &window->link); + wl_list_remove(&surface->link); + wl_list_insert(&xwm->unpaired_surfaces, &surface->link); } } wlr_log(L_DEBUG, "unhandled client message %u", ev->type); @@ -224,20 +236,19 @@ static int x11_event_handler(int fd, uint32_t mask, void *data) { static void create_surface_handler(struct wl_listener *listener, void *data) { struct wlr_surface *surface = data; - struct wlr_xwm *xwm = wl_container_of(listener, xwm, surface_create_listener); - struct wlr_x11_window *window; - uint32_t surface_id; - + struct wlr_xwm *xwm = wl_container_of(listener, xwm, + surface_create_listener); if (wl_resource_get_client(surface->resource) != xwm->xwayland->client) { return; } wlr_log(L_DEBUG, "New x11 surface: %p", surface); - surface_id = wl_resource_get_id(surface->resource); - wl_list_for_each(window, &xwm->unpaired_windows, link) { - if (window->surface_id == surface_id) { - map_shell_surface(xwm, window, surface); + uint32_t surface_id = wl_resource_get_id(surface->resource); + struct wlr_xwayland_surface *xwayland_surface; + wl_list_for_each(xwayland_surface, &xwm->unpaired_surfaces, link) { + if (xwayland_surface->surface_id == surface_id) { + map_shell_surface(xwm, xwayland_surface, surface); xcb_flush(xwm->xcb_conn); return; } @@ -273,57 +284,57 @@ static void xcb_get_resources(struct wlr_xwm *xwm) { } static void xcb_init_wm(struct wlr_xwm *xwm) { - xcb_screen_iterator_t screen_iterator; - screen_iterator = xcb_setup_roots_iterator(xcb_get_setup(xwm->xcb_conn)); + xcb_screen_iterator_t screen_iterator = + xcb_setup_roots_iterator(xcb_get_setup(xwm->xcb_conn)); xwm->screen = screen_iterator.data; xwm->window = xcb_generate_id(xwm->xcb_conn); uint32_t values[] = { - XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY | + XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY | XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT | XCB_EVENT_MASK_PROPERTY_CHANGE, /* xwm->cursor, */ }; - XCB_CALL(xwm, xcb_change_window_attributes_checked(xwm->xcb_conn, xwm->screen->root, - XCB_CW_EVENT_MASK /* | XCB_CW_CURSOR */, values)); + XCB_CALL(xwm, xcb_change_window_attributes_checked(xwm->xcb_conn, + xwm->screen->root, XCB_CW_EVENT_MASK /* | XCB_CW_CURSOR */, values)); XCB_CALL(xwm, xcb_composite_redirect_subwindows_checked(xwm->xcb_conn, - xwm->screen->root, XCB_COMPOSITE_REDIRECT_MANUAL)); + xwm->screen->root, XCB_COMPOSITE_REDIRECT_MANUAL)); XCB_CALL(xwm, xcb_create_window_checked(xwm->xcb_conn, XCB_COPY_FROM_PARENT, - xwm->window, xwm->screen->root, 0, 0, 1, 1, 0, - XCB_WINDOW_CLASS_INPUT_OUTPUT, xwm->screen->root_visual, - XCB_CW_EVENT_MASK, (uint32_t[]){XCB_EVENT_MASK_PROPERTY_CHANGE})); + xwm->window, xwm->screen->root, 0, 0, 1, 1, 0, + XCB_WINDOW_CLASS_INPUT_OUTPUT, xwm->screen->root_visual, + XCB_CW_EVENT_MASK, (uint32_t[]){XCB_EVENT_MASK_PROPERTY_CHANGE})); xcb_atom_t supported[] = { xwm->atoms[NET_WM_STATE], }; - XCB_CALL(xwm, xcb_change_property_checked(xwm->xcb_conn, XCB_PROP_MODE_REPLACE, - xwm->screen->root, xwm->atoms[NET_SUPPORTED], XCB_ATOM_ATOM, - 32, sizeof(supported)/sizeof(*supported), supported)); + XCB_CALL(xwm, xcb_change_property_checked(xwm->xcb_conn, + XCB_PROP_MODE_REPLACE, xwm->screen->root, xwm->atoms[NET_SUPPORTED], + XCB_ATOM_ATOM, 32, sizeof(supported)/sizeof(*supported), supported)); XCB_CALL(xwm, xcb_set_selection_owner_checked(xwm->xcb_conn, xwm->window, - xwm->atoms[WM_S0], XCB_CURRENT_TIME)); + xwm->atoms[WM_S0], XCB_CURRENT_TIME)); XCB_CALL(xwm, xcb_set_selection_owner_checked(xwm->xcb_conn, xwm->window, - xwm->atoms[NET_WM_S0], XCB_CURRENT_TIME)); + xwm->atoms[NET_WM_S0], XCB_CURRENT_TIME)); xcb_flush(xwm->xcb_conn); } -void wlr_x11_window_activate(struct wlr_xwayland *wlr_xwayland, - struct wlr_x11_window *window) { +void wlr_xwayland_surface_activate(struct wlr_xwayland *wlr_xwayland, + struct wlr_xwayland_surface *surface) { struct wlr_xwm *xwm = wlr_xwayland->xwm; xcb_client_message_event_t m = {0}; m.response_type = XCB_CLIENT_MESSAGE; m.format = 32; - m.window = window->window_id; + m.window = surface->window_id; m.type = xwm->atoms[WM_PROTOCOLS]; m.data.data32[0] = xwm->atoms[WM_TAKE_FOCUS]; m.data.data32[1] = XCB_TIME_CURRENT_TIME; - xcb_send_event_checked(xwm->xcb_conn, 0, window->window_id, - XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT, (char*)&m); + xcb_send_event_checked(xwm->xcb_conn, 0, surface->window_id, + XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT, (char*)&m); xcb_set_input_focus_checked(xwm->xcb_conn, XCB_INPUT_FOCUS_POINTER_ROOT, - window->window_id, XCB_CURRENT_TIME); - xcb_configure_window_checked(xwm->xcb_conn, window->window_id, - XCB_CONFIG_WINDOW_STACK_MODE, (uint32_t[]){XCB_STACK_MODE_ABOVE}); + surface->window_id, XCB_CURRENT_TIME); + xcb_configure_window_checked(xwm->xcb_conn, surface->window_id, + XCB_CONFIG_WINDOW_STACK_MODE, (uint32_t[]){XCB_STACK_MODE_ABOVE}); xcb_flush(xwm->xcb_conn); } @@ -334,15 +345,16 @@ void xwm_destroy(struct wlr_xwm *xwm) { if (xwm->event_source) { wl_event_source_remove(xwm->event_source); } - struct wlr_x11_window *window, *tmp; - wl_list_for_each_safe(window, tmp, &xwm->xwayland->displayable_windows, link) { - wlr_x11_window_destroy(window); + struct wlr_xwayland_surface *surface, *tmp; + wl_list_for_each_safe(surface, tmp, &xwm->xwayland->displayable_surfaces, + link) { + wlr_xwayland_surface_destroy(surface); } - wl_list_for_each_safe(window, tmp, &xwm->new_windows, link) { - wlr_x11_window_destroy(window); + wl_list_for_each_safe(surface, tmp, &xwm->new_surfaces, link) { + wlr_xwayland_surface_destroy(surface); } - wl_list_for_each_safe(window, tmp, &xwm->unpaired_windows, link) { - wlr_x11_window_destroy(window); + wl_list_for_each_safe(surface, tmp, &xwm->unpaired_surfaces, link) { + wlr_xwayland_surface_destroy(surface); } wl_list_remove(&xwm->surface_create_listener.link); xcb_disconnect(xwm->xcb_conn); @@ -352,22 +364,27 @@ void xwm_destroy(struct wlr_xwm *xwm) { struct wlr_xwm *xwm_create(struct wlr_xwayland *wlr_xwayland) { struct wlr_xwm *xwm = calloc(1, sizeof(struct wlr_xwm)); - int rc; + if (xwm == NULL) { + return NULL; + } xwm->xwayland = wlr_xwayland; - wl_list_init(&xwm->new_windows); - wl_list_init(&xwm->unpaired_windows); + wl_list_init(&xwm->new_surfaces); + wl_list_init(&xwm->unpaired_surfaces); xwm->xcb_conn = xcb_connect_to_fd(wlr_xwayland->wm_fd[0], NULL); - if ((rc = xcb_connection_has_error(xwm->xcb_conn))) { + + int rc = xcb_connection_has_error(xwm->xcb_conn); + if (rc) { wlr_log(L_ERROR, "xcb connect failed: %d", rc); free(xwm); return NULL; } - struct wl_event_loop *event_loop = wl_display_get_event_loop(wlr_xwayland->wl_display); + struct wl_event_loop *event_loop = wl_display_get_event_loop( + wlr_xwayland->wl_display); xwm->event_source = wl_event_loop_add_fd(event_loop, wlr_xwayland->wm_fd[0], - WL_EVENT_READABLE, x11_event_handler, xwm); + WL_EVENT_READABLE, x11_event_handler, xwm); // probably not needed // wl_event_source_check(xwm->event_source); @@ -378,7 +395,7 @@ struct wlr_xwm *xwm_create(struct wlr_xwayland *wlr_xwayland) { xwm->surface_create_listener.notify = create_surface_handler; wl_signal_add(&wlr_xwayland->compositor->events.create_surface, - &xwm->surface_create_listener); + &xwm->surface_create_listener); return xwm; } diff --git a/xwayland/xwm.h b/xwayland/xwm.h index 7fc6f3bf..869eb303 100644 --- a/xwayland/xwm.h +++ b/xwayland/xwm.h @@ -75,8 +75,8 @@ struct wlr_xwm { xcb_screen_t *screen; xcb_window_t window; - struct wl_list new_windows; - struct wl_list unpaired_windows; + struct wl_list new_surfaces; + struct wl_list unpaired_surfaces; }; void xwm_destroy(struct wlr_xwm *xwm); From f0a14a318cd3d8723b42d2889f0170bf211a844c Mon Sep 17 00:00:00 2001 From: emersion Date: Thu, 28 Sep 2017 23:50:20 +0200 Subject: [PATCH 2/4] Fix segfault on startup --- xwayland/xwm.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xwayland/xwm.h b/xwayland/xwm.h index 869eb303..7ff87ea0 100644 --- a/xwayland/xwm.h +++ b/xwayland/xwm.h @@ -56,13 +56,14 @@ enum atom_name { ATOM_LAST, }; -static const char * const atom_map[ATOM_LAST] = { +static const char *atom_map[ATOM_LAST] = { "WL_SURFACE_ID", "WM_PROTOCOLS", "WM_S0", "_NET_SUPPORTED", "_NET_WM_S0", "_NET_WM_STATE", + "WM_TAKE_FOCUS", }; struct wlr_xwm { From efadbf84249e419b52c3f4bca10f8cd5b7f3d942 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Thu, 28 Sep 2017 18:47:20 -0400 Subject: [PATCH 3/4] Fix atom_map usage --- xwayland/xwm.c | 10 ++++++++++ xwayland/xwm.h | 10 +--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/xwayland/xwm.c b/xwayland/xwm.c index 1feb4bd0..862db70b 100644 --- a/xwayland/xwm.c +++ b/xwayland/xwm.c @@ -5,6 +5,16 @@ #include "wlr/xwayland.h" #include "xwm.h" +const char *atom_map[ATOM_LAST] = { + "WL_SURFACE_ID", + "WM_PROTOCOLS", + "WM_S0", + "_NET_SUPPORTED", + "_NET_WM_S0", + "_NET_WM_STATE", + "WM_TAKE_FOCUS", +}; + /* General helpers */ // TODO: replace this with hash table? static struct wlr_xwayland_surface *lookup_surface(struct wl_list *list, diff --git a/xwayland/xwm.h b/xwayland/xwm.h index 7ff87ea0..ecbab535 100644 --- a/xwayland/xwm.h +++ b/xwayland/xwm.h @@ -56,15 +56,7 @@ enum atom_name { ATOM_LAST, }; -static const char *atom_map[ATOM_LAST] = { - "WL_SURFACE_ID", - "WM_PROTOCOLS", - "WM_S0", - "_NET_SUPPORTED", - "_NET_WM_S0", - "_NET_WM_STATE", - "WM_TAKE_FOCUS", -}; +extern const char *atom_map[ATOM_LAST]; struct wlr_xwm { struct wlr_xwayland *xwayland; From 10240af6ea2e3cef474c2e79e9ca220f028cce2d Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Thu, 28 Sep 2017 19:05:38 -0400 Subject: [PATCH 4/4] Handle input device removal --- include/rootston/input.h | 2 ++ rootston/input.c | 4 ++-- rootston/keyboard.c | 9 +++++++++ rootston/pointer.c | 8 ++++++++ 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/include/rootston/input.h b/include/rootston/input.h index b3ce84d7..0ace6cd1 100644 --- a/include/rootston/input.h +++ b/include/rootston/input.h @@ -97,7 +97,9 @@ struct roots_input *input_create(struct roots_server *server, void input_destroy(struct roots_input *input); void pointer_add(struct wlr_input_device *device, struct roots_input *input); +void pointer_remove(struct wlr_input_device *device, struct roots_input *input); void keyboard_add(struct wlr_input_device *device, struct roots_input *input); +void keyboard_remove(struct wlr_input_device *device, struct roots_input *input); void cursor_initialize(struct roots_input *input); void cursor_load_config(struct roots_config *config, diff --git a/rootston/input.c b/rootston/input.c index ac8e7396..b4427212 100644 --- a/rootston/input.c +++ b/rootston/input.c @@ -52,10 +52,10 @@ static void input_remove_notify(struct wl_listener *listener, void *data) { struct roots_input *input = wl_container_of(listener, input, input_remove); switch (device->type) { case WLR_INPUT_DEVICE_KEYBOARD: - //keyboard_remove(device, input); + keyboard_remove(device, input); break; case WLR_INPUT_DEVICE_POINTER: - //pointer_remove(device, input); + pointer_remove(device, input); break; case WLR_INPUT_DEVICE_TOUCH: //touch_remove(device, input); diff --git a/rootston/keyboard.c b/rootston/keyboard.c index 57e0d14e..c4c98c91 100644 --- a/rootston/keyboard.c +++ b/rootston/keyboard.c @@ -42,6 +42,7 @@ static void keyboard_key_notify(struct wl_listener *listener, void *data) { void keyboard_add(struct wlr_input_device *device, struct roots_input *input) { struct roots_keyboard *keyboard = calloc(sizeof(struct roots_keyboard), 1); + device->data = keyboard; keyboard->device = device; keyboard->input = input; wl_list_init(&keyboard->key.link); @@ -64,3 +65,11 @@ void keyboard_add(struct wlr_input_device *device, struct roots_input *input) { xkb_context_unref(context); wlr_seat_attach_keyboard(input->wl_seat, device); } + +void keyboard_remove(struct wlr_input_device *device, struct roots_input *input) { + struct roots_keyboard *keyboard = device->data; + wlr_seat_detach_keyboard(input->wl_seat, device->keyboard); + wl_list_remove(&keyboard->key.link); + wl_list_remove(&keyboard->link); + free(keyboard); +} diff --git a/rootston/pointer.c b/rootston/pointer.c index 1693893e..299ecdfc 100644 --- a/rootston/pointer.c +++ b/rootston/pointer.c @@ -6,6 +6,7 @@ void pointer_add(struct wlr_input_device *device, struct roots_input *input) { struct roots_pointer *pointer = calloc(sizeof(struct roots_pointer), 1); + device->data = pointer; pointer->device = device; pointer->input = input; wl_list_insert(&input->pointers, &pointer->link); @@ -13,3 +14,10 @@ void pointer_add(struct wlr_input_device *device, struct roots_input *input) { cursor_load_config(input->server->config, input->cursor, input, input->server->desktop); } + +void pointer_remove(struct wlr_input_device *device, struct roots_input *input) { + struct roots_pointer *pointer = device->data; + wlr_cursor_detach_input_device(input->cursor, device); + wl_list_remove(&pointer->link); + free(pointer); +}