diff options
| author | emersion <contact@emersion.fr> | 2017-11-12 22:12:50 +0100 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2017-11-12 22:12:50 +0100 |
| commit | f8b43940b1a14e78c5365c9c1d17bfc79f523530 (patch) | |
| tree | ad2aa347b862cc7446a1cc80f5932847e1491fbe /include | |
| parent | 2e312a7e27fac0ef299abbdf5f66cf164992f02f (diff) | |
| parent | a317ecdab8ef8deb184b72db208794daa4c4a3a0 (diff) | |
Merge branch 'master' into cursor-scale
Diffstat (limited to 'include')
| -rw-r--r-- | include/rootston/seat.h | 2 | ||||
| -rw-r--r-- | include/wlr/types/wlr_seat.h | 3 | ||||
| -rw-r--r-- | include/wlr/xwayland.h | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/rootston/seat.h b/include/rootston/seat.h index b5593651..bef515a4 100644 --- a/include/rootston/seat.h +++ b/include/rootston/seat.h @@ -1,8 +1,6 @@ #ifndef _ROOTSTON_SEAT_H #define _ROOTSTON_SEAT_H - #include <wayland-server.h> - #include "rootston/input.h" #include "rootston/keyboard.h" diff --git a/include/wlr/types/wlr_seat.h b/include/wlr/types/wlr_seat.h index 09d3e282..a5f00402 100644 --- a/include/wlr/types/wlr_seat.h +++ b/include/wlr/types/wlr_seat.h @@ -1,6 +1,6 @@ #ifndef WLR_TYPES_WLR_SEAT_H #define WLR_TYPES_WLR_SEAT_H - +#include <time.h> #include <wlr/types/wlr_surface.h> #include <wlr/types/wlr_input_device.h> #include <wlr/types/wlr_keyboard.h> @@ -109,6 +109,7 @@ struct wlr_seat { struct wl_list clients; char *name; uint32_t capabilities; + struct timespec last_event; struct wlr_data_device *data_device; // TODO needed? struct wlr_data_source *selection_source; diff --git a/include/wlr/xwayland.h b/include/wlr/xwayland.h index bea97394..6518b703 100644 --- a/include/wlr/xwayland.h +++ b/include/wlr/xwayland.h @@ -29,6 +29,7 @@ struct wlr_xwayland { struct wlr_xwayland_cursor *cursor; struct { + struct wl_signal ready; struct wl_signal new_surface; } events; |