xbintsc 0.5.51 → 0.6.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +8 -2
- package/README.zh-CN.md +9 -3
- package/dist/scripts/fetch-tarball.d.ts +28 -0
- package/dist/scripts/fetch-tarball.js +57 -0
- package/dist/scripts/fetch-tarball.js.map +1 -0
- package/dist/scripts/gui-build-options.d.ts +77 -0
- package/dist/scripts/gui-build-options.js +134 -0
- package/dist/scripts/gui-build-options.js.map +1 -0
- package/dist/src/cli/help.d.ts +1 -1
- package/dist/src/cli/hints.d.ts +6 -2
- package/dist/src/cli/hints.js +16 -2
- package/dist/src/cli/hints.js.map +1 -1
- package/dist/src/cli/main.js +9 -0
- package/dist/src/cli/main.js.map +1 -1
- package/dist/src/driver/app-artifacts.d.ts +2 -0
- package/dist/src/driver/app-artifacts.js +3 -3
- package/dist/src/driver/app-artifacts.js.map +1 -1
- package/dist/src/driver/compiler.js +147 -52
- package/dist/src/driver/compiler.js.map +1 -1
- package/dist/src/driver/icon.d.ts +1 -1
- package/dist/src/driver/icon.js +3 -3
- package/dist/src/driver/icon.js.map +1 -1
- package/dist/src/driver/macos-sdk.d.ts +32 -0
- package/dist/src/driver/macos-sdk.js +50 -0
- package/dist/src/driver/macos-sdk.js.map +1 -0
- package/dist/src/driver/options.d.ts +6 -0
- package/dist/src/driver/platform-support.d.ts +45 -0
- package/dist/src/driver/platform-support.js +66 -0
- package/dist/src/driver/platform-support.js.map +1 -0
- package/dist/src/driver/prebuilt.d.ts +26 -0
- package/dist/src/driver/prebuilt.js +58 -0
- package/dist/src/driver/prebuilt.js.map +1 -0
- package/dist/src/driver/runtime-objects.d.ts +11 -0
- package/dist/src/driver/runtime-objects.js +14 -5
- package/dist/src/driver/runtime-objects.js.map +1 -1
- package/dist/src/driver/toolchain-provider.d.ts +8 -0
- package/dist/src/driver/toolchain-provider.js +8 -0
- package/dist/src/driver/toolchain-provider.js.map +1 -1
- package/dist/src/driver/toolchain.d.ts +20 -1
- package/dist/src/driver/toolchain.js +19 -0
- package/dist/src/driver/toolchain.js.map +1 -1
- package/dist/src/driver/version.d.ts +1 -1
- package/dist/src/driver/version.js +1 -1
- package/dist/src/driver/version.js.map +1 -1
- package/dist/src/driver/win-entry.d.ts +1 -1
- package/dist/src/driver/win-entry.js +4 -4
- package/dist/src/driver/win-entry.js.map +1 -1
- package/dist/src/extensions/gui/features.d.ts +9 -6
- package/dist/src/extensions/gui/features.js +14 -9
- package/dist/src/extensions/gui/features.js.map +1 -1
- package/dist/src/extensions/gui/html.d.ts +10 -7
- package/dist/src/extensions/gui/html.js +53 -29
- package/dist/src/extensions/gui/html.js.map +1 -1
- package/dist/src/extensions/node/child_process/index.d.ts +4 -3
- package/dist/src/extensions/node/child_process/index.js +4 -3
- package/dist/src/extensions/node/child_process/index.js.map +1 -1
- package/dist/tests/cli/hints.test.js +9 -1
- package/dist/tests/cli/hints.test.js.map +1 -1
- package/dist/tests/cli/main.test.js +9 -0
- package/dist/tests/cli/main.test.js.map +1 -1
- package/dist/tests/driver/compiler.test.js +107 -0
- package/dist/tests/driver/compiler.test.js.map +1 -1
- package/dist/tests/driver/cxx-compile-flags.test.d.ts +1 -0
- package/dist/tests/driver/cxx-compile-flags.test.js +24 -0
- package/dist/tests/driver/cxx-compile-flags.test.js.map +1 -0
- package/dist/tests/driver/macos-sdk.test.d.ts +1 -0
- package/dist/tests/driver/macos-sdk.test.js +83 -0
- package/dist/tests/driver/macos-sdk.test.js.map +1 -0
- package/dist/tests/driver/platform-support.test.d.ts +1 -0
- package/dist/tests/driver/platform-support.test.js +41 -0
- package/dist/tests/driver/platform-support.test.js.map +1 -0
- package/dist/tests/driver/prebuilt.test.d.ts +1 -0
- package/dist/tests/driver/prebuilt.test.js +44 -0
- package/dist/tests/driver/prebuilt.test.js.map +1 -0
- package/dist/tests/driver/toolchain-provider.test.js +24 -0
- package/dist/tests/driver/toolchain-provider.test.js.map +1 -1
- package/dist/tests/driver/toolchain.test.js +23 -0
- package/dist/tests/driver/toolchain.test.js.map +1 -1
- package/dist/tests/e2e/async-await.test.js +4 -2
- package/dist/tests/e2e/async-await.test.js.map +1 -1
- package/dist/tests/e2e/compile-node.test.js +21 -0
- package/dist/tests/e2e/compile-node.test.js.map +1 -1
- package/dist/tests/e2e/fetch.test.js +34 -6
- package/dist/tests/e2e/fetch.test.js.map +1 -1
- package/dist/tests/e2e/gui-css-coverage.test.d.ts +9 -0
- package/dist/tests/e2e/gui-css-coverage.test.js +333 -0
- package/dist/tests/e2e/gui-css-coverage.test.js.map +1 -0
- package/dist/tests/e2e/gui-css-features.test.d.ts +6 -0
- package/dist/tests/e2e/gui-css-features.test.js +270 -0
- package/dist/tests/e2e/gui-css-features.test.js.map +1 -0
- package/dist/tests/e2e/gui-effects.test.js +92 -11
- package/dist/tests/e2e/gui-effects.test.js.map +1 -1
- package/dist/tests/e2e/gui-example-pelican3d.test.d.ts +10 -0
- package/dist/tests/e2e/gui-example-pelican3d.test.js +94 -0
- package/dist/tests/e2e/gui-example-pelican3d.test.js.map +1 -0
- package/dist/tests/e2e/gui-font-face.test.d.ts +10 -0
- package/dist/tests/e2e/gui-font-face.test.js +142 -0
- package/dist/tests/e2e/gui-font-face.test.js.map +1 -0
- package/dist/tests/e2e/gui-fonts.test.d.ts +10 -0
- package/dist/tests/e2e/gui-fonts.test.js +150 -0
- package/dist/tests/e2e/gui-fonts.test.js.map +1 -0
- package/dist/tests/e2e/gui-helpers.d.ts +5 -0
- package/dist/tests/e2e/gui-helpers.js +4 -0
- package/dist/tests/e2e/gui-helpers.js.map +1 -1
- package/dist/tests/e2e/gui-layout.test.js +3 -2
- package/dist/tests/e2e/gui-layout.test.js.map +1 -1
- package/dist/tests/e2e/gui-script.test.js +48 -0
- package/dist/tests/e2e/gui-script.test.js.map +1 -1
- package/dist/tests/e2e/gui-track-sizing.test.d.ts +6 -0
- package/dist/tests/e2e/gui-track-sizing.test.js +173 -0
- package/dist/tests/e2e/gui-track-sizing.test.js.map +1 -0
- package/dist/tests/e2e/gui-transform.test.js +3 -2
- package/dist/tests/e2e/gui-transform.test.js.map +1 -1
- package/dist/tests/e2e/unhandled-rejection.test.d.ts +14 -0
- package/dist/tests/e2e/unhandled-rejection.test.js +107 -0
- package/dist/tests/e2e/unhandled-rejection.test.js.map +1 -0
- package/dist/tests/extensions/gui-features.test.js +8 -1
- package/dist/tests/extensions/gui-features.test.js.map +1 -1
- package/dist/tests/extensions/gui.test.js +44 -0
- package/dist/tests/extensions/gui.test.js.map +1 -1
- package/dist/tests/scripts/fetch-tarball.test.d.ts +1 -0
- package/dist/tests/scripts/fetch-tarball.test.js +70 -0
- package/dist/tests/scripts/fetch-tarball.test.js.map +1 -0
- package/doc/ai/cli.md +6 -0
- package/doc/ai/extensions.md +10 -5
- package/doc/ai/language-support.md +1 -0
- package/doc/ai/troubleshooting.md +32 -2
- package/doc/ai/zh-CN/cli.md +5 -0
- package/doc/ai/zh-CN/extensions.md +9 -4
- package/doc/ai/zh-CN/language-support.md +1 -0
- package/doc/ai/zh-CN/troubleshooting.md +27 -2
- package/doc/gui/animation.md +39 -9
- package/doc/gui/build.md +13 -8
- package/doc/gui/dom.md +23 -5
- package/doc/gui/known-issues.md +31 -23
- package/doc/gui/layout.md +30 -7
- package/doc/gui/rendering.md +84 -26
- package/doc/gui/webgl.md +4 -0
- package/doc/gui-scripts.md +33 -17
- package/doc/gui.md +79 -15
- package/doc/implemented/async.md +1 -0
- package/doc/implemented/modules.md +9 -6
- package/doc/implemented/node/child-process.md +12 -4
- package/doc/implemented/runtime-core.md +1 -1
- package/doc/npm-package.md +23 -2
- package/doc/post/make-js-great-again.md +30 -0
- package/doc/requirements.md +31 -0
- package/doc/unimplemented/deviations.md +1 -0
- package/doc/zh-CN/gui/animation.md +33 -10
- package/doc/zh-CN/gui/build.md +9 -7
- package/doc/zh-CN/gui/dom.md +19 -4
- package/doc/zh-CN/gui/known-issues.md +21 -12
- package/doc/zh-CN/gui/layout.md +22 -5
- package/doc/zh-CN/gui/rendering.md +61 -20
- package/doc/zh-CN/gui/webgl.md +1 -0
- package/doc/zh-CN/gui-scripts.md +23 -11
- package/doc/zh-CN/gui.md +64 -16
- package/doc/zh-CN/implemented/async.md +1 -0
- package/doc/zh-CN/implemented/modules.md +8 -4
- package/doc/zh-CN/implemented/node/child-process.md +10 -3
- package/doc/zh-CN/implemented/runtime-core.md +1 -1
- package/doc/zh-CN/npm-package.md +18 -1
- package/doc/zh-CN/post/make-js-great-again.md +32 -0
- package/doc/zh-CN/requirements.md +25 -0
- package/doc/zh-CN/unimplemented/deviations.md +1 -0
- package/package.json +7 -7
- package/runtime/ext_gui/animation_values.cpp +425 -0
- package/runtime/ext_gui/animation_values.h +64 -0
- package/runtime/ext_gui/css.cpp +172 -21
- package/runtime/ext_gui/css.h +75 -4
- package/runtime/ext_gui/css_match.cpp +4 -0
- package/runtime/ext_gui/css_sheet.cpp +218 -2
- package/runtime/ext_gui/document.cpp +42 -192
- package/runtime/ext_gui/document.h +25 -12
- package/runtime/ext_gui/document_animation.cpp +428 -0
- package/runtime/ext_gui/effect_values.cpp +245 -21
- package/runtime/ext_gui/gradient_values.cpp +24 -0
- package/runtime/ext_gui/grid_values.cpp +23 -0
- package/runtime/ext_gui/gui_cursor.cpp +50 -0
- package/runtime/ext_gui/gui_events.cpp +16 -4
- package/runtime/ext_gui/gui_internal.h +3 -0
- package/runtime/ext_gui/image_api.h +3 -1
- package/runtime/ext_gui/image_feature.cpp +4 -2
- package/runtime/ext_gui/inline_svg.cpp +95 -8
- package/runtime/ext_gui/inline_svg.h +5 -1
- package/runtime/ext_gui/layout.cpp +3 -2
- package/runtime/ext_gui/layout.h +6 -0
- package/runtime/ext_gui/layout_flex.cpp +134 -29
- package/runtime/ext_gui/layout_flow.cpp +58 -7
- package/runtime/ext_gui/layout_flow_internal.h +39 -4
- package/runtime/ext_gui/layout_grid.cpp +31 -0
- package/runtime/ext_gui/layout_inline.cpp +26 -2
- package/runtime/ext_gui/layout_vertical.cpp +196 -0
- package/runtime/ext_gui/paint.cpp +67 -9
- package/runtime/ext_gui/paint.h +61 -8
- package/runtime/ext_gui/paint_backdrop.cpp +211 -0
- package/runtime/ext_gui/paint_background.cpp +175 -97
- package/runtime/ext_gui/paint_effects.cpp +12 -6
- package/runtime/ext_gui/paint_internal.h +27 -0
- package/runtime/ext_gui/paint_outline.cpp +44 -0
- package/runtime/ext_gui/paint_shadow.cpp +368 -0
- package/runtime/ext_gui/renderer.cpp +15 -7
- package/runtime/ext_gui/renderer.h +10 -1
- package/runtime/ext_gui/renderer_backdrop.cpp +374 -0
- package/runtime/ext_gui/renderer_bitmap.cpp +82 -0
- package/runtime/ext_gui/renderer_gradient.cpp +51 -17
- package/runtime/ext_gui/renderer_image.cpp +6 -1
- package/runtime/ext_gui/renderer_internal.h +21 -0
- package/runtime/ext_gui/renderer_layer.cpp +27 -1
- package/runtime/ext_gui/renderer_text.cpp +2 -1
- package/runtime/ext_gui/style.cpp +62 -8
- package/runtime/ext_gui/style.h +111 -4
- package/runtime/ext_gui/style_cascade.cpp +83 -0
- package/runtime/ext_gui/style_internal.h +13 -1
- package/runtime/ext_gui/style_length.cpp +92 -0
- package/runtime/ext_gui/style_print.cpp +83 -2
- package/runtime/ext_gui/style_svg.cpp +40 -0
- package/runtime/ext_gui/style_text.cpp +302 -0
- package/runtime/ext_gui/style_ui.cpp +150 -0
- package/runtime/ext_gui/style_values.cpp +76 -62
- package/runtime/ext_gui/style_values_internal.h +23 -0
- package/runtime/ext_gui/text.cpp +4 -2
- package/runtime/ext_gui/text.h +11 -4
- package/runtime/ext_gui/text_cache.cpp +11 -2
- package/runtime/ext_gui/text_font_db.cpp +427 -0
- package/runtime/ext_gui/text_font_paths.cpp +250 -0
- package/runtime/ext_gui/text_font_paths.h +39 -0
- package/runtime/ext_gui/text_font_sfnt.cpp +396 -0
- package/runtime/ext_gui/text_font_sfnt.h +44 -0
- package/runtime/ext_gui/text_fonts.cpp +348 -0
- package/runtime/ext_gui/text_fonts.h +78 -0
- package/runtime/ext_gui/text_fonts_internal.h +77 -0
- package/runtime/ext_gui/text_hb.cpp +63 -179
- package/runtime/ext_gui/text_stb.cpp +49 -193
- package/runtime/ext_gui/transform.cpp +107 -9
- package/runtime/ext_gui/transform.h +5 -0
- package/runtime/ext_gui/window.cpp +1 -1
- package/runtime/ext_node/child_process/child_process.c +149 -7
- package/runtime/rt.h +4 -0
- package/runtime/xt_async.c +4 -0
- package/runtime/xt_generator.c +2 -0
- package/runtime/xt_loop.c +8 -4
- package/runtime/xt_promise.c +103 -0
- package/scripts/build-gui.ts +17 -5
- package/scripts/build-media.ts +89 -10
- package/scripts/build-runtime.ts +7 -2
- package/scripts/fetch-tarball.ts +71 -0
- package/scripts/gui-build-cache.ts +28 -0
- package/scripts/gui-build-options.ts +26 -2
- package/scripts/package-release.ts +8 -0
- package/src/cli/hints.ts +19 -2
- package/src/cli/main.ts +11 -0
- package/src/driver/app-artifacts.ts +5 -3
- package/src/driver/compiler.ts +167 -56
- package/src/driver/icon.ts +3 -2
- package/src/driver/macos-sdk.ts +52 -0
- package/src/driver/options.ts +6 -0
- package/src/driver/platform-support.ts +69 -0
- package/src/driver/prebuilt.ts +61 -0
- package/src/driver/runtime-objects.ts +26 -5
- package/src/driver/toolchain-provider.ts +11 -0
- package/src/driver/toolchain.ts +26 -1
- package/src/driver/version.ts +1 -1
- package/src/driver/win-entry.ts +4 -3
- package/src/extensions/gui/features.ts +13 -9
- package/src/extensions/gui/html.ts +61 -31
- package/src/extensions/node/child_process/index.ts +4 -3
|
@@ -10,19 +10,21 @@
|
|
|
10
10
|
* ligatures or complex-script shaping (Arabic/Indic/Thai) and it only accepts
|
|
11
11
|
* TrueType outlines, not CFF/OTF or variable fonts. The fallback chain still
|
|
12
12
|
* switches faces for codepoints the primary lacks.
|
|
13
|
+
*
|
|
14
|
+
* Faces are selected by `text_fonts.cpp`: the CSS family list, weight and style
|
|
15
|
+
* resolve to a `(path, collection index)` pair, and only the ordered candidates
|
|
16
|
+
* this backend can actually load (TrueType outlines) are tried.
|
|
13
17
|
*/
|
|
14
18
|
|
|
15
19
|
#include "text_api.h"
|
|
20
|
+
#include "text_fonts.h"
|
|
16
21
|
|
|
17
22
|
#define STB_TRUETYPE_IMPLEMENTATION
|
|
18
23
|
#include "stb_truetype.h"
|
|
19
24
|
|
|
20
|
-
#include <cmath>
|
|
21
25
|
#include <cstddef>
|
|
22
26
|
#include <cstdint>
|
|
23
27
|
#include <cstdio>
|
|
24
|
-
#include <cstdlib>
|
|
25
|
-
#include <cstring>
|
|
26
28
|
#include <memory>
|
|
27
29
|
#include <string>
|
|
28
30
|
#include <unordered_map>
|
|
@@ -38,7 +40,7 @@ struct Font {
|
|
|
38
40
|
* pointers into it, so it must outlive this face. */
|
|
39
41
|
std::shared_ptr<const std::vector<unsigned char>> data;
|
|
40
42
|
std::string path;
|
|
41
|
-
|
|
43
|
+
int face_index = 0;
|
|
42
44
|
float pixel_size = 16.0f;
|
|
43
45
|
float scale = 1.0f;
|
|
44
46
|
float ascent = 0;
|
|
@@ -48,75 +50,11 @@ struct Font {
|
|
|
48
50
|
|
|
49
51
|
namespace {
|
|
50
52
|
|
|
51
|
-
const char *const kSansCandidates[] = {
|
|
52
|
-
/* Explicit override wins (also checked per family class below). */
|
|
53
|
-
nullptr,
|
|
54
|
-
/* Fonts with CJK coverage come first: the default face is a single face, so
|
|
55
|
-
* it has to be able to render Chinese/Japanese/Korean text as well as
|
|
56
|
-
* Latin. */
|
|
57
|
-
"C:\\Windows\\Fonts\\msyh.ttc", /* Microsoft YaHei (Win 8.1+) */
|
|
58
|
-
"C:\\Windows\\Fonts\\msyh.ttf", /* Microsoft YaHei (Win 7) */
|
|
59
|
-
"C:\\Windows\\Fonts\\Deng.ttf", /* DengXian */
|
|
60
|
-
"C:\\Windows\\Fonts\\simsun.ttc", /* SimSun */
|
|
61
|
-
"/System/Library/Fonts/PingFang.ttc",
|
|
62
|
-
"/System/Library/Fonts/STHeiti Light.ttc",
|
|
63
|
-
"/System/Library/Fonts/Helvetica.ttc",
|
|
64
|
-
"/System/Library/Fonts/Supplemental/Arial.ttf",
|
|
65
|
-
"/System/Library/Fonts/Supplemental/Verdana.ttf",
|
|
66
|
-
"/Library/Fonts/Arial.ttf",
|
|
67
|
-
"/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc",
|
|
68
|
-
"/usr/share/fonts/truetype/wqy/wqy-microhei.ttc",
|
|
69
|
-
"/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf",
|
|
70
|
-
"/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf",
|
|
71
|
-
"/usr/share/fonts/TTF/DejaVuSans.ttf",
|
|
72
|
-
"/usr/share/fonts/dejavu/DejaVuSans.ttf",
|
|
73
|
-
"C:\\Windows\\Fonts\\segoeui.ttf",
|
|
74
|
-
"C:\\Windows\\Fonts\\arial.ttf",
|
|
75
|
-
};
|
|
76
|
-
|
|
77
|
-
const char *const kMonoCandidates[] = {
|
|
78
|
-
nullptr,
|
|
79
|
-
"C:\\Windows\\Fonts\\msyh.ttc", /* CJK-capable fallback (see above) */
|
|
80
|
-
"/System/Library/Fonts/PingFang.ttc",
|
|
81
|
-
"/System/Library/Fonts/Menlo.ttc",
|
|
82
|
-
"/System/Library/Fonts/Supplemental/Courier New.ttf",
|
|
83
|
-
"/System/Library/Fonts/Courier.ttc",
|
|
84
|
-
"/Library/Fonts/Courier New.ttf",
|
|
85
|
-
"/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc",
|
|
86
|
-
"/usr/share/fonts/truetype/dejavu/DejaVuSansMono.ttf",
|
|
87
|
-
"/usr/share/fonts/truetype/liberation/LiberationMono-Regular.ttf",
|
|
88
|
-
"/usr/share/fonts/TTF/DejaVuSansMono.ttf",
|
|
89
|
-
"C:\\Windows\\Fonts\\consola.ttf",
|
|
90
|
-
"C:\\Windows\\Fonts\\cour.ttf",
|
|
91
|
-
};
|
|
92
|
-
|
|
93
|
-
/* Faces tried after the primary one for codepoints it does not cover. Symbol
|
|
94
|
-
* faces come first (shape/arrow/box-drawing coverage), then the other family
|
|
95
|
-
* class so a monospace run still gets CJK and a sans run still gets
|
|
96
|
-
* monospace-only codepoints. The primary and duplicates are skipped. */
|
|
97
|
-
const char *const kSymbolCandidates[] = {
|
|
98
|
-
nullptr,
|
|
99
|
-
"C:\\Windows\\Fonts\\seguisym.ttf", /* Segoe UI Symbol */
|
|
100
|
-
"C:\\Windows\\Fonts\\arialuni.ttf", /* Arial Unicode MS */
|
|
101
|
-
"/System/Library/Fonts/Apple Symbols.ttf",
|
|
102
|
-
"/System/Library/Fonts/Supplemental/Arial Unicode.ttf",
|
|
103
|
-
"/usr/share/fonts/truetype/noto/NotoSansSymbols2-Regular.ttf",
|
|
104
|
-
"/usr/share/fonts/truetype/noto/NotoSansSymbols-Regular.ttf",
|
|
105
|
-
"/usr/share/fonts/truetype/ancient-scripts/Symbola_hint.ttf",
|
|
106
|
-
"/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf",
|
|
107
|
-
};
|
|
108
|
-
|
|
109
53
|
struct Engine {
|
|
110
|
-
bool initialized = false;
|
|
111
|
-
bool font_loaded = false;
|
|
112
|
-
std::string sans_path;
|
|
113
|
-
std::string mono_path;
|
|
114
|
-
std::vector<std::string> sans_fallbacks;
|
|
115
|
-
std::vector<std::string> mono_fallbacks;
|
|
116
54
|
std::unordered_map<std::string, std::shared_ptr<const std::vector<unsigned char>>> data;
|
|
117
55
|
std::unordered_map<std::string, std::unique_ptr<Font>> cache; // key -> face (may be null)
|
|
118
|
-
std::unordered_map<std::string, std::vector<Font *>> fallbacks; //
|
|
119
|
-
std::unordered_map<std::string, Font *> primary;
|
|
56
|
+
std::unordered_map<std::string, std::vector<Font *>> fallbacks; // face+size -> faces
|
|
57
|
+
std::unordered_map<std::string, Font *> primary; // spec -> face (may be null)
|
|
120
58
|
};
|
|
121
59
|
|
|
122
60
|
Engine &engine() {
|
|
@@ -124,15 +62,6 @@ Engine &engine() {
|
|
|
124
62
|
return instance;
|
|
125
63
|
}
|
|
126
64
|
|
|
127
|
-
bool fileExists(const char *path) {
|
|
128
|
-
FILE *file = fopen(path, "rb");
|
|
129
|
-
if (file == nullptr) return false;
|
|
130
|
-
fclose(file);
|
|
131
|
-
return true;
|
|
132
|
-
}
|
|
133
|
-
|
|
134
|
-
/* Deliberately crude, deterministic per-byte advance (fraction of the font
|
|
135
|
-
* size). Used only when no font file can be loaded. */
|
|
136
65
|
/* Decode one UTF-8 sequence starting at `index`; advances `index`. */
|
|
137
66
|
uint32_t decodeUtf8(const std::string &text, size_t &index) {
|
|
138
67
|
unsigned char first = (unsigned char)text[index];
|
|
@@ -171,70 +100,6 @@ uint32_t decodeUtf8(const std::string &text, size_t &index) {
|
|
|
171
100
|
return code_point;
|
|
172
101
|
}
|
|
173
102
|
|
|
174
|
-
bool isMonospaceFamily(const std::string &family) {
|
|
175
|
-
return family.find("mono") != std::string::npos || family.find("courier") != std::string::npos ||
|
|
176
|
-
family.find("consol") != std::string::npos || family.find("menlo") != std::string::npos ||
|
|
177
|
-
family.find("code") != std::string::npos;
|
|
178
|
-
}
|
|
179
|
-
|
|
180
|
-
const char *firstExisting(const char *const *candidates, size_t count) {
|
|
181
|
-
for (size_t i = 0; i < count; i++) {
|
|
182
|
-
if (candidates[i] != nullptr && fileExists(candidates[i])) return candidates[i];
|
|
183
|
-
}
|
|
184
|
-
return nullptr;
|
|
185
|
-
}
|
|
186
|
-
|
|
187
|
-
void addFallbackPath(std::vector<std::string> &paths, const char *path) {
|
|
188
|
-
if (path == nullptr || !fileExists(path)) return;
|
|
189
|
-
for (const std::string &entry : paths) {
|
|
190
|
-
if (entry == path) return;
|
|
191
|
-
}
|
|
192
|
-
paths.push_back(path);
|
|
193
|
-
}
|
|
194
|
-
|
|
195
|
-
/* The chain for a primary face: every existing symbol face, then the other
|
|
196
|
-
* family class (CJK coverage for a monospace primary and vice versa). The
|
|
197
|
-
* primary itself is skipped because it is tried first, per codepoint. */
|
|
198
|
-
void buildFallbackChain(std::vector<std::string> &paths, const std::string &primary,
|
|
199
|
-
const std::string &otherClass) {
|
|
200
|
-
for (const char *candidate : kSymbolCandidates) {
|
|
201
|
-
if (candidate != nullptr && primary != candidate) addFallbackPath(paths, candidate);
|
|
202
|
-
}
|
|
203
|
-
if (!otherClass.empty() && otherClass != primary) addFallbackPath(paths, otherClass.c_str());
|
|
204
|
-
}
|
|
205
|
-
|
|
206
|
-
void ensureInitialized() {
|
|
207
|
-
Engine &e = engine();
|
|
208
|
-
if (e.initialized) return;
|
|
209
|
-
e.initialized = true;
|
|
210
|
-
|
|
211
|
-
const size_t sansCount = sizeof(kSansCandidates) / sizeof(kSansCandidates[0]);
|
|
212
|
-
const size_t monoCount = sizeof(kMonoCandidates) / sizeof(kMonoCandidates[0]);
|
|
213
|
-
|
|
214
|
-
const char *env = std::getenv("XT_GUI_FONT");
|
|
215
|
-
if (env != nullptr && env[0] != '\0' && fileExists(env)) e.sans_path = env;
|
|
216
|
-
if (e.sans_path.empty()) {
|
|
217
|
-
const char *path = firstExisting(kSansCandidates, sansCount);
|
|
218
|
-
if (path != nullptr) e.sans_path = path;
|
|
219
|
-
}
|
|
220
|
-
|
|
221
|
-
const char *envMono = std::getenv("XT_GUI_FONT_MONO");
|
|
222
|
-
if (envMono != nullptr && envMono[0] != '\0' && fileExists(envMono)) {
|
|
223
|
-
e.mono_path = envMono;
|
|
224
|
-
} else if (env != nullptr && env[0] != '\0' && fileExists(env) && isMonospaceFamily(env)) {
|
|
225
|
-
e.mono_path = env;
|
|
226
|
-
}
|
|
227
|
-
if (e.mono_path.empty()) {
|
|
228
|
-
const char *path = firstExisting(kMonoCandidates, monoCount);
|
|
229
|
-
if (path != nullptr) e.mono_path = path;
|
|
230
|
-
}
|
|
231
|
-
/* No dedicated monospace face: reuse the sans face so metrics stay real. */
|
|
232
|
-
if (e.mono_path.empty()) e.mono_path = e.sans_path;
|
|
233
|
-
|
|
234
|
-
buildFallbackChain(e.sans_fallbacks, e.sans_path, e.mono_path);
|
|
235
|
-
buildFallbackChain(e.mono_fallbacks, e.mono_path, e.sans_path);
|
|
236
|
-
}
|
|
237
|
-
|
|
238
103
|
/* Read a font file once and share the bytes across every pixel size. */
|
|
239
104
|
std::shared_ptr<const std::vector<unsigned char>> fontData(const std::string &path) {
|
|
240
105
|
Engine &e = engine();
|
|
@@ -261,13 +126,12 @@ std::shared_ptr<const std::vector<unsigned char>> fontData(const std::string &pa
|
|
|
261
126
|
return shared;
|
|
262
127
|
}
|
|
263
128
|
|
|
264
|
-
std::unique_ptr<Font> createFont(const std::string &path,
|
|
265
|
-
Engine &e = engine();
|
|
129
|
+
std::unique_ptr<Font> createFont(const std::string &path, int face_index, float pixel_size) {
|
|
266
130
|
if (path.empty()) return nullptr;
|
|
267
131
|
std::shared_ptr<const std::vector<unsigned char>> data = fontData(path);
|
|
268
132
|
if (data == nullptr || data->empty()) return nullptr;
|
|
269
133
|
|
|
270
|
-
const int offset = stbtt_GetFontOffsetForIndex(data->data(),
|
|
134
|
+
const int offset = stbtt_GetFontOffsetForIndex(data->data(), face_index);
|
|
271
135
|
if (offset < 0) return nullptr;
|
|
272
136
|
stbtt_fontinfo info;
|
|
273
137
|
if (!stbtt_InitFont(&info, data->data(), offset)) return nullptr;
|
|
@@ -276,7 +140,7 @@ std::unique_ptr<Font> createFont(const std::string &path, float pixel_size, bool
|
|
|
276
140
|
font->info = info;
|
|
277
141
|
font->data = std::move(data);
|
|
278
142
|
font->path = path;
|
|
279
|
-
font->
|
|
143
|
+
font->face_index = face_index;
|
|
280
144
|
font->pixel_size = pixel_size;
|
|
281
145
|
font->scale = stbtt_ScaleForPixelHeight(&font->info, pixel_size);
|
|
282
146
|
|
|
@@ -287,46 +151,49 @@ std::unique_ptr<Font> createFont(const std::string &path, float pixel_size, bool
|
|
|
287
151
|
font->ascent = (float)ascent * font->scale;
|
|
288
152
|
font->descent = (float)-descent * font->scale;
|
|
289
153
|
font->line_height = (float)(ascent - descent + line_gap) * font->scale;
|
|
290
|
-
e.font_loaded = true;
|
|
291
154
|
return font;
|
|
292
155
|
}
|
|
293
156
|
|
|
294
|
-
/* Resolve one face by path, keyed by path+
|
|
295
|
-
* through a `FontSpec` and the same face resolved as a
|
|
296
|
-
* `Font` (and one glyph-atlas key). */
|
|
297
|
-
Font *resolveFacePath(const std::string &path,
|
|
157
|
+
/* Resolve one face by path+index, keyed by path+collection index+size so the
|
|
158
|
+
* primary resolved through a `FontSpec` and the same face resolved as a
|
|
159
|
+
* fallback share one `Font` (and one glyph-atlas key). */
|
|
160
|
+
Font *resolveFacePath(const std::string &path, int face_index, float pixel_size) {
|
|
298
161
|
Engine &e = engine();
|
|
299
162
|
if (path.empty()) return nullptr;
|
|
300
|
-
char
|
|
301
|
-
std::snprintf(
|
|
302
|
-
|
|
163
|
+
char header[64];
|
|
164
|
+
std::snprintf(header, sizeof(header), "p|%d|%.2f|", face_index, (double)pixel_size);
|
|
165
|
+
std::string key = header;
|
|
166
|
+
key += path;
|
|
303
167
|
auto it = e.cache.find(key);
|
|
304
168
|
if (it != e.cache.end()) return it->second.get();
|
|
305
|
-
std::unique_ptr<Font> font = createFont(path,
|
|
169
|
+
std::unique_ptr<Font> font = createFont(path, face_index, pixel_size);
|
|
306
170
|
Font *raw = font.get();
|
|
307
|
-
e.cache.emplace(key, std::move(font));
|
|
171
|
+
e.cache.emplace(std::move(key), std::move(font));
|
|
308
172
|
return raw;
|
|
309
173
|
}
|
|
310
174
|
|
|
311
|
-
/* The resolved fallback faces for a primary, in order, cached per
|
|
175
|
+
/* The resolved fallback faces for a primary, in order, cached per face+size. */
|
|
312
176
|
const std::vector<Font *> &fallbackFaces(Font *font) {
|
|
313
177
|
static const std::vector<Font *> kEmpty;
|
|
314
178
|
if (font == nullptr) return kEmpty;
|
|
315
179
|
Engine &e = engine();
|
|
316
|
-
char
|
|
317
|
-
std::snprintf(
|
|
318
|
-
|
|
180
|
+
char header[64];
|
|
181
|
+
std::snprintf(header, sizeof(header), "f|%.2f|", (double)font->pixel_size);
|
|
182
|
+
std::string key = header;
|
|
183
|
+
key += font->path;
|
|
184
|
+
key += '#';
|
|
185
|
+
key += std::to_string(font->face_index);
|
|
319
186
|
auto it = e.fallbacks.find(key);
|
|
320
187
|
if (it != e.fallbacks.end()) return it->second;
|
|
321
188
|
|
|
322
|
-
|
|
323
|
-
|
|
189
|
+
std::vector<FontFaceRef> candidates;
|
|
190
|
+
xt_font_fallback_faces(FontFaceRef{font->path, font->face_index}, true, candidates);
|
|
324
191
|
std::vector<Font *> faces;
|
|
325
|
-
for (const
|
|
326
|
-
Font *face = resolveFacePath(path,
|
|
192
|
+
for (const FontFaceRef &ref : candidates) {
|
|
193
|
+
Font *face = resolveFacePath(ref.path, ref.index, font->pixel_size);
|
|
327
194
|
if (face != nullptr) faces.push_back(face);
|
|
328
195
|
}
|
|
329
|
-
return e.fallbacks.emplace(key, std::move(faces)).first->second;
|
|
196
|
+
return e.fallbacks.emplace(std::move(key), std::move(faces)).first->second;
|
|
330
197
|
}
|
|
331
198
|
|
|
332
199
|
/* The face that draws `code_point`: the primary when it has the glyph, else the
|
|
@@ -378,35 +245,29 @@ float shapeSegment(const std::string &segment, Font *font, std::vector<ShapedGly
|
|
|
378
245
|
} // namespace
|
|
379
246
|
|
|
380
247
|
Font *xt_text_stb_resolve(const FontSpec &spec) {
|
|
381
|
-
ensureInitialized();
|
|
382
248
|
Engine &e = engine();
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
std::
|
|
249
|
+
char suffix[80];
|
|
250
|
+
std::snprintf(suffix, sizeof(suffix), "|%d|%d|%.4f", spec.weight, spec.italic ? 1 : 0,
|
|
251
|
+
(double)spec.pixel_size);
|
|
252
|
+
std::string key = spec.family;
|
|
253
|
+
key += suffix;
|
|
387
254
|
auto cached = e.primary.find(key);
|
|
388
255
|
if (cached != e.primary.end()) return cached->second;
|
|
389
256
|
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
const size_t count = mono ? sizeof(kMonoCandidates) / sizeof(kMonoCandidates[0])
|
|
397
|
-
: sizeof(kSansCandidates) / sizeof(kSansCandidates[0]);
|
|
398
|
-
for (size_t i = 0; i < count && font == nullptr; i++) {
|
|
399
|
-
if (candidates[i] == nullptr || path == candidates[i]) continue;
|
|
400
|
-
font = resolveFacePath(candidates[i], spec.pixel_size, mono);
|
|
401
|
-
}
|
|
257
|
+
std::vector<FontFaceRef> faces;
|
|
258
|
+
xt_font_face_candidates(spec, true, faces);
|
|
259
|
+
Font *font = nullptr;
|
|
260
|
+
for (const FontFaceRef &ref : faces) {
|
|
261
|
+
font = resolveFacePath(ref.path, ref.index, spec.pixel_size);
|
|
262
|
+
if (font != nullptr) break;
|
|
402
263
|
}
|
|
403
|
-
e.primary.emplace(key, font);
|
|
264
|
+
e.primary.emplace(std::move(key), font);
|
|
404
265
|
return font;
|
|
405
266
|
}
|
|
406
267
|
|
|
407
268
|
Font *xt_text_stb_scale(Font *font, float pixel_size) {
|
|
408
269
|
if (font == nullptr) return nullptr;
|
|
409
|
-
return resolveFacePath(font->path,
|
|
270
|
+
return resolveFacePath(font->path, font->face_index, pixel_size);
|
|
410
271
|
}
|
|
411
272
|
|
|
412
273
|
float xt_text_stb_shape(const std::string &utf8, Font *font, std::vector<ShapedGlyph> &out) {
|
|
@@ -475,8 +336,8 @@ void xt_text_stb_metrics(const FontSpec &spec, float *ascent, float *descent, fl
|
|
|
475
336
|
}
|
|
476
337
|
|
|
477
338
|
bool xt_text_stb_ready() {
|
|
478
|
-
|
|
479
|
-
return
|
|
339
|
+
FontSpec spec;
|
|
340
|
+
return xt_text_stb_resolve(spec) != nullptr;
|
|
480
341
|
}
|
|
481
342
|
|
|
482
343
|
void xt_text_stb_shutdown() {
|
|
@@ -486,15 +347,10 @@ void xt_text_stb_shutdown() {
|
|
|
486
347
|
e.fallbacks.clear();
|
|
487
348
|
e.cache.clear();
|
|
488
349
|
e.data.clear();
|
|
489
|
-
e.font_loaded = false;
|
|
490
|
-
e.initialized = false;
|
|
491
|
-
e.sans_path.clear();
|
|
492
|
-
e.mono_path.clear();
|
|
493
|
-
e.sans_fallbacks.clear();
|
|
494
|
-
e.mono_fallbacks.clear();
|
|
495
350
|
}
|
|
496
351
|
|
|
497
352
|
} // namespace xtgui
|
|
353
|
+
|
|
498
354
|
namespace xtgui {
|
|
499
355
|
|
|
500
356
|
const TextApi *xt_text_stb_api() {
|
|
@@ -32,16 +32,25 @@ bool isSpace(char c) { return xt_is_css_space(c); }
|
|
|
32
32
|
|
|
33
33
|
std::string trim(const std::string &text) { return xt_css_trim(text); }
|
|
34
34
|
|
|
35
|
-
/** Split `a, b` / `a b` / `a,b` into its arguments
|
|
35
|
+
/** Split `a, b` / `a b` / `a,b` into its arguments, keeping a nested
|
|
36
|
+
* `calc(10px + 2px)` argument together. */
|
|
36
37
|
std::vector<std::string> splitArgs(const std::string &text) {
|
|
37
38
|
std::vector<std::string> parts;
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
if (
|
|
39
|
+
std::string current;
|
|
40
|
+
int depth = 0;
|
|
41
|
+
for (char c : text) {
|
|
42
|
+
if (c == '(') depth++;
|
|
43
|
+
if (c == ')') depth--;
|
|
44
|
+
if ((isSpace(c) || c == ',') && depth == 0) {
|
|
45
|
+
if (!current.empty()) {
|
|
46
|
+
parts.push_back(current);
|
|
47
|
+
current.clear();
|
|
48
|
+
}
|
|
49
|
+
} else {
|
|
50
|
+
current.push_back(c);
|
|
51
|
+
}
|
|
44
52
|
}
|
|
53
|
+
if (!current.empty()) parts.push_back(current);
|
|
45
54
|
return parts;
|
|
46
55
|
}
|
|
47
56
|
|
|
@@ -134,6 +143,24 @@ bool applyFunction(const std::string &name, const std::vector<std::string> &args
|
|
|
134
143
|
op->kind = TransformKind::Rotate;
|
|
135
144
|
return parseAngleArg(args[0], &op->angle);
|
|
136
145
|
}
|
|
146
|
+
if (name == "skew") {
|
|
147
|
+
if (args.empty() || args.size() > 2) return false;
|
|
148
|
+
op->kind = TransformKind::Skew;
|
|
149
|
+
if (!parseAngleArg(args[0], &op->skew_x)) return false;
|
|
150
|
+
op->skew_y = 0.0f;
|
|
151
|
+
if (args.size() > 1 && !parseAngleArg(args[1], &op->skew_y)) return false;
|
|
152
|
+
return true;
|
|
153
|
+
}
|
|
154
|
+
if (name == "skewx") {
|
|
155
|
+
if (args.size() != 1) return false;
|
|
156
|
+
op->kind = TransformKind::SkewX;
|
|
157
|
+
return parseAngleArg(args[0], &op->skew_x);
|
|
158
|
+
}
|
|
159
|
+
if (name == "skewy") {
|
|
160
|
+
if (args.size() != 1) return false;
|
|
161
|
+
op->kind = TransformKind::SkewY;
|
|
162
|
+
return parseAngleArg(args[0], &op->skew_y);
|
|
163
|
+
}
|
|
137
164
|
if (name == "matrix") {
|
|
138
165
|
if (args.size() != 6) return false;
|
|
139
166
|
op->kind = TransformKind::Matrix;
|
|
@@ -142,7 +169,7 @@ bool applyFunction(const std::string &name, const std::vector<std::string> &args
|
|
|
142
169
|
}
|
|
143
170
|
return true;
|
|
144
171
|
}
|
|
145
|
-
return false; //
|
|
172
|
+
return false; // perspective/… are not supported yet
|
|
146
173
|
}
|
|
147
174
|
|
|
148
175
|
float resolveLength(const Length &length, float base, float em, float vw, float vh) {
|
|
@@ -150,7 +177,13 @@ float resolveLength(const Length &length, float base, float em, float vw, float
|
|
|
150
177
|
}
|
|
151
178
|
|
|
152
179
|
bool sameLength(const Length &left, const Length &right) {
|
|
153
|
-
|
|
180
|
+
if (left.unit != right.unit || left.value != right.value || left.op != right.op ||
|
|
181
|
+
left.args.size() != right.args.size())
|
|
182
|
+
return false;
|
|
183
|
+
for (size_t i = 0; i < left.args.size(); i++) {
|
|
184
|
+
if (!sameLength(left.args[i], right.args[i])) return false;
|
|
185
|
+
}
|
|
186
|
+
return true;
|
|
154
187
|
}
|
|
155
188
|
|
|
156
189
|
bool sameOp(const TransformOp &left, const TransformOp &right) {
|
|
@@ -170,6 +203,12 @@ bool sameOp(const TransformOp &left, const TransformOp &right) {
|
|
|
170
203
|
return left.scale_y == right.scale_y;
|
|
171
204
|
case TransformKind::Rotate:
|
|
172
205
|
return left.angle == right.angle;
|
|
206
|
+
case TransformKind::Skew:
|
|
207
|
+
return left.skew_x == right.skew_x && left.skew_y == right.skew_y;
|
|
208
|
+
case TransformKind::SkewX:
|
|
209
|
+
return left.skew_x == right.skew_x;
|
|
210
|
+
case TransformKind::SkewY:
|
|
211
|
+
return left.skew_y == right.skew_y;
|
|
173
212
|
case TransformKind::Matrix:
|
|
174
213
|
for (int i = 0; i < 6; i++) {
|
|
175
214
|
if (left.matrix[i] != right.matrix[i]) return false;
|
|
@@ -181,6 +220,25 @@ bool sameOp(const TransformOp &left, const TransformOp &right) {
|
|
|
181
220
|
|
|
182
221
|
bool mixLength(const Length &from, const Length &to, float t, Length *out) {
|
|
183
222
|
if (from.unit != to.unit) return false;
|
|
223
|
+
if (from.unit == Unit::Calc) {
|
|
224
|
+
if (from.op != to.op || from.args.size() != to.args.size()) return false;
|
|
225
|
+
out->unit = Unit::Calc;
|
|
226
|
+
out->op = from.op;
|
|
227
|
+
out->args.resize(from.args.size());
|
|
228
|
+
for (size_t i = 0; i < from.args.size(); i++) {
|
|
229
|
+
if (!mixLength(from.args[i], to.args[i], t, &out->args[i])) return false;
|
|
230
|
+
}
|
|
231
|
+
return true;
|
|
232
|
+
}
|
|
233
|
+
if (from.unit == Unit::Clamp || from.unit == Unit::Min || from.unit == Unit::Max) {
|
|
234
|
+
if (from.args.size() != to.args.size()) return false;
|
|
235
|
+
out->unit = from.unit;
|
|
236
|
+
out->args.resize(from.args.size());
|
|
237
|
+
for (size_t i = 0; i < from.args.size(); i++) {
|
|
238
|
+
if (!mixLength(from.args[i], to.args[i], t, &out->args[i])) return false;
|
|
239
|
+
}
|
|
240
|
+
return true;
|
|
241
|
+
}
|
|
184
242
|
out->unit = from.unit;
|
|
185
243
|
out->value = from.value + (to.value - from.value) * t;
|
|
186
244
|
return true;
|
|
@@ -308,6 +366,16 @@ bool xt_transform_interpolate(const std::vector<TransformOp> &from,
|
|
|
308
366
|
case TransformKind::Rotate:
|
|
309
367
|
op.angle = left.angle + (right.angle - left.angle) * t;
|
|
310
368
|
break;
|
|
369
|
+
case TransformKind::Skew:
|
|
370
|
+
op.skew_x = left.skew_x + (right.skew_x - left.skew_x) * t;
|
|
371
|
+
op.skew_y = left.skew_y + (right.skew_y - left.skew_y) * t;
|
|
372
|
+
break;
|
|
373
|
+
case TransformKind::SkewX:
|
|
374
|
+
op.skew_x = left.skew_x + (right.skew_x - left.skew_x) * t;
|
|
375
|
+
break;
|
|
376
|
+
case TransformKind::SkewY:
|
|
377
|
+
op.skew_y = left.skew_y + (right.skew_y - left.skew_y) * t;
|
|
378
|
+
break;
|
|
311
379
|
case TransformKind::Matrix:
|
|
312
380
|
for (int entry = 0; entry < 6; entry++) {
|
|
313
381
|
op.matrix[entry] = left.matrix[entry] + (right.matrix[entry] - left.matrix[entry]) * t;
|
|
@@ -349,6 +417,16 @@ Matrix2D xt_transform_matrix(const std::vector<TransformOp> &ops, float percent_
|
|
|
349
417
|
case TransformKind::Rotate:
|
|
350
418
|
step = Matrix2D::rotate(op.angle);
|
|
351
419
|
break;
|
|
420
|
+
case TransformKind::Skew:
|
|
421
|
+
step.c = std::tan(op.skew_x);
|
|
422
|
+
step.b = std::tan(op.skew_y);
|
|
423
|
+
break;
|
|
424
|
+
case TransformKind::SkewX:
|
|
425
|
+
step.c = std::tan(op.skew_x);
|
|
426
|
+
break;
|
|
427
|
+
case TransformKind::SkewY:
|
|
428
|
+
step.b = std::tan(op.skew_y);
|
|
429
|
+
break;
|
|
352
430
|
case TransformKind::Matrix:
|
|
353
431
|
step.a = op.matrix[0];
|
|
354
432
|
step.b = op.matrix[1];
|
|
@@ -396,6 +474,26 @@ std::string xt_transform_to_string(const std::vector<TransformOp> &ops) {
|
|
|
396
474
|
text += buffer;
|
|
397
475
|
break;
|
|
398
476
|
}
|
|
477
|
+
case TransformKind::Skew: {
|
|
478
|
+
char buffer[96];
|
|
479
|
+
std::snprintf(buffer, sizeof(buffer), "skew(%.4gdeg, %.4gdeg)",
|
|
480
|
+
(double)(op.skew_x * 180.0f / kPi),
|
|
481
|
+
(double)(op.skew_y * 180.0f / kPi));
|
|
482
|
+
text += buffer;
|
|
483
|
+
break;
|
|
484
|
+
}
|
|
485
|
+
case TransformKind::SkewX: {
|
|
486
|
+
char buffer[64];
|
|
487
|
+
std::snprintf(buffer, sizeof(buffer), "skewX(%.4gdeg)", (double)(op.skew_x * 180.0f / kPi));
|
|
488
|
+
text += buffer;
|
|
489
|
+
break;
|
|
490
|
+
}
|
|
491
|
+
case TransformKind::SkewY: {
|
|
492
|
+
char buffer[64];
|
|
493
|
+
std::snprintf(buffer, sizeof(buffer), "skewY(%.4gdeg)", (double)(op.skew_y * 180.0f / kPi));
|
|
494
|
+
text += buffer;
|
|
495
|
+
break;
|
|
496
|
+
}
|
|
399
497
|
case TransformKind::Matrix: {
|
|
400
498
|
char buffer[160];
|
|
401
499
|
std::snprintf(buffer, sizeof(buffer), "matrix(%.6g, %.6g, %.6g, %.6g, %.6g, %.6g)",
|
|
@@ -67,6 +67,9 @@ enum class TransformKind {
|
|
|
67
67
|
ScaleX,
|
|
68
68
|
ScaleY,
|
|
69
69
|
Rotate,
|
|
70
|
+
Skew,
|
|
71
|
+
SkewX,
|
|
72
|
+
SkewY,
|
|
70
73
|
Matrix,
|
|
71
74
|
};
|
|
72
75
|
|
|
@@ -79,6 +82,8 @@ struct TransformOp {
|
|
|
79
82
|
float scale_x = 1.0f; // scale x (a unitless factor)
|
|
80
83
|
float scale_y = 1.0f; // scale y
|
|
81
84
|
float angle = 0.0f; // rotate, in radians
|
|
85
|
+
float skew_x = 0.0f; // skew X angle, in radians
|
|
86
|
+
float skew_y = 0.0f; // skew Y angle, in radians
|
|
82
87
|
float matrix[6] = {1, 0, 0, 1, 0, 0}; // a b c d e f
|
|
83
88
|
};
|
|
84
89
|
|
|
@@ -254,7 +254,7 @@ static xt_value win_inline_svg(xt_value self, xt_value env, int32_t argc, xt_val
|
|
|
254
254
|
const xtgui::Node *node = win->document->querySelector(selector);
|
|
255
255
|
const XtImageApi *images = xt_image_api();
|
|
256
256
|
if (images == nullptr || !images->inline_is_root(node)) return XT_UNDEFINED;
|
|
257
|
-
std::string markup = images->inline_serialize(node);
|
|
257
|
+
std::string markup = images->inline_serialize(node, &win->document->styles());
|
|
258
258
|
int width = 0, height = 0;
|
|
259
259
|
images->svg_markup_size(markup, &width, &height);
|
|
260
260
|
xt_value object = xt_object_new();
|