diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2017-10-17 16:01:17 -0400 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2017-10-17 16:01:17 -0400 |
| commit | b7c622a319aff00a1c825a4f16bd9443faa6b7c4 (patch) | |
| tree | 873b760bd9288724028841159fdad22d18e62fb3 /include/rootston | |
| parent | 09f16058c890cc3329c8aa39593f229b2bf31443 (diff) | |
| parent | 9129687ad6dcf162b3af8d91b2fc582f185d0943 (diff) | |
Merge branch 'master' into feature/data-device-selection
Diffstat (limited to 'include/rootston')
| -rw-r--r-- | include/rootston/input.h | 2 | ||||
| -rw-r--r-- | include/rootston/view.h | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/include/rootston/input.h b/include/rootston/input.h index 8b4fc3b3..40aea80a 100644 --- a/include/rootston/input.h +++ b/include/rootston/input.h @@ -88,8 +88,8 @@ struct roots_input { struct wlr_xcursor_theme *theme; struct wlr_xcursor *xcursor; struct wlr_seat *wl_seat; - struct roots_view *client_cursor_view; struct wl_list drag_icons; + struct wl_client *cursor_client; enum roots_cursor_mode mode; struct roots_view *active_view, *last_active_view; diff --git a/include/rootston/view.h b/include/rootston/view.h index af087182..a4fb6f01 100644 --- a/include/rootston/view.h +++ b/include/rootston/view.h @@ -17,8 +17,6 @@ struct roots_wl_shell_surface { struct wl_listener request_set_maximized; struct wl_listener surface_commit; - - bool initialized; }; struct roots_xdg_surface_v6 { @@ -32,8 +30,6 @@ struct roots_xdg_surface_v6 { struct wl_listener request_move; struct wl_listener request_resize; struct wl_listener request_show_window_menu; - - bool initialized; }; struct roots_xwayland_surface { @@ -85,6 +81,6 @@ void view_activate(struct roots_view *view, bool active); void view_resize(struct roots_view *view, uint32_t width, uint32_t height); void view_close(struct roots_view *view); bool view_center(struct roots_view *view); -bool view_initialize(struct roots_view *view); +void view_initialize(struct roots_view *view); #endif |