mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-12-15 08:56:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into xwayland-dnd

Browse source
This commit is contained in:
emersion 2018-04-03 10:38:46 -04:00
commit 58ac05c276
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
18 changed files with 230 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

14
xwayland/xwm.c
View file

@ -1,6 +1,7 @@
#ifndef _POSIX_C_SOURCE
#define _POSIX_C_SOURCE 200809L
#endif
#include <assert.h>
#include <stdlib.h>
#include <unistd.h>
#include <wlr/config.h>
@ -73,6 +74,18 @@ const char *atom_map[ATOM_LAST] = {
"XdndActionPrivate",
};
const char *wlr_xwayland_surface_role = "wlr_xwayland_surface";
bool wlr_surface_is_xwayland_surface(struct wlr_surface *surface) {
return strcmp(surface->role, wlr_xwayland_surface_role) == 0;
}
struct wlr_xwayland_surface *wlr_xwayland_surface_from_wlr_surface(
struct wlr_surface *surface) {
assert(wlr_surface_is_xwayland_surface(surface));
return (struct wlr_xwayland_surface *)surface->role_data;
}
// TODO: replace this with hash table?
static struct wlr_xwayland_surface *lookup_surface(struct wlr_xwm *xwm,
xcb_window_t window_id) {
@ -606,6 +619,7 @@ static void xwm_map_shell_surface(struct wlr_xwm *xwm,
read_surface_property(xwm, xsurface, props[i]);
}
wlr_surface_set_role(xsurface->surface, wlr_xwayland_surface_role, NULL, 0);
wlr_surface_set_role_committed(xsurface->surface, handle_surface_commit,
xsurface);