diff options
author | xdavidwu <xdavidwuph@gmail.com> | 2019-10-18 18:57:17 +0800 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2020-04-04 11:42:04 +0200 |
commit | 5886187c6ef56307f15be475dc62785faf32ef35 (patch) | |
tree | 535283eca78c9a4ea63f26d9a13c1df48fe2b2f6 /include/sway/server.h | |
parent | swapped hiding the cursor and sending a touch event as a more logical sequence (diff) | |
download | sway-5886187c6ef56307f15be475dc62785faf32ef35.tar.gz sway-5886187c6ef56307f15be475dc62785faf32ef35.tar.zst sway-5886187c6ef56307f15be475dc62785faf32ef35.zip |
Port input method and text input from rootston
This ports swaywm/wlroots#1203, swaywm/wlroots#1303,
swaywm/wlroots#1308, swaywm/wlroots#1759 rootston part to sway.
Co-Authored-By: Leo Chen <leo881003@gmail.com>
Diffstat (limited to 'include/sway/server.h')
-rw-r--r-- | include/sway/server.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/sway/server.h b/include/sway/server.h index 65bd6429..a9ffe187 100644 --- a/include/sway/server.h +++ b/include/sway/server.h | |||
@@ -7,12 +7,14 @@ | |||
7 | #include <wlr/render/wlr_renderer.h> | 7 | #include <wlr/render/wlr_renderer.h> |
8 | #include <wlr/types/wlr_compositor.h> | 8 | #include <wlr/types/wlr_compositor.h> |
9 | #include <wlr/types/wlr_data_device.h> | 9 | #include <wlr/types/wlr_data_device.h> |
10 | #include <wlr/types/wlr_input_method_v2.h> | ||
10 | #include <wlr/types/wlr_layer_shell_v1.h> | 11 | #include <wlr/types/wlr_layer_shell_v1.h> |
11 | #include <wlr/types/wlr_output_management_v1.h> | 12 | #include <wlr/types/wlr_output_management_v1.h> |
12 | #include <wlr/types/wlr_output_power_management_v1.h> | 13 | #include <wlr/types/wlr_output_power_management_v1.h> |
13 | #include <wlr/types/wlr_presentation_time.h> | 14 | #include <wlr/types/wlr_presentation_time.h> |
14 | #include <wlr/types/wlr_relative_pointer_v1.h> | 15 | #include <wlr/types/wlr_relative_pointer_v1.h> |
15 | #include <wlr/types/wlr_server_decoration.h> | 16 | #include <wlr/types/wlr_server_decoration.h> |
17 | #include <wlr/types/wlr_text_input_v3.h> | ||
16 | #include <wlr/types/wlr_xdg_shell.h> | 18 | #include <wlr/types/wlr_xdg_shell.h> |
17 | #include "config.h" | 19 | #include "config.h" |
18 | #include "list.h" | 20 | #include "list.h" |
@@ -76,6 +78,8 @@ struct sway_server { | |||
76 | 78 | ||
77 | struct wlr_output_power_manager_v1 *output_power_manager_v1; | 79 | struct wlr_output_power_manager_v1 *output_power_manager_v1; |
78 | struct wl_listener output_power_manager_set_mode; | 80 | struct wl_listener output_power_manager_set_mode; |
81 | struct wlr_input_method_manager_v2 *input_method; | ||
82 | struct wlr_text_input_manager_v3 *text_input; | ||
79 | 83 | ||
80 | size_t txn_timeout_ms; | 84 | size_t txn_timeout_ms; |
81 | list_t *transactions; | 85 | list_t *transactions; |