diff options
| -rw-r--r-- | include/sway/input-manager.h (renamed from include/sway/input.h) | 5 | ||||
| -rw-r--r-- | include/sway/server.h | 2 | ||||
| -rw-r--r-- | sway/input/input-manager.c (renamed from sway/input/input.c) | 8 | ||||
| -rw-r--r-- | sway/meson.build | 2 | ||||
| -rw-r--r-- | sway/server.c | 4 |
5 files changed, 12 insertions, 9 deletions
diff --git a/include/sway/input.h b/include/sway/input-manager.h index 21ed61c5..a3662f7b 100644 --- a/include/sway/input.h +++ b/include/sway/input-manager.h @@ -5,7 +5,7 @@ #include "config.h" #include "list.h" -struct sway_input { +struct sway_input_manager { list_t *input_devices; }; @@ -13,6 +13,7 @@ struct input_config *new_input_config(const char* identifier); char* libinput_dev_unique_id(struct libinput_device *dev); -struct sway_input *sway_input_create(struct sway_server *server); +struct sway_input_manager *sway_input_manager_create( + struct sway_server *server); #endif diff --git a/include/sway/server.h b/include/sway/server.h index 3fa72e84..76a05476 100644 --- a/include/sway/server.h +++ b/include/sway/server.h @@ -22,7 +22,7 @@ struct sway_server { struct wlr_compositor *compositor; struct wlr_data_device_manager *data_device_manager; - struct sway_input *input; + struct sway_input_manager *input; struct wl_listener output_add; struct wl_listener output_remove; diff --git a/sway/input/input.c b/sway/input/input-manager.c index 02b4995e..285a68b8 100644 --- a/sway/input/input.c +++ b/sway/input/input-manager.c @@ -6,15 +6,17 @@ #include <string.h> #include <libinput.h> #include "sway/config.h" -#include "sway/input.h" +#include "sway/input-manager.h" #include "sway/server.h" #include "list.h" #include "log.h" struct input_config *current_input_config = NULL; -struct sway_input *sway_input_create(struct sway_server *server) { - struct sway_input *input = calloc(1, sizeof(struct sway_input)); +struct sway_input_manager *sway_input_manager_create( + struct sway_server *server) { + struct sway_input_manager *input = + calloc(1, sizeof(struct sway_input_manager)); if (!input) { return NULL; } diff --git a/sway/meson.build b/sway/meson.build index 8631b9c3..b5cdbbf2 100644 --- a/sway/meson.build +++ b/sway/meson.build @@ -2,7 +2,7 @@ sway_sources = files( 'main.c', 'server.c', 'commands.c', - 'input/input.c', + 'input/input-manager.c', 'commands/exit.c', 'commands/exec.c', 'commands/exec_always.c', diff --git a/sway/server.c b/sway/server.c index 3873e625..174beac6 100644 --- a/sway/server.c +++ b/sway/server.c @@ -11,7 +11,7 @@ // TODO WLR: make Xwayland optional #include <wlr/xwayland.h> #include "sway/server.h" -#include "sway/input.h" +#include "sway/input-manager.h" #include "log.h" bool server_init(struct sway_server *server) { @@ -60,7 +60,7 @@ bool server_init(struct sway_server *server) { return false; } - server->input = sway_input_create(server); + server->input = sway_input_manager_create(server); return true; } |