b639bc6c4f
The old widget system (archive/dusk/ui/) depended on infrastructure this rewrite deleted -- a static X-macro element list, a 9-slice UI_FRAME, and a global gamepad/keyboard focus stack -- so everything below is rebuilt on top of the new native uielement_t pool + parent/child tree instead, gamepad/keyboard-only (no mouse support exists in the input system). New JS widgets (assets/scripts/), all pure composites of Label/Rectangle following the Button.js pattern: Checkbox, Tab, Slider, Dropdown. Slider/ Dropdown expose a directionInput(dx, dy) hook so a menu can hand them LEFT/RIGHT before falling back to cursor movement. New Menu.js replaces the old global uifocus_t stack: a small push/pop stack of Menu instances where only the topmost consumes CANCEL/ACCEPT/ direction input each tick (needed for nested modals -- a Settings sub-page menu plus a "discard changes?" Confirm can be open at once). Held-direction repeat timing matches the old 0.5s delay / 0.1s repeat. New overlay composites (added via a new UI.addOverlay()/UI.removeOverlay(), always drawn/updated after normal roots): FpsCounter, ConsoleOverlay (one Label per console history line, driven directly rather than via add() since History (16) exceeds the 8-children-per-element cap), Crop (letterbox/pillarbox bars), and Fullbox (a reusable tweened full-screen fade covering both the old fullbox and transition effects -- reuses shared instances rather than allocate-and-dispose, since disposing an element from inside its own render() callback risks the same JerryScript refcount corruption hit earlier in this rewrite). New Confirm.js (Yes/No dialog) and Settings.js (+ SettingsGeneral/ SettingsInput sub-pages) built on Menu. Display/Audio settings pages are intentionally not ported -- neither had a real backing engine system even in the old code. Frame is a flat Rectangle for now, not real 9-slice (a genuinely bigger native lift, deliberately deferred). Small native binding additions needed by the above, each with its own unit test: Time.renderDelta, Console.lineCount/getLine/visible/ consumeDirty, a new Screen module, a new Locale module, Input.deadzone, a new Save module, and Label.color (was missing entirely). Also fixes a real gap from the UI.addOverlay() work: uiElementDispose() wasn't removing disposed elements from the new overlay root array, which would have left dangling ids behind. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
140 lines
3.9 KiB
C
140 lines
3.9 KiB
C
/**
|
|
* Copyright (c) 2026 Dominic Masters
|
|
*
|
|
* This software is released under the MIT License.
|
|
* https://opensource.org/licenses/MIT
|
|
*/
|
|
|
|
#include "dusktest.h"
|
|
#include "console/console.h"
|
|
#include "script/scriptmanager.h"
|
|
#include "script/module/modulebase.h"
|
|
#include "util/memory.h"
|
|
|
|
static int console_setup(void **state) {
|
|
consoleInit();
|
|
|
|
errorret_t ret = scriptManagerInit();
|
|
if(errorIsNotOk(ret)) { errorCatch(ret); return -1; }
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int console_teardown(void **state) {
|
|
errorret_t ret = scriptManagerDispose();
|
|
if(errorIsNotOk(ret)) errorCatch(ret);
|
|
|
|
consoleDispose();
|
|
return 0;
|
|
}
|
|
|
|
static void test_console_print_joins_stringified_args(void **state) {
|
|
jerry_value_t result;
|
|
errorret_t ret = scriptManagerExec(
|
|
"Console.print('hello', 42, true);", &result
|
|
);
|
|
assert_true(errorIsOk(ret));
|
|
jerry_value_free(result);
|
|
|
|
assert_string_equal(
|
|
CONSOLE.line[CONSOLE_HISTORY_MAX - 1], "hello 42 true"
|
|
);
|
|
|
|
assert_int_equal(memoryGetAllocatedCount(), 0);
|
|
}
|
|
|
|
static void test_console_print_no_args_prints_empty_line(void **state) {
|
|
jerry_value_t result;
|
|
errorret_t ret = scriptManagerExec("Console.print();", &result);
|
|
assert_true(errorIsOk(ret));
|
|
jerry_value_free(result);
|
|
|
|
assert_string_equal(CONSOLE.line[CONSOLE_HISTORY_MAX - 1], "");
|
|
|
|
assert_int_equal(memoryGetAllocatedCount(), 0);
|
|
}
|
|
|
|
static void test_console_line_count_is_history_max(void **state) {
|
|
jerry_value_t result;
|
|
errorret_t ret = scriptManagerExec("Console.lineCount;", &result);
|
|
assert_true(errorIsOk(ret));
|
|
assert_int_equal((int32_t)jerry_value_as_number(result), CONSOLE_HISTORY_MAX);
|
|
jerry_value_free(result);
|
|
}
|
|
|
|
static void test_console_get_line_reads_history(void **state) {
|
|
jerry_value_t result;
|
|
errorret_t ret = scriptManagerExec(
|
|
"Console.print('a line'); Console.getLine(Console.lineCount - 1);",
|
|
&result
|
|
);
|
|
assert_true(errorIsOk(ret));
|
|
|
|
char_t buf[32];
|
|
moduleBaseToString(result, buf, sizeof(buf));
|
|
assert_string_equal(buf, "a line");
|
|
jerry_value_free(result);
|
|
}
|
|
|
|
static void test_console_get_line_out_of_range_throws(void **state) {
|
|
errorret_t ret = scriptManagerExec("Console.getLine(999);", NULL);
|
|
assert_true(errorIsNotOk(ret));
|
|
errorCatch(ret);
|
|
}
|
|
|
|
static void test_console_visible_defaults_false(void **state) {
|
|
jerry_value_t result;
|
|
errorret_t ret = scriptManagerExec("Console.visible;", &result);
|
|
assert_true(errorIsOk(ret));
|
|
assert_false(jerry_value_is_true(result));
|
|
jerry_value_free(result);
|
|
}
|
|
|
|
static void test_console_consume_dirty_clears_flag(void **state) {
|
|
CONSOLE.dirty = true;
|
|
|
|
jerry_value_t result;
|
|
errorret_t ret = scriptManagerExec("Console.consumeDirty();", &result);
|
|
assert_true(errorIsOk(ret));
|
|
assert_true(jerry_value_is_true(result));
|
|
jerry_value_free(result);
|
|
|
|
assert_false(CONSOLE.dirty);
|
|
|
|
ret = scriptManagerExec("Console.consumeDirty();", &result);
|
|
assert_true(errorIsOk(ret));
|
|
assert_false(jerry_value_is_true(result));
|
|
jerry_value_free(result);
|
|
}
|
|
|
|
int main(void) {
|
|
assertInit();
|
|
const struct CMUnitTest tests[] = {
|
|
cmocka_unit_test_setup_teardown(
|
|
test_console_print_joins_stringified_args,
|
|
console_setup, console_teardown
|
|
),
|
|
cmocka_unit_test_setup_teardown(
|
|
test_console_print_no_args_prints_empty_line,
|
|
console_setup, console_teardown
|
|
),
|
|
cmocka_unit_test_setup_teardown(
|
|
test_console_line_count_is_history_max, console_setup, console_teardown
|
|
),
|
|
cmocka_unit_test_setup_teardown(
|
|
test_console_get_line_reads_history, console_setup, console_teardown
|
|
),
|
|
cmocka_unit_test_setup_teardown(
|
|
test_console_get_line_out_of_range_throws,
|
|
console_setup, console_teardown
|
|
),
|
|
cmocka_unit_test_setup_teardown(
|
|
test_console_visible_defaults_false, console_setup, console_teardown
|
|
),
|
|
cmocka_unit_test_setup_teardown(
|
|
test_console_consume_dirty_clears_flag, console_setup, console_teardown
|
|
),
|
|
};
|
|
return cmocka_run_group_tests(tests, NULL, NULL);
|
|
}
|