orca-app · martinfouilleul · Oct 22, 2024 · Oct 22, 2024 · Oct 22, 2024 · Oct 22, 2024
diff --git a/.github/workflows/build-all.yaml b/.github/workflows/build-all.yaml
@@ -80,6 +80,10 @@ jobs:
         with:
           python-version: '3.10'
 
+      - name: install autotools
+        run: |
+          brew install autoconf automake libtool
+
       - uses: actions/checkout@v4
 
       - uses: actions/download-artifact@v4
@@ -122,6 +126,10 @@ jobs:
         with:
           python-version: '3.10'
 
+      - name: install autotools
+        run: |
+          brew install autoconf automake libtool
+
       - uses: actions/checkout@v4
 
       - uses: actions/download-artifact@v4

diff --git a/.github/workflows/build-doc-site.yml b/.github/workflows/build-doc-site.yml
@@ -3,6 +3,10 @@ on:
   push:
     branches:
       - main
+  pull_request:
+    branches:
+      - main
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -31,6 +35,7 @@ jobs:
           path: "./doc/mkdocs/site"
 
   deploy:
+    if: ${{ github.ref_name == 'main'}}
     runs-on: ubuntu-latest
     needs: build
 

diff --git a/.gitignore b/.gitignore
@@ -47,6 +47,8 @@ scripts/files
 # explicitly abandon old ext dir
 /ext
 src/ext/angle
+src/ext/harfbuzz
+src/ext/fribidi
 
 sketches/*/bin
 
@@ -60,4 +62,6 @@ src/ext/curl/winbuild/*.idb
 src/ext/zlib/build/
 
 doc/mkdocs/docs/api
-doc/mkdocs/mkdocs.yml
+doc/mkdocs/mkdocs.yml
+
+.clocignore
diff --git a/deps/fribidi-commit.txt b/deps/fribidi-commit.txt
@@ -0,0 +1 @@
+68162babff4f39c4e2dc164a5e825af93bda9983
diff --git a/deps/harfbuzz-commit.txt b/deps/harfbuzz-commit.txt
@@ -0,0 +1 @@
+825bc1964374eed7d19ffa327989d0ee841dda71
diff --git a/samples/breakout/src/main.c b/samples/breakout/src/main.c
@@ -97,15 +97,7 @@ ORCA_EXPORT void oc_on_init(void)
         oc_log_error("couldn't load ball image\n");
     }
 
-    oc_unicode_range ranges[5] = {
-        OC_UNICODE_BASIC_LATIN,
-        OC_UNICODE_C1_CONTROLS_AND_LATIN_1_SUPPLEMENT,
-        OC_UNICODE_LATIN_EXTENDED_A,
-        OC_UNICODE_LATIN_EXTENDED_B,
-        OC_UNICODE_SPECIALS
-    };
-
-    font = oc_font_create_from_path(OC_STR8("/Literata-SemiBoldItalic.ttf"), 5, ranges);
+    font = oc_font_create_from_path(OC_STR8("/Literata-SemiBoldItalic.ttf"));
 }
 
 ORCA_EXPORT void oc_on_terminate(void)
@@ -437,13 +429,11 @@ ORCA_EXPORT void oc_on_frame_refresh(void)
             oc_circle_fill(r.x + r.w / 2, r.y + r.h / 2, r.h / 2.5);
 
             oc_set_color_rgba(0, 0, 0, 1);
-            oc_set_font(font);
-            oc_set_font_size(18);
+
             oc_move_to(textPos.x, textPos.y);
             oc_matrix_multiply_push(flip_y_at(textPos));
             {
-                oc_text_outlines(text);
-                oc_fill();
+                oc_text_draw_utf8(text, font, 18);
             }
             oc_matrix_pop();
         }
@@ -465,8 +455,7 @@ ORCA_EXPORT void oc_on_frame_refresh(void)
             oc_matrix_multiply_push(flip_y_at(textPos));
             {
                 oc_set_color_rgba(0.9, 0.9, 0.9, 1);
-                oc_text_outlines(text);
-                oc_fill();
+                oc_text_draw_utf8(text, font, 18);
             }
             oc_matrix_pop();
         }

diff --git a/samples/clock/src/main.c b/samples/clock/src/main.c
@@ -7,6 +7,7 @@
 **************************************************************************/
 #include <math.h>
 #include <orca.h>
+#include <fribidi/include/fribidi.h>
 
 const oc_str8 clockNumberStrings[] = {
     OC_STR8_LIT("12"),
@@ -46,15 +47,29 @@ ORCA_EXPORT void oc_on_init(void)
     surface = oc_canvas_surface_create(renderer);
     context = oc_canvas_context_create();
 
-    oc_unicode_range ranges[5] = {
-        OC_UNICODE_BASIC_LATIN,
-        OC_UNICODE_C1_CONTROLS_AND_LATIN_1_SUPPLEMENT,
-        OC_UNICODE_LATIN_EXTENDED_A,
-        OC_UNICODE_LATIN_EXTENDED_B,
-        OC_UNICODE_SPECIALS
-    };
+    font = oc_font_create_from_path(OC_STR8("/segoeui.ttf"));
 
-    font = oc_font_create_from_path(OC_STR8("/segoeui.ttf"), 5, ranges);
+    ////////////////////////////////
+    const char* text = "bahrain مصر kuwait";
+
+    oc_arena_scope scratch = oc_scratch_begin();
+    oc_str32 codepoints = oc_utf8_push_to_codepoints(scratch.arena, OC_STR8(text));
+
+    FriBidiParType baseDir = FRIBIDI_TYPE_LTR_VAL;
+    FriBidiLevel levels[256];
+
+    fribidi_log2vis(codepoints.ptr,
+                    codepoints.len,
+                    &baseDir,
+                    0, 0, 0,
+                    levels);
+
+    for(u64 i = 0; i < codepoints.len; i++)
+    {
+        oc_log_info("%i\n", levels[i]);
+    }
+
+    oc_scratch_end(scratch);
 }
 
 ORCA_EXPORT void oc_on_resize(u32 width, u32 height)
@@ -93,8 +108,6 @@ ORCA_EXPORT void oc_on_frame_refresh(void)
     const f32 uiScale = clockRadius / DEFAULT_CLOCK_RADIUS;
 
     const f32 fontSize = 26 * uiScale;
-    oc_set_font(font);
-    oc_set_font_size(fontSize);
 
     // clock backing
     oc_set_color_rgba(1, 1, 1, 1);
@@ -113,7 +126,8 @@ ORCA_EXPORT void oc_on_frame_refresh(void)
         oc_vec2 pos = oc_mat2x3_mul(transform, (oc_vec2){ clockRadius * 0.8f, 0 });
 
         oc_set_color_srgba(0.2, 0.2, 0.2, 1);
-        oc_text_fill(pos.x, pos.y, clockNumberStrings[i]);
+        oc_move_to(pos.x, pos.y);
+        oc_text_draw_utf8(clockNumberStrings[i], font, fontSize);
     }
 
     // hours hand

diff --git a/samples/ui/src/main.c b/samples/ui/src/main.c
@@ -56,13 +56,8 @@ ORCA_EXPORT void oc_on_init(void)
         char* buffer = (char*)oc_arena_push(scratch.arena, size);
         oc_file_read(file, size, buffer);
         oc_file_close(file);
-        oc_unicode_range ranges[5] = { OC_UNICODE_BASIC_LATIN,
-                                       OC_UNICODE_C1_CONTROLS_AND_LATIN_1_SUPPLEMENT,
-                                       OC_UNICODE_LATIN_EXTENDED_A,
-                                       OC_UNICODE_LATIN_EXTENDED_B,
-                                       OC_UNICODE_SPECIALS };
 
-        *fonts[i] = oc_font_create_from_memory(oc_str8_from_buffer(size, buffer), 5, ranges);
+        *fonts[i] = oc_font_create_from_memory(oc_str8_from_buffer(size, buffer));
 
         oc_scratch_end(scratch);
     }

diff --git a/scripts/bindgen.py b/scripts/bindgen.py
@@ -229,7 +229,7 @@ def bindgen(apiName, spec, **kwargs):
             elif retTag == 'S':
                 s += '*__retPtr = '
             elif retTag == 'p':
-                printError(name + ": pointer return type not supported yet")
+                s += '*((oc_wasm_addr*)&_returns[0]) = '
 
             s += cname + '('
 
@@ -286,7 +286,10 @@ def bindgen(apiName, spec, **kwargs):
             return_types = '\t\toc_wasm_valtype returnTypes[1];\n\n'
         else:
             return_types = '\t\toc_wasm_valtype returnTypes[] = {'
-            return_types += tag_to_valtype(decl['ret']['tag'], name)
+            tag = decl['ret']['tag']
+            if tag == 'p':
+                tag = 'i'
+            return_types += tag_to_valtype(tag, name)
             return_types += '};\n\n'
 
         s += '\t{\n'