mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-19 04:46:08 +00:00
* Support CJK text with the device's own fonts The Linux runtime's rootfs ships DejaVu alone, which has no CJK glyphs, so Chinese, Japanese and Korean text in Steam Big Picture and on the LXQt desktop draws as tofu boxes (issues #118, #206, #249). Bind the device's own CJK fonts - Android's world-readable Noto CJK .ttc, or DroidSansFallback / Source Han - into the guest under /usr/share/fonts/droiddeck-cjk, so nothing is added to the ~790 MB runtime image and the coverage follows the device. A new droiddeck-fonts script, run by droiddeck-session before any program that queries fontconfig, links the default rules, writes local.conf with DejaVu first and the CJK families after it, and rebuilds the fontconfig cache once per set of font files. The desktop's own fontconfig block moves there, so every mode gets it. * Fix CJK and Thai: bind the device font directory, not one file at a time The first cut bound each device font with its own proot -b host:guest. A per-file binding into a plain directory is not applied here: the guest sees a zero-byte placeholder where the font should be (stat size=0, fc-scan empty), so Chinese stayed tofu even though the app had "bound" the font. A directory binding is what the rest of the runtime relies on, so bind /system/fonts as a whole under /usr/share/fonts/droiddeck-device. That also brings Thai, Arabic, Devanagari and the emoji fonts, which the runtime did not have either. Verified on the AYN Thor: the session's fontconfig probe reports sans=DejaVu Sans, zh=Noto Sans CJK SC, th=Noto Serif Thai, and Steam Big Picture in Simplified Chinese renders without tofu (screenshot under docs/development/evidence/). --------- Co-authored-by: xXJsonDeruloXx <danielhimebauch@gmail.com>
47 lines
2.1 KiB
Bash
Executable File
47 lines
2.1 KiB
Bash
Executable File
#!/bin/bash
|
|
# DroidDeck's fontconfig setup for the Linux runtime. The rootfs ships DejaVu alone and no rules
|
|
# for a default family: applications then find fonts but no default, and Firefox logs "no fonts"
|
|
# and draws pages without text. DejaVu also has no CJK, Thai or Arabic glyphs, so those draw as
|
|
# tofu boxes. The app binds Android's fonts for the session, which adds language-specific fallbacks
|
|
# separately. This script links fontconfig's default rules and writes generic DejaVu aliases to an
|
|
# owned conf.d file. Fontconfig reads local.conf afterward, so user overrides keep precedence and
|
|
# are never replaced.
|
|
# The first argument is the root to set up, "/" in a session; the tests point it at a temp tree.
|
|
set -u
|
|
root=${1:-/}
|
|
root=${root%/}
|
|
# "/" strips to empty above; put it back so the paths below read as absolute and the test for a
|
|
# real session ("/") still holds.
|
|
[ -n "$root" ] || root=/
|
|
conf_dir=$root/etc/fonts
|
|
defaults_dir=$root/usr/share/fontconfig/conf.default
|
|
mkdir -p "$conf_dir/conf.d" 2>/dev/null
|
|
|
|
# The default rules (sans-serif -> DejaVu Sans and the rest) live as links in /etc/fonts/conf.d,
|
|
# and the rootfs has none. Linked by name, so a file we ship is never overwritten.
|
|
if [ -d "$defaults_dir" ]; then
|
|
for f in "$defaults_dir"/*.conf; do
|
|
[ -e "$f" ] || continue
|
|
[ -e "$conf_dir/conf.d/${f##*/}" ] || ln -sf "$f" "$conf_dir/conf.d/${f##*/}"
|
|
done
|
|
fi
|
|
|
|
owned_conf=$conf_dir/conf.d/65-droiddeck-default-fonts.conf
|
|
{
|
|
echo '<?xml version="1.0"?><!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"><fontconfig>'
|
|
for generic in sans-serif sans serif monospace mono cursive fantasy system-ui ui-sans-serif; do
|
|
case $generic in
|
|
serif) face="DejaVu Serif" ;;
|
|
mono*|ui-mono) face="DejaVu Sans Mono" ;;
|
|
*) face="DejaVu Sans" ;;
|
|
esac
|
|
printf '<alias binding="weak"><family>%s</family><prefer><family>%s</family></prefer></alias>\n' "$generic" "$face"
|
|
done
|
|
echo '</fontconfig>'
|
|
} > "$owned_conf.new"
|
|
if ! cmp -s "$owned_conf.new" "$owned_conf" 2>/dev/null; then
|
|
mv -f "$owned_conf.new" "$owned_conf"
|
|
echo "== fontconfig: wrote DejaVu defaults"
|
|
fi
|
|
rm -f "$owned_conf.new"
|