Move input related source files into src/input/

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

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"
 

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)
 

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"

src/input/meson.build

@@ -0,0 +1,6 @@
+labwc_sources += files(
+  'keyboard.c',
+  'key-state.c',
+  'touch.c',
+  'cursor.c',
+)

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')

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"