Major font work, terminal enhancements.

Makefile

@@ -57,15 +57,15 @@ loader: libdvx libtasks
 	$(MAKE) -C src/loader
 
 # Every .wgt recipe runs bin/host/dvxres, so widgets need the tools.
-widgets: libdvx libtasks texthelp listhelp tools
+widgets: libdvx libtasks texthelp listhelp richtext tools
 	$(MAKE) -C src/widgets/kpunch
 
 tools:
 	$(MAKE) -C src/tools
 
-# SETUP.EXE (bin/setup.exe, a static build of the core it needs) and the
+# SETUP.EXE (bin/setup.exe, a static build of the core it needs, with
-# package tool bin/host/dvxpkg.
+# fonts mkfont makes) and the package tool bin/host/dvxpkg.
-installer:
+installer: tools
 	$(MAKE) -C src/installer
 
 # Release media in dist/: the CD image and floppy images (FLOPPY=360K,
@@ -218,20 +218,21 @@ include src/sdkHeaders.mk
 # The SDK's own files (README, sdk.mk, newProject.sh, project templates)
 # live in src/sdk; its bin/ holds the host tools a project build runs.
 SDK_SRC   = src/sdk
-SDK_TOOLS = bin/host/dvxres bin/host/dvxhlpc bin/host/bascomp src/tools/dxeGen.sh
+SDK_TOOLS = bin/host/dvxres bin/host/dvxhlpc bin/host/bascomp bin/host/mkfont src/tools/dxeGen.sh
 
-# The host tools come from tools (dvxres, dvxhlpc) and apps (bascomp).
+# The host tools come from tools (dvxres, dvxhlpc, mkfont) and apps (bascomp).
 deploy-sdk: tools apps
 	@echo "Building SDK..."
 	@# Start from an empty tree so a header dropped from the lists goes away.
 	rm -rf $(SDKDIR)
-	@mkdir -p $(SDKDIR)/bin $(SDKDIR)/include/core $(SDKDIR)/include/shell $(SDKDIR)/include/tasks $(SDKDIR)/include/sql $(SDKDIR)/include/texthelp $(SDKDIR)/include/listhelp $(SDKDIR)/include/fileops $(SDKDIR)/include/hlpfile $(SDKDIR)/include/xfer $(SDKDIR)/include/conn $(SDKDIR)/include/print $(SDKDIR)/include/game $(SDKDIR)/include/joystick $(SDKDIR)/include/audio $(SDKDIR)/include/music $(SDKDIR)/include/net $(SDKDIR)/include/basic $(SDKDIR)/samples/basic/basdemo $(SDKDIR)/samples/basic/widshow
+	@mkdir -p $(SDKDIR)/bin $(SDKDIR)/include/core $(SDKDIR)/include/shell $(SDKDIR)/include/tasks $(SDKDIR)/include/sql $(SDKDIR)/include/texthelp $(SDKDIR)/include/listhelp $(SDKDIR)/include/richtext $(SDKDIR)/include/fileops $(SDKDIR)/include/hlpfile $(SDKDIR)/include/xfer $(SDKDIR)/include/conn $(SDKDIR)/include/print $(SDKDIR)/include/game $(SDKDIR)/include/joystick $(SDKDIR)/include/audio $(SDKDIR)/include/music $(SDKDIR)/include/net $(SDKDIR)/include/basic $(SDKDIR)/samples/basic/basdemo $(SDKDIR)/samples/basic/widshow
 	cp $(SDK_CORE_H) $(SDKDIR)/include/core/
 	cp $(SDK_SHELL_H) $(SDKDIR)/include/shell/
 	cp $(SDK_TASKS_H) $(SDKDIR)/include/tasks/
 	cp $(SDK_SQL_H) $(SDKDIR)/include/sql/
 	cp $(SDK_TEXTHELP_H) $(SDKDIR)/include/texthelp/
 	cp $(SDK_LISTHELP_H) $(SDKDIR)/include/listhelp/
+	cp $(SDK_RICHTEXT_H) $(SDKDIR)/include/richtext/
 	cp $(SDK_FILEOPS_H) $(SDKDIR)/include/fileops/
 	cp $(SDK_HLPFILE_H) $(SDKDIR)/include/hlpfile/
 	cp $(SDK_XFER_H) $(SDKDIR)/include/xfer/

README.md

@@ -69,14 +69,15 @@ pinned SHA-256, and unpacks it there (no sudo, nothing outside the
 project); run it again with `--force` to reinstall:
 
 * DJGPP (GCC 12.2.0) and the CWSDPMI stub -- the DOS cross compiler
+* UPX 4.2.4 -- packs `SETUP.EXE` to about half its size
 * 86Box 6.0 and its ROM set, FreeDOS 1.3 boot files and CuteMouse,
   and DOSBox Staging 0.83.0 -- the emulator test harness
 * cppcheck 2.21, built from source -- used by the static gate
 * lrzsz 0.12.20 -- the Terminal tests' ZMODEM peer
 
-It needs curl, tar, bzip2, xz, unzip, make, g++, mtools and xvfb-run.
+It needs curl, tar, bzip2, xz, unzip, make, g++, mtools, and xvfb-run.
-To build with a different DOS toolchain, pass `DJGPP_PREFIX=...` and
+To build with a different DOS toolchain, pass `DJGPP_PREFIX=...`,
-`CWSDSTUB=...` to `make`.
+`CWSDSTUB=...`, and `UPX=...` to `make`.
 
 `make` builds in dependency order: core, tasks, loader, helpers,
 host tools, widgets, shell, task manager, apps. Build output goes to
@@ -92,7 +93,7 @@ subset. The emulators never touch your home directory. See
 `make dist` builds the release media in `dist/`: a CD image
 (`DVX.ISO`: `SETUP.EXE` with the DVX package appended, and
 `README.TXT`) and a set of floppy images (`make dist FLOPPY=720K`;
-360K, 720K, 1.2M, 1.44M (default), 2.88M or a number of bytes per
+360K, 720K, 1.2M, 1.44M (default), 2.88M, or a number of bytes per
 disk). On the target machine, type `SETUP` on the CD or Disk 1: Setup
 installs DVX in a hard-disk folder (and can add it to AUTOEXEC.BAT);
 the `SETUP.EXE` it leaves in that folder uninstalls. `./mkcd.sh` wraps
@@ -130,7 +131,7 @@ dvxgui/
 See `src/tools/README.md` for the host-side development tools
 (resource tool, icon generators, help compiler, proxy), and
 `src/apps/kpunch/README.md` for the SDK contract applications must
-follow.  `make` also writes the SDK to `bin/sdk`: headers, host tools
+follow.  `make` also writes the SDK to `bin/sdk`: headers, host tools,
 and a template for each kind of module (`bin/sdk/newProject.sh app
 NAME`); the SDK Quick Start in the system help walks through it.
 

cppcheck.sh

@@ -24,6 +24,7 @@ INCLUDES=(
     -Isrc/libs/kpunch/libtasks
     -Isrc/libs/kpunch/texthelp
     -Isrc/libs/kpunch/listhelp
+    -Isrc/libs/kpunch/richtext
     -Isrc/libs/kpunch/dvxshell
     -Isrc/libs/kpunch/taskmgr
     -Isrc/libs/kpunch/serial

docs/dvx_help_viewer.html

@@ -59,7 +59,7 @@ img { max-width: 100%; }
 <div class="topic" id="help.overview">
 <h1>DVX Help Viewer</h1>
 <p>DVX Help shows help pages. The list on the left is the table of contents, the page you are reading is on the right, and underlined words are links to other pages. You can also look things up in the Index or with Search.</p>
-<blockquote><strong>Tip:</strong> New to DVX? Click the Program Manager window and press F1, or choose DVX Help from the Program Manager's Help menu, to open the DVX user guide. It explains how to start programs, work with windows, menus and dialog boxes, and everything else that works the same in every program. Each program's own commands are explained in that program's help: press F1 while you work in it.</blockquote>
+<blockquote><strong>Tip:</strong> New to DVX? Click the Program Manager window and press F1, or choose DVX Help from the Program Manager's Help menu, to open the DVX user guide. It explains how to start programs, work with windows, menus, and dialog boxes, and everything else that works the same in every program. Each program's own commands are explained in that program's help: press F1 while you work in it.</blockquote>
 <h2>Opening Help</h2>
 <p>Press F1 from any DVX application to open context-sensitive help. Applications can register their own help file and topic so F1 opens the relevant page.</p>
 <p>If the help viewer is already running, F1 reuses its window: the requested page is shown there (loading the other application's help file if needed, which starts a fresh Back/Forward history) and the window is brought to the front. The Help menu of the Program Manager does the same. F1 pressed in the help viewer itself shows this help about the viewer. While the viewer's Index or Search dialog is open, the page asked for with F1 is shown once the dialog closes.</p>
@@ -97,7 +97,7 @@ img { max-width: 100%; }
   .link &lt;id&gt; &lt;text&gt;    Hyperlink to another topic in the same help
                        file (see Links below)
   .image &lt;file&gt; [left|center|right]
-                       Inline image (BMP, PNG, JPEG or GIF), path
+                       Inline image (BMP, PNG, JPEG, or GIF), path
                        relative to the -i directory</pre>
 <h2>Block Directives</h2>
 <pre>  .list                Start a bulleted list
@@ -169,11 +169,11 @@ This is a warning message.
                       skipped)</pre>
 <p>Multiple input files are merged into a single help file. This allows per-widget or per-feature documentation fragments to be combined automatically.</p>
 <h2>Input Files</h2>
-<p>Each input file starts fresh: no topic is current and no .list, .note, .code or .table block is left open from the previous file. Text before a file's first .topic is ignored, and directives there are errors. A .code or .table block still open at the end of a file is closed with a warning. Files named with .include are different: they are read in place, as if their lines were part of the including file.</p>
+<p>Each input file starts fresh: no topic is current and no .list, .note, .code, or .table block is left open from the previous file. Text before a file's first .topic is ignored, and directives there are errors. A .code or .table block still open at the end of a file is closed with a warning. Files named with .include are different: they are read in place, as if their lines were part of the including file.</p>
 <p>Source lines longer than 4094 characters, and lines that contain a NUL byte, are errors. The .image directive may name a path relative to the -i directory, including a subdirectory (for example sub/pic.png).</p>
 <p>If any error is reported the compile stops and the previous output file is kept.</p>
 <h2>Links</h2>
-<p>Every .link must name a topic that is compiled into the same help file: a topic in any of the input files or the files they include, before or after the link. A link to any other ID is an error that names the file, the line and the missing ID. The one exception is the help DVX rebuilds by itself when it starts after programs, widgets or libraries were added or removed: there a link to a topic that is no longer present shows as plain text instead, so removing a piece of DVX never breaks the rest of the help. Links cannot reach into another help file; name the other file's page in the text instead. A .link line inside a .code block is example text and is never checked.</p>
+<p>Every .link must name a topic that is compiled into the same help file: a topic in any of the input files or the files they include, before or after the link. A link to any other ID is an error that names the file, the line, and the missing ID. The one exception is the help DVX rebuilds by itself when it starts after programs, widgets, or libraries were added or removed: there a link to a topic that is no longer present shows as plain text instead, so removing a piece of DVX never breaks the rest of the help. Links cannot reach into another help file; name the other file's page in the text instead. A .link line inside a .code block is example text and is never checked.</p>
 <h2>Build Integration</h2>
 <p>The standard build pattern globs all fragments:</p>
 <pre><code>dvxhlpc -o dvxhelp.hlp docs/src/overview.dhs widgets/*/*.dhs</code></pre>

installToolchain.sh

@@ -31,6 +31,8 @@
 #                        linux64 release of andrewwutw/build-djgpp v3.4)
 #   toolchains/cwsdpmi   CWSDPMI r7 (csdpmi7b.zip); src/common.mk uses
 #                        toolchains/cwsdpmi/bin/bin/CWSDSTUB.EXE
+#   toolchains/upx       UPX 4.2.4 (amd64 Linux release), which packs
+#                        SETUP.EXE (src/installer/Makefile)
 #   toolchains/86box     86Box v6.0 (build 9001) x86_64 Linux AppImage,
 #                        extracted once into app/ (no FUSE needed), and
 #                        the matching 86Box ROM set (tag v6.0) in roms/
@@ -53,6 +55,10 @@
 #   toolchains/soundfont installMusicRefs.sh, which pins them): the
 #                        emu8950 OPL2 emulator (host suite) and a General
 #                        MIDI sound font for 86Box's MIDI (DOS tests)
+#   toolchains/freetype  the fonts' inputs (src/fonts/installFonts.sh,
+#   toolchains/fonts     which pins them): FreeType for the font converter,
+#                        built from source, and every font DVX converts
+#                        and ships, with its licence (src/fonts/sources.txt)
 #
 # Every download is checked against a pinned SHA-256 before it is unpacked,
 # so a changed or corrupted archive is refused instead of installed.
@@ -70,6 +76,10 @@ DJGPP_SHA256="8464f17017d6ab1b2bb2df4ed82357b5bf692e6e2b7fee37e315638f3d505f00"
 DJGPP_VERSION="12.2.0"
 CWSDPMI_URL="https://sandmann.dotster.com/cwsdpmi/csdpmi7b.zip"
 CWSDPMI_SHA256="deacda0488e1cdd7c4a9f32fab45662b34c0ed6b2d7d4d13bc07041b62004a8c"
+UPX_URL="https://github.com/upx/upx/releases/download/v4.2.4/upx-4.2.4-amd64_linux.tar.xz"
+UPX_FILE="upx-4.2.4-amd64_linux.tar.xz"
+UPX_SHA256="75cab4e57ab72fb4585ee45ff36388d280c7afd72aa03e8d4b9c3cbddb474193"
+UPX_VERSION="4.2.4"
 BOX86_URL="https://github.com/86Box/86Box/releases/download/v6.0/86Box-Linux-x86_64-b9001.AppImage"
 BOX86_FILE="86Box-Linux-x86_64-b9001.AppImage"
 BOX86_SHA256="535d3c329f8c32b601103970c86d80aa80298f345452c3524ea2f433624727a4"
@@ -103,6 +113,8 @@ DJGPP_DIR="${TOOLCHAINS}/djgpp"
 CWSDPMI_DIR="${TOOLCHAINS}/cwsdpmi"
 DJGPP_GCC="${DJGPP_DIR}/bin/i586-pc-msdosdjgpp-gcc"
 CWSDSTUB="${CWSDPMI_DIR}/bin/bin/CWSDSTUB.EXE"
+UPX_DIR="${TOOLCHAINS}/upx"
+UPX_BIN="${UPX_DIR}/upx"
 
 # Emulator, FreeDOS and cppcheck locations and the isolated run environment
 DVX_ROOT="${ROOT}"
@@ -200,6 +212,20 @@ else
     echo "installToolchain: CWSDPMI installed in ${CWSDPMI_DIR}"
 fi
 
+# UPX (the release binary, with its licence files)
+if [ "${FORCE}" -eq 0 ] && pinned "${UPX_DIR}" "${UPX_SHA256}" && [ -x "${UPX_BIN}" ]; then
+    echo "installToolchain: UPX ${UPX_VERSION} already installed"
+else
+    fetch "${UPX_URL}" "${UPX_FILE}" "${UPX_SHA256}"
+    rm -rf "${UPX_DIR}.new"
+    mkdir -p "${UPX_DIR}.new"
+    tar -xJf "${CACHE}/${UPX_FILE}" -C "${UPX_DIR}.new" --strip-components=1
+    rm -rf "${UPX_DIR}"
+    mv "${UPX_DIR}.new" "${UPX_DIR}"
+    echo "${UPX_SHA256}" > "${UPX_DIR}/${PIN_FILE}"
+    echo "installToolchain: UPX installed in ${UPX_DIR}"
+fi
+
 # 86Box AppImage, extracted once so it runs without FUSE
 if [ "${FORCE}" -eq 0 ] && pinned "${BOX86_APP}" "${BOX86_SHA256}" && [ -x "${BOX86_BIN}" ]; then
     echo "installToolchain: 86Box already installed"
@@ -313,19 +339,31 @@ else
     "${ROOT}/src/test/music/installMusicRefs.sh"
 fi
 
+# FreeType and the fonts, pinned in their own script
+if [ "${FORCE}" -eq 1 ]; then
+    "${ROOT}/src/fonts/installFonts.sh" --force
+else
+    "${ROOT}/src/fonts/installFonts.sh"
+fi
+
 # Verify what the build needs.
 if [ "$("${DJGPP_GCC}" -dumpfullversion)" != "${DJGPP_VERSION}" ]; then
     echo "installToolchain: ${DJGPP_GCC} is not GCC ${DJGPP_VERSION}" >&2
     exit 1
 fi
 
-for f in "${DJGPP_DIR}/i586-pc-msdosdjgpp/bin/dxe3gen" "${DJGPP_DIR}/i586-pc-msdosdjgpp/bin/exe2coff" "${CWSDSTUB}" "${BOX86_BIN}" "${BOX86_ROMS}/machines" "${FREEDOS_DIR}/MBR.BIN" "${FREEDOS_DIR}/BOOTSECT.BIN" "${FREEDOS_DIR}/KERNEL.SYS" "${FREEDOS_DIR}/COMMAND.COM" "${FREEDOS_DIR}/HIMEMX.EXE" "${FREEDOS_DIR}/UDVD2.SYS" "${FREEDOS_DIR}/SHSUCDX.COM" "${FREEDOS_DIR}/CTMOUSE.EXE" "${DOSBOX_BIN}" "${CPPCHECK_BIN}" "${TOOLCHAINS}/lrzsz/bin/lsz" "${TOOLCHAINS}/pktdrv/NE2000.COM" "${TOOLCHAINS}/emu8950/emu8950.c" "${TOOLCHAINS}/soundfont/TimGM6mb.sf2"; do
+for f in "${DJGPP_DIR}/i586-pc-msdosdjgpp/bin/dxe3gen" "${DJGPP_DIR}/i586-pc-msdosdjgpp/bin/exe2coff" "${CWSDSTUB}" "${UPX_BIN}" "${BOX86_BIN}" "${BOX86_ROMS}/machines" "${FREEDOS_DIR}/MBR.BIN" "${FREEDOS_DIR}/BOOTSECT.BIN" "${FREEDOS_DIR}/KERNEL.SYS" "${FREEDOS_DIR}/COMMAND.COM" "${FREEDOS_DIR}/HIMEMX.EXE" "${FREEDOS_DIR}/UDVD2.SYS" "${FREEDOS_DIR}/SHSUCDX.COM" "${FREEDOS_DIR}/CTMOUSE.EXE" "${DOSBOX_BIN}" "${CPPCHECK_BIN}" "${TOOLCHAINS}/lrzsz/bin/lsz" "${TOOLCHAINS}/pktdrv/NE2000.COM" "${TOOLCHAINS}/emu8950/emu8950.c" "${TOOLCHAINS}/soundfont/TimGM6mb.sf2" "${TOOLCHAINS}/freetype/lib/libfreetype.a" "${TOOLCHAINS}/fonts/.installed"; do
     if [ ! -e "${f}" ]; then
         echo "installToolchain: expected file missing after install: ${f}" >&2
         exit 1
     fi
 done
 
+if [ "$("${UPX_BIN}" --version | head -1)" != "upx ${UPX_VERSION}" ]; then
+    echo "installToolchain: ${UPX_BIN} is not UPX ${UPX_VERSION}" >&2
+    exit 1
+fi
+
 case "$("${CPPCHECK_BIN}" --version)" in
     "Cppcheck ${CPPCHECK_VERSION}"|"Cppcheck ${CPPCHECK_VERSION%.0}") ;;
     *)
@@ -362,4 +400,4 @@ fi
 rm -rf "${checkDir}"
 echo "installToolchain: 86Box ran isolated (nothing written outside ${DVX_ROOT})"
 
-echo "installToolchain: toolchain ready (GCC ${DJGPP_VERSION}, CWSDPMI r7, 86Box 6.0, FreeDOS 1.3, DOSBox Staging 0.83.0, cppcheck ${CPPCHECK_VERSION})"
+echo "installToolchain: toolchain ready (GCC ${DJGPP_VERSION}, CWSDPMI r7, UPX ${UPX_VERSION}, 86Box 6.0, FreeDOS 1.3, DOSBox Staging 0.83.0, cppcheck ${CPPCHECK_VERSION})"