Merge branch 'master' into seat-views

This commit is contained in:
emersion 2017-11-18 22:18:25 +01:00
commit 72d877658a
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
24 changed files with 1049 additions and 187 deletions

View file

@ -9,6 +9,9 @@ struct roots_drag_icon {
struct wl_list link; // roots_seat::drag_icons
bool mapped;
bool is_pointer;
int32_t touch_id;
int32_t sx, sy;
struct wl_listener surface_destroy;
@ -22,6 +25,10 @@ struct roots_seat {
struct wl_list drag_icons;
struct wl_list link;
// coordinates of the first touch point if it exists
int32_t touch_id;
double touch_x, touch_y;
struct wl_list views; // roots_seat_view::link
struct roots_seat_view *focus;
@ -51,13 +58,6 @@ struct roots_touch {
struct wl_list link;
};
struct roots_touch_point {
struct roots_touch *device;
int32_t slot;
double x, y;
struct wl_list link;
};
struct roots_tablet_tool {
struct roots_seat *seat;
struct wlr_input_device *device;