aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--modules/TUI/module.jai18
-rw-r--r--modules/UTF8.jai71
-rw-r--r--ttt.jai63
3 files changed, 74 insertions, 78 deletions
diff --git a/modules/TUI/module.jai b/modules/TUI/module.jai
index bda326b..e7dc21a 100644
--- a/modules/TUI/module.jai
+++ b/modules/TUI/module.jai
@@ -14,6 +14,7 @@
#import "Basic";
#import "String";
#import "Thread";
+#import "UTF8";
#load "key_map.jai";
// Special Graphics Characters
@@ -289,21 +290,6 @@ set_next_key :: (key: Key) {
get_key :: (timeout_milliseconds: s32 = -1) -> Key {
assert_is_active();
- // BBBB BBBB & 1100 0000 == 10XX XXXX -> is continuation byte
- is_utf8_continuation_byte :: inline (byte: u8) -> bool {
- return (byte & 0xC0) == 0x80;
- }
-
- // BBBB BBBB & 1110 0000 == 110X XXXX -> 1 initial + 1 continuation byte
- // BBBB BBBB & 1111 0000 == 1110 XXXX -> 1 initial + 2 continuation byte
- // BBBB BBBB & 1111 1000 == 1111 0XXX -> 1 initial + 3 continuation byte
- count_utf8_bytes :: inline (byte: u8) -> int {
- if (byte & 0xE0) == 0xC0 return 1+1;
- if (byte & 0xF0) == 0xE0 return 1+2;
- if (byte & 0xF8) == 0xF0 return 1+3;
- return 1;
- }
-
if input_override != xx Keys.None {
defer input_override = xx Keys.None;
return input_override;
@@ -421,7 +407,7 @@ read_input :: (count_limit: int = -1, terminators: .. u8) -> string {
}
}
-read_input_line :: (count_limit: int, is_visible: bool = true) -> string, Key {
+read_input_line :: (count_limit: int, is_visible: bool = true, placeholder: string = "") -> string, Key {
/*
Use the get_key to read user input and show it on screen.
Should allow to move the cursor left and right and to delete/backspace.
diff --git a/modules/UTF8.jai b/modules/UTF8.jai
new file mode 100644
index 0000000..fac1326
--- /dev/null
+++ b/modules/UTF8.jai
@@ -0,0 +1,71 @@
+// BBBB BBBB & 1100 0000 == 10XX XXXX -> is continuation byte
+is_utf8_continuation_byte :: inline (byte: u8) -> bool {
+ return (byte & 0xC0) == 0x80;
+}
+
+// BBBB BBBB & 1110 0000 == 110X XXXX -> 1 initial + 1 continuation byte
+// BBBB BBBB & 1111 0000 == 1110 XXXX -> 1 initial + 2 continuation byte
+// BBBB BBBB & 1111 1000 == 1111 0XXX -> 1 initial + 3 continuation byte
+count_utf8_bytes :: inline (byte: u8) -> int {
+ if (byte & 0xE0) == 0xC0 return 1+1;
+ if (byte & 0xF0) == 0xE0 return 1+2;
+ if (byte & 0xF8) == 0xF0 return 1+3;
+ return 1;
+}
+
+// Truncates the string to the length provided or shorter, in case of UTF8 strings that require so.
+// Truncation is done by zeroing the tail of the string in place.
+// Returns length of truncated string.
+truncate_string :: (str: string, length: int) -> length: int {
+ if str.data == null then return -1;
+
+ if str.count < length then length = str.count;
+
+ data := str.data;
+ count := str.count;
+
+ // Find index of first continuation byte.
+ idx := length;
+ // while (idx > 0 && ((data[idx - 1] & 0xC0) == 0x80)) { TODO REMOVE AFTER TESTING
+ while (idx > 0 && is_utf8_continuation_byte(data[idx - 1])) {
+ idx -= 1;
+ }
+ continuation_bytes := length - idx;
+
+ // If string starts with continuation bytes, it's an invalid UTF8 string.
+ if (idx == 0 && continuation_bytes > 0) {
+ length = 0;
+ }
+ // If length truncates some continuation bytes, remove incomplete UTF8 character.
+ else if (idx > 0 // string is not empty
+ // continuation bytes are not complete
+ && !(continuation_bytes == 0 && (data[idx - 1] & 0x80) == 0x00)
+ && !(continuation_bytes == 1 && (data[idx - 1] & 0xE0) == 0xC0)
+ && !(continuation_bytes == 2 && (data[idx - 1] & 0xF0) == 0xE0)
+ && !(continuation_bytes == 3 && (data[idx - 1] & 0xF8) == 0xF0)
+ ) {
+ length -= (continuation_bytes + 1); // Remove start byte, ence '+ 1'.
+ }
+
+ memset(data + length, 0, count - length);
+ return length;
+}
+
+// Returns true when the string is empty or consists of space characters.
+is_empty_string :: (str: string) -> bool {
+ for 0..str.count-1 {
+ if str[it] == {
+ case #char "\0"; #through;
+ case #char "\t"; #through; // horizontal tab
+ case #char "\n"; #through; // line feed
+ case #char "\x0B"; #through; // vertical tabulation
+ case #char "\x0C"; #through; // form feed
+ case #char "\r"; #through; // carriage return
+ case #char " ";
+ continue;
+ case;
+ return false;
+ }
+ }
+ return true;
+}
diff --git a/ttt.jai b/ttt.jai
index 414ab8c..43a972f 100644
--- a/ttt.jai
+++ b/ttt.jai
@@ -25,6 +25,7 @@
#import "File_Utilities";
#import "String";
#import "Integer_Saturating_Arithmetic";
+#import "UTF8";
TUI :: #import "TUI"(COLOR_BIT_DEPTH=8);
VERSION :: "2.0"; // Use only 3 chars (to fit layouts).
@@ -189,68 +190,6 @@ count_digits :: (number: s64, base: s64 = 10) -> s64 {
return digits;
}
-Text_Encoding :: enum u8 #specified {
- ASCII :: 1;
- UTF8 :: 2;
-}
-
-// Truncates the string to the length provided or shorter, in case of UTF8 strings that require so.
-// Truncation is done by zeroing the tail of the string in place.
-// Returns length of truncated string.
-truncate_string :: (str: string, length: s64, $encoding: Text_Encoding = .UTF8) -> length: s64 {
- assert(str.data != null, ASSERT_NOT_NULL, "str");
- assert(str.count >= length, "'str.count' should be equal or greater to 'length'.");
-
- data := str.data;
- count := str.count;
-
- #if encoding == .UTF8 {
- // Find index of first continuation byte.
- idx := length;
- while (idx > 0 && ((data[idx - 1] & 0xC0) == 0x80)) {
- idx -= 1;
- }
- continuation_bytes := length - idx;
-
- // If string starts with continuation bytes, it's an invalid UTF8 string.
- if (idx == 0 && continuation_bytes > 0) {
- length = 0;
- }
- // If length truncates some continuation bytes, remove incomplete UTF8 character.
- else if (idx > 0 // string is not empty
- // continuation bytes are not complete
- && !(continuation_bytes == 0 && (data[idx - 1] & 0x80) == 0x00)
- && !(continuation_bytes == 1 && (data[idx - 1] & 0xE0) == 0xC0)
- && !(continuation_bytes == 2 && (data[idx - 1] & 0xF0) == 0xE0)
- && !(continuation_bytes == 3 && (data[idx - 1] & 0xF8) == 0xF0)
- ) {
- length -= (continuation_bytes + 1); // Remove start byte, ence '+ 1'.
- }
- }
-
- memset(data + length, 0, count - length);
- return length;
-}
-
-// Returns true when the string is empty or consists of space characters.
-is_empty_string :: (str: string) -> bool {
- for 0..str.count-1 {
- if str[it] == {
- case #char "\0"; #through;
- case #char "\t"; #through; // horizontal tab
- case #char "\n"; #through; // line feed
- case #char "\x0B"; #through; // vertical tabulation
- case #char "\x0C"; #through; // form feed
- case #char "\r"; #through; // carriage return
- case #char " ";
- continue;
- case;
- return false;
- }
- }
- return true;
-}
-
// Prints, on row y and column x, the time using 5 characters centered on space.
// Returns the result of a call to mvprintw.
print_time :: (y: int, x: int, time: s64, space: int) -> int {
generated by cgit v1.2.3 (git 2.46.0) at 2026-05-27 23:43:13 +0000