Skip to content
This repository has been archived by the owner on Oct 4, 2024. It is now read-only.

console: rewrite to use the new UI framework #261

Merged
merged 6 commits into from
Sep 25, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
18 changes: 11 additions & 7 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -161,14 +161,18 @@ dll_sources = [
'src/game/shell.c',
'src/game/sound.c',
'src/game/text.c',
'src/game/ui/common.c',
'src/game/ui/controllers/controls.c',
'src/game/ui/controls_column.c',
'src/game/ui/controls_dialog.c',
'src/game/ui/controls_input_selector.c',
'src/game/ui/controls_layout_selector.c',
'src/game/ui/label.c',
'src/game/ui/stack.c',
'src/game/ui/window.c',
'src/game/ui/events.c',
'src/game/ui/widgets/console.c',
'src/game/ui/widgets/controls_column.c',
'src/game/ui/widgets/controls_dialog.c',
'src/game/ui/widgets/controls_input_selector.c',
'src/game/ui/widgets/controls_layout_selector.c',
'src/game/ui/widgets/label.c',
'src/game/ui/widgets/prompt.c',
'src/game/ui/widgets/stack.c',
'src/game/ui/widgets/window.c',
'src/global/enum_str.c',
'src/global/vars.c',
'src/inject_exec.c',
Expand Down
9 changes: 7 additions & 2 deletions src/decomp/decomp.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include "game/shell.h"
#include "game/sound.h"
#include "game/text.h"
#include "game/ui/common.h"
#include "global/const.h"
#include "global/funcs.h"
#include "global/vars.h"
Expand Down Expand Up @@ -561,6 +562,7 @@ void __cdecl Shell_Shutdown(void)
if (g_ErrorMessage[0]) {
MessageBoxA(NULL, g_ErrorMessage, NULL, MB_ICONWARNING);
}
UI_Shutdown();
}

int16_t __cdecl TitleSequence(void)
Expand Down Expand Up @@ -749,10 +751,13 @@ bool __cdecl WinVidSpinMessageLoop(bool need_wait)
g_MessageLoopCounter--;
return 0;
} else if (msg.message == WM_KEYDOWN) {
Console_HandleKeyDown(msg.wParam);
UI_HandleKeyDown(msg.wParam);
return 0;
} else if (msg.message == WM_KEYUP) {
UI_HandleKeyUp(msg.wParam);
return 0;
} else if (msg.message == WM_CHAR) {
Console_HandleChar(msg.wParam);
UI_HandleChar(msg.wParam);
return 0;
}
}
Expand Down
Loading
Loading