aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/rootston/view.h6
-rw-r--r--include/wlr/xwayland.h10
2 files changed, 8 insertions, 8 deletions
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