diff options
author | 2018-07-29 23:01:59 +1000 | |
---|---|---|
committer | 2018-07-29 23:01:59 +1000 | |
commit | b2f58af46c65474a72131fcee4ba9f59cae96330 (patch) | |
tree | 07018da33f4b7ebceba2b2dc359c8801804402ef /include | |
parent | Escaping underscores in tap_button_map (diff) | |
parent | Merge pull request #2376 from swaywm/virtual-keyboard (diff) | |
download | sway-b2f58af46c65474a72131fcee4ba9f59cae96330.tar.gz sway-b2f58af46c65474a72131fcee4ba9f59cae96330.tar.zst sway-b2f58af46c65474a72131fcee4ba9f59cae96330.zip |
Merge branch 'master' into tap-button-map-man-fix
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/input/input-manager.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/sway/input/input-manager.h b/include/sway/input/input-manager.h index 89a3ac71..aa2f6f19 100644 --- a/include/sway/input/input-manager.h +++ b/include/sway/input/input-manager.h | |||
@@ -2,6 +2,7 @@ | |||
2 | #define _SWAY_INPUT_INPUT_MANAGER_H | 2 | #define _SWAY_INPUT_INPUT_MANAGER_H |
3 | #include <libinput.h> | 3 | #include <libinput.h> |
4 | #include <wlr/types/wlr_input_inhibitor.h> | 4 | #include <wlr/types/wlr_input_inhibitor.h> |
5 | #include <wlr/types/wlr_virtual_keyboard_v1.h> | ||
5 | #include "sway/server.h" | 6 | #include "sway/server.h" |
6 | #include "sway/config.h" | 7 | #include "sway/config.h" |
7 | #include "list.h" | 8 | #include "list.h" |
@@ -25,10 +26,12 @@ struct sway_input_manager { | |||
25 | struct wl_list seats; | 26 | struct wl_list seats; |
26 | 27 | ||
27 | struct wlr_input_inhibit_manager *inhibit; | 28 | struct wlr_input_inhibit_manager *inhibit; |
29 | struct wlr_virtual_keyboard_manager_v1 *virtual_keyboard; | ||
28 | 30 | ||
29 | struct wl_listener new_input; | 31 | struct wl_listener new_input; |
30 | struct wl_listener inhibit_activate; | 32 | struct wl_listener inhibit_activate; |
31 | struct wl_listener inhibit_deactivate; | 33 | struct wl_listener inhibit_deactivate; |
34 | struct wl_listener virtual_keyboard_new; | ||
32 | }; | 35 | }; |
33 | 36 | ||
34 | struct sway_input_manager *input_manager_create(struct sway_server *server); | 37 | struct sway_input_manager *input_manager_create(struct sway_server *server); |