From 2edc8148ca4a72ed5d26ebb112f6eddc4b78ce3f Mon Sep 17 00:00:00 2001 From: Able Date: Wed, 18 Sep 2024 03:40:25 -0500 Subject: [PATCH] no merge whamies pls --- sysdata/libraries/dt_api/src/lib.hb | 2 +- sysdata/libraries/intouch/src/keycodes.hb | 61 ++++++++++++++++++++- sysdata/libraries/stn/src/random.hb | 2 +- sysdata/programs/render_example/src/main.hb | 2 +- sysdata/system_config.toml | 17 +++--- 5 files changed, 72 insertions(+), 12 deletions(-) diff --git a/sysdata/libraries/dt_api/src/lib.hb b/sysdata/libraries/dt_api/src/lib.hb index 5363cd3..78ddd1c 100644 --- a/sysdata/libraries/dt_api/src/lib.hb +++ b/sysdata/libraries/dt_api/src/lib.hb @@ -4,5 +4,5 @@ stn := @use("../../stn/src/lib.hb"); dt_get := fn(query: ^u8): int { message_length := string.length(query) - return @eca(int, 3, 5, query, message_length) + return @eca(3, 5, query, message_length) } \ No newline at end of file diff --git a/sysdata/libraries/intouch/src/keycodes.hb b/sysdata/libraries/intouch/src/keycodes.hb index 85e96f4..b5fbc3d 100644 --- a/sysdata/libraries/intouch/src/keycodes.hb +++ b/sysdata/libraries/intouch/src/keycodes.hb @@ -5,4 +5,63 @@ Backspace := KeyCode.(8) Tab := KeyCode.(9) Clear := KeyCode.(12) Return := KeyCode.(13) -Pause := KeyCode.(19) \ No newline at end of file +Pause := KeyCode.(19) +Escape := KeyCode.(27) +Space := KeyCode.(32) + +A := KeyCode.(97) +/* +ETC +*/ +Z := KeyCode.(122) + +Delete := KeyCode.(127) + +/* +ETC +*/ + +KeypadNumber0 := KeyCode.(256) +KeypadNumber1 := KeyCode.(257) +KeypadNumber2 := KeyCode.(258) +KeypadNumber3 := KeyCode.(259) +KeypadNumber4 := KeyCode.(260) +KeypadNumber5 := KeyCode.(261) +KeypadNumber6 := KeyCode.(262) +KeypadNumber7 := KeyCode.(263) +KeypadNumber8 := KeyCode.(264) +KeypadNumber9 := KeyCode.(265) + +KeypadPeriod := KeyCode.(266) +KeypadDivide := KeyCode.(267) +KeypadMultiply := KeyCode.(268) +KeypadMinus := KeyCode.(269) +KeypadPlus := KeyCode.(270) +KeypadEnter := KeyCode.(271) +KeypadEquals := KeyCode.(272) + +NumLock := KeyCode.(300) +CapsLock := KeyCode.(301) +ScrollLock := KeyCode.(302) + +RightShift := KeyCode.(303) +LeftShift := KeyCode.(304) + +RightControl := KeyCode.(305) +LeftControl := KeyCode.(306) +RightAlt := KeyCode.(307) +LeftAlt := KeyCode.(308) +RightMeta := KeyCode.(309) +LeftMeta := KeyCode.(310) + +/* Left "Windows" key */ +LeftSuper := KeyCode.(311) + +/* Right "Windows" key */ +RightSuper := KeyCode.(312) + +/* "Alt Gr" key */ +Mode := KeyCode.(313) + +/* Multi-key compose key */ +Compose := KeyCode.(314) diff --git a/sysdata/libraries/stn/src/random.hb b/sysdata/libraries/stn/src/random.hb index b515d1c..2681a69 100644 --- a/sysdata/libraries/stn/src/random.hb +++ b/sysdata/libraries/stn/src/random.hb @@ -3,5 +3,5 @@ integer := fn(): int { } integer_range := fn(min: int, max: int): int { - return @eca(int, 3, 4) % (max - min + 1) + min + return @eca(3, 4) % (max - min + 1) + min } \ No newline at end of file diff --git a/sysdata/programs/render_example/src/main.hb b/sysdata/programs/render_example/src/main.hb index 35b2706..336f76d 100644 --- a/sysdata/programs/render_example/src/main.hb +++ b/sysdata/programs/render_example/src/main.hb @@ -1,4 +1,4 @@ -.{example} := @use("./examples/amogus.hb") +.{example} := @use("./examples/random.hb") main := fn(): void { @inline(example) diff --git a/sysdata/system_config.toml b/sysdata/system_config.toml index e8d6df0..825712d 100644 --- a/sysdata/system_config.toml +++ b/sysdata/system_config.toml @@ -26,28 +26,29 @@ resolution = "1024x768x24" # [boot.limine.ableos.modules.diskio_driver] # path = "boot:///diskio_driver.hbf" -# [boot.limine.ableos.modules.render_example] -# path = "boot:///render_example.hbf" +[boot.limine.ableos.modules.render_example] +path = "boot:///render_example.hbf" # [boot.limine.ableos.modules.serial_driver_test] # path = "boot:///serial_driver_test.hbf" -[boot.limine.ableos.modules.horizon] -path = "boot:///horizon.hbf" +# [boot.limine.ableos.modules.horizon] +# path = "boot:///horizon.hbf" -[boot.limine.ableos.modules.horizon_testing_program] -path = "boot:///horizon_testing_program.hbf" +# [boot.limine.ableos.modules.horizon_testing_program] +# path = "boot:///horizon_testing_program.hbf" # [boot.limine.ableos.modules.dt_buffer_test] # path = "boot:///dt_buffer_test.hbf" -[boot.limine.ableos.modules.svga_driver] -path = "boot:///svga_driver.hbf" +# [boot.limine.ableos.modules.svga_driver] +# path = "boot:///svga_driver.hbf" [boot.limine.ableos.modules.ps2_driver] path = "boot:///ps2_driver.hbf" # [boot.limine.ableos.modules.filesystem_fat32] # path = "boot:///filesystem_fat32.hbf" + # [boot.limine.ableos.modules.pumpkin_print] # path = "boot:///pumpkin_print.hbf"