diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2017-12-07 07:31:49 -0500 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2017-12-07 07:35:10 -0500 |
| commit | 21ce20885a6a6e9e7178778513b09fea9354c603 (patch) | |
| tree | b7d763380f5b4df177ae0b8e0ca455e163bdad19 /sway | |
| parent | 338a0399f8d7c0ebe9cbb989945d8fd646d8d407 (diff) | |
| download | sway-21ce20885a6a6e9e7178778513b09fea9354c603.tar.xz | |
rename input to input-manager
Diffstat (limited to 'sway')
| -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 |
3 files changed, 8 insertions, 6 deletions
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; } |