Split seat code into its own file

3 files changed, 194 insertions, 245 deletions

diff --git a/swaylock/main.c b/swaylock/main.c
index 555b1d64..7602e47e 100644
--- a/swaylock/main.c
+++ b/swaylock/main.c
@@ -8,101 +8,19 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/mman.h>
 #include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
 #include <wayland-client.h>
 #include <wlr/util/log.h>
-#include <xkbcommon/xkbcommon.h>
+#include "swaylock/seat.h"
+#include "swaylock/swaylock.h"
 #include "background-image.h"
 #include "pool-buffer.h"
 #include "cairo.h"
 #include "util.h"
 #include "wlr-layer-shell-unstable-v1-client-protocol.h"
 
-struct swaylock_args {
-        uint32_t color;
-        enum background_mode mode;
-        bool show_indicator;
-};
-
-enum mod_bit {
-        MOD_SHIFT = 1<<0,
-        MOD_CAPS = 1<<1,
-        MOD_CTRL = 1<<2,
-        MOD_ALT = 1<<3,
-        MOD_MOD2 = 1<<4,
-        MOD_MOD3 = 1<<5,
-        MOD_LOGO = 1<<6,
-        MOD_MOD5 = 1<<7,
-};
-
-enum mask {
-        MASK_SHIFT,
-        MASK_CAPS,
-        MASK_CTRL,
-        MASK_ALT,
-        MASK_MOD2,
-        MASK_MOD3,
-        MASK_LOGO,
-        MASK_MOD5,
-        MASK_LAST
-};
-
-const char *XKB_MASK_NAMES[MASK_LAST] = {
-        XKB_MOD_NAME_SHIFT,
-        XKB_MOD_NAME_CAPS,
-        XKB_MOD_NAME_CTRL,
-        XKB_MOD_NAME_ALT,
-        "Mod2",
-        "Mod3",
-        XKB_MOD_NAME_LOGO,
-        "Mod5",
-};
-
-const enum mod_bit XKB_MODS[MASK_LAST] = {
-        MOD_SHIFT,
-        MOD_CAPS,
-        MOD_CTRL,
-        MOD_ALT,
-        MOD_MOD2,
-        MOD_MOD3,
-        MOD_LOGO,
-        MOD_MOD5
-};
-
-struct swaylock_xkb {
-        uint32_t modifiers;
-        struct xkb_state *state;
-        struct xkb_context *context;
-        struct xkb_keymap *keymap;
-        xkb_mod_mask_t masks[MASK_LAST];
-};
-
-struct swaylock_state {
-        struct wl_display *display;
-        struct wl_compositor *compositor;
-        struct zwlr_layer_shell_v1 *layer_shell;
-        struct wl_shm *shm;
-        struct wl_list contexts;
-        struct swaylock_args args;
-        struct swaylock_xkb xkb;
-        bool run_display;
-};
-
-struct swaylock_context {
-        cairo_surface_t *image;
-        struct swaylock_state *state;
-        struct wl_output *output;
-        struct wl_surface *surface;
-        struct zwlr_layer_surface_v1 *layer_surface;
-        struct pool_buffer buffers[2];
-        struct pool_buffer *current_buffer;
-        uint32_t width, height;
-        struct wl_list link;
-};
-
 static void daemonize() {
         if (fork() == 0) {
                 int devnull = open("/dev/null", O_RDWR);
@@ -149,169 +67,11 @@ static void layer_surface_closed(void *data,
         context->state->run_display = false;
 }
 
-static struct zwlr_layer_surface_v1_listener layer_surface_listener = {
+static const struct zwlr_layer_surface_v1_listener layer_surface_listener = {
         .configure = layer_surface_configure,
         .closed = layer_surface_closed,
 };
 
-static void keyboard_keymap(void *data, struct wl_keyboard *wl_keyboard,
-                uint32_t format, int32_t fd, uint32_t size) {
-        struct swaylock_state *state = data;
-        if (format != WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1) {
-                close(fd);
-                wlr_log(L_ERROR, "Unknown keymap format %d, aborting", format);
-                exit(1);
-        }
-        char *map_shm = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0);
-        if (map_shm == MAP_FAILED) {
-                close(fd);
-                wlr_log(L_ERROR, "Unable to initialize keymap shm, aborting");
-                exit(1);
-        }
-        struct xkb_keymap *keymap = xkb_keymap_new_from_string(
-                        state->xkb.context, map_shm, XKB_KEYMAP_FORMAT_TEXT_V1, 0);
-        munmap(map_shm, size);
-        close(fd);
-        assert(keymap);
-        struct xkb_state *xkb_state = xkb_state_new(keymap);
-        assert(xkb_state);
-        xkb_keymap_unref(state->xkb.keymap);
-        xkb_state_unref(state->xkb.state);
-        state->xkb.keymap = keymap;
-        state->xkb.state = xkb_state;
-}
-
-static void keyboard_enter(void *data, struct wl_keyboard *wl_keyboard,
-                uint32_t serial, struct wl_surface *surface, struct wl_array *keys) {
-        // Who cares
-}
-
-static void keyboard_leave(void *data, struct wl_keyboard *wl_keyboard,
-                uint32_t serial, struct wl_surface *surface) {
-        // Who cares
-}
-
-static void keyboard_key(void *data, struct wl_keyboard *wl_keyboard,
-                uint32_t serial, uint32_t time, uint32_t key, uint32_t _key_state) {
-        struct swaylock_state *state = data;
-        enum wl_keyboard_key_state key_state = _key_state;
-        xkb_keysym_t sym = xkb_state_key_get_one_sym(state->xkb.state, key + 8);
-        uint32_t keycode = key_state == WL_KEYBOARD_KEY_STATE_PRESSED ?
-                key + 8 : 0;
-        uint32_t codepoint = xkb_state_key_get_utf32(state->xkb.state, keycode);
-        wlr_log(L_DEBUG, "%c %d", codepoint, sym);
-}
-
-static void keyboard_modifiers(void *data, struct wl_keyboard *wl_keyboard,
-                uint32_t serial, uint32_t mods_depressed, uint32_t mods_latched,
-                uint32_t mods_locked, uint32_t group) {
-        struct swaylock_state *state = data;
-        xkb_state_update_mask(state->xkb.state,
-                        mods_depressed, mods_latched, mods_locked, 0, 0, group);
-        xkb_mod_mask_t mask = xkb_state_serialize_mods(state->xkb.state,
-                        XKB_STATE_MODS_DEPRESSED | XKB_STATE_MODS_LATCHED);
-        state->xkb.modifiers = 0;
-        for (uint32_t i = 0; i < MASK_LAST; ++i) {
-                if (mask & state->xkb.masks[i]) {
-                        state->xkb.modifiers |= XKB_MODS[i];
-                }
-        }
-}
-
-static void keyboard_repeat_info(void *data, struct wl_keyboard *wl_keyboard,
-                int32_t rate, int32_t delay) {
-        // TODO
-}
-
-static struct wl_keyboard_listener keyboard_listener = {
-        .keymap = keyboard_keymap,
-        .enter = keyboard_enter,
-        .leave = keyboard_leave,
-        .key = keyboard_key,
-        .modifiers = keyboard_modifiers,
-        .repeat_info = keyboard_repeat_info,
-};
-
-static void wl_pointer_enter(void *data, struct wl_pointer *wl_pointer,
-                uint32_t serial, struct wl_surface *surface,
-                wl_fixed_t surface_x, wl_fixed_t surface_y) {
-        wl_pointer_set_cursor(wl_pointer, serial, NULL, 0, 0);
-}
-
-static void wl_pointer_leave(void *data, struct wl_pointer *wl_pointer,
-                uint32_t serial, struct wl_surface *surface) {
-        // Who cares
-}
-
-static void wl_pointer_motion(void *data, struct wl_pointer *wl_pointer,
-                uint32_t time, wl_fixed_t surface_x, wl_fixed_t surface_y) {
-        // Who cares
-}
-
-static void wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
-                uint32_t serial, uint32_t time, uint32_t button, uint32_t state) {
-        // Who cares
-}
-
-static void wl_pointer_axis(void *data, struct wl_pointer *wl_pointer,
-                uint32_t time, uint32_t axis, wl_fixed_t value) {
-        // Who cares
-}
-
-static void wl_pointer_frame(void *data, struct wl_pointer *wl_pointer) {
-        // Who cares
-}
-
-static void wl_pointer_axis_source(void *data, struct wl_pointer *wl_pointer,
-                uint32_t axis_source) {
-        // Who cares
-}
-
-static void wl_pointer_axis_stop(void *data, struct wl_pointer *wl_pointer,
-                uint32_t time, uint32_t axis) {
-        // Who cares
-}
-
-static void wl_pointer_axis_discrete(void *data, struct wl_pointer *wl_pointer,
-                uint32_t axis, int32_t discrete) {
-        // Who cares
-}
-
-static struct wl_pointer_listener pointer_listener = {
-        .enter = wl_pointer_enter,
-        .leave = wl_pointer_leave,
-        .motion = wl_pointer_motion,
-        .button = wl_pointer_button,
-        .axis = wl_pointer_axis,
-        .frame = wl_pointer_frame,
-        .axis_source = wl_pointer_axis_source,
-        .axis_stop = wl_pointer_axis_stop,
-        .axis_discrete = wl_pointer_axis_discrete,
-};
-
-static void seat_handle_capabilities(void *data, struct wl_seat *wl_seat,
-                enum wl_seat_capability caps) {
-        struct swaylock_state *state = data;
-        if ((caps & WL_SEAT_CAPABILITY_POINTER)) {
-                struct wl_pointer *pointer = wl_seat_get_pointer(wl_seat);
-                wl_pointer_add_listener(pointer, &pointer_listener, NULL);
-        }
-        if ((caps & WL_SEAT_CAPABILITY_KEYBOARD)) {
-                struct wl_keyboard *keyboard = wl_seat_get_keyboard(wl_seat);
-                wl_keyboard_add_listener(keyboard, &keyboard_listener, state);
-        }
-}
-
-static void seat_handle_name(void *data, struct wl_seat *wl_seat,
-                const char *name) {
-        // Who cares
-}
-
-const struct wl_seat_listener seat_listener = {
-        .capabilities = seat_handle_capabilities,
-        .name = seat_handle_name,
-};
-
 static void handle_global(void *data, struct wl_registry *registry,
                 uint32_t name, const char *interface, uint32_t version) {
         struct swaylock_state *state = data;
diff --git a/swaylock/meson.build b/swaylock/meson.build
index 5b886ded..2f2733f8 100644
--- a/swaylock/meson.build
+++ b/swaylock/meson.build
@@ -1,6 +1,8 @@
 executable(
-        'swaylock',
-        'main.c',
+        'swaylock', [
+                'main.c',
+                'seat.c'
+        ],
         include_directories: [sway_inc],
         dependencies: [
                 cairo,
diff --git a/swaylock/seat.c b/swaylock/seat.c
new file mode 100644
index 00000000..522200f2
--- /dev/null
+++ b/swaylock/seat.c
@@ -0,0 +1,187 @@
+#include <assert.h>
+#include <sys/mman.h>
+#include <unistd.h>
+#include <wlr/util/log.h>
+#include <xkbcommon/xkbcommon.h>
+#include "swaylock/swaylock.h"
+#include "swaylock/seat.h"
+
+const char *XKB_MASK_NAMES[MASK_LAST] = {
+        XKB_MOD_NAME_SHIFT,
+        XKB_MOD_NAME_CAPS,
+        XKB_MOD_NAME_CTRL,
+        XKB_MOD_NAME_ALT,
+        "Mod2",
+        "Mod3",
+        XKB_MOD_NAME_LOGO,
+        "Mod5",
+};
+
+const enum mod_bit XKB_MODS[MASK_LAST] = {
+        MOD_SHIFT,
+        MOD_CAPS,
+        MOD_CTRL,
+        MOD_ALT,
+        MOD_MOD2,
+        MOD_MOD3,
+        MOD_LOGO,
+        MOD_MOD5
+};
+
+static void keyboard_keymap(void *data, struct wl_keyboard *wl_keyboard,
+                uint32_t format, int32_t fd, uint32_t size) {
+        struct swaylock_state *state = data;
+        if (format != WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1) {
+                close(fd);
+                wlr_log(L_ERROR, "Unknown keymap format %d, aborting", format);
+                exit(1);
+        }
+        char *map_shm = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0);
+        if (map_shm == MAP_FAILED) {
+                close(fd);
+                wlr_log(L_ERROR, "Unable to initialize keymap shm, aborting");
+                exit(1);
+        }
+        struct xkb_keymap *keymap = xkb_keymap_new_from_string(
+                        state->xkb.context, map_shm, XKB_KEYMAP_FORMAT_TEXT_V1, 0);
+        munmap(map_shm, size);
+        close(fd);
+        assert(keymap);
+        struct xkb_state *xkb_state = xkb_state_new(keymap);
+        assert(xkb_state);
+        xkb_keymap_unref(state->xkb.keymap);
+        xkb_state_unref(state->xkb.state);
+        state->xkb.keymap = keymap;
+        state->xkb.state = xkb_state;
+}
+
+static void keyboard_enter(void *data, struct wl_keyboard *wl_keyboard,
+                uint32_t serial, struct wl_surface *surface, struct wl_array *keys) {
+        // Who cares
+}
+
+static void keyboard_leave(void *data, struct wl_keyboard *wl_keyboard,
+                uint32_t serial, struct wl_surface *surface) {
+        // Who cares
+}
+
+static void keyboard_key(void *data, struct wl_keyboard *wl_keyboard,
+                uint32_t serial, uint32_t time, uint32_t key, uint32_t _key_state) {
+        struct swaylock_state *state = data;
+        enum wl_keyboard_key_state key_state = _key_state;
+        xkb_keysym_t sym = xkb_state_key_get_one_sym(state->xkb.state, key + 8);
+        uint32_t keycode = key_state == WL_KEYBOARD_KEY_STATE_PRESSED ?
+                key + 8 : 0;
+        uint32_t codepoint = xkb_state_key_get_utf32(state->xkb.state, keycode);
+        wlr_log(L_DEBUG, "%c %d", codepoint, sym);
+}
+
+static void keyboard_modifiers(void *data, struct wl_keyboard *wl_keyboard,
+                uint32_t serial, uint32_t mods_depressed, uint32_t mods_latched,
+                uint32_t mods_locked, uint32_t group) {
+        struct swaylock_state *state = data;
+        xkb_state_update_mask(state->xkb.state,
+                        mods_depressed, mods_latched, mods_locked, 0, 0, group);
+        xkb_mod_mask_t mask = xkb_state_serialize_mods(state->xkb.state,
+                        XKB_STATE_MODS_DEPRESSED | XKB_STATE_MODS_LATCHED);
+        state->xkb.modifiers = 0;
+        for (uint32_t i = 0; i < MASK_LAST; ++i) {
+                if (mask & state->xkb.masks[i]) {
+                        state->xkb.modifiers |= XKB_MODS[i];
+                }
+        }
+}
+
+static void keyboard_repeat_info(void *data, struct wl_keyboard *wl_keyboard,
+                int32_t rate, int32_t delay) {
+        // TODO
+}
+
+static const struct wl_keyboard_listener keyboard_listener = {
+        .keymap = keyboard_keymap,
+        .enter = keyboard_enter,
+        .leave = keyboard_leave,
+        .key = keyboard_key,
+        .modifiers = keyboard_modifiers,
+        .repeat_info = keyboard_repeat_info,
+};
+
+static void wl_pointer_enter(void *data, struct wl_pointer *wl_pointer,
+                uint32_t serial, struct wl_surface *surface,
+                wl_fixed_t surface_x, wl_fixed_t surface_y) {
+        wl_pointer_set_cursor(wl_pointer, serial, NULL, 0, 0);
+}
+
+static void wl_pointer_leave(void *data, struct wl_pointer *wl_pointer,
+                uint32_t serial, struct wl_surface *surface) {
+        // Who cares
+}
+
+static void wl_pointer_motion(void *data, struct wl_pointer *wl_pointer,
+                uint32_t time, wl_fixed_t surface_x, wl_fixed_t surface_y) {
+        // Who cares
+}
+
+static void wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
+                uint32_t serial, uint32_t time, uint32_t button, uint32_t state) {
+        // Who cares
+}
+
+static void wl_pointer_axis(void *data, struct wl_pointer *wl_pointer,
+                uint32_t time, uint32_t axis, wl_fixed_t value) {
+        // Who cares
+}
+
+static void wl_pointer_frame(void *data, struct wl_pointer *wl_pointer) {
+        // Who cares
+}
+
+static void wl_pointer_axis_source(void *data, struct wl_pointer *wl_pointer,
+                uint32_t axis_source) {
+        // Who cares
+}
+
+static void wl_pointer_axis_stop(void *data, struct wl_pointer *wl_pointer,
+                uint32_t time, uint32_t axis) {
+        // Who cares
+}
+
+static void wl_pointer_axis_discrete(void *data, struct wl_pointer *wl_pointer,
+                uint32_t axis, int32_t discrete) {
+        // Who cares
+}
+
+static const struct wl_pointer_listener pointer_listener = {
+        .enter = wl_pointer_enter,
+        .leave = wl_pointer_leave,
+        .motion = wl_pointer_motion,
+        .button = wl_pointer_button,
+        .axis = wl_pointer_axis,
+        .frame = wl_pointer_frame,
+        .axis_source = wl_pointer_axis_source,
+        .axis_stop = wl_pointer_axis_stop,
+        .axis_discrete = wl_pointer_axis_discrete,
+};
+
+static void seat_handle_capabilities(void *data, struct wl_seat *wl_seat,
+                enum wl_seat_capability caps) {
+        struct swaylock_state *state = data;
+        if ((caps & WL_SEAT_CAPABILITY_POINTER)) {
+                struct wl_pointer *pointer = wl_seat_get_pointer(wl_seat);
+                wl_pointer_add_listener(pointer, &pointer_listener, NULL);
+        }
+        if ((caps & WL_SEAT_CAPABILITY_KEYBOARD)) {
+                struct wl_keyboard *keyboard = wl_seat_get_keyboard(wl_seat);
+                wl_keyboard_add_listener(keyboard, &keyboard_listener, state);
+        }
+}
+
+static void seat_handle_name(void *data, struct wl_seat *wl_seat,
+                const char *name) {
+        // Who cares
+}
+
+const struct wl_seat_listener seat_listener = {
+        .capabilities = seat_handle_capabilities,
+        .name = seat_handle_name,
+};