From 797e743c8ac5e74f2c5ff41ceff0f056f25617ab Mon Sep 17 00:00:00 2001
From: Consolatis <35009135+Consolatis@users.noreply.github.com>
Date: Sun, 3 Sep 2023 19:21:16 +0200
Subject: [PATCH] Move input handler init() and finish() functions to
 input/input.c

---
 include/input/input.h | 10 ++++++++++
 src/input/input.c     | 18 ++++++++++++++++++
 src/input/meson.build |  1 +
 src/seat.c            |  7 +++----
 4 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 include/input/input.h
 create mode 100644 src/input/input.c

diff --git a/include/input/input.h b/include/input/input.h
new file mode 100644
index 00000000..37758e0e
--- /dev/null
+++ b/include/input/input.h
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef LABWC_INPUT_H
+#define LABWC_INPUT_H
+
+struct seat;
+
+void input_handlers_init(struct seat *seat);
+void input_handlers_finish(struct seat *seat);
+
+#endif /* LABWC_INPUT_H */
diff --git a/src/input/input.c b/src/input/input.c
new file mode 100644
index 00000000..ef55ca69
--- /dev/null
+++ b/src/input/input.c
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: GPL-2.0-only
+#include "input/cursor.h"
+#include "input/input.h"
+#include "input/keyboard.h"
+
+void
+input_handlers_init(struct seat *seat)
+{
+	cursor_init(seat);
+	keyboard_init(seat);
+}
+
+void
+input_handlers_finish(struct seat *seat)
+{
+	cursor_finish(seat);
+	keyboard_finish(seat);
+}
diff --git a/src/input/meson.build b/src/input/meson.build
index 8444656b..cfdd3cd0 100644
--- a/src/input/meson.build
+++ b/src/input/meson.build
@@ -1,6 +1,7 @@
 labwc_sources += files(
   'cursor.c',
   'gestures.c',
+  'input.c',
   'keyboard.c',
   'key-state.c',
   'touch.c',
diff --git a/src/seat.c b/src/seat.c
index 32ca58c8..cc170da5 100644
--- a/src/seat.c
+++ b/src/seat.c
@@ -9,6 +9,7 @@
 #include <wlr/types/wlr_touch.h>
 #include <wlr/util/log.h>
 #include "common/mem.h"
+#include "input/input.h"
 #include "input/keyboard.h"
 #include "input/key-state.h"
 #include "labwc.h"
@@ -415,8 +416,7 @@ seat_init(struct server *server)
 	}
 	wlr_cursor_attach_output_layout(seat->cursor, server->output_layout);
 
-	cursor_init(seat);
-	keyboard_init(seat);
+	input_handlers_init(seat);
 }
 
 void
@@ -431,8 +431,7 @@ seat_finish(struct server *server)
 		input_device_destroy(&input->destroy, NULL);
 	}
 
-	cursor_finish(seat);
-	keyboard_finish(seat);
+	input_handlers_finish(seat);
 }
 
 static void
-- 
2.52.0