console: move ui to libtrx

meson.build

@@ -114,6 +114,10 @@ sources = [
   'src/game/effect_routines/chain_block.c',
   'src/game/effect_routines/dino_stomp.c',
   'src/game/effect_routines/earthquake.c',
+  'src/game/ui/common.c',
+  'src/game/ui/widgets/label.c',
+  'src/game/ui/widgets/prompt.c',
+  'src/game/ui/widgets/window.c',
   'src/game/effect_routines/explosion.c',
   'src/game/effect_routines/finish_level.c',
   'src/game/effect_routines/flicker.c',

src/game/console/common.c

@@ -1,322 +1,32 @@
 #include "game/console/common.h"
 
-#include "config.h"
-#include "game/clock.h"
 #include "game/console/setup.h"
-#include "game/game_string.h"
-#include "game/input.h"
 #include "game/output.h"
 #include "game/screen.h"
 #include "game/text.h"
 #include "game/viewport.h"
-#include "global/const.h"
-#include "global/types.h"
-
-#include <libtrx/game/console/common.h>
-#include <libtrx/log.h>
-#include <libtrx/memory.h>
-#include <libtrx/strings.h>
-
-#include <SDL2/SDL_keycode.h>
-#include <assert.h>
-#include <stdarg.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define MAX_LOG_LINES 10
-#define MAX_PROMPT_LENGTH 100
-#define HOVER_DELAY_CPS 5
-#define MARGIN 5
-#define PADDING 3
-
-static bool m_IsOpened = false;
-static bool m_AreAnyLogsOnScreen = false;
-
-static struct {
-    char text[MAX_PROMPT_LENGTH];
-    uint32_t caret;
-    TEXTSTRING *prompt_ts;
-    TEXTSTRING *caret_ts;
-} m_Prompt = { 0 };
-
-static struct {
-    int32_t expire_at;
-    TEXTSTRING *ts;
-} m_Logs[MAX_LOG_LINES] = { 0 };
-
-static const double m_PromptScale = 1.0;
-static const double m_LogScale = 0.8;
-static const int32_t m_TextHeight = 15;
-static const char m_ValidPromptChars[] =
-    "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.- ";
-
-static void M_UpdatePromptTextstring(void);
-static void M_UpdateCaretTextstring(void);
-
-static void M_UpdatePromptTextstring(void)
-{
-    Text_ChangeText(m_Prompt.prompt_ts, m_Prompt.text);
-}
-
-static void M_UpdateCaretTextstring(void)
-{
-    const char old = m_Prompt.prompt_ts->string[m_Prompt.caret];
-    m_Prompt.prompt_ts->string[m_Prompt.caret] = '\0';
-    const int32_t width = Text_GetWidth(m_Prompt.prompt_ts);
-    m_Prompt.prompt_ts->string[m_Prompt.caret] = old;
-    Text_SetPos(m_Prompt.caret_ts, MARGIN + width, -MARGIN);
-}
-
-void Console_Init(void)
-{
-    for (int i = 0; i < MAX_LOG_LINES; i++) {
-        m_Logs[i].expire_at = -1;
-        m_Logs[i].ts = Text_Create(MARGIN, -MARGIN, "");
-        Text_SetScale(m_Logs[i].ts, PHD_ONE * m_LogScale, PHD_ONE * m_LogScale);
-        Text_AlignBottom(m_Logs[i].ts, true);
-        Text_SetMultiline(m_Logs[i].ts, true);
-    }
-}
-
-void Console_Shutdown(void)
-{
-    for (int i = 0; i < MAX_LOG_LINES; i++) {
-        Text_Remove(m_Logs[i].ts);
-        m_Logs[i].ts = NULL;
-    }
-}
-
-void Console_Open(void)
-{
-    m_IsOpened = true;
-
-    if (m_Prompt.prompt_ts) {
-        return;
-    }
-
-    m_Prompt.caret = strlen(m_Prompt.text);
-
-    m_Prompt.prompt_ts = Text_Create(MARGIN, -MARGIN, m_Prompt.text);
-    Text_SetScale(
-        m_Prompt.prompt_ts, PHD_ONE * m_PromptScale, PHD_ONE * m_PromptScale);
-    Text_AlignBottom(m_Prompt.prompt_ts, true);
-
-    m_Prompt.caret_ts = Text_Create(MARGIN, -MARGIN, "\x80");
-    Text_SetScale(
-        m_Prompt.caret_ts, PHD_ONE * m_PromptScale, PHD_ONE * m_PromptScale);
-    Text_AlignBottom(m_Prompt.caret_ts, true);
-    Text_Flash(m_Prompt.caret_ts, 1, LOGIC_FPS * 1.5);
-}
-
-void Console_Close(void)
-{
-    m_IsOpened = false;
-    strcpy(m_Prompt.text, "");
-    Text_Remove(m_Prompt.prompt_ts);
-    Text_Remove(m_Prompt.caret_ts);
-    m_Prompt.prompt_ts = NULL;
-    m_Prompt.caret_ts = NULL;
-}
-
-bool Console_IsOpened(void)
-{
-    return m_IsOpened;
-}
-
-void Console_Confirm(void)
-{
-    if (strcmp(m_Prompt.text, "") == 0) {
-        Console_Close();
-        return;
-    }
-
-    Console_Eval(m_Prompt.text);
-    Console_Close();
-}
-
-void Console_HandleKeyDown(const SDL_Event event)
-{
-    if (!g_Config.enable_console) {
-        return;
-    }
-
-    if (!m_IsOpened) {
-        const INPUT_SCANCODE open_console_keysym = Input_GetAssignedScancode(
-            g_Config.input.layout, INPUT_ROLE_ENTER_CONSOLE);
-        if (event.key.keysym.scancode == open_console_keysym) {
-            Console_Open();
-        }
-        return;
-    }
-
-    switch (event.key.keysym.sym) {
-    case SDLK_LEFT:
-        if (m_Prompt.caret > 0) {
-            m_Prompt.caret--;
-            M_UpdateCaretTextstring();
-        }
-        break;
-
-    case SDLK_RIGHT:
-        if (m_Prompt.caret < strlen(m_Prompt.text)) {
-            m_Prompt.caret++;
-            M_UpdateCaretTextstring();
-        }
-        break;
-
-    case SDLK_HOME:
-        m_Prompt.caret = 0;
-        M_UpdateCaretTextstring();
-        break;
-
-    case SDLK_END:
-        m_Prompt.caret = strlen(m_Prompt.text);
-        M_UpdateCaretTextstring();
-        break;
-
-    case SDLK_BACKSPACE:
-        if (m_Prompt.caret > 0) {
-            for (int i = m_Prompt.caret; i < MAX_PROMPT_LENGTH; i++) {
-                m_Prompt.text[i - 1] = m_Prompt.text[i];
-            }
-            m_Prompt.caret--;
-            M_UpdatePromptTextstring();
-            M_UpdateCaretTextstring();
-        }
-        break;
-    }
-}
-
-void Console_HandleTextEdit(const SDL_Event event)
-{
-    if (!m_IsOpened) {
-        return;
-    }
-    strncpy(m_Prompt.text, event.text.text, MAX_PROMPT_LENGTH);
-    m_Prompt.text[MAX_PROMPT_LENGTH - 1] = '\0';
-    M_UpdatePromptTextstring();
-    M_UpdateCaretTextstring();
-}
-
-void Console_HandleTextInput(const SDL_Event event)
-{
-    if (!m_IsOpened) {
-        return;
-    }
-    if (strlen(event.text.text) != 1
-        || !strstr(m_ValidPromptChars, event.text.text)) {
-        return;
-    }
-
-    const char *insert_string = event.text.text;
-    const size_t insert_length = strlen(insert_string);
-    const size_t available_space =
-        MAX_PROMPT_LENGTH - strlen(m_Prompt.text) - 1;
-
-    if (insert_length > available_space) {
-        return;
-    }
-
-    for (int i = strlen(m_Prompt.text); i >= (int)m_Prompt.caret; i--) {
-        m_Prompt.text[i + insert_length] = m_Prompt.text[i];
-    }
-
-    memcpy(m_Prompt.text + m_Prompt.caret, insert_string, insert_length);
-
-    m_Prompt.caret += insert_length;
-    m_Prompt.text[MAX_PROMPT_LENGTH - 1] = '\0';
-    M_UpdatePromptTextstring();
-    M_UpdateCaretTextstring();
-}
-
-void Console_LogImpl(const char *const text)
-{
-    int32_t dst_idx = -1;
-    for (int32_t i = MAX_LOG_LINES - 1; i > 0; i--) {
-        if (m_Logs[i].ts == NULL) {
-            continue;
-        }
-        Text_ChangeText(m_Logs[i].ts, m_Logs[i - 1].ts->string);
-        m_Logs[i].expire_at = m_Logs[i - 1].expire_at;
-    }
-
-    if (m_Logs[0].ts == NULL) {
-        return;
-    }
-
-    m_Logs[0].expire_at =
-        Clock_GetHighPrecisionCounter() + 1000 * strlen(text) / HOVER_DELAY_CPS;
-    Text_ChangeText(m_Logs[0].ts, text);
-    int32_t y = -MARGIN - m_TextHeight * m_PromptScale;
-
-    for (int32_t i = 0; i < MAX_LOG_LINES; i++) {
-        const int32_t text_height = Text_GetHeight(m_Logs[i].ts);
-        y -= text_height;
-        y -= PADDING * m_LogScale / PHD_ONE;
-        Text_SetPos(m_Logs[i].ts, m_Logs[i].ts->pos.x, y);
-    }
-
-    m_AreAnyLogsOnScreen = true;
-}
-
-extern CONSOLE_COMMAND **Console_GetCommands(void)
-{
-    return g_ConsoleCommands;
-}
 
 int32_t Console_GetMaxLineLength(void)
 {
     return TEXT_MAX_STRING_SIZE - 1;
 }
 
-void Console_ScrollLogs(void)
+extern CONSOLE_COMMAND **Console_GetCommands(void)
 {
-    int i = MAX_LOG_LINES - 1;
-    while (i >= 0 && !m_Logs[i].expire_at) {
-        i--;
-    }
-
-    while (i >= 0 && m_Logs[i].expire_at
-           && Clock_GetHighPrecisionCounter() >= m_Logs[i].expire_at) {
-        m_Logs[i].expire_at = 0;
-        Text_ChangeText(m_Logs[i].ts, "");
-        i--;
-    }
-
-    m_AreAnyLogsOnScreen = i >= 0;
+    return g_ConsoleCommands;
 }
 
-void Console_Draw(void)
+void Console_DrawBackdrop(void)
 {
-    Console_ScrollLogs();
-
-    if (m_IsOpened || m_AreAnyLogsOnScreen) {
-        int32_t sx = 0;
-        int32_t sw = Viewport_GetWidth();
-        int32_t sh = Screen_GetRenderScale(
-            // not entirely accurate, but good enough
-            TEXT_HEIGHT * m_PromptScale
-                + MAX_LOG_LINES * TEXT_HEIGHT * m_LogScale,
-            RSR_TEXT);
-        int32_t sy = Viewport_GetHeight() - sh;
-
-        RGBA_8888 top = { 0, 0, 0, 0 };
-        RGBA_8888 bottom = { 0, 0, 0, 196 };
+    int32_t sx = 0;
+    int32_t sw = Viewport_GetWidth();
+    int32_t sh = Screen_GetRenderScale(
+        // not entirely accurate, but good enough
+        TEXT_HEIGHT * 1.0 + 10 * TEXT_HEIGHT * 0.8, RSR_TEXT);
+    int32_t sy = Viewport_GetHeight() - sh;
 
-        Output_DrawScreenGradientQuad(sx, sy, sw, sh, top, top, bottom, bottom);
-    }
+    RGBA_8888 top = { 0, 0, 0, 0 };
+    RGBA_8888 bottom = { 0, 0, 0, 196 };
 
-    if (m_Prompt.prompt_ts) {
-        Text_DrawText(m_Prompt.prompt_ts);
-    }
-    if (m_Prompt.caret_ts) {
-        Text_DrawText(m_Prompt.caret_ts);
-    }
-    for (int i = 0; i < MAX_LOG_LINES; i++) {
-        if (m_Logs[i].ts) {
-            Text_DrawText(m_Logs[i].ts);
-        }
-    }
+    Output_DrawScreenGradientQuad(sx, sy, sw, sh, top, top, bottom, bottom);
 }

src/game/console/common.h

@@ -1,22 +1,5 @@
 #pragma once
 
-#include <SDL2/SDL.h>
-#include <SDL2/SDL_events.h>
-#include <stdbool.h>
+#include <libtrx/game/console/common.h>
 
-void Console_Init(void);
-void Console_Shutdown(void);
-void Console_Draw(void);
-
-void Console_Open(void);
-void Console_Close(void);
-bool Console_IsOpened(void);
-
-void Console_Confirm(void);
-
-void Console_HandleKeyDown(const SDL_Event event);
-void Console_HandleTextEdit(const SDL_Event event);
-void Console_HandleTextInput(const SDL_Event event);
-
-void Console_Log(const char *fmt, ...);
-void Console_ScrollLogs(void);
+void Console_DrawBackdrop(void);