xenia/fox32
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename key_t to keycode_t

Browse Source
This commit is contained in:
Ry 2022-10-24 21:36:18 -07:00
parent 29f0fb96e6
commit 847e476d76
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/keyboard.c
View File

@ -13,13 +13,13 @@
typedef struct node_s { typedef struct node_s {
struct node_s *prev; struct node_s *prev;
struct node_s *next; struct node_s *next;
key_t code; keycode_t code;
} node_t; } node_t;
static node_t *head = NULL; static node_t *head = NULL;
static node_t *tail = NULL; static node_t *tail = NULL;
key_t key_take(void) { keycode_t key_take(void) {
node_t *node = head; node_t *node = head;
if (node == NULL) { if (node == NULL) {
@ -34,11 +34,11 @@ key_t key_take(void) {
head->prev = NULL; head->prev = NULL;
} }
key_t code = node->code; keycode_t code = node->code;
return free(node), code; return free(node), code;
} }
void key_put(key_t code) { void key_put(keycode_t code) {
if (code == 0) abort(); if (code == 0) abort();
node_t *node = malloc(sizeof(node_t)); node_t *node = malloc(sizeof(node_t));
@ -56,7 +56,7 @@ void key_put(key_t code) {
tail = node; tail = node;
} }
static const key_t key_map[SDL_NUM_SCANCODES] = { static const keycode_t key_map[SDL_NUM_SCANCODES] = {
[SDL_SCANCODE_ESCAPE] = 0x01, [SDL_SCANCODE_ESCAPE] = 0x01,
[SDL_SCANCODE_1] = 0x02, [SDL_SCANCODE_1] = 0x02,
[SDL_SCANCODE_KP_1] = 0x02, [SDL_SCANCODE_KP_1] = 0x02,
@ -143,7 +143,7 @@ static const key_t key_map[SDL_NUM_SCANCODES] = {
[SDL_SCANCODE_RIGHT] = 0x6A, [SDL_SCANCODE_RIGHT] = 0x6A,
}; };
key_t key_convert(int sdlcode) { keycode_t key_convert(int sdlcode) {
if (sdlcode < 0 || sdlcode > SDL_NUM_SCANCODES) abort(); if (sdlcode < 0 || sdlcode > SDL_NUM_SCANCODES) abort();
return key_map[sdlcode]; return key_map[sdlcode];
} }

8
src/keyboard.h
View File

@ -1,10 +1,10 @@
#pragma once #pragma once
typedef unsigned char key_t; typedef unsigned char keycode_t;
key_t key_take(void); keycode_t key_take(void);
void key_put(key_t code); void key_put(keycode_t code);
key_t key_convert(int sdlcode); keycode_t key_convert(int sdlcode);
void key_pressed(int sdlcode); void key_pressed(int sdlcode);
void key_released(int sdlcode); void key_released(int sdlcode);