From d76e745b738281fb98834fd5dee78f2a21727d80 Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Fri, 8 Dec 2017 08:07:47 -0500 Subject: [PATCH] input include directory --- include/sway/{ => input}/cursor.h | 2 +- include/sway/{ => input}/input-manager.h | 2 +- include/sway/{ => input}/seat.h | 2 +- sway/input/cursor.c | 2 +- sway/input/input-manager.c | 4 ++-- sway/input/seat.c | 6 +++--- sway/server.c | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) rename include/sway/{ => input}/cursor.h (94%) rename include/sway/{ => input}/input-manager.h (95%) rename include/sway/{ => input}/seat.h (91%) diff --git a/include/sway/cursor.h b/include/sway/input/cursor.h similarity index 94% rename from include/sway/cursor.h rename to include/sway/input/cursor.h index 647bc8f10..91421964a 100644 --- a/include/sway/cursor.h +++ b/include/sway/input/cursor.h @@ -1,7 +1,7 @@ #ifndef _SWAY_CURSOR_H #define _SWAY_CURSOR_H -#include "sway/seat.h" +#include "sway/input/seat.h" struct sway_cursor { struct wlr_cursor *cursor; diff --git a/include/sway/input-manager.h b/include/sway/input/input-manager.h similarity index 95% rename from include/sway/input-manager.h rename to include/sway/input/input-manager.h index 4c01a0435..5dc75ba76 100644 --- a/include/sway/input-manager.h +++ b/include/sway/input/input-manager.h @@ -2,7 +2,7 @@ #define _SWAY_INPUT_MANAGER_H #include #include "sway/server.h" -#include "config.h" +#include "sway/config.h" #include "list.h" struct sway_input_manager { diff --git a/include/sway/seat.h b/include/sway/input/seat.h similarity index 91% rename from include/sway/seat.h rename to include/sway/input/seat.h index 2f8ca72e1..a84b7efd0 100644 --- a/include/sway/seat.h +++ b/include/sway/input/seat.h @@ -2,7 +2,7 @@ #define _SWAY_SEAT_H #include -#include "sway/input-manager.h" +#include "sway/input/input-manager.h" struct sway_seat { struct wlr_seat *seat; diff --git a/sway/input/cursor.c b/sway/input/cursor.c index 819007d56..85b7865d7 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c @@ -1,6 +1,6 @@ #define _XOPEN_SOURCE 700 #include -#include "sway/cursor.h" +#include "sway/input/cursor.h" #include "log.h" static void handle_cursor_motion(struct wl_listener *listener, void *data) { diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c index b5ab8cc16..4f52e59a9 100644 --- a/sway/input/input-manager.c +++ b/sway/input/input-manager.c @@ -6,8 +6,8 @@ #include #include #include "sway/config.h" -#include "sway/input-manager.h" -#include "sway/seat.h" +#include "sway/input/input-manager.h" +#include "sway/input/seat.h" #include "sway/server.h" #include "list.h" #include "log.h" diff --git a/sway/input/seat.c b/sway/input/seat.c index 459b2ee2f..1a2b728c7 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -1,8 +1,8 @@ #define _XOPEN_SOURCE 700 #include -#include "sway/seat.h" -#include "sway/cursor.h" -#include "sway/input-manager.h" +#include "sway/input/seat.h" +#include "sway/input/cursor.h" +#include "sway/input/input-manager.h" #include "log.h" struct sway_seat *sway_seat_create(struct wl_display *display, diff --git a/sway/server.c b/sway/server.c index 174beac6f..7b9a5e8e5 100644 --- a/sway/server.c +++ b/sway/server.c @@ -11,7 +11,7 @@ // TODO WLR: make Xwayland optional #include #include "sway/server.h" -#include "sway/input-manager.h" +#include "sway/input/input-manager.h" #include "log.h" bool server_init(struct sway_server *server) {