mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-22 16:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename input to input-manager

Browse source
This commit is contained in:
Tony Crisci 2017-12-07 07:31:49 -05:00
parent 338a0399f8
commit 21ce20885a
5 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/sway/input.h → include/sway/input-manager.h
View file

@ -5,7 +5,7 @@
#include "config.h" #include "config.h"
#include "list.h" #include "list.h"
struct sway_input { struct sway_input_manager {
list_t *input_devices; 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); 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 #endif

2
include/sway/server.h
View file

@ -22,7 +22,7 @@ struct sway_server {
struct wlr_compositor *compositor; struct wlr_compositor *compositor;
struct wlr_data_device_manager *data_device_manager; 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_add;
struct wl_listener output_remove; struct wl_listener output_remove;

8
sway/input/input.c → sway/input/input-manager.c
View file

@ -6,15 +6,17 @@
#include <string.h> #include <string.h>
#include <libinput.h> #include <libinput.h>
#include "sway/config.h" #include "sway/config.h"
#include "sway/input.h" #include "sway/input-manager.h"
#include "sway/server.h" #include "sway/server.h"
#include "list.h" #include "list.h"
#include "log.h" #include "log.h"
struct input_config *current_input_config = NULL; struct input_config *current_input_config = NULL;
struct sway_input *sway_input_create(struct sway_server *server) { struct sway_input_manager *sway_input_manager_create(
struct sway_input *input = calloc(1, sizeof(struct sway_input)); struct sway_server *server) {
struct sway_input_manager *input =
calloc(1, sizeof(struct sway_input_manager));
if (!input) { if (!input) {
return NULL; return NULL;
} }

2
sway/meson.build
View file

@ -2,7 +2,7 @@ sway_sources = files(
'main.c', 'main.c',
'server.c', 'server.c',
'commands.c', 'commands.c',
'input/input.c', 'input/input-manager.c',
'commands/exit.c', 'commands/exit.c',
'commands/exec.c', 'commands/exec.c',
'commands/exec_always.c', 'commands/exec_always.c',

4
sway/server.c
View file

@ -11,7 +11,7 @@
// TODO WLR: make Xwayland optional // TODO WLR: make Xwayland optional
#include <wlr/xwayland.h> #include <wlr/xwayland.h>
#include "sway/server.h" #include "sway/server.h"
#include "sway/input.h" #include "sway/input-manager.h"
#include "log.h" #include "log.h"
bool server_init(struct sway_server *server) { bool server_init(struct sway_server *server) {
@ -60,7 +60,7 @@ bool server_init(struct sway_server *server) {
return false; return false;
} }
server->input = sway_input_create(server); server->input = sway_input_manager_create(server);
return true; return true;
} }