sway

commit d76e745b738281fb98834fd5dee78f2a21727d80
parent ec7fc42a00db8c230ca1a050f0a1f7badc697fa5
Author: Tony Crisci <tony@dubstepdish.com>
Date:   Fri,  8 Dec 2017 08:07:47 -0500

input include directory

Diffstat:
D
include/sway/cursor.h
 | 
26
--------------------------
D
include/sway/input-manager.h
 | 
22
----------------------
A
include/sway/input/cursor.h
 | 
26
++++++++++++++++++++++++++
A
include/sway/input/input-manager.h
 | 
22
++++++++++++++++++++++
A
include/sway/input/seat.h
 | 
21
+++++++++++++++++++++
D
include/sway/seat.h
 | 
21
---------------------
M
sway/input/cursor.c
 | 
2
+-
M
sway/input/input-manager.c
 | 
4
++--
M
sway/input/seat.c
 | 
6
+++---
M
sway/server.c
 | 
2
+-

10 files changed, 76 insertions(+), 76 deletions(-)
diff --git a/include/sway/cursor.h b/include/sway/cursor.h
@@ -1,26 +0,0 @@
-#ifndef _SWAY_CURSOR_H
-#define _SWAY_CURSOR_H
-
-#include "sway/seat.h"
-
-struct sway_cursor {
-	struct wlr_cursor *cursor;
-
-	struct wl_listener motion;
-	struct wl_listener motion_absolute;
-	struct wl_listener button;
-	struct wl_listener axis;
-
-	struct wl_listener touch_down;
-	struct wl_listener touch_up;
-	struct wl_listener touch_motion;
-
-	struct wl_listener tool_axis;
-	struct wl_listener tool_tip;
-
-	struct wl_listener request_set_cursor;
-};
-
-struct sway_cursor *sway_cursor_create(struct sway_seat *seat);
-
-#endif
diff --git a/include/sway/input-manager.h b/include/sway/input-manager.h
@@ -1,22 +0,0 @@
-#ifndef _SWAY_INPUT_MANAGER_H
-#define _SWAY_INPUT_MANAGER_H
-#include <libinput.h>
-#include "sway/server.h"
-#include "config.h"
-#include "list.h"
-
-struct sway_input_manager {
-	struct wl_listener input_add;
-	struct wl_listener input_remove;
-	struct sway_server *server;
-	list_t *seats;
-};
-
-struct input_config *new_input_config(const char* identifier);
-
-char* libinput_dev_unique_id(struct libinput_device *dev);
-
-struct sway_input_manager *sway_input_manager_create(
-		struct sway_server *server);
-
-#endif
diff --git a/include/sway/input/cursor.h b/include/sway/input/cursor.h
@@ -0,0 +1,26 @@
+#ifndef _SWAY_CURSOR_H
+#define _SWAY_CURSOR_H
+
+#include "sway/input/seat.h"
+
+struct sway_cursor {
+	struct wlr_cursor *cursor;
+
+	struct wl_listener motion;
+	struct wl_listener motion_absolute;
+	struct wl_listener button;
+	struct wl_listener axis;
+
+	struct wl_listener touch_down;
+	struct wl_listener touch_up;
+	struct wl_listener touch_motion;
+
+	struct wl_listener tool_axis;
+	struct wl_listener tool_tip;
+
+	struct wl_listener request_set_cursor;
+};
+
+struct sway_cursor *sway_cursor_create(struct sway_seat *seat);
+
+#endif
diff --git a/include/sway/input/input-manager.h b/include/sway/input/input-manager.h
@@ -0,0 +1,22 @@
+#ifndef _SWAY_INPUT_MANAGER_H
+#define _SWAY_INPUT_MANAGER_H
+#include <libinput.h>
+#include "sway/server.h"
+#include "sway/config.h"
+#include "list.h"
+
+struct sway_input_manager {
+	struct wl_listener input_add;
+	struct wl_listener input_remove;
+	struct sway_server *server;
+	list_t *seats;
+};
+
+struct input_config *new_input_config(const char* identifier);
+
+char* libinput_dev_unique_id(struct libinput_device *dev);
+
+struct sway_input_manager *sway_input_manager_create(
+		struct sway_server *server);
+
+#endif
diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
@@ -0,0 +1,21 @@
+#ifndef _SWAY_SEAT_H
+#define _SWAY_SEAT_H
+
+#include <wlr/types/wlr_seat.h>
+#include "sway/input/input-manager.h"
+
+struct sway_seat {
+	struct wlr_seat *seat;
+	struct sway_cursor *cursor;
+};
+
+struct sway_seat *sway_seat_create(struct wl_display *display,
+		const char *seat_name);
+
+void sway_seat_add_device(struct sway_seat *seat,
+		struct wlr_input_device *device);
+
+void sway_seat_remove_device(struct sway_seat *seat,
+		struct wlr_input_device *device);
+
+#endif
diff --git a/include/sway/seat.h b/include/sway/seat.h
@@ -1,21 +0,0 @@
-#ifndef _SWAY_SEAT_H
-#define _SWAY_SEAT_H
-
-#include <wlr/types/wlr_seat.h>
-#include "sway/input-manager.h"
-
-struct sway_seat {
-	struct wlr_seat *seat;
-	struct sway_cursor *cursor;
-};
-
-struct sway_seat *sway_seat_create(struct wl_display *display,
-		const char *seat_name);
-
-void sway_seat_add_device(struct sway_seat *seat,
-		struct wlr_input_device *device);
-
-void sway_seat_remove_device(struct sway_seat *seat,
-		struct wlr_input_device *device);
-
-#endif
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
@@ -1,6 +1,6 @@
 #define _XOPEN_SOURCE 700
 #include <wlr/types/wlr_cursor.h>
-#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
@@ -6,8 +6,8 @@
 #include <string.h>
 #include <libinput.h>
 #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
@@ -1,8 +1,8 @@
 #define _XOPEN_SOURCE 700
 #include <wlr/types/wlr_cursor.h>
-#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
@@ -11,7 +11,7 @@
 // TODO WLR: make Xwayland optional
 #include <wlr/xwayland.h>
 #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) {