aboutsummaryrefslogtreecommitdiff
path: root/xwayland
diff options
context:
space:
mode:
Diffstat (limited to 'xwayland')
-rw-r--r--xwayland/xwayland.c7
-rw-r--r--xwayland/xwm.c262
-rw-r--r--xwayland/xwm.h16
3 files changed, 165 insertions, 120 deletions
diff --git a/xwayland/xwayland.c b/xwayland/xwayland.c
index bed2e00e..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,8 @@ 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);
if (wlr_xwayland->display < 0) {
diff --git a/xwayland/xwm.c b/xwayland/xwm.c
index be8fe123..862db70b 100644
--- a/xwayland/xwm.c
+++ b/xwayland/xwm.c
@@ -5,50 +5,64 @@
#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_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);
- 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_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 */
@@ -66,105 +80,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->resource;
+ xwayland_surface->surface = surface;
- wl_list_remove(&window->link);
- wl_list_insert(&xwm->xwayland->displayable_windows, &window->link);
+ 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);
@@ -220,20 +246,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;
}
@@ -269,38 +294,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_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 = 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, surface->window_id,
+ XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT, (char*)&m);
+ xcb_set_input_focus_checked(xwm->xcb_conn, XCB_INPUT_FOCUS_POINTER_ROOT,
+ 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);
}
@@ -311,15 +355,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);
@@ -329,22 +374,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);
@@ -355,7 +405,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 235145b9..ecbab535 100644
--- a/xwayland/xwm.h
+++ b/xwayland/xwm.h
@@ -52,17 +52,11 @@ enum atom_name {
NET_SUPPORTED,
NET_WM_S0,
NET_WM_STATE,
- ATOM_LAST
+ WM_TAKE_FOCUS,
+ ATOM_LAST,
};
-static const char * const atom_map[ATOM_LAST] = {
- "WL_SURFACE_ID",
- "WM_PROTOCOLS",
- "WM_S0",
- "_NET_SUPPORTED",
- "_NET_WM_S0",
- "_NET_WM_STATE",
-};
+extern const char *atom_map[ATOM_LAST];
struct wlr_xwm {
struct wlr_xwayland *xwayland;
@@ -74,8 +68,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);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-18 17:57:29 +0000