aboutsummaryrefslogtreecommitdiff
path: root/include/wlr
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2017-09-28 19:05:59 -0400
committerGitHub <noreply@github.com>2017-09-28 19:05:59 -0400
commite4ad534ab41b01a08b6b4f19aa47805f6040f7b4 (patch)
treee29b0788e128fb8fb228fa5dc8af24a0f47cd887 /include/wlr
parent262c3b1638d42012d6be9ce9f5a3f4c2f7cdaae1 (diff)
parent10240af6ea2e3cef474c2e79e9ca220f028cce2d (diff)
Merge pull request #167 from emersion/xwayland
[WIP] Improve xwayland
Diffstat (limited to 'include/wlr')
-rw-r--r--include/wlr/xwayland.h10
1 files changed, 5 insertions, 5 deletions
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