diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2017-10-24 09:11:12 -0400 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2017-10-24 09:11:12 -0400 |
| commit | 2ca502b546f57fe7252dc990e7bfe89e151430a5 (patch) | |
| tree | 87f66bd9bf5aa83f2b5f344d07143d4831b8459d /include/rootston | |
| parent | 0f7f6b1373438675b5f4d6a6ca0b4b88b472e322 (diff) | |
| parent | bbf08f3ef9cf831c6af49060871995eaa0963bca (diff) | |
Merge branch 'master' into feature/xwm-rewrite
Diffstat (limited to 'include/rootston')
| -rw-r--r-- | include/rootston/input.h | 13 | ||||
| -rw-r--r-- | include/rootston/server.h | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/include/rootston/input.h b/include/rootston/input.h index ddd5a05d..33750d7b 100644 --- a/include/rootston/input.h +++ b/include/rootston/input.h @@ -64,6 +64,17 @@ struct roots_input_event { struct wlr_input_device *device; }; +struct roots_drag_icon { + struct wlr_surface *surface; + struct wl_list link; // roots_input::drag_icons + + int32_t sx; + int32_t sy; + + struct wl_listener surface_destroy; + struct wl_listener surface_commit; +}; + struct roots_touch_point { struct roots_touch *device; int32_t slot; @@ -80,6 +91,7 @@ struct roots_input { struct wlr_xcursor_theme *theme; struct wlr_xcursor *xcursor; struct wlr_seat *wl_seat; + struct wl_list drag_icons; struct wl_client *cursor_client; enum roots_cursor_mode mode; @@ -113,6 +125,7 @@ struct roots_input { struct wl_listener cursor_tool_axis; struct wl_listener cursor_tool_tip; + struct wl_listener pointer_grab_begin; struct wl_list touch_points; struct wl_listener pointer_grab_end; diff --git a/include/rootston/server.h b/include/rootston/server.h index a4eacb7f..8fc6530e 100644 --- a/include/rootston/server.h +++ b/include/rootston/server.h @@ -3,7 +3,7 @@ #include <wayland-server.h> #include <wlr/backend.h> #include <wlr/backend/session.h> -#include <wlr/types/wlr_data_device_manager.h> +#include <wlr/types/wlr_data_device.h> #include <wlr/render.h> #ifdef HAS_XWAYLAND #include <wlr/xwayland.h> |