aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Tony Crisci <tony@dubstepdish.com>2017-12-08 08:07:47 -0500
committerLibravatar Tony Crisci <tony@dubstepdish.com>2017-12-08 08:07:47 -0500
commitd76e745b738281fb98834fd5dee78f2a21727d80 (patch)
tree60d4c92b68788b1380f03481f70663b5cd67e57c
parentsway cursor (diff)
downloadsway-d76e745b738281fb98834fd5dee78f2a21727d80.tar.gz
sway-d76e745b738281fb98834fd5dee78f2a21727d80.tar.zst
sway-d76e745b738281fb98834fd5dee78f2a21727d80.zip
input include directory
-rw-r--r--include/sway/input/cursor.h (renamed from include/sway/cursor.h)2
-rw-r--r--include/sway/input/input-manager.h (renamed from include/sway/input-manager.h)2
-rw-r--r--include/sway/input/seat.h (renamed from include/sway/seat.h)2
-rw-r--r--sway/input/cursor.c2
-rw-r--r--sway/input/input-manager.c4
-rw-r--r--sway/input/seat.c6
-rw-r--r--sway/server.c2
7 files changed, 10 insertions, 10 deletions
diff --git a/include/sway/cursor.h b/include/sway/input/cursor.h
index 647bc8f1..91421964 100644
--- a/include/sway/cursor.h
+++ b/include/sway/input/cursor.h
@@ -1,7 +1,7 @@
1#ifndef _SWAY_CURSOR_H 1#ifndef _SWAY_CURSOR_H
2#define _SWAY_CURSOR_H 2#define _SWAY_CURSOR_H
3 3
4#include "sway/seat.h" 4#include "sway/input/seat.h"
5 5
6struct sway_cursor { 6struct sway_cursor {
7 struct wlr_cursor *cursor; 7 struct wlr_cursor *cursor;
diff --git a/include/sway/input-manager.h b/include/sway/input/input-manager.h
index 4c01a043..5dc75ba7 100644
--- a/include/sway/input-manager.h
+++ b/include/sway/input/input-manager.h
@@ -2,7 +2,7 @@
2#define _SWAY_INPUT_MANAGER_H 2#define _SWAY_INPUT_MANAGER_H
3#include <libinput.h> 3#include <libinput.h>
4#include "sway/server.h" 4#include "sway/server.h"
5#include "config.h" 5#include "sway/config.h"
6#include "list.h" 6#include "list.h"
7 7
8struct sway_input_manager { 8struct sway_input_manager {
diff --git a/include/sway/seat.h b/include/sway/input/seat.h
index 2f8ca72e..a84b7efd 100644
--- a/include/sway/seat.h
+++ b/include/sway/input/seat.h
@@ -2,7 +2,7 @@
2#define _SWAY_SEAT_H 2#define _SWAY_SEAT_H
3 3
4#include <wlr/types/wlr_seat.h> 4#include <wlr/types/wlr_seat.h>
5#include "sway/input-manager.h" 5#include "sway/input/input-manager.h"
6 6
7struct sway_seat { 7struct sway_seat {
8 struct wlr_seat *seat; 8 struct wlr_seat *seat;
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 819007d5..85b7865d 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -1,6 +1,6 @@
1#define _XOPEN_SOURCE 700 1#define _XOPEN_SOURCE 700
2#include <wlr/types/wlr_cursor.h> 2#include <wlr/types/wlr_cursor.h>
3#include "sway/cursor.h" 3#include "sway/input/cursor.h"
4#include "log.h" 4#include "log.h"
5 5
6static void handle_cursor_motion(struct wl_listener *listener, void *data) { 6static 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 b5ab8cc1..4f52e59a 100644
--- a/sway/input/input-manager.c
+++ b/sway/input/input-manager.c
@@ -6,8 +6,8 @@
6#include <string.h> 6#include <string.h>
7#include <libinput.h> 7#include <libinput.h>
8#include "sway/config.h" 8#include "sway/config.h"
9#include "sway/input-manager.h" 9#include "sway/input/input-manager.h"
10#include "sway/seat.h" 10#include "sway/input/seat.h"
11#include "sway/server.h" 11#include "sway/server.h"
12#include "list.h" 12#include "list.h"
13#include "log.h" 13#include "log.h"
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 459b2ee2..1a2b728c 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -1,8 +1,8 @@
1#define _XOPEN_SOURCE 700 1#define _XOPEN_SOURCE 700
2#include <wlr/types/wlr_cursor.h> 2#include <wlr/types/wlr_cursor.h>
3#include "sway/seat.h" 3#include "sway/input/seat.h"
4#include "sway/cursor.h" 4#include "sway/input/cursor.h"
5#include "sway/input-manager.h" 5#include "sway/input/input-manager.h"
6#include "log.h" 6#include "log.h"
7 7
8struct sway_seat *sway_seat_create(struct wl_display *display, 8struct sway_seat *sway_seat_create(struct wl_display *display,
diff --git a/sway/server.c b/sway/server.c
index 174beac6..7b9a5e8e 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -11,7 +11,7 @@
11// TODO WLR: make Xwayland optional 11// TODO WLR: make Xwayland optional
12#include <wlr/xwayland.h> 12#include <wlr/xwayland.h>
13#include "sway/server.h" 13#include "sway/server.h"
14#include "sway/input-manager.h" 14#include "sway/input/input-manager.h"
15#include "log.h" 15#include "log.h"
16 16
17bool server_init(struct sway_server *server) { 17bool server_init(struct sway_server *server) {