3 files changed, 12 insertions, 5 deletions
diff --git a/src/rendering/include/engine/rendering/platform.h b/src/rendering/include/engine/rendering/platform.h
index 9497fdb..ea51c47 100644
--- a/src/rendering/include/engine/rendering/platform.h
+++ b/src/rendering/include/engine/rendering/platform.h
@@ -32,7 +32,7 @@ struct Platform {
    * Returns:
    *   A pointer to a struct Window, NULL on error.
    */
-  Window* (*window_init)(const Instance *restrict i, const char *restrict title, ivec2 windowsize, const u32 flags);
+  Window* (*window_init)(const char *restrict title, ivec2 windowsize, const u32 flags);
 
   /* Destroy, close, and free up resources related to the window and the
    * platform library specific resources.
diff --git a/src/rendering/include/engine/rendering/platform_glfw.h b/src/rendering/include/engine/rendering/platform_glfw.h
index 056d130..949968d 100644
--- a/src/rendering/include/engine/rendering/platform_glfw.h
+++ b/src/rendering/include/engine/rendering/platform_glfw.h
@@ -1,5 +1,5 @@
-#ifndef PLATFORM_GLFW_H
-#define PLATFORM_GLFW_H
+#ifndef ENGINE_RENDERING_PLATFORM_GLFW_H
+#define ENGINE_RENDERING_PLATFORM_GLFW_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -11,7 +11,7 @@ extern "C" {
 #include <engine/rendering/platform.h>
 #include <engine/rendering/window.h>
 
-Window* window_init_glfw(const Instance *restrict i, const char *restrict windowtitle, ivec2 windowsize, const u32 flags);
+Window* window_init_glfw(const char *restrict windowtitle, ivec2 windowsize, const u32 flags);
 void window_destroy_glfw(Window *restrict w);
 void window_resize_glfw(Window *restrict window, int width, int height);
 bool window_should_close_glfw(Window *restrict window);
diff --git a/src/rendering/include/engine/rendering/window.h b/src/rendering/include/engine/rendering/window.h
index 10d4ddd..a964b38 100644
--- a/src/rendering/include/engine/rendering/window.h
+++ b/src/rendering/include/engine/rendering/window.h
@@ -8,9 +8,9 @@ extern "C" {
 #include <cglm/ivec2.h>
 
 #include <engine/core/types.h>
+#include <engine/ctrl/input.h>
 
 #ifndef ENGINE_RENDERING_WINDOW_H_EXCLUDE_EXTERNS
-extern void (*window_poll_events)(void);
 extern u64 (*get_time)(void);
 #endif
 
@@ -36,8 +36,15 @@ typedef struct {
   // Subject to change to a union of backend-dependent structs
   void* window;
   void* context;
+
+  /* The ctrl is probably the only sensible thing in this struct. */
+  usize bindings_sz;
+  usize bindings_len;
+  i_ctx** bindings;
 } Window;
 
+Window* Window_new(const char *restrict title, Window_framework framework, Window_renderer renderer, ivec2 size, u32 flags);
+
 void get_mousepos(double *x, double *y);
 
 #ifdef __cplusplus