diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-09-28 19:05:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-28 19:05:59 -0400 |
| commit | e4ad534ab41b01a08b6b4f19aa47805f6040f7b4 (patch) | |
| tree | e29b0788e128fb8fb228fa5dc8af24a0f47cd887 /include/rootston | |
| parent | 262c3b1638d42012d6be9ce9f5a3f4c2f7cdaae1 (diff) | |
| parent | 10240af6ea2e3cef474c2e79e9ca220f028cce2d (diff) | |
Merge pull request #167 from emersion/xwayland
[WIP] Improve xwayland
Diffstat (limited to 'include/rootston')
| -rw-r--r-- | include/rootston/input.h | 2 | ||||
| -rw-r--r-- | include/rootston/view.h | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/rootston/input.h b/include/rootston/input.h index b3ce84d7..0ace6cd1 100644 --- a/include/rootston/input.h +++ b/include/rootston/input.h @@ -97,7 +97,9 @@ struct roots_input *input_create(struct roots_server *server, void input_destroy(struct roots_input *input); void pointer_add(struct wlr_input_device *device, struct roots_input *input); +void pointer_remove(struct wlr_input_device *device, struct roots_input *input); void keyboard_add(struct wlr_input_device *device, struct roots_input *input); +void keyboard_remove(struct wlr_input_device *device, struct roots_input *input); void cursor_initialize(struct roots_input *input); void cursor_load_config(struct roots_config *config, 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; |