diff options
| author | onelin <oscar@nelin.dk> | 2025-04-13 09:28:24 +0000 |
|---|---|---|
| committer | onelin <oscar@nelin.dk> | 2025-05-02 18:07:56 +0000 |
| commit | d0d3236687e265e6507a275fae506b17f2c85f6a (patch) | |
| tree | a28710f2608b54e70d190371a06c240d09dcbe89 /src/ctrl | |
| parent | aa35d972ef76d23f90d602b684b87510ddbb6fc0 (diff) | |
Move bindings to Window
Diffstat (limited to 'src/ctrl')
| -rw-r--r-- | src/ctrl/src/input.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/ctrl/src/input.c b/src/ctrl/src/input.c index 9da4114..52d5ce4 100644 --- a/src/ctrl/src/input.c +++ b/src/ctrl/src/input.c @@ -42,8 +42,8 @@ extern Instance* GLOBAL_PLATFORM; void key_callback(void* window, int key, int scancode, int action, int mods) { - const i_ctx* bindings = *GLOBAL_PLATFORM->bindings; - const usize bindings_len = GLOBAL_PLATFORM->bindings_len; + const i_ctx* bindings = *GLOBAL_PLATFORM->window->bindings; + const usize bindings_len = GLOBAL_PLATFORM->window->bindings_len; const u64 now = get_time(); @@ -369,22 +369,22 @@ void i_bind_alt(binding_t* b, keycode_t s) { /* Pushes an input context onto the input handling stack */ void i_ctx_push(i_ctx* ctx) { - if (GLOBAL_PLATFORM->bindings == NULL) { - GLOBAL_PLATFORM->bindings = calloc(8, sizeof(i_ctx*)); - GLOBAL_PLATFORM->bindings_sz = 8; + if (GLOBAL_PLATFORM->window->bindings == NULL) { + GLOBAL_PLATFORM->window->bindings = calloc(8, sizeof(i_ctx*)); + GLOBAL_PLATFORM->window->bindings_sz = 8; } - if (GLOBAL_PLATFORM->bindings_len + 1 >= GLOBAL_PLATFORM->bindings_sz) { + if (GLOBAL_PLATFORM->window->bindings_len + 1 >= GLOBAL_PLATFORM->window->bindings_sz) { void* m = - realloc(GLOBAL_PLATFORM->bindings, GLOBAL_PLATFORM->bindings_sz + 8); + realloc(GLOBAL_PLATFORM->window->bindings, GLOBAL_PLATFORM->window->bindings_sz + 8); if (m == NULL) { ERROR("Failed to allocate 8 bytes (%d): %s", errno, strerror(errno)); exit(EXIT_FAILURE); } - GLOBAL_PLATFORM->bindings_sz += 8; + GLOBAL_PLATFORM->window->bindings_sz += 8; } - LOG("Bindings in ctx[%d]:", GLOBAL_PLATFORM->bindings_len); + LOG("Bindings in ctx[%d]:", GLOBAL_PLATFORM->window->bindings_len); for (usize i = 0; i < ctx->len; i++) { switch (ctx->bindings[i].action.type) { case InputType_error: @@ -406,19 +406,19 @@ void i_ctx_push(i_ctx* ctx) { } } - GLOBAL_PLATFORM->bindings[GLOBAL_PLATFORM->bindings_len++] = ctx; + GLOBAL_PLATFORM->window->bindings[GLOBAL_PLATFORM->window->bindings_len++] = ctx; } /* Pops an input context from the input stack */ void i_ctx_pop(void) { - if (GLOBAL_PLATFORM->bindings == NULL || GLOBAL_PLATFORM->bindings_sz == 0) + if (GLOBAL_PLATFORM->window->bindings == NULL || GLOBAL_PLATFORM->window->bindings_sz == 0) return; - i_ctx_t_free(GLOBAL_PLATFORM->bindings[--GLOBAL_PLATFORM->bindings_len]); + i_ctx_t_free(GLOBAL_PLATFORM->window->bindings[--GLOBAL_PLATFORM->window->bindings_len]); } /* Removes all input contexts from the input stack */ void i_ctx_reset(void) { - while (GLOBAL_PLATFORM->bindings_len > 0) { - i_ctx_t_free(GLOBAL_PLATFORM->bindings[--GLOBAL_PLATFORM->bindings_len]); + while (GLOBAL_PLATFORM->window->bindings_len > 0) { + i_ctx_t_free(GLOBAL_PLATFORM->window->bindings[--GLOBAL_PLATFORM->window->bindings_len]); } } |
