diff options
author | Drew DeVault <sir@cmpwn.com> | 2017-10-22 11:38:30 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2017-11-11 09:09:17 -0500 |
commit | 0f45fad18cf56910aa339c7c6ad1a661e96cfb0d (patch) | |
tree | 1ecf1d65177844ec0dc9ed3e1a8b55382e648be0 /include | |
parent | Also need meson (diff) | |
download | sway-0f45fad18cf56910aa339c7c6ad1a661e96cfb0d.tar.gz sway-0f45fad18cf56910aa339c7c6ad1a661e96cfb0d.tar.zst sway-0f45fad18cf56910aa339c7c6ad1a661e96cfb0d.zip |
Establish sway input submodule
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/input.h | 11 | ||||
-rw-r--r-- | include/sway/server.h | 5 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/sway/input.h b/include/sway/input.h index 4ed9bffe..eb92e470 100644 --- a/include/sway/input.h +++ b/include/sway/input.h | |||
@@ -1,18 +1,19 @@ | |||
1 | #ifndef _SWAY_INPUT_H | 1 | #ifndef _SWAY_INPUT_H |
2 | #define _SWAY_INPUT_H | 2 | #define _SWAY_INPUT_H |
3 | |||
4 | #include <libinput.h> | 3 | #include <libinput.h> |
4 | #include "sway/server.h" | ||
5 | #include "config.h" | 5 | #include "config.h" |
6 | #include "list.h" | 6 | #include "list.h" |
7 | 7 | ||
8 | struct sway_input { | ||
9 | list_t *input_devices; | ||
10 | }; | ||
11 | |||
8 | struct input_config *new_input_config(const char* identifier); | 12 | struct input_config *new_input_config(const char* identifier); |
9 | 13 | ||
10 | char* libinput_dev_unique_id(struct libinput_device *dev); | 14 | char* libinput_dev_unique_id(struct libinput_device *dev); |
11 | 15 | ||
12 | /** | 16 | struct sway_input *sway_input_create(struct sway_server *server); |
13 | * Global input device list. | ||
14 | */ | ||
15 | extern list_t *input_devices; | ||
16 | 17 | ||
17 | /** | 18 | /** |
18 | * Pointer used when reading input blocked. | 19 | * Pointer used when reading input blocked. |
diff --git a/include/sway/server.h b/include/sway/server.h index 9cd760ac..22069f9c 100644 --- a/include/sway/server.h +++ b/include/sway/server.h | |||
@@ -10,9 +10,6 @@ | |||
10 | #include <wlr/xwayland.h> | 10 | #include <wlr/xwayland.h> |
11 | 11 | ||
12 | struct sway_server { | 12 | struct sway_server { |
13 | // TODO WLR | ||
14 | //struct roots_input *input; | ||
15 | |||
16 | struct wl_display *wl_display; | 13 | struct wl_display *wl_display; |
17 | struct wl_event_loop *wl_event_loop; | 14 | struct wl_event_loop *wl_event_loop; |
18 | 15 | ||
@@ -20,6 +17,8 @@ struct sway_server { | |||
20 | struct wlr_renderer *renderer; | 17 | struct wlr_renderer *renderer; |
21 | 18 | ||
22 | struct wlr_data_device_manager *data_device_manager; | 19 | struct wlr_data_device_manager *data_device_manager; |
20 | |||
21 | struct sway_input *input; | ||
23 | }; | 22 | }; |
24 | 23 | ||
25 | bool server_init(struct sway_server *server); | 24 | bool server_init(struct sway_server *server); |