Add game layer linking

.gitignore

@@ -1,4 +1,5 @@
 wayland
+game.so
 xdg-shell-client-protocol.h
 xdg-shell-protocol.c
 zwp-text-input-unstable-v3-client-protocol.c

Makefile

@@ -17,3 +17,5 @@ xdg-decoration-unstable-v1.c:
 	wayland-scanner private-code $(INTERFACEDIR)/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml xdg-decoration-unstable-v1.c
 xdg-decoration-unstable-v1.h:
 	wayland-scanner client-header $(INTERFACEDIR)/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml xdg-decoration-unstable-v1.h
+game.so: game.c game.h
+	gcc $(CFLAGS) game.c --shared -o game.so

arena.h

@@ -1,6 +1,10 @@
 #ifndef ARENA_H
 #define ARENA_H
 
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
 typedef enum {
     ARENA_ZERO     = 1 << 0,
     ARENA_SOFTFAIL = 1 << 1,

debug.h

@@ -8,6 +8,7 @@ typedef enum {
     MODULE_MOUSE      = 1 << 2,
     MODULE_WAYLAND    = 1 << 3,
     MODULE_CONTROLLER = 1 << 4,
+    MODULE_HOTRELOAD  = 1 << 5,
     MODULE_ALL        = ~0
 } console_verbosity_t;
 

game.c

@@ -0,0 +1,7 @@
+#include "game.h"
+
+void simulate_frame(game_state_t *state)
+{
+    // TODO: Do something amazing here
+    ;
+}

game.h

@@ -0,0 +1,16 @@
+#ifndef GAME_H
+#define GAME_H
+
+#include "input.h"
+#include "arena.h"
+
+typedef struct {
+    input_t game_input;
+    arena_t main_arena;
+    int32_t window_h;
+    int32_t window_w;
+    int64_t frame;
+    double dt;
+} game_state_t;
+
+#endif

input.h

@@ -1,6 +1,8 @@
 #ifndef INPUT_H
 #define INPUT_H
 
+#include <stdint.h>
+
 // NOTE: KEY_STATE_RELEASED does not imply KEY_STATE_UNPRESSED, which can be funky. Maybe give this another look?
 typedef enum {
     KEY_STATE_UNPRESSED = 0,

wayland.c

@@ -17,6 +17,7 @@
 #include <linux/input-event-codes.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <dlfcn.h>
 // libevdev
 #include <libevdev-1.0/libevdev/libevdev.h>
 // generated header using wayland-scanner
@@ -27,6 +28,7 @@
 #include "input.h"
 #include "arena.h"
 #include "debug.h"
+#include "game.h"
 
 struct wl_compositor *compositor = NULL;
 struct wl_registry *registry = NULL;
@@ -55,16 +57,26 @@ struct xkb_state *xkb_state = NULL;
 struct xkb_keymap *xkb_keymap = NULL;
 
 /* libevdev */
-struct libevdev *libevdev;
+struct libevdev *libevdev = NULL;
 
 /* Misc. global state */
+game_state_t game_state = {};
 EGLBoolean errcode = 0;
 bool running = true;
 input_t user_input = {};
 arena_t main_arena = {};
-console_verbosity_t console_verbosity = { MODULE_CONTROLLER };
+console_verbosity_t console_verbosity = { MODULE_ALL };
 error_level_t error_verbosity = { ERROR_LEVEL_DEBUG };
 
+typedef void (*simulate_frame_fn)(game_state_t*);
+
+/* Game layer */
+typedef struct {
+    simulate_frame_fn simulate_frame;
+} game_api_t;
+
+game_api_t game_api = {};
+
 char *egl_s(int code)
 {
     switch (code)
@@ -225,7 +237,9 @@ void keymap_callback(void *data, struct wl_keyboard *kb, uint format, int fd, ui
     // TODO: Check for XKB compatibility and use xkbcommon to extract
     console_debug_ss(MODULE_KEYBOARD, "KBMAP of size %d detected\n", size);
 
-    char *mem = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0);
+    char *mem = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);
+    if (mem == MAP_FAILED)
+        console_err_ss(MODULE_KEYBOARD, "Could not mmap keyboard: %s\n", strerror(errno));
     console_debug_ss(MODULE_KEYBOARD, "XKBMAP desc:\n\t%s\n", mem);
     xkb_keymap = xkb_keymap_new_from_string(xkb_context, mem, XKB_KEYMAP_FORMAT_TEXT_V1, XKB_KEYMAP_COMPILE_NO_FLAGS);
     munmap(mem, size);
@@ -727,6 +741,18 @@ int main()
     // necessary before our first eglSwapBuffers
     wl_surface_commit(surface);
 
+    // Trying to link with game layer
+    void *dlhandle = dlopen("./game.so", RTLD_NOW);
+    if (!dlhandle)
+        console_err_ss(MODULE_HOTRELOAD, "Could not load game layer\n");
+    dlerror();
+
+    game_api.simulate_frame = (simulate_frame_fn)dlsym(dlhandle, "simulate_frame");
+
+    char *dlerr = NULL;
+    if ((dlerr = dlerror()))
+        console_err_ss(MODULE_HOTRELOAD, "Could not link game layer: %s\n", dlerr);
+
     // Main event loop
     int framecount = 0;
     while (running)
@@ -734,6 +760,8 @@ int main()
         wl_display_dispatch_pending(display);
 
         /* Controller input handling */
+        if (libevdev_get_fd(libevdev) != -1) // check if we actually found a controller to query
+        {
             struct input_event iev;
             int errcode = libevdev_next_event(libevdev, LIBEVDEV_READ_FLAG_NORMAL | LIBEVDEV_READ_FLAG_BLOCKING, &iev);
             do {
@@ -809,8 +837,19 @@ int main()
 
             if (errcode != LIBEVDEV_READ_STATUS_SUCCESS && errcode != -EAGAIN)
                 console_warn_ss(MODULE_CONTROLLER, "Failed to handle controller event: %s\n", strerror(-errcode));
+        } // end of input handling
 
+        game_state.game_input = user_input;
+        game_state.main_arena = main_arena;
+        int32_t w, h;
+        wl_egl_window_get_attached_size(window, &w, &h);
+        game_state.window_w = w;
+        game_state.window_h = h;
+        game_state.frame = framecount;
+        // TODO: Get delta time since last frame
+        game_state.dt = 0;
 
+        game_api.simulate_frame(&game_state);
         //console_debug_ss(MODULE_WAYLAND, "Frame %d\n", framecount);
         glClearColor(0.5, 0.3, 0.0, 1.0);
         glClear(GL_COLOR_BUFFER_BIT);