library: vendors/kb_text_shape + vendors/file_utils; modules/ffi/stb_truetype.sx retired

kb_text_shape (v2.10, JimmyLefevre) had been LOST from the sx tree —
ffi/stb_truetype.sx referenced repo paths that no longer existed (and
nothing runs glyph_cache, so the dangling unit never fired). The
trimmed copy returns from the m3te project as a proper vendor:
curated c/kbts_api.h decls over the full upstream header, README with
provenance, and examples/1627 pinning context + font creation so the
unit compiles and runs in-suite. file_utils (in-house asset-read
helper with the Android AAssetManager hook) gets the same unit shape.

modules/ffi/stb_truetype.sx is gone: glyph_cache imports the three
vendored units (stb_truetype, kb_text_shape, file_utils) directly.
This commit is contained in:
agra
2026-06-12 17:58:23 +03:00
parent 58af806b7a
commit b06776d6e9
15 changed files with 30919 additions and 14 deletions

10
library/vendors/file_utils/README.md vendored Normal file
View File

@@ -0,0 +1,10 @@
# vendors/file_utils — in-house asset-read helper
Not third-party: a small in-house C helper kept under vendors/ because
it ships as a `#import c` unit like the rest.
- `read_file_bytes(path, *out_size)` — whole-file read, malloc'd bytes.
- On Android, paths rooted inside the APK resolve through the
`AAssetManager` installed via `sx_android_set_asset_manager`
(modules/platform/android.sx calls it during activity startup; the
hook only exists in the `__ANDROID__` build of the unit).

View File

@@ -0,0 +1,55 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#ifdef __ANDROID__
#include <android/asset_manager.h>
// Caller-installed AAssetManager pointer. Chess's android_main extracts
// it from `app->activity->assetManager` (via sx-side platform module's
// `g_android_asset_manager` global) and feeds it here once at startup.
// Until the setter has been called, Android falls through to fopen —
// gives a predictable "file not found" rather than a NULL-deref.
static AAssetManager* g_aam = NULL;
void sx_android_set_asset_manager(void* m) {
g_aam = (AAssetManager*)m;
}
#endif
unsigned char* read_file_bytes(const char* path, int* out_size) {
#ifdef __ANDROID__
if (g_aam != NULL) {
// AAssetManager paths are relative to the APK's `assets/`
// directory. Strip a leading "assets/" so callers can use the
// same paths across iOS/macOS/Android (those platforms read
// assets via `assets/...` rooted in the bundle or CWD).
const char* lookup = path;
if (strncmp(path, "assets/", 7) == 0) {
lookup = path + 7;
}
AAsset* a = AAssetManager_open(g_aam, lookup, AASSET_MODE_BUFFER);
if (a != NULL) {
off_t n = AAsset_getLength(a);
*out_size = (int)n;
unsigned char* buf = (unsigned char*)malloc((size_t)n);
if (buf != NULL) {
memcpy(buf, AAsset_getBuffer(a), (size_t)n);
}
AAsset_close(a);
return buf;
}
// Falls through to fopen — useful when assets land in the data
// dir via extraction or app updates.
}
#endif
FILE* f = fopen(path, "rb");
if (!f) return 0;
fseek(f, 0, SEEK_END);
*out_size = (int)ftell(f);
fseek(f, 0, SEEK_SET);
unsigned char* buf = (unsigned char*)malloc(*out_size);
fread(buf, 1, *out_size, f);
fclose(f);
return buf;
}

View File

@@ -0,0 +1,13 @@
#ifndef FILE_UTILS_H
#define FILE_UTILS_H
unsigned char* read_file_bytes(const char* path, int* out_size);
#ifdef __ANDROID__
// Install the AAssetManager that `read_file_bytes` consults for paths
// rooted inside the APK. Caller is responsible for passing the manager
// from `ANativeActivity->assetManager` before any read_file_bytes call.
void sx_android_set_asset_manager(void* m);
#endif
#endif

View File

@@ -0,0 +1,12 @@
// =====================================================================
// vendors/file_utils — in-house C helper: `read_file_bytes` with an
// Android twist. On most platforms it is a plain stdio read; on
// Android, paths rooted inside the APK resolve through the
// AAssetManager installed via `sx_android_set_asset_manager`
// (modules/platform/android.sx wires that during activity startup).
// =====================================================================
#import c {
#include "c/file_utils.h";
#source "c/file_utils.c";
};

22
library/vendors/kb_text_shape/README.md vendored Normal file
View File

@@ -0,0 +1,22 @@
# vendors/kb_text_shape — OpenType text shaping for sx programs
- Version: **v2.10** (version history at the top of the header)
- Source: <https://github.com/JimmyLefevre/kb> (`kb_text_shape.h`)
- License: zlib-style permissive (see the header's license block)
- Files: `c/kb/kb_text_shape.h` (the full upstream single-header,
~30k lines), `c/kb_text_shape_impl.c` (defines
`KB_TEXT_SHAPE_IMPLEMENTATION` and includes it), and
`c/kbts_api.h` — a hand-curated MINIMAL declaration header carrying
only the bound surface, so decl synthesis never parses the full
upstream header.
`#import "vendors/kb_text_shape/kb_text_shape.sx"` resolves through
the stdlib search paths; the implementation compiles once per machine
through sx's object cache. Shape contexts, fonts, runs, and glyphs are
opaque pointers on the sx side (modules/ui/glyph_cache.sx is the
reference consumer; `examples/1627-vendor-kbts-shape-context.sx` pins
context + font creation in the sx suite).
To upgrade: replace `c/kb/kb_text_shape.h` with a newer upstream copy,
extend `c/kbts_api.h` if the bound surface grows, update this file,
and rebuild (the object cache keys on source bytes).

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,2 @@
#define KB_TEXT_SHAPE_IMPLEMENTATION
#include "kb/kb_text_shape.h"

View File

@@ -0,0 +1,15 @@
// Minimal API declarations for SX import.
// Only the functions/types we actually use — avoids parsing the full 30k-line header.
typedef struct kbts_shape_context kbts_shape_context;
typedef struct kbts_font kbts_font;
kbts_shape_context *kbts_CreateShapeContext(void *Allocator, void *AllocatorData);
void kbts_DestroyShapeContext(kbts_shape_context *Context);
kbts_font *kbts_ShapePushFontFromMemory(kbts_shape_context *Context, void *Memory, int Size, int FontIndex);
void kbts_GetFontInfo2(kbts_font *Font, void *Info);
void kbts_ShapeBegin(kbts_shape_context *Context, unsigned int ParagraphDirection, unsigned int Language);
void kbts_ShapeUtf8(kbts_shape_context *Context, const char *Utf8, int Length, unsigned int UserIdGenerationMode);
void kbts_ShapeEnd(kbts_shape_context *Context);
int kbts_ShapeRun(kbts_shape_context *Context, void *Run);
int kbts_GlyphIteratorNext(void *It, void **Glyph);

View File

@@ -0,0 +1,18 @@
// =====================================================================
// vendors/kb_text_shape — Jimmy Lefevre's kb_text_shape (OpenType text
// shaping) as a `#import c` unit (c/, see README.md for version +
// provenance).
//
// `#import "vendors/kb_text_shape/kb_text_shape.sx"` gives any sx
// program text shaping with no system dependency. The decls come from
// c/kbts_api.h — a hand-curated MINIMAL declaration header covering
// only the bound surface (the full upstream header is ~30k lines and
// is included only by the implementation unit). Shape contexts, fonts,
// runs, and glyphs are opaque pointers on the sx side; see
// modules/ui/glyph_cache.sx for the reference consumer.
// =====================================================================
#import c {
#include "c/kbts_api.h";
#source "c/kb_text_shape_impl.c";
};