Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cleaning up the linux part: #14

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.engine.linux.mak
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ASSEMBLY := engine
EXTENSION := .so
COMPILER_FLAGS := -g -MD -Werror=vla -fdeclspec -fPIC
INCLUDE_FLAGS := -Iengine/src -I$(VULKAN_SDK)/include
LINKER_FLAGS := -g -shared -lvulkan -lxcb -lX11 -lX11-xcb -lxkbcommon -L$(VULKAN_SDK)/lib -L/usr/X11R6/lib
LINKER_FLAGS := -g -shared -lvulkan -lxcb -lxcb-keysyms -lxcb-xkb -L$(VULKAN_SDK)/lib -L/usr/X11R6/lib
DEFINES := -D_DEBUG -DKEXPORT

# Make does not offer a recursive wildcard function, so here's one:
Expand Down
31 changes: 30 additions & 1 deletion engine/src/core/application.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ static application_state* app_state;
b8 application_on_event(u16 code, void* sender, void* listener_inst, event_context context);
b8 application_on_key(u16 code, void* sender, void* listener_inst, event_context context);
b8 application_on_resized(u16 code, void* sender, void* listener_inst, event_context context);
b8 application_on_minimized(u16 code, void *sender, void *listener_inst, event_context context);
b8 application_on_raised(u16 code, void *sender, void *listener_inst, event_context context);

b8 application_create(game* game_inst) {
if (game_inst->application_state) {
Expand Down Expand Up @@ -95,6 +97,8 @@ b8 application_create(game* game_inst) {
event_register(EVENT_CODE_KEY_PRESSED, 0, application_on_key);
event_register(EVENT_CODE_KEY_RELEASED, 0, application_on_key);
event_register(EVENT_CODE_RESIZED, 0, application_on_resized);
event_register(EVENT_CODE_MINIZED, 0, application_on_minimized);
event_register(EVENT_CODE_RAISED, 0, application_on_raised);

// Platform
platform_system_startup(&app_state->platform_system_memory_requirement, 0, 0, 0, 0, 0, 0);
Expand Down Expand Up @@ -206,6 +210,9 @@ b8 application_run() {
event_unregister(EVENT_CODE_APPLICATION_QUIT, 0, application_on_event);
event_unregister(EVENT_CODE_KEY_PRESSED, 0, application_on_key);
event_unregister(EVENT_CODE_KEY_RELEASED, 0, application_on_key);
event_unregister(EVENT_CODE_RESIZED, 0, application_on_resized);
event_unregister(EVENT_CODE_MINIZED, 0, application_on_minimized);
event_unregister(EVENT_CODE_RAISED, 0, application_on_raised);

input_system_shutdown(app_state->input_system_state);

Expand Down Expand Up @@ -295,4 +302,26 @@ b8 application_on_resized(u16 code, void* sender, void* listener_inst, event_con

// Event purposely not handled to allow other listeners to get this.
return false;
}
}

b8 application_on_minimized(u16 code, void *sender, void *listener_inst, event_context context) {
if (code == EVENT_CODE_MINIZED) {
if (!app_state->is_suspended) {
KDEBUG("Application was minimized and suspended.");
app_state->is_suspended = true;
}
}

return true;
}

b8 application_on_raised(u16 code, void *sender, void *listener_inst, event_context context) {
if (code == EVENT_CODE_RAISED) {
if (app_state->is_suspended) {
KDEBUG("Application was raised and unsuspended.");
app_state->is_suspended = false;
}
}

return true;
}
6 changes: 6 additions & 0 deletions engine/src/core/event.h
Original file line number Diff line number Diff line change
Expand Up @@ -108,5 +108,11 @@ typedef enum system_event_code {
*/
EVENT_CODE_RESIZED = 0x08,

// Window was minimized
EVENT_CODE_MINIZED = 0x09,

// Window was raised from minimized
EVENT_CODE_RAISED = 0x0a,

MAX_EVENT_CODE = 0xFF
} system_event_code;
106 changes: 105 additions & 1 deletion engine/src/core/input.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ typedef enum buttons {
#define DEFINE_KEY(name, code) KEY_##name = code

typedef enum keys {
#if KPLATFORM_WINDOWS
DEFINE_KEY(BACKSPACE, 0x08),
DEFINE_KEY(ENTER, 0x0D),
DEFINE_KEY(TAB, 0x09),
Expand Down Expand Up @@ -138,7 +139,110 @@ typedef enum keys {
DEFINE_KEY(PERIOD, 0xBE),
DEFINE_KEY(SLASH, 0xBF),
DEFINE_KEY(GRAVE, 0xC0),

#elif KPLATFORM_LINUX
DEFINE_KEY(SPACE, 0x0020),
DEFINE_KEY(HASH, 0x0023),
DEFINE_KEY(APOS, 0x0027),
DEFINE_KEY(COMMA, 0x002c),
DEFINE_KEY(MINUS, 0x002d),
DEFINE_KEY(PERIOD, 0x002e),
DEFINE_KEY(SLASH, 0x002f),
DEFINE_KEY(0, 0x0030),
DEFINE_KEY(1, 0x0031),
DEFINE_KEY(2, 0x0032),
DEFINE_KEY(3, 0x0033),
DEFINE_KEY(4, 0x0034),
DEFINE_KEY(5, 0x0035),
DEFINE_KEY(6, 0x0036),
DEFINE_KEY(7, 0x0037),
DEFINE_KEY(8, 0x0038),
DEFINE_KEY(9, 0x0039),
DEFINE_KEY(SEMICOLON, 0x003b),
DEFINE_KEY(EQUAL, 0x003d),
DEFINE_KEY(A, 0x0041),
DEFINE_KEY(B, 0x0042),
DEFINE_KEY(C, 0x0043),
DEFINE_KEY(D, 0x0044),
DEFINE_KEY(E, 0x0045),
DEFINE_KEY(F, 0x0046),
DEFINE_KEY(G, 0x0047),
DEFINE_KEY(H, 0x0048),
DEFINE_KEY(I, 0x0049),
DEFINE_KEY(J, 0x004a),
DEFINE_KEY(K, 0x004b),
DEFINE_KEY(L, 0x004c),
DEFINE_KEY(M, 0x004d),
DEFINE_KEY(N, 0x004e),
DEFINE_KEY(O, 0x004f),
DEFINE_KEY(P, 0x0050),
DEFINE_KEY(Q, 0x0051),
DEFINE_KEY(R, 0x0052),
DEFINE_KEY(S, 0x0053),
DEFINE_KEY(T, 0x0054),
DEFINE_KEY(U, 0x0055),
DEFINE_KEY(V, 0x0056),
DEFINE_KEY(W, 0x0057),
DEFINE_KEY(X, 0x0058),
DEFINE_KEY(Y, 0x0059),
DEFINE_KEY(Z, 0x005a),
DEFINE_KEY(LBRACKET, 0x005b),
DEFINE_KEY(BSLASH, 0x005c),
DEFINE_KEY(RBRACKET, 0x005d),
DEFINE_KEY(GRAVE, 0x0060),
DEFINE_KEY(BACKSPACE, 0xff08),
DEFINE_KEY(TAB, 0xff09),
DEFINE_KEY(ENTER, 0xff0d),
DEFINE_KEY(PAUSE, 0xff13),
DEFINE_KEY(SCROLL, 0xff14),
DEFINE_KEY(ESCAPE, 0xff1b),
DEFINE_KEY(HOME, 0xff50),
DEFINE_KEY(LEFT, 0xff51),
DEFINE_KEY(UP, 0xff52),
DEFINE_KEY(RIGHT, 0xff53),
DEFINE_KEY(DOWN, 0xff54),
DEFINE_KEY(PAGEUP, 0xff55),
DEFINE_KEY(PAGEDOWN, 0xff56),
DEFINE_KEY(END, 0xff57),
DEFINE_KEY(PRINT, 0xff61),
DEFINE_KEY(INSERT, 0xff63),
DEFINE_KEY(NUMLOCK, 0xff7f),
DEFINE_KEY(KP_ENTER, 0xff8d),
DEFINE_KEY(KP_7, 0xff95),
DEFINE_KEY(KP_4, 0xff96),
DEFINE_KEY(KP_8, 0xff97),
DEFINE_KEY(KP_6, 0xff98),
DEFINE_KEY(KP_2, 0xff99),
DEFINE_KEY(KP_9, 0xff9a),
DEFINE_KEY(KP_3, 0xff9b),
DEFINE_KEY(KP_1, 0xff9c),
DEFINE_KEY(KP_5, 0xff9d),
DEFINE_KEY(KP_0, 0xff9e),
DEFINE_KEY(KP_DECIMAL, 0xff9f ),
DEFINE_KEY(KP_MULTIPLY, 0xffaa),
DEFINE_KEY(KP_ADD, 0xffab),
DEFINE_KEY(KP_SUBTRACT, 0xffad),
DEFINE_KEY(KP_DIVIDE, 0xffaf),
DEFINE_KEY(F1, 0xffbe),
DEFINE_KEY(F2, 0xffbf),
DEFINE_KEY(F3, 0xffc0),
DEFINE_KEY(F4, 0xffc1),
DEFINE_KEY(F5, 0xffc2),
DEFINE_KEY(F6, 0xffc3),
DEFINE_KEY(F7, 0xffc4),
DEFINE_KEY(F8, 0xffc5),
DEFINE_KEY(F9, 0xffc6),
DEFINE_KEY(F10, 0xffc7),
DEFINE_KEY(F11, 0xffc8),
DEFINE_KEY(F12, 0xffc9),
DEFINE_KEY(LSHIFT, 0xffe1),
DEFINE_KEY(RSHIFT, 0xffe2),
DEFINE_KEY(LCONTROL, 0xffe3),
DEFINE_KEY(RCONTROL, 0xffe4),
DEFINE_KEY(CAPSLOCK, 0xffe5),
DEFINE_KEY(LALT, 0xffe9),
DEFINE_KEY(RALT, 0xfe03),
DEFINE_KEY(DELETE, 0xffff),
#endif
KEYS_MAX_KEYS
} keys;

Expand Down
Loading