diff options
author | Drew DeVault <sir@cmpwn.com> | 2017-09-28 19:06:41 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2017-09-28 19:06:41 -0400 |
commit | 033036712ade73a872f1034ddb47235be11a74aa (patch) | |
tree | ecae511da6a408177369858ac43d200bae427472 /include/wlr/xwayland.h | |
parent | 2850a9360b23eaf27f6437a889b13bdcbe506863 (diff) | |
parent | e4ad534ab41b01a08b6b4f19aa47805f6040f7b4 (diff) |
Merge branch 'rootston'
Diffstat (limited to 'include/wlr/xwayland.h')
-rw-r--r-- | include/wlr/xwayland.h | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/include/wlr/xwayland.h b/include/wlr/xwayland.h index 41b8042f..2b9d4e81 100644 --- a/include/wlr/xwayland.h +++ b/include/wlr/xwayland.h @@ -20,23 +20,37 @@ 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; + } events; + + void *data; }; -struct wlr_x11_window { +struct wlr_xwayland_surface { xcb_window_t window_id; uint32_t surface_id; struct wl_list link; - struct wl_resource *surface; + struct wlr_surface *surface; struct wl_listener surface_destroy_listener; int16_t x, y; uint16_t width, height; bool override_redirect; + + struct { + struct wl_signal destroy; + } events; + + void *data; }; void wlr_xwayland_destroy(struct wlr_xwayland *wlr_xwayland); struct wlr_xwayland *wlr_xwayland_create(struct wl_display *wl_display, - struct wlr_compositor *compositor); + struct wlr_compositor *compositor); +void wlr_xwayland_surface_activate(struct wlr_xwayland *wlr_xwayland, + struct wlr_xwayland_surface *surface); #endif |