diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2017-10-27 15:22:00 -0400 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2017-10-27 15:22:00 -0400 |
| commit | c555a66ddafe3ea06f3abbf38194a8589733082d (patch) | |
| tree | 2298ce1eb691b3d9d5a8ae69cb77894333f943c1 /include/rootston/input.h | |
| parent | 325def38418f5caefd6dc23749dd2ca6bae0a36c (diff) | |
| parent | b97160238fa5b61fef81316102559c8c3e137cd2 (diff) | |
Merge branch 'master' into feature/xwm-rewrite
Diffstat (limited to 'include/rootston/input.h')
| -rw-r--r-- | include/rootston/input.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/include/rootston/input.h b/include/rootston/input.h index 33750d7b..b9af5028 100644 --- a/include/rootston/input.h +++ b/include/rootston/input.h @@ -88,14 +88,13 @@ struct roots_input { // TODO: multiseat, multicursor struct wlr_cursor *cursor; - struct wlr_xcursor_theme *theme; - struct wlr_xcursor *xcursor; + struct wlr_xcursor_theme *xcursor_theme; struct wlr_seat *wl_seat; struct wl_list drag_icons; struct wl_client *cursor_client; enum roots_cursor_mode mode; - struct roots_view *active_view, *last_active_view; + struct roots_view *active_view; int offs_x, offs_y; int view_x, view_y, view_width, view_height; float view_rotation; @@ -158,6 +157,12 @@ void view_begin_move(struct roots_input *input, struct wlr_cursor *cursor, void view_begin_resize(struct roots_input *input, struct wlr_cursor *cursor, struct roots_view *view, uint32_t edges); +struct wlr_xcursor *get_default_xcursor(struct wlr_xcursor_theme *theme); +struct wlr_xcursor *get_move_xcursor(struct wlr_xcursor_theme *theme); +struct wlr_xcursor *get_resize_xcursor(struct wlr_xcursor_theme *theme, + uint32_t edges); +struct wlr_xcursor *get_rotate_xcursor(struct wlr_xcursor_theme *theme); + void set_view_focus(struct roots_input *input, struct roots_desktop *desktop, struct roots_view *view); |