diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2017-10-06 07:04:27 -0400 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2017-10-06 07:04:27 -0400 |
| commit | 4657f10dd29e0dd5d27967b72e4dc1d95b34b6aa (patch) | |
| tree | 7c9e6c441849604a4303df501e9a73f9c3eac384 /include/rootston | |
| parent | d3ebf99b0fcadff6b70e6d7e90b956330cefe8a1 (diff) | |
| parent | b2d478a4189ffd96dc6158003f5cde76b70bd368 (diff) | |
Merge branch 'master' into feature/xdg-popup
Diffstat (limited to 'include/rootston')
| -rw-r--r-- | include/rootston/config.h | 4 | ||||
| -rw-r--r-- | include/rootston/desktop.h | 1 | ||||
| -rw-r--r-- | include/rootston/input.h | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/include/rootston/config.h b/include/rootston/config.h index ece11829..545b6742 100644 --- a/include/rootston/config.h +++ b/include/rootston/config.h @@ -33,6 +33,10 @@ struct roots_config { struct wlr_box *mapped_box; } cursor; + struct { + uint32_t meta_key; + } keyboard; + struct wl_list outputs; struct wl_list devices; struct wl_list bindings; diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h index 91ac87b7..0d641848 100644 --- a/include/rootston/desktop.h +++ b/include/rootston/desktop.h @@ -16,7 +16,6 @@ struct roots_output { struct roots_desktop *desktop; struct wlr_output *wlr_output; struct wl_listener frame; - struct wl_listener resolution; struct timespec last_frame; struct wl_list link; }; diff --git a/include/rootston/input.h b/include/rootston/input.h index 6161eb7a..ae3e3b80 100644 --- a/include/rootston/input.h +++ b/include/rootston/input.h @@ -76,6 +76,7 @@ struct roots_input { // TODO: multiseat, multicursor struct wlr_cursor *cursor; + struct wlr_xcursor_theme *theme; struct wlr_xcursor *xcursor; struct wlr_seat *wl_seat; @@ -83,6 +84,7 @@ struct roots_input { struct roots_view *active_view; int offs_x, offs_y; int view_x, view_y, view_width, view_height; + float view_rotation; uint32_t resize_edges; // Ring buffer of input events that could trigger move/resize/rotate |