Move input handler init() and finish() functions to input/input.c

diff --git a/include/input/input.h b/include/input/input.h
new file mode 100644 (file)
index 0000000..37758e0
--- /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 (file)
index 0000000..ef55ca6
--- /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 8444656bbc069f86bc5ebb3669cfa1d83adaf9d5..cfdd3cd086d5f9731f8601661e7d1f88f798f582 100644 (file)
--- 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 32ca58c89d85e8e4f60a83ecc5142c356fa9b6b9..cc170da59cc4c2794cf7120bdac2c7cf42718922 100644 (file)
--- 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