From 67a8ae8561dd1e92c8c850d19000320d8e74f0e3 Mon Sep 17 00:00:00 2001
From: Consolatis <35009135+Consolatis@users.noreply.github.com>
Date: Sun, 3 Sep 2023 17:39:48 +0200
Subject: [PATCH] Move input related source files into src/input/

---
 include/{ => input}/cursor.h    | 0
 include/{ => input}/key-state.h | 0
 include/labwc.h                 | 2 +-
 src/dnd.c                       | 2 +-
 src/{ => input}/cursor.c        | 0
 src/{ => input}/key-state.c     | 2 +-
 src/{ => input}/keyboard.c      | 2 +-
 src/input/meson.build           | 6 ++++++
 src/{ => input}/touch.c         | 0
 src/meson.build                 | 7 ++-----
 src/seat.c                      | 2 +-
 11 files changed, 13 insertions(+), 10 deletions(-)
 rename include/{ => input}/cursor.h (100%)
 rename include/{ => input}/key-state.h (100%)
 rename src/{ => input}/cursor.c (100%)
 rename src/{ => input}/key-state.c (98%)
 rename src/{ => input}/keyboard.c (99%)
 create mode 100644 src/input/meson.build
 rename src/{ => input}/touch.c (100%)

diff --git a/include/cursor.h b/include/input/cursor.h
similarity index 100%
rename from include/cursor.h
rename to include/input/cursor.h
diff --git a/include/key-state.h b/include/input/key-state.h
similarity index 100%
rename from include/key-state.h
rename to include/input/key-state.h
diff --git a/include/labwc.h b/include/labwc.h
index a870345e..9810ac1a 100644
--- a/include/labwc.h
+++ b/include/labwc.h
@@ -41,9 +41,9 @@
 #include <wlr/types/wlr_virtual_keyboard_v1.h>
 #include <wlr/util/log.h>
 #include <xkbcommon/xkbcommon.h>
-#include "cursor.h"
 #include "config/keybind.h"
 #include "config/rcxml.h"
+#include "input/cursor.h"
 #include "regions.h"
 #include "session-lock.h"
 #if HAVE_NLS
diff --git a/src/dnd.c b/src/dnd.c
index deec970d..7d62ca70 100644
--- a/src/dnd.c
+++ b/src/dnd.c
@@ -4,8 +4,8 @@
 #include <wlr/types/wlr_scene.h>
 #include <wlr/util/log.h>
 #include "common/mem.h"
-#include "cursor.h"
 #include "dnd.h"
+#include "input/cursor.h"
 #include "labwc.h"  /* for struct seat */
 #include "view.h"
 
diff --git a/src/cursor.c b/src/input/cursor.c
similarity index 100%
rename from src/cursor.c
rename to src/input/cursor.c
diff --git a/src/key-state.c b/src/input/key-state.c
similarity index 98%
rename from src/key-state.c
rename to src/input/key-state.c
index 945ea6c6..fad8e3b1 100644
--- a/src/key-state.c
+++ b/src/input/key-state.c
@@ -2,7 +2,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
-#include "key-state.h"
+#include "input/key-state.h"
 
 #define MAX_PRESSED_KEYS (16)
 
diff --git a/src/keyboard.c b/src/input/keyboard.c
similarity index 99%
rename from src/keyboard.c
rename to src/input/keyboard.c
index 2d6cae7c..ab4f5ac5 100644
--- a/src/keyboard.c
+++ b/src/input/keyboard.c
@@ -5,7 +5,7 @@
 #include <wlr/interfaces/wlr_keyboard.h>
 #include "action.h"
 #include "idle.h"
-#include "key-state.h"
+#include "input/key-state.h"
 #include "labwc.h"
 #include "menu/menu.h"
 #include "regions.h"
diff --git a/src/input/meson.build b/src/input/meson.build
new file mode 100644
index 00000000..e83de9d0
--- /dev/null
+++ b/src/input/meson.build
@@ -0,0 +1,6 @@
+labwc_sources += files(
+  'keyboard.c',
+  'key-state.c',
+  'touch.c',
+  'cursor.c',
+)
diff --git a/src/touch.c b/src/input/touch.c
similarity index 100%
rename from src/touch.c
rename to src/input/touch.c
diff --git a/src/meson.build b/src/meson.build
index e88014f3..9a04034a 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,15 +1,12 @@
 labwc_sources = files(
   'action.c',
   'buffer.c',
-  'cursor.c',
   'debug.c',
   'desktop.c',
   'dnd.c',
   'foreign.c',
   'idle.c',
   'interactive.c',
-  'keyboard.c',
-  'key-state.c',
   'layers.c',
   'main.c',
   'node.c',
@@ -21,7 +18,6 @@ labwc_sources = files(
   'server.c',
   'session-lock.c',
   'snap.c',
-  'touch.c',
   'theme.c',
   'view.c',
   'view-impl-common.c',
@@ -39,9 +35,10 @@ if have_xwayland
 endif
 
 
+subdir('button')
 subdir('common')
 subdir('config')
 subdir('decorations')
-subdir('button')
+subdir('input')
 subdir('menu')
 subdir('ssd')
diff --git a/src/seat.c b/src/seat.c
index 4387b817..807c5a5b 100644
--- a/src/seat.c
+++ b/src/seat.c
@@ -9,7 +9,7 @@
 #include <wlr/types/wlr_touch.h>
 #include <wlr/util/log.h>
 #include "common/mem.h"
-#include "key-state.h"
+#include "input/key-state.h"
 #include "labwc.h"
 #include "view.h"
 
-- 
2.52.0