Improve GTK3 Performance

2026-10-16 18:27:13 +00:00 · 2026-09-09 16:45:28 -06:00
85 changed files with 1453 additions and 45279 deletions
@@ -30,13 +30,13 @@ jobs:
            gettext \
            libcanberra-dev libglib2.0-dev \
            libarchive-dev \
-            libgtk-3-dev libfontconfig1-dev libpango1.0-dev xvfb xauth dbus-daemon at-spi2-core \
+            libgtk-3-dev \
            libwayland-client0 libwayland-cursor0 libwayland-egl1 \
            libxkbcommon0 \
-            libgtk-3-bin libglib2.0-bin glib-networking shared-mime-info gsettings-desktop-schemas \
+            libgtk-3-bin libglib2.0-bin shared-mime-info gsettings-desktop-schemas \
            liblua5.4-dev libpci-dev libperl-dev libssl-dev libayatana-appindicator3-dev \
            perl python3 python3-minimal python3-dev python3-cffi mono-devel desktop-file-utils \
-            breeze-gtk-theme \
+            fonts-noto-color-emoji breeze-gtk-theme \
            patchelf file curl

      - name: Configure
@@ -56,9 +56,6 @@ jobs:
          set -eux
          ninja -C build

-      - name: Test emoji catalog, font coverage and picker
-        run: xvfb-run -a dbus-run-session -- meson test -C build --print-errorlogs "Emoji Data Tests" "Emoji Font Tests" "Emoji UI Tests"
-
      - name: Install to AppDir
        run: |
          set -eux
@@ -122,8 +119,15 @@ jobs:
            cp -a /usr/lib/x86_64-linux-gnu/libpython3*.so* AppDir/usr/lib/x86_64-linux-gnu/
          fi

-          # Every package ships the pinned font, including portable builds.
-          cmp data/fonts/NotoColorEmoji.ttf AppDir/usr/share/fonts/zoitechat/NotoColorEmoji.ttf
+          if [ -d "/usr/share/gtk-3.0/emoji" ]; then
+            install -d AppDir/usr/share/gtk-3.0
+            cp -a /usr/share/gtk-3.0/emoji AppDir/usr/share/gtk-3.0/
+          fi
+
+          if [ -f "/usr/share/fonts/truetype/noto/NotoColorEmoji.ttf" ]; then
+            install -d AppDir/usr/share/fonts/truetype/noto
+            cp -a /usr/share/fonts/truetype/noto/NotoColorEmoji.ttf AppDir/usr/share/fonts/truetype/noto/
+          fi

          if [ -d "/usr/lib/x86_64-linux-gnu/gtk-3.0/modules" ]; then
            install -d AppDir/usr/lib/x86_64-linux-gnu/gtk-3.0
@@ -135,20 +139,6 @@ jobs:
            cp -a /usr/lib/gtk-3.0/modules AppDir/usr/lib/gtk-3.0/
          fi

-          # HTTPS inline-image downloads use GSocketClient TLS on Linux.
-          # GLib provides the API, but TLS and system-proxy support live in
-          # loadable GIO modules shipped by glib-networking. Bundle those
-          # modules so the AppImage does not depend on the host copy.
-          gio_module_dir="$(pkg-config --variable=giomoduledir gio-2.0)"
-
-          test -n "$gio_module_dir"
-          test -f "${gio_module_dir}/libgiognutls.so"
-          install -d "AppDir${gio_module_dir}"
-          cp -a "${gio_module_dir}"/libgio*.so "AppDir${gio_module_dir}/"
-          gio-querymodules "AppDir${gio_module_dir}"
-          test -f "AppDir${gio_module_dir}/libgiognutls.so"
-          test -s "AppDir${gio_module_dir}/giomodule.cache"
-
      - name: Verify bundled plugins
        run: |
          set -eux
@@ -202,6 +192,14 @@ jobs:
            export GTK_PATH="$gtk_path_entries${GTK_PATH:+:$GTK_PATH}"
          fi

+          if [ -d "$APPDIR/etc/fonts" ]; then
+            export FONTCONFIG_SYSROOT="$APPDIR"
+            export FONTCONFIG_PATH="$APPDIR/etc/fonts${FONTCONFIG_PATH:+:$FONTCONFIG_PATH}"
+            if [ -f "$APPDIR/etc/fonts/fonts.conf" ]; then
+              export FONTCONFIG_FILE="$APPDIR/etc/fonts/fonts.conf"
+            fi
+          fi
+
          if [ -d "$APPDIR/usr/lib/x86_64-linux-gnu/zoitechat/plugins" ]; then
            export ZOITECHAT_LIBDIR="$APPDIR/usr/lib/x86_64-linux-gnu/zoitechat/plugins"
          elif [ -d "$APPDIR/usr/lib/zoitechat/plugins" ]; then
@@ -260,9 +258,6 @@ jobs:
            export PYTHONPATH="$pythonpath_entries${PYTHONPATH:+:$PYTHONPATH}"
          fi

-          # Register the private font without hiding the host's normal fonts.
-          export ZOITECHAT_EMOJI_FONT="${ZOITECHAT_EMOJI_FONT:-$APPDIR/usr/share/fonts/zoitechat/NotoColorEmoji.ttf}"
-
          # OpenSSL trust store override
          export SSL_CERT_FILE="${SSL_CERT_FILE:-$APPDIR/etc/ssl/certs/ca-certificates.crt}"
          export SSL_CERT_DIR="${SSL_CERT_DIR:-$APPDIR/etc/ssl/certs}"
@@ -69,30 +69,6 @@ jobs:
          Download-WithRetry -Url https://github.com/ZoiteChat/gvsbuild/releases/download/zoitechat-2.20.0-alpha.1/GTK3_Gvsbuild_zoitechat-2.20.0-alpha.1_x64.zip -OutFile deps\gtk-${{ matrix.arch }}.zip
          Expand-Archive -LiteralPath deps\gtk-${{ matrix.arch }}.zip -DestinationPath C:\gtk-build\gtk\x64\release -Force

-          # The GTK3 archive omits librsvg. Add only its renderer, loader and
-          # license from the companion release, keeping the GTK3 DLLs intact.
-          Download-WithRetry -Url https://github.com/ZoiteChat/gvsbuild/releases/download/zoitechat-2.20.0-alpha.1/GTK4_Gvsbuild_zoitechat-2.20.0-alpha.1_x64.zip -OutFile deps\svg-runtime.zip
-          if ((Get-FileHash deps\svg-runtime.zip -Algorithm SHA256).Hash -ne 'fb657f9ebae3a6807defb15e66091d643a703ee66cb37488e3e11e5646f45adb') {
-            throw 'Unexpected SVG runtime archive checksum'
-          }
-          $svgArchive = [System.IO.Compression.ZipFile]::OpenRead((Resolve-Path deps\svg-runtime.zip))
-          try {
-            foreach ($name in @('bin/rsvg-2-2.dll', 'lib/gdk-pixbuf-2.0/2.10.0/loaders/pixbufloader_svg.dll', 'share/doc/librsvg/COPYING.LIB')) {
-              $entry = $svgArchive.GetEntry($name)
-              if ($null -eq $entry) { throw "Missing SVG runtime file: $name" }
-              $destination = Join-Path 'C:\gtk-build\gtk\x64\release' $name
-              New-Item -ItemType Directory -Path (Split-Path $destination) -Force | Out-Null
-              [System.IO.Compression.ZipFileExtensions]::ExtractToFile($entry, $destination, $true)
-            }
-          }
-          finally { $svgArchive.Dispose() }
-          # This loads the module now, catching missing DLLs before the build.
-          & C:\gtk-build\gtk\x64\release\bin\gdk-pixbuf-query-loaders.exe --update-cache
-          if ($LASTEXITCODE -ne 0) { throw 'Could not generate the pixbuf loader cache' }
-          if (-not (Select-String -LiteralPath 'C:\gtk-build\gtk\x64\release\lib\gdk-pixbuf-2.0\2.10.0\loaders.cache' -SimpleMatch '"svg"')) {
-            throw 'SVG loader could not be loaded with the GTK3 runtime'
-          }
-
          Download-WithRetry -Url https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-hicolor-icon-theme-0.18-1-any.pkg.tar.zst -OutFile deps\hicolor-icon-theme.pkg.tar.zst
          python -c "import tarfile,zstandard,pathlib;archive=pathlib.Path(r'deps\\hicolor-icon-theme.pkg.tar.zst');target=pathlib.Path(r'C:\\gtk-build\\gtk\\x64\\release');dctx=zstandard.ZstdDecompressor();f=archive.open('rb');reader=dctx.stream_reader(f);tf=tarfile.open(fileobj=reader,mode='r|');[tf.extract(m,path=target) for m in tf if m.name.startswith('mingw64/share/icons/hicolor/')];tf.close();reader.close();f.close()"

@@ -198,22 +174,6 @@ jobs:
          )
        shell: cmd

-      - name: Test emoji catalog, font coverage and picker
-        shell: cmd
-        run: |
-          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
-          set "PATH=%CD%\..\zoitechat-build\x64\rel;%PATH%"
-          set "GDK_PIXBUF_MODULE_FILE=%CD%\..\zoitechat-build\x64\rel\lib\gdk-pixbuf-2.0\2.10.0\loaders.cache"
-          set "ZOITECHAT_EMOJI_FONT=%CD%\..\zoitechat-build\x64\rel\share\fonts\zoitechat\NotoColorEmoji.ttf"
-          fc /b data\fonts\NotoColorEmoji.ttf "%ZOITECHAT_EMOJI_FONT%"
-          if errorlevel 1 exit /b 1
-          for %%T in (data font ui) do (
-            msbuild win32\emoji-tests.vcxproj /m /verbosity:minimal /p:Configuration=Release /p:Platform=x64 /p:EmojiTestKind=%%T
-            if errorlevel 1 exit /b 1
-            ..\zoitechat-build\x64\tests\emoji-%%T-tests.exe --tap
-            if errorlevel 1 exit /b 1
-          )
-
      - name: Preparing Artifacts
        run: |
          move ..\zoitechat-build\${{ matrix.platform }}\ZoiteChat-*.exe .\
@@ -336,26 +336,3 @@ proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
-
-
-
-======================================================================
-ADDITIONAL LICENSE NOTICE
-======================================================================
-
-ZoiteChat source code:
-GPL version 2
-See Above.
-
-Unicode Emoji and CLDR data:
-Unicode License v3
-data/emoji/LICENSE-UNICODE.txt
-
-gemoji shortcode data:
-MIT License
-Copyright (c) 2019 GitHub, Inc.
-data/emoji/LICENSE-GEMOJI.txt
-
-Noto Color Emoji:
-SIL Open Font License 1.1
-data/fonts/OFL.txt
@@ -1 +1 @@
-2.20.0-dev
+2.19.0
@@ -1,39 +0,0 @@
-UNICODE LICENSE V3
-
-COPYRIGHT AND PERMISSION NOTICE
-
-Copyright © 1991-2026 Unicode, Inc.
-
-NOTICE TO USER: Carefully read the following legal agreement. BY
-DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
-SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
-TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT
-DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of data files and any associated documentation (the "Data Files") or
-software and any associated documentation (the "Software") to deal in the
-Data Files or Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, and/or sell
-copies of the Data Files or Software, and to permit persons to whom the
-Data Files or Software are furnished to do so, provided that either (a)
-this copyright and permission notice appear with all copies of the Data
-Files or Software, or (b) this copyright and permission notice appear in
-associated Documentation.
-
-THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
-THIRD PARTY RIGHTS.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
-BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
-OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA
-FILES OR SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder shall
-not be used in advertising or otherwise to promote the sale, use or other
-dealings in these Data Files or Software without prior written
-authorization of the copyright holder.
@@ -1,30 +0,0 @@
-# Bundled emoji data
-
-These are pinned copies of the upstream data files that
-`tools/gen-emoji-data.py` compiles into ZoiteChat's emoji picker catalog
-at build time. Bundling them means every ZoiteChat package exposes the
-same emoji, names, categories and search keywords, independent of the
-GTK runtime version or the emoji data a distribution installs under
-`/usr/share/gtk-3.0/emoji`.
-
-Nothing here affects what is sent over IRC: the picker inserts plain
-Unicode sequences. Official builds register the bundled Noto Color Emoji
-font privately for consistent rendering, while preserving platform font
-fallback if registration is unavailable.
-
-| File | Source | Version |
-| ---- | ------ | ------- |
-| `emoji-test.txt` | [Unicode emoji data](https://unicode.org/Public/emoji/17.0/emoji-test.txt) (mirrored at [unicode-org/unicodetools](https://github.com/unicode-org/unicodetools/blob/main/unicodetools/data/emoji/17.0/emoji-test.txt)) | Emoji 17.0 |
-| `cldr-annotations-en.xml` | [unicode-org/cldr](https://github.com/unicode-org/cldr/blob/release-48/common/annotations/en.xml) `common/annotations/en.xml` | CLDR release 48 |
-| `cldr-annotations-derived-en.xml` | [unicode-org/cldr](https://github.com/unicode-org/cldr/blob/release-48/common/annotationsDerived/en.xml) `common/annotationsDerived/en.xml` | CLDR release 48 |
-| `gemoji.json` | [github/gemoji](https://github.com/github/gemoji/blob/v4.1.0/db/emoji.json) `db/emoji.json` | v4.1.0 |
-
-The pinned versions are recorded in `VERSIONS`.
-
-## Licenses
-
- `emoji-test.txt`, `cldr-annotations-en.xml`,
-  `cldr-annotations-derived-en.xml`: © Unicode, Inc., distributed under
-  the [Unicode License v3](https://www.unicode.org/license.txt).
- `gemoji.json`: from the gemoji project, MIT licensed,
-  © GitHub, Inc.
@@ -1,6 +0,0 @@
-# Pinned versions of the emoji source data in this directory.
-# Keep in sync with the files themselves; tools/gen-emoji-data.py
-# verifies unicode-emoji against the emoji-test.txt header.
-unicode-emoji=17.0
-cldr=48
-gemoji=4.1.0
@@ -1,91 +0,0 @@
-Copyright 2013 Google LLC
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-https://scripts.sil.org/OFL
-
-
-----------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) shall not be
-used to promote, endorse or advertise any Modified Version, except to
-acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s)
-or with their explicit written permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
@@ -1,43 +0,0 @@
-# Bundled emoji font
-
-`NotoColorEmoji.ttf` reports Noto Color Emoji version 2.051 and covers
-Unicode Emoji 17.0. It is vendored from Debian's
-`fonts-noto-color-emoji` 2.051 package, built from the corresponding
-Google Noto Emoji release.
-
-Every GTK build installs this exact file: Windows (installer and portable
-build files), AppImage, Flatpak and native Meson/RPM builds. It is loaded
-into a private Pango/FreeType font map as `ZoiteChat Emoji`; an older system
-Noto font cannot replace it. No font is installed globally on Windows.
-
-Chat windows and the emoji picker share this map. Fontconfig still loads
-system fonts and configuration for ordinary text, and the configured text
-font, size and style remain in effect. In particular, plain digits, `#`
-and `*` are not assigned emoji metrics.
-
-Windows uses the same FreeType backend rather than GDI registration or an
-OS-version-specific picker. The dependency bundle already ships FreeType,
-Fontconfig and PangoFT2. This rendering path does not require Windows' native
-color-font support. Actual Windows 7 execution still needs testing on that OS.
-
-Meson requires PangoFT2 >= 1.44 and Fontconfig >= 2.13. Normal installations
-load `share/fonts/zoitechat/NotoColorEmoji.ttf` beneath the configured data
-directory; Windows resolves it relative to the executable. AppImage sets
-`ZOITECHAT_EMOJI_FONT` to its own copy. For an uninstalled development build:
-
-```sh
-ZOITECHAT_EMOJI_FONT="$PWD/data/fonts/NotoColorEmoji.ttf" build/src/fe-gtk/zoitechat
-```
-
-A missing/unloadable file logs a warning and retains system-font fallback.
-CI verifies the installed copy and tests catalog/font coverage; AppImage and
-Windows also run the interactive picker regression tests. Native themes,
-DPI and different Pango/Cairo versions can still affect pixel-level output.
-
-Upstream release: https://github.com/googlefonts/noto-emoji/releases/tag/v2.051
-
-Vendored file SHA-256:
-`dac5c27651082d6c53dab5081f50d2022ddf6877d730fa919cf6a4fc2af22de0`
-
-The font is distributed under the SIL Open Font License 1.1. See
-`OFL.txt`.
@@ -1,13 +0,0 @@
-emoji_font_dir = join_paths(get_option('datadir'), 'fonts', 'zoitechat')
-emoji_font_doc_dir = join_paths(get_option('datadir'), 'doc', 'zoitechat', 'fonts')
-
-install_data(
-  'NotoColorEmoji.ttf',
-  install_dir: emoji_font_dir,
-)
-
-install_data(
-  'OFL.txt',
-  'README.md',
-  install_dir: emoji_font_doc_dir,
-)
@@ -3,7 +3,6 @@ if get_option('plugin')
 endif

 if get_option('gtk-frontend')
-  subdir('fonts')
  subdir('icons')
  subdir('misc')
  subdir('man')
@@ -2,7 +2,6 @@ appdir = join_paths(get_option('datadir'), 'applications')
 metainfodir = join_paths(get_option('datadir'), 'metainfo')
 mimedir = join_paths(get_option('datadir'), 'mime', 'packages')
 desktop_utils = find_program('desktop-file-validate', required: false)
-appstreamcli = find_program('appstreamcli', required: false)

 if get_option('gtk-frontend')
  if get_option('install-appdata')
@@ -14,6 +13,7 @@ if get_option('gtk-frontend')
      install_dir: metainfodir
    )

+    appstreamcli = find_program('appstreamcli', required: false)
    if appstreamcli.found()
      test('Validate net.zoite.Zoitechat.appdata.xml', appstreamcli,
        args: ['validate', zoitechat_appdata]
@@ -29,22 +29,6 @@
    <id>zoitechat.desktop</id>
  </provides>
 <releases>
-<release date="2026-09-15" version="2.19.1">
-  <description>
-    <ul>
-      <li>Fixed /msg messages showing twice on servers using IRCv3 <code>echo-message</code>.</li>
-      <li>Fixed escaping a leading command slash so <code>//text</code> sends <code>/text</code> as normal chat.</li>
-      <li>Fixed automatic away clearing when sending messages on servers using <code>echo-message</code>.</li>
-      <li>Fixed other users' away status not updating until rejoining a channel when <code>away-notify</code> updates are missed.</li>
-      <li>Fixed private messages and <code>/me</code> actions being routed to the wrong window when using WeeChat's IRC relay, while preserving channel ACTION routing.</li>
-      <li>Fixed a Flatpak startup error caused by the D-Bus service still using the old HexChat app ID.</li>
-      <li>Fixed optional Windows 10 theme downloads in the Windows installer.</li>
-      <li>Fixed the GTK warning when switching from channel tabs to the channel tree.</li>
-      <li>Fixed GTK3 theme archive root detection so themes with an <code>index.theme</code> file are preferred correctly.</li>
-      <li>Fixed source-build configuration when plugin AppStream metadata installation is disabled, and corrected the minimum Meson version to 0.59.</li>
-    </ul>
-  </description>
-</release>
 <release date="2026-07-28" version="2.19.0">
  <description>
    <ul>
@@ -78,11 +78,6 @@ a {
    text-decoration: none;
 }

-::selection {
-    background: var(--accent);
-    color: #fff8ea;
-}
-
 button,
 input,
 textarea,
@@ -144,7 +139,6 @@ select {
    z-index: 2000;
    border-bottom: 3px solid var(--rule);
    background: rgba(238, 229, 211, 0.94);
-    -webkit-backdrop-filter: blur(8px);
    backdrop-filter: blur(8px);
 }

@@ -237,17 +231,6 @@ select {
    font-weight: 900;
 }

-.site-nav a[aria-current="page"] {
-    border-block-color: var(--rule);
-    background: var(--panel-dark);
-    color: var(--paper-warm);
-    box-shadow: inset 0 -0.3rem 0 var(--accent);
-}
-
-.site-nav a[aria-current="page"]::before {
-    color: #d19b25;
-}
-
 .site-nav a:hover,
 .site-nav a:focus-visible {
    border-block-color: var(--rule);
@@ -528,7 +511,6 @@ select {
    font-weight: 900;
    line-height: 1.18;
    box-shadow: 4px 4px 0 var(--rule);
-    touch-action: manipulation;
    transition: transform 0.12s ease, background-color 0.12s ease, color 0.12s ease, box-shadow 0.12s ease;
 }

@@ -545,11 +527,6 @@ select {
    outline: none;
 }

-.button:active {
-    transform: translate(3px, 3px);
-    box-shadow: none;
-}
-
 .button-primary {
    background: var(--accent);
    color: #fff8ea;
@@ -1199,11 +1176,6 @@ select {
    color: rgba(255, 248, 234, 0.82);
 }

-.footer-links a {
-    width: fit-content;
-    border-bottom: 1px solid transparent;
-}
-
 .footer-links a::before {
    color: #d19b25;
    content: "↳ ";
@@ -1212,7 +1184,6 @@ select {
 .footer-links a:hover,
 .footer-links a:focus-visible {
    color: #fff8ea;
-    border-bottom-color: currentColor;
    outline: none;
 }

@@ -1375,70 +1346,6 @@ select {
        animation-iteration-count: 1 !important;
    }
 }
-
-/* Automatic dark appearance, matching the main ZoiteChat site palette. */
-@media (prefers-color-scheme: dark) {
-    :root {
-        color-scheme: dark;
-        --paper: #161514;
-        --paper-warm: #f4ead9;
-        --paper-cool: #1c2522;
-        --ink: #f2eadb;
-        --ink-soft: #ddd2c1;
-        --muted: #bdb19f;
-        --quiet: #928777;
-        --rule: #080706;
-        --rule-soft: rgba(242, 234, 219, 0.16);
-        --rule-mid: rgba(242, 234, 219, 0.3);
-        --panel: #211e1a;
-        --panel-alt: #2b261f;
-        --panel-dark: #0b0c0c;
-        --accent: #c34720;
-        --accent-dark: #ff966d;
-        --accent-soft: rgba(195, 71, 32, 0.17);
-        --green: #367662;
-        --blue: #386b8d;
-        --warning: #9b6508;
-        --success: #43856a;
-        --shadow: 8px 8px 0 rgba(0, 0, 0, 0.82);
-        --shadow-soft: 0 18px 40px rgba(0, 0, 0, 0.36);
-    }
-
-    html {
-        background: var(--paper);
-    }
-
-    body {
-        background:
-            linear-gradient(90deg, rgba(242, 234, 219, 0.025) 1px, transparent 1px) 0 0 / 68px 68px,
-            linear-gradient(180deg, rgba(242, 234, 219, 0.022) 1px, transparent 1px) 0 0 / 68px 68px,
-            radial-gradient(circle at 11% 18%, rgba(195, 71, 32, 0.15), transparent 24rem),
-            radial-gradient(circle at 86% 4%, rgba(54, 118, 98, 0.16), transparent 28rem),
-            linear-gradient(180deg, #181715 0%, #111311 58%, #191714 100%);
-    }
-
-    body::before {
-        background:
-            repeating-linear-gradient(90deg, transparent 0 17px, rgba(242, 234, 219, 0.025) 17px 18px),
-            repeating-linear-gradient(0deg, transparent 0 5px, rgba(255, 255, 255, 0.025) 5px 6px);
-        mix-blend-mode: screen;
-    }
-
-    .site-header {
-        background: rgba(22, 21, 20, 0.94);
-    }
-
-    .site-nav a,
-    .nav-menu summary {
-        background: rgba(39, 35, 30, 0.52);
-    }
-
-    .eyebrow::before,
-    .footer-links a::before {
-        color: #e0aa3c;
-    }
-}
-
 /* Sphinx/Read the Docs bridge: aggressively map documentation onto the main ZoiteChat site skin. */
 html {
    font-size: 16px !important;
@@ -1578,17 +1485,6 @@ body a {
    font-weight: 900 !important;
 }

-#navbar-top .site-nav a[aria-current="page"] {
-    border-block-color: var(--rule) !important;
-    background: var(--panel-dark) !important;
-    color: var(--paper-warm) !important;
-    box-shadow: inset 0 -0.3rem 0 var(--accent) !important;
-}
-
-#navbar-top .site-nav a[aria-current="page"]::before {
-    color: #d19b25 !important;
-}
-
 #navbar-top .site-nav a:hover,
 #navbar-top .site-nav a:focus-visible,
 #navbar-top .site-nav summary:hover,
@@ -1775,7 +1671,6 @@ footer.site-footer-lite {
 }

 .document .body p {
-    max-width: 78ch;
    margin: 0 0 1rem !important;
 }

@@ -1821,7 +1716,6 @@ ul.search a:focus-visible {

 .document .body ul,
 .document .body ol {
-    max-width: 78ch;
    margin: 0.75rem 0 1.4rem !important;
    padding-left: 1.35rem !important;
 }
@@ -1971,11 +1865,6 @@ ul.search a:focus-visible {
    text-transform: uppercase !important;
 }

-.document .body table tbody tr:hover td,
-.document .body table tbody tr:focus-within td {
-    background: var(--accent-soft) !important;
-}
-
 .admonition,
 .note,
 .warning,
@@ -2115,7 +2004,6 @@ input[type="submit"],
    line-height: 1.18 !important;
    text-shadow: none !important;
    box-shadow: 4px 4px 0 var(--rule) !important;
-    touch-action: manipulation;
 }

 .btn:hover,
@@ -2131,13 +2019,6 @@ input[type="submit"]:focus-visible {
    outline: none !important;
 }

-.btn:active,
-button:active,
-input[type="submit"]:active {
-    transform: translate(3px, 3px) !important;
-    box-shadow: none !important;
-}
-
 #navbar-related {
    min-height: auto !important;
    margin: 1rem 0 1.5rem !important;
@@ -2394,37 +2275,3 @@ footer:not(.site-footer) {
        letter-spacing: -0.04em !important;
    }
 }
-
-/* Keep basicstrap's stronger overrides readable with the main site's dark palette. */
-@media (prefers-color-scheme: dark) {
-    #navbar-top.site-header {
-        background: rgba(22, 21, 20, 0.94) !important;
-    }
-
-    #navbar-top .site-nav a,
-    #navbar-top .site-nav summary {
-        background: rgba(39, 35, 30, 0.52) !important;
-    }
-
-    .document::after,
-    .sidebar::after,
-    #navbar-related::after {
-        background: linear-gradient(135deg, transparent 50%, rgba(242, 234, 219, 0.09) 50%) !important;
-    }
-
-    input[type="text"],
-    input[type="search"],
-    .search-query,
-    .form-control,
-    textarea,
-    select {
-        background: var(--panel) !important;
-        box-shadow: inset 3px 3px 0 rgba(0, 0, 0, 0.32) !important;
-    }
-
-    .warning,
-    .caution,
-    .danger {
-        background: #3a2e19 !important;
-    }
-}
@@ -209,8 +209,6 @@
    {%- endif %}
    <meta name="description" content="">
    <meta name="author" content="">
-    <meta name="theme-color" content="#eee5d3" media="(prefers-color-scheme: light)">
-    <meta name="theme-color" content="#161514" media="(prefers-color-scheme: dark)">

    {{ css() }}
    {%- if not embedded %}
@@ -262,9 +260,8 @@
        <nav class="site-nav" aria-label="Primary">
          <a href="https://zoitechat.org/">Home</a>
          <a href="https://zoitechat.org/addons.php">Addons</a>
-          <a href="https://zoitechat.org/announcements.php">Announcements</a>
          <a href="https://zoitechat.org/download.php">Download</a>
-          <a href="{{ pathto(master_doc) }}" aria-current="page">Docs</a>
+          <a href="{{ pathto(master_doc) }}">Docs</a>
          <a href="https://github.com/ZoiteChat/zoitechat" target="_blank" rel="noopener">GitHub</a>
          <details class="nav-menu">
            <summary>IRC Support</summary>
@@ -339,7 +336,6 @@
          <div class="footer-links">
            <a href="https://zoitechat.org/download.php">Download</a>
            <a href="https://zoitechat.org/addons.php">Addons</a>
-            <a href="https://zoitechat.org/announcements.php">Announcements</a>
            <a href="https://zoitechat.org/privacy.php">Privacy Policy</a>
            <a href="{{ pathto(master_doc) }}">Documentation</a>
            <a href="https://github.com/ZoiteChat/zoitechat" target="_blank" rel="noopener">Source code</a>
@@ -1,20 +1,6 @@
 ZoiteChat ChangeLog
 =================

-2.19.1 (2026-09-15)
-------------------
-
- Fixed ``/msg`` messages showing twice on servers using IRCv3 ``echo-message``.
- Fixed escaping a leading command slash so ``//text`` sends ``/text`` as normal chat.
- Fixed automatic away clearing when sending messages on servers using ``echo-message``.
- Fixed other users' away status not updating until rejoining a channel when ``away-notify`` updates are missed.
- Fixed private messages and ``/me`` actions being routed to the wrong window when using WeeChat's IRC relay, while preserving channel ACTION routing.
- Fixed a Flatpak startup error caused by the D-Bus service still using the old HexChat app ID.
- Fixed optional Windows 10 theme downloads in the Windows installer.
- Fixed the GTK warning when switching from channel tabs to the channel tree.
- Fixed GTK3 theme archive root detection so themes with an ``index.theme`` file are preferred correctly.
- Fixed source-build configuration when plugin AppStream metadata installation is disabled, and corrected the minimum Meson version to 0.59.
-
 2.19.0 (2026-07-28)
 -------------------

@@ -52,11 +52,6 @@
    {
      "name": "zoitechat",
      "buildsystem": "meson",
-      "run-tests": true,
-      "test-rule": "",
-      "test-commands": [
-        "meson test --print-errorlogs 'Emoji Data Tests' 'Emoji Font Tests'"
-      ],
      "config-opts": [
        "-Ddbus-service-use-appid=true",
        "-Dwith-perl=perl",
@@ -70,8 +65,7 @@
        "/share/man"
      ],
      "post-install": [
-        "install -d /app/extensions",
-        "cmp ../data/fonts/NotoColorEmoji.ttf /app/share/fonts/zoitechat/NotoColorEmoji.ttf"
+        "install -d /app/extensions"
      ],
      "sources": [
        {
@@ -1,6 +1,6 @@
 project('zoitechat', 'c',
  version: run_command('cat', 'VERSION', check: true).stdout().strip(),
-  meson_version: '>= 0.59.0',
+  meson_version: '>= 0.55.0',
  default_options: [
    'c_std=c17',
    'buildtype=debugoptimized',
@@ -36,7 +36,6 @@ config_h.set_quoted('GETTEXT_PACKAGE', 'zoitechat')
 config_h.set_quoted('LOCALEDIR', join_paths(get_option('prefix'),
                                 get_option('datadir'), 'locale'))
 config_h.set10('ENABLE_NLS', true)
-config_h.set_quoted('ZOITECHAT_DATADIR', join_paths(get_option('prefix'), get_option('datadir')))

 # Optional features
 config_h.set('USE_OPENSSL', libssl_dep.found())
@@ -23,8 +23,6 @@ BuildRequires:  pkgconfig(dbus-glib-1)
 BuildRequires:  pkgconfig(gio-2.0) >= 2.36.0
 BuildRequires:  pkgconfig(gmodule-2.0)
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.22
-BuildRequires:  pkgconfig(fontconfig) >= 2.13
-BuildRequires:  pkgconfig(pangoft2) >= 1.44
 BuildRequires:  pkgconfig(iso-codes)
 BuildRequires:  pkgconfig(libarchive)
 BuildRequires:  pkgconfig(libcanberra) >= 0.22
@@ -74,9 +72,6 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/net.zoite
 appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/net.zoite.Zoitechat*.metainfo.xml

 xwfb-run -- /usr/bin/meson test -C %{_vpath_builddir} --num-processes %{_smp_build_ncpus} --print-errorlogs \
-  "Emoji Data Tests" \
-  "Emoji Font Tests" \
-  "Emoji UI Tests" \
  "Theme Manager Dispatch Routing Tests" \
  "Validate net.zoite.Zoitechat.desktop" \
  "Validate translations" \
@@ -85,8 +80,6 @@ xwfb-run -- /usr/bin/meson test -C %{_vpath_builddir} --num-processes %{_smp_bui
 %files -f %{name}.lang
 %license COPYING
 %doc readme.md troubleshooting.md
-%{_datadir}/fonts/zoitechat/
-%{_datadir}/doc/zoitechat/fonts/
 %{_bindir}/zoitechat
 %{_datadir}/applications/net.zoite.Zoitechat.desktop
 %{_datadir}/dbus-1/services/org.zoitechat.service.service
@@ -710,7 +710,6 @@ static int handle_fishlim(char *word[], char *word_eol[], void *userdata) {
    gtk_box_pack_start(GTK_BOX(content), grid, TRUE, TRUE, 0);

    fishlim_target_entry = gtk_entry_new();
-    gtk_widget_set_hexpand(fishlim_target_entry, TRUE);
    if (target)
        gtk_entry_set_text(GTK_ENTRY(fishlim_target_entry), target);
    gtk_grid_attach(GTK_GRID(grid), gtk_label_new("Target nick or channel"), 0, 0, 1, 1);
@@ -761,7 +760,6 @@ static int handle_fishlim(char *word[], char *word_eol[], void *userdata) {
    g_signal_connect(view, "row-activated", G_CALLBACK(fishlim_gui_row_activated), NULL);

    scroll = gtk_scrolled_window_new(NULL, NULL);
-    gtk_widget_set_hexpand(scroll, TRUE);
    gtk_widget_set_vexpand(scroll, TRUE);
    gtk_container_add(GTK_CONTAINER(scroll), view);
    gtk_grid_attach(GTK_GRID(grid), scroll, 0, 6, 3, 1);
@@ -26,7 +26,7 @@ if system == 'linux' or system == 'gnu' or system.startswith('gnu/') or system =
      sysinfo_cargs += '-DHAVE_LIBPCI'
      sysinfo_sources += 'unix/pci.c'

-      picidsdir = libpci.get_variable(pkgconfig : 'idsdir') 
+      picidsdir = libpci.get_pkgconfig_variable('idsdir')
      pciids = join_paths(picidsdir, 'pci.ids')
      sysinfo_cargs += '-DPCIIDS_FILE="@0@"'.format(pciids)
    endif
@@ -4,7 +4,6 @@ data/misc/net.zoite.Zoitechat.ThemeManager.desktop.in
 src/common/cfgfiles.c
 src/common/chanopt.c
 src/common/dcc.c
-src/common/emoji-data.c
 src/common/zoitechat.c
 src/common/ignore.c
 src/common/inbound.c
@@ -25,12 +24,10 @@ src/fe-gtk/banlist.c
 src/fe-gtk/chanlist.c
 src/fe-gtk/dccgui.c
 src/fe-gtk/editlist.c
-src/fe-gtk/emoji-picker.c
 src/fe-gtk/fe-gtk.c
 src/fe-gtk/fkeys.c
 src/fe-gtk/gtkutil.c
 src/fe-gtk/ignoregui.c
-src/fe-gtk/inline-image.c
 src/fe-gtk/joind.c
 src/fe-gtk/maingui.c
 src/fe-gtk/menu.c
@@ -416,7 +416,6 @@ const struct prefs vars[] =
 	{"gui_dialog_left", P_OFFINT (hex_gui_dialog_left), TYPE_INT},
 	{"gui_dialog_top", P_OFFINT (hex_gui_dialog_top), TYPE_INT},
 	{"gui_dialog_width", P_OFFINT (hex_gui_dialog_width), TYPE_INT},
-	{"gui_emoji_skin_tone", P_OFFINT (hex_gui_emoji_skin_tone), TYPE_INT},
 	{"gui_filesize_iec", P_OFFINT (hex_gui_filesize_iec), TYPE_BOOL},
 	{"gui_focus_omitalerts", P_OFFINT (hex_gui_focus_omitalerts), TYPE_BOOL},
 	{"gui_hide_menu", P_OFFINT (hex_gui_hide_menu), TYPE_BOOL},
@@ -443,7 +442,6 @@ const struct prefs vars[] =
 	{"gui_tab_chans", P_OFFINT (hex_gui_tab_chans), TYPE_BOOL},
 	{"gui_tab_dialogs", P_OFFINT (hex_gui_tab_dialogs), TYPE_BOOL},
 	{"gui_tab_dots", P_OFFINT (hex_gui_tab_dots), TYPE_BOOL},
-	{"gui_tab_font", P_OFFSET (hex_gui_tab_font), TYPE_STR},
 	{"gui_tab_icons", P_OFFINT (hex_gui_tab_icons), TYPE_BOOL},
 	{"gui_dark_mode", P_OFFINT (hex_gui_dark_mode), TYPE_INT},
 	{"gui_gtk3_variant", P_OFFINT (hex_gui_gtk3_variant), TYPE_INT},
@@ -566,7 +564,6 @@ const struct prefs vars[] =
 	{"net_proxy_use", P_OFFINT (hex_net_proxy_use), TYPE_INT},
 	{"net_proxy_user", P_OFFSET (hex_net_proxy_user), TYPE_STR},
 	{"net_reconnect_delay", P_OFFINT (hex_net_reconnect_delay), TYPE_INT},
-	{"net_remote_media", P_OFFINT (hex_net_remote_media), TYPE_BOOL},
 	{"net_throttle", P_OFFINT (hex_net_throttle), TYPE_BOOL},

 	{"notify_timeout", P_OFFINT (hex_notify_timeout), TYPE_INT},
@@ -780,8 +777,6 @@ load_default_config(void)
 	prefs.hex_gui_hide_menu = 1;
 #endif
 	prefs.hex_gui_ctrlq_quit = 1;
-	/* hex_net_remote_media stays 0: loading remote media can reveal the
-	   user's IP address, so it is strictly opt-in */
 	prefs.hex_gui_input_attr = 1;
 	prefs.hex_gui_input_icon = 1;
 	prefs.hex_gui_input_nick = 1;
@@ -43,7 +43,6 @@
    <ClInclude Include="typedef.h" />
    <ClInclude Include="url.h" />
    <ClInclude Include="userlist.h" />
-    <ClInclude Include="hexcolor.h" />
    <ClInclude Include="util.h" />
    <ClInclude Include="zoitechat-plugin.h" />
    <ClInclude Include="zoitechat.h" />
@@ -56,7 +55,6 @@
    <ClCompile Include="chanopt.c" />
    <ClCompile Include="ctcp.c" />
    <ClCompile Include="dcc.c" />
-    <ClCompile Include="emoji-data.c" />
    <ClCompile Include="history.c" />
    <ClCompile Include="plugin-identd.c" />
    <ClCompile Include="ignore.c" />
@@ -80,7 +78,6 @@
    <ClCompile Include="tree.c" />
    <ClCompile Include="url.c" />
    <ClCompile Include="userlist.c" />
-    <ClCompile Include="hexcolor.c" />
    <ClCompile Include="util.c" />
    <ClCompile Include="zoitechat.c" />
    <ClCompile Include="theme-service.c" />
@@ -116,8 +113,6 @@
 SET SOLUTIONDIR=$(SolutionDir)..\
 "$(Python3Path)\python.exe" $(ProjectDir)make-te.py "$(ProjectDir)textevents.in" "$(ZoiteChatLib)textevents.h" "$(ZoiteChatLib)textenums.h"
 "$(Python3Path)\python.exe" $(ProjectDir)gen-public-suffix.py "$(ZoiteChatLib)public_suffix_data.h"
-"$(Python3Path)\python.exe" "$(SolutionDir)..\tools\gen-emoji-data.py" "$(SolutionDir)..\data\emoji\emoji-test.txt" "$(SolutionDir)..\data\emoji\cldr-annotations-en.xml" "$(SolutionDir)..\data\emoji\cldr-annotations-derived-en.xml" "$(SolutionDir)..\data\emoji\gemoji.json" "$(SolutionDir)..\data\emoji\VERSIONS" "$(ZoiteChatLib)emoji-data-table.h"
-if errorlevel 1 exit /b 1
 powershell -File "$(SolutionDir)..\win32\version-template.ps1" "$(SolutionDir)..\win32\config.h.tt" "$(ZoiteChatLib)config.h"
 $(GlibGenMarshal) --prefix=_zoitechat_marshal --header "$(ProjectDir)marshalers.list" --output "$(ZoiteChatLib)marshal.h"
 $(GlibGenMarshal) --prefix=_zoitechat_marshal --body "$(ProjectDir)marshalers.list" --output "$(ZoiteChatLib)marshal.c"
@@ -98,9 +98,6 @@
    <ClInclude Include="userlist.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="hexcolor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="util.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -205,9 +202,6 @@
    <ClCompile Include="userlist.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="hexcolor.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
    <ClCompile Include="util.c">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -1,239 +0,0 @@
-/* ZoiteChat
- * Copyright (C) 2026 deepend-tildeclub.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include <string.h>
-
-#include <glib.h>
-#include <glib/gi18n.h>
-
-#include "emoji-data.h"
-
-#include "emoji-data-table.h"
-
-gsize
-emoji_data_count (void)
-{
-	return G_N_ELEMENTS (emoji_entries_table);
-}
-
-const EmojiEntry *
-emoji_data_entry (gsize index)
-{
-	g_return_val_if_fail (index < G_N_ELEMENTS (emoji_entries_table), NULL);
-
-	return &emoji_entries_table[index];
-}
-
-static GHashTable *
-emoji_sequence_index (void)
-{
-	static GHashTable *table = NULL;
-	gsize i;
-	int tone;
-
-	if (table)
-		return table;
-
-	table = g_hash_table_new (g_str_hash, g_str_equal);
-	for (i = 0; i < G_N_ELEMENTS (emoji_entries_table); i++)
-	{
-		const EmojiEntry *entry = &emoji_entries_table[i];
-
-		g_hash_table_insert (table, (gpointer) entry->sequence,
-									GSIZE_TO_POINTER (i * EMOJI_TONE_COUNT + 1));
-		if (entry->tone_set < 0)
-			continue;
-		for (tone = EMOJI_TONE_LIGHT; tone < EMOJI_TONE_COUNT; tone++)
-		{
-			const char *seq =
-				emoji_tone_sets_table[entry->tone_set].sequence[tone - 1];
-
-			g_hash_table_insert (table, (gpointer) seq,
-										GSIZE_TO_POINTER (i * EMOJI_TONE_COUNT + tone + 1));
-		}
-	}
-
-	return table;
-}
-
-const EmojiEntry *
-emoji_data_find_by_sequence (const char *sequence, EmojiTone *tone_out)
-{
-	gpointer value;
-	gsize packed;
-
-	if (tone_out)
-		*tone_out = EMOJI_TONE_NONE;
-	if (!sequence || !*sequence)
-		return NULL;
-
-	value = g_hash_table_lookup (emoji_sequence_index (), sequence);
-	if (!value)
-		return NULL;
-
-	packed = GPOINTER_TO_SIZE (value) - 1;
-	if (tone_out)
-		*tone_out = (EmojiTone) (packed % EMOJI_TONE_COUNT);
-
-	return &emoji_entries_table[packed / EMOJI_TONE_COUNT];
-}
-
-const char *
-emoji_data_group_display_name (EmojiGroup group)
-{
-	static const char *const names[EMOJI_GROUP_COUNT] =
-	{
-		N_("Smileys & Emotion"),
-		N_("People & Body"),
-		N_("Animals & Nature"),
-		N_("Food & Drink"),
-		N_("Travel & Places"),
-		N_("Activities"),
-		N_("Objects"),
-		N_("Symbols"),
-		N_("Flags"),
-	};
-
-	g_return_val_if_fail ((guint) group < EMOJI_GROUP_COUNT, "");
-
-	return _(names[group]);
-}
-
-const char *
-emoji_data_group_icon_sequence (EmojiGroup group)
-{
-	static const char *const icons[EMOJI_GROUP_COUNT] =
-	{
-		"\360\237\230\200",					/* 😀 */
-		"\360\237\221\213",					/* 👋 */
-		"\360\237\220\273",					/* 🐻 */
-		"\360\237\215\224",					/* 🍔 */
-		"\360\237\232\227",					/* 🚗 */
-		"\342\232\275",						/* ⚽ */
-		"\360\237\222\241",					/* 💡 */
-		"\360\237\224\243",					/* 🔣 */
-		"\360\237\217\201",					/* 🏁 */
-	};
-
-	g_return_val_if_fail ((guint) group < EMOJI_GROUP_COUNT, "");
-
-	return icons[group];
-}
-
-const char *
-emoji_data_tone_display_name (EmojiTone tone)
-{
-	static const char *const names[EMOJI_TONE_COUNT] =
-	{
-		N_("No skin tone"),
-		N_("Light skin tone"),
-		N_("Medium-light skin tone"),
-		N_("Medium skin tone"),
-		N_("Medium-dark skin tone"),
-		N_("Dark skin tone"),
-	};
-
-	g_return_val_if_fail ((guint) tone < EMOJI_TONE_COUNT, "");
-
-	return _(names[tone]);
-}
-
-const char *
-emoji_entry_sequence_for_tone (const EmojiEntry *entry, EmojiTone tone)
-{
-	g_return_val_if_fail (entry != NULL, NULL);
-
-	if (tone == EMOJI_TONE_NONE || (guint) tone >= EMOJI_TONE_COUNT ||
-		 entry->tone_set < 0)
-		return entry->sequence;
-
-	return emoji_tone_sets_table[entry->tone_set].sequence[tone - 1];
-}
-
-char **
-emoji_search_tokenize (const char *text)
-{
-	GPtrArray *tokens;
-	char *folded;
-	char **split;
-	gsize i;
-
-	if (!text || !g_utf8_validate (text, -1, NULL))
-		return NULL;
-
-	folded = g_utf8_casefold (text, -1);
-	split = g_strsplit_set (folded, " \t\n", -1);
-	g_free (folded);
-
-	tokens = g_ptr_array_new ();
-	for (i = 0; split[i]; i++)
-	{
-		const char *token = split[i];
-		gsize len;
-
-		while (*token == ':')
-			token++;
-		len = strlen (token);
-		while (len > 0 && token[len - 1] == ':')
-			len--;
-		if (len > 0)
-			g_ptr_array_add (tokens, g_strndup (token, len));
-	}
-	g_strfreev (split);
-
-	if (tokens->len == 0)
-	{
-		g_ptr_array_free (tokens, TRUE);
-		return NULL;
-	}
-
-	g_ptr_array_add (tokens, NULL);
-
-	return (char **) g_ptr_array_free (tokens, FALSE);
-}
-
-gboolean
-emoji_entry_matches (const EmojiEntry *entry, char *const *needle_tokens)
-{
-	gsize i;
-
-	g_return_val_if_fail (entry != NULL, FALSE);
-
-	if (!needle_tokens || !needle_tokens[0])
-		return FALSE;
-
-	for (i = 0; needle_tokens[i]; i++)
-	{
-		if (!strstr (entry->search, needle_tokens[i]))
-			return FALSE;
-	}
-
-	return TRUE;
-}
-
-const char *
-emoji_data_unicode_version (void)
-{
-	return emoji_data_unicode_version_str;
-}
-
-const char *
-emoji_data_cldr_version (void)
-{
-	return emoji_data_cldr_version_str;
-}
@@ -1,91 +0,0 @@
-/* ZoiteChat
- * Copyright (C) 2026 deepend-tildeclub.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-/* Bundled emoji catalog, generated at build time from pinned Unicode,
- * CLDR and gemoji data (see data/emoji/ and tools/gen-emoji-data.py).
- * Every entry is a fully-qualified Unicode sequence; nothing here depends
- * on the GTK runtime's emoji data.  The catalog only decides what users
- * can find and insert - rendering stays with the platform's fonts, and
- * IRC always receives the plain Unicode sequence. */
-
-#ifndef ZOITECHAT_EMOJI_DATA_H
-#define ZOITECHAT_EMOJI_DATA_H
-
-#include <glib.h>
-
-typedef enum
-{
-	EMOJI_GROUP_SMILEYS_EMOTION,
-	EMOJI_GROUP_PEOPLE_BODY,
-	EMOJI_GROUP_ANIMALS_NATURE,
-	EMOJI_GROUP_FOOD_DRINK,
-	EMOJI_GROUP_TRAVEL_PLACES,
-	EMOJI_GROUP_ACTIVITIES,
-	EMOJI_GROUP_OBJECTS,
-	EMOJI_GROUP_SYMBOLS,
-	EMOJI_GROUP_FLAGS,
-	EMOJI_GROUP_COUNT
-} EmojiGroup;
-
-typedef enum
-{
-	EMOJI_TONE_NONE,
-	EMOJI_TONE_LIGHT,
-	EMOJI_TONE_MEDIUM_LIGHT,
-	EMOJI_TONE_MEDIUM,
-	EMOJI_TONE_MEDIUM_DARK,
-	EMOJI_TONE_DARK,
-	EMOJI_TONE_COUNT
-} EmojiTone;
-
-typedef struct
-{
-	const char *sequence;
-	const char *name;
-	const char *search;
-	const char *aliases;
-	guint8 group;
-	gint16 tone_set;
-} EmojiEntry;
-
-typedef struct
-{
-	const char *sequence[EMOJI_TONE_COUNT - 1];
-} EmojiToneSet;
-
-gsize emoji_data_count (void);
-const EmojiEntry *emoji_data_entry (gsize index);
-
-const EmojiEntry *emoji_data_find_by_sequence (const char *sequence,
-															  EmojiTone *tone_out);
-
-const char *emoji_data_group_display_name (EmojiGroup group);
-const char *emoji_data_group_icon_sequence (EmojiGroup group);
-const char *emoji_data_tone_display_name (EmojiTone tone);
-
-const char *emoji_entry_sequence_for_tone (const EmojiEntry *entry,
-														 EmojiTone tone);
-
-char **emoji_search_tokenize (const char *text);
-gboolean emoji_entry_matches (const EmojiEntry *entry,
-										char *const *needle_tokens);
-
-const char *emoji_data_unicode_version (void);
-const char *emoji_data_cldr_version (void);
-
-#endif
@@ -70,9 +70,6 @@ void fe_add_rawlog (struct server *serv, char *text, int len, int outbound);
 #define FE_MSG_ERROR 8
 #define FE_MSG_MARKUP 16
 void fe_message (char *msg, int flags);
-#ifdef __linux__
-void fe_root_warning (void);
-#endif
 #define FIA_READ 1
 #define FIA_WRITE 2
 #define FIA_EX 4
@@ -858,10 +858,8 @@ path_depth_from_root (const char *base, const char *path)
 static gint
 theme_root_candidate_compare (gconstpointer a, gconstpointer b)
 {
-	/* g_ptr_array_sort() passes pointers to the array slots, not the values
-	 * stored in those slots. Dereference once before comparing candidates. */
-	const ThemeRootCandidate *ca = *(ThemeRootCandidate * const *) a;
-	const ThemeRootCandidate *cb = *(ThemeRootCandidate * const *) b;
+	const ThemeRootCandidate *ca = a;
+	const ThemeRootCandidate *cb = b;
 	if (ca->has_index_theme != cb->has_index_theme)
 		return ca->has_index_theme ? -1 : 1;
 	if (ca->depth != cb->depth)
@@ -1,42 +0,0 @@
-/* ZoiteChat
- * Parsing of \004 (hex color) formatting codes: RRGGBB[,RRGGBB].
- * Kept free of other application dependencies so the xtext widget tests can
- * compile it on its own.
- * Distributed under GPL-2.0-or-later; see COPYING. */
-
-#include "hexcolor.h"
-
-static int
-hexcolor_component (const char *s, int avail, guint32 *rgb)
-{
-	int i;
-	guint32 value = 0;
-
-	if (avail < 6)
-		return FALSE;
-	for (i = 0; i < 6; i++)
-	{
-		if (!g_ascii_isxdigit (s[i]))
-			return FALSE;
-		value = (value << 4) | g_ascii_xdigit_value (s[i]);
-	}
-	if (rgb)
-		*rgb = value;
-	return TRUE;
-}
-
-int
-hexcolor_parse (const char *s, int avail, guint32 *fg, guint32 *bg, int *has_bg)
-{
-	if (has_bg)
-		*has_bg = FALSE;
-	if (!hexcolor_component (s, avail, fg))
-		return 0;
-	if (avail >= 7 && s[6] == ',' && hexcolor_component (s + 7, avail - 7, bg))
-	{
-		if (has_bg)
-			*has_bg = TRUE;
-		return 13;
-	}
-	return 6;
-}
@@ -1,16 +0,0 @@
-/* ZoiteChat
- * Parsing of \004 (hex color) formatting codes: RRGGBB[,RRGGBB].
- * See https://modern.ircdocs.horse/formatting
- * Distributed under GPL-2.0-or-later; see COPYING. */
-
-#ifndef ZOITECHAT_HEXCOLOR_H
-#define ZOITECHAT_HEXCOLOR_H
-
-#include <glib.h>
-
-/* Parses the parameters following a \004 byte. Returns the number of bytes
- * consumed (6 or 13), or 0 if no valid RRGGBB follows. fg, bg and has_bg
- * may be NULL. */
-int hexcolor_parse (const char *s, int avail, guint32 *fg, guint32 *bg, int *has_bg);
-
-#endif
@@ -1880,51 +1880,38 @@ inbound_toggle_caps (server *serv, const char *extensions_str, gboolean enable)
 	char **extensions;
 	gsize i;

-	if (!extensions_str)
-		return;
-
 	extensions = g_strsplit (extensions_str, " ", 0);

 	for (i = 0; extensions[i]; i++)
 	{
 		const char *extension = extensions[i];
-		gboolean cap_enable = enable;
-
-		/* ACK prefixes disabled capabilities with '-', unlike CAP DEL. */
-		if (*extension == '-')
-		{
-			cap_enable = FALSE;
-			extension++;
-		}

 		if (!strcmp (extension, "solanum.chat/identify-msg"))
-			serv->have_idmsg = cap_enable;
+			serv->have_idmsg = enable;
 		else if (!strcmp (extension, "multi-prefix"))
-			serv->have_namesx = cap_enable;
+			serv->have_namesx = enable;
 		else if (!strcmp (extension, "account-notify"))
-			serv->have_accnotify = cap_enable;
+			serv->have_accnotify = enable;
 		else if (!strcmp (extension, "extended-join"))
-			serv->have_extjoin = cap_enable;
+			serv->have_extjoin = enable;
 		else if (!strcmp (extension, "userhost-in-names"))
-			serv->have_uhnames = cap_enable;
+			serv->have_uhnames = enable;
 		else if (!strcmp (extension, "server-time")
 				|| !strcmp (extension, "znc.in/server-time")
 				|| !strcmp (extension, "znc.in/server-time-iso"))
-			serv->have_server_time = cap_enable;
+			serv->have_server_time = enable;
 		else if (!strcmp (extension, "away-notify"))
-			serv->have_awaynotify = cap_enable;
+			serv->have_awaynotify = enable;
 		else if (!strcmp (extension, "account-tag"))
-			serv->have_account_tag = cap_enable;
+			serv->have_account_tag = enable;
 		else if (!strcmp (extension, "message-tags"))
-			serv->have_message_tags = cap_enable;
+			serv->have_message_tags = enable;
 		else if (!strcmp (extension, "echo-message"))
-			serv->have_echo_message = cap_enable;
+			serv->have_echo_message = enable;
 		else if (!strcmp (extension, "sasl"))
 		{
-			gboolean start_auth = cap_enable && !serv->have_sasl;
-
-			serv->have_sasl = cap_enable;
-			if (start_auth)
+			serv->have_sasl = enable;
+			if (enable)
 			{
 #ifdef USE_OPENSSL
 				if (serv->loginmethod == LOGIN_SASLEXTERNAL)
@@ -1975,15 +1962,10 @@ inbound_cap_ack (server *serv, char *nick, char *extensions,
 	inbound_toggle_caps (serv, extensions, TRUE);
 }

-static void inbound_request_new_caps (server *serv, const char *extensions_str,
-									 const message_tags_data *tags_data);
-
 void
 inbound_cap_new (server *serv, char *nick, char *extensions,
 					 const message_tags_data *tags_data)
 {
-	gboolean sts_upgrade_triggered = FALSE;
-
 	if (extensions)
 	{
 		char **tokens = g_strsplit (extensions, " ", 0);
@@ -1995,7 +1977,7 @@ inbound_cap_new (server *serv, char *nick, char *extensions,

 			if (!g_strcmp0 (parts[0], "sts") && parts[1] && parts[1][0])
 			{
-				sts_upgrade_triggered |= sts_handle_capability (serv, parts[1]);
+				sts_handle_capability (serv, parts[1]);
 			}

 			g_strfreev (parts);
@@ -2004,22 +1986,38 @@ inbound_cap_new (server *serv, char *nick, char *extensions,
 		g_strfreev (tokens);
 	}

-	EMIT_SIGNAL_TIMESTAMP (XP_TE_CAPLIST, serv->server_session, nick, extensions,
+	EMIT_SIGNAL_TIMESTAMP (XP_TE_CAPACK, serv->server_session, nick, extensions,
 								  NULL, NULL, 0, tags_data->timestamp);

-	/* NEW advertises availability; only ACK confirms an enabled capability. */
-	if (!sts_upgrade_triggered)
-		inbound_request_new_caps (serv, extensions, tags_data);
+	inbound_toggle_caps (serv, extensions, TRUE);
 }

 void
 inbound_cap_del (server *serv, char *nick, char *extensions,
 					 const message_tags_data *tags_data)
 {
+	if (extensions)
+	{
+		char **tokens = g_strsplit (extensions, " ", 0);
+		int i;
+
+		for (i = 0; tokens[i]; i++)
+		{
+			if (!g_strcmp0 (tokens[i], "sts") ||
+				g_str_has_prefix (tokens[i], "sts="))
+			{
+				/* STS cannot be disabled via CAP DEL. */
+				g_strfreev (tokens);
+				return;
+			}
+		}
+
+		g_strfreev (tokens);
+	}
+
 	EMIT_SIGNAL_TIMESTAMP (XP_TE_CAPDEL, serv->server_session, nick, extensions,
 								  NULL, NULL, 0, tags_data->timestamp);

-	/* STS has no toggle, but must not prevent other capabilities being removed. */
 	inbound_toggle_caps (serv, extensions, FALSE);
 }

@@ -2055,44 +2053,6 @@ static const char * const supported_caps[] = {
 	"solanum.chat/identify-msg",
 };

-static void
-inbound_request_new_caps (server *serv, const char *extensions_str,
-							 const message_tags_data *tags_data)
-{
-	char **extensions;
-	gsize i, x;
-
-	if (!extensions_str)
-		return;
-
-	extensions = g_strsplit (extensions_str, " ", 0);
-	for (i = 0; extensions[i]; i++)
-	{
-		char *value = strchr (extensions[i], '=');
-
-		if (value)
-			*value = '\0';
-	}
-
-	/* Request each supported capability once, keeping every IRC line bounded.
-	 * SASL is negotiated during login and is not in supported_caps. */
-	for (x = 0; x < G_N_ELEMENTS (supported_caps); x++)
-	{
-		for (i = 0; extensions[i]; i++)
-		{
-			if (!strcmp (extensions[i], supported_caps[x]))
-			{
-				EMIT_SIGNAL_TIMESTAMP (XP_TE_CAPREQ, serv->server_session,
-										  extensions[i], NULL, NULL, NULL, 0,
-										  tags_data->timestamp);
-				tcp_sendf (serv, "CAP REQ :%s\r\n", extensions[i]);
-				break;
-			}
-		}
-	}
-	g_strfreev (extensions);
-}
-
 static int
 get_supported_mech (server *serv, const char *list)
 {
@@ -3,7 +3,6 @@ common_sources = [
  'chanopt.c',
  'ctcp.c',
  'dcc.c',
-  'emoji-data.c',
  'gtk3-theme-service.c',
  'zoitechat.c',
  'history.c',
@@ -25,7 +24,6 @@ common_sources = [
  'tree.c',
  'url.c',
  'userlist.c',
-  'hexcolor.c',
  'util.c'
 ]

@@ -111,20 +109,6 @@ public_suffix_data = custom_target('public_suffix_data_h',
  command: [python3, files('gen-public-suffix.py'), '@OUTPUT@']
 )

-emoji_data_table = custom_target('emoji_data_table_h',
-  input: [
-    '../../data/emoji/emoji-test.txt',
-    '../../data/emoji/cldr-annotations-en.xml',
-    '../../data/emoji/cldr-annotations-derived-en.xml',
-    '../../data/emoji/gemoji.json',
-    '../../data/emoji/VERSIONS',
-  ],
-  output: 'emoji-data-table.h',
-  command: [python3, files('../../tools/gen-emoji-data.py'),
-            '@INPUT0@', '@INPUT1@', '@INPUT2@', '@INPUT3@', '@INPUT4@',
-            '@OUTPUT@']
-)
-
 textevents = custom_target('textevents',
  input: 'textevents.in',
  output: ['textevents.h', 'textenums.h'],
@@ -148,7 +132,7 @@ if get_option('plugin')
 endif

 zoitechat_common = static_library('zoitechatcommon',
-  sources: [textevents, public_suffix_data, emoji_data_table] + marshal + common_sources + secretstore_sources,
+  sources: [textevents, public_suffix_data] + marshal + common_sources + secretstore_sources,
  include_directories: config_h_include,
  dependencies: common_deps + common_sysinfo_deps,
  c_args: common_cflags,
@@ -183,33 +167,3 @@ test('GTK3 Theme Service Tests', gtk3_theme_service_tests,
  protocol: 'tap',
  timeout: 120,
 )
-
-emoji_data_tests = executable('emoji_data_tests',
-  [
-    'tests/test-emoji-data.c',
-    'emoji-data.c',
-    emoji_data_table,
-  ],
-  include_directories: [config_h_include, include_directories('.')],
-  dependencies: [libgio_dep],
-)
-
-test('Emoji Data Tests', emoji_data_tests,
-  protocol: 'tap',
-  timeout: 120,
-)
-
-hexcolor_tests = executable('hexcolor_tests',
-  [
-    'tests/test-hexcolor.c',
-    'hexcolor.c',
-    'util.c',
-  ],
-  include_directories: [config_h_include, include_directories('.')],
-  dependencies: [libgio_dep] + (libssl_dep.found() ? [libssl_dep] : []),
-)
-
-test('Hex Color Tests', hexcolor_tests,
-  protocol: 'tap',
-  timeout: 120,
-)
@@ -2826,7 +2826,6 @@ static gboolean
 client_tag_allowed (server *serv, const char *tag)
 {
 	char **deny;
-	gboolean blocked = FALSE;
 	int i;

 	if (!serv->have_message_tags)
@@ -2838,16 +2837,15 @@ client_tag_allowed (server *serv, const char *tag)
 	deny = g_strsplit (serv->clienttagdeny, ",", 0);
 	for (i = 0; deny[i]; i++)
 	{
-		if (!strcmp (deny[i], "*"))
-			blocked = TRUE;
-		else if (deny[i][0] == '-' && !strcmp (deny[i] + 1, tag))
-			blocked = FALSE;
-		else if (!strcmp (deny[i], tag) || (deny[i][0] == '+' && !strcmp (deny[i] + 1, tag)))
-			blocked = TRUE;
+		if (!strcmp (deny[i], "*") || !strcmp (deny[i], tag) || (deny[i][0] == '+' && !strcmp (deny[i] + 1, tag)))
+		{
+			g_strfreev (deny);
+			return FALSE;
+		}
 	}

 	g_strfreev (deny);
-	return !blocked;
+	return TRUE;
 }

 static char *
@@ -155,7 +155,7 @@ _SSL_get_cert_info (struct cert_info *cert_info, SSL * ssl)
 {
 	X509 *peer_cert;
 	const X509_PUBKEY *key;
-	ASN1_OBJECT *obj = NULL;
+	X509_ALGOR *algor = NULL;
 	EVP_PKEY *peer_pkey;
 	char notBefore[64];
 	char notAfter[64];
@@ -174,10 +174,10 @@ _SSL_get_cert_info (struct cert_info *cert_info, SSL * ssl)
 	broke_oneline (cert_info->issuer, cert_info->issuer_word);

 	key = X509_get_X509_PUBKEY(peer_cert);
-	if (!X509_PUBKEY_get0_param(&obj, NULL, NULL, NULL, key))
+	if (!X509_PUBKEY_get0_param(NULL, NULL, 0, &algor, key))
 		return 1;

-	alg = OBJ_obj2nid (obj);
+	alg = OBJ_obj2nid (algor->algorithm);
 #ifndef HAVE_X509_GET_SIGNATURE_NID
 	sign_alg = OBJ_obj2nid (peer_cert->sig_alg->algorithm);
 #else
@@ -1,243 +0,0 @@
-/* ZoiteChat
- * Copyright (C) 2026 deepend-tildeclub.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include <string.h>
-
-#include <glib.h>
-
-#include "../emoji-data.h"
-
-#define GRINNING_FACE "\360\237\230\200"			/* 😀 */
-#define DUCK "\360\237\246\206"						/* 🦆 */
-#define THUMBS_UP "\360\237\221\215"				/* 👍 */
-#define WAVE_DARK "\360\237\221\213\360\237\217\277"	/* 👋🏿 */
-#define MEDIUM_TONE_MODIFIER "\360\237\217\275"	/* U+1F3FD */
-#define KEYCAP_HASH "#\357\270\217\342\203\243"	/* #️⃣ */
-
-static const EmojiEntry *
-find_by_name (const char *name)
-{
-	gsize i;
-
-	for (i = 0; i < emoji_data_count (); i++)
-	{
-		const EmojiEntry *entry = emoji_data_entry (i);
-
-		if (!strcmp (entry->name, name))
-			return entry;
-	}
-
-	return NULL;
-}
-
-static void
-test_catalog_integrity (void)
-{
-	gsize i;
-
-	g_assert_cmpuint (emoji_data_count (), >=, 1800);
-
-	for (i = 0; i < emoji_data_count (); i++)
-	{
-		const EmojiEntry *entry = emoji_data_entry (i);
-
-		g_assert_nonnull (entry->sequence);
-		g_assert_true (*entry->sequence != '\0');
-		g_assert_true (g_utf8_validate (entry->sequence, -1, NULL));
-		g_assert_nonnull (entry->name);
-		g_assert_true (*entry->name != '\0');
-		g_assert_true (g_utf8_validate (entry->name, -1, NULL));
-		g_assert_nonnull (entry->search);
-		g_assert_true (*entry->search != '\0');
-		g_assert_nonnull (entry->aliases);
-		g_assert_cmpuint (entry->group, <, EMOJI_GROUP_COUNT);
-		g_assert_cmpint (entry->tone_set, >=, -1);
-	}
-}
-
-static void
-test_cldr_order (void)
-{
-	const EmojiEntry *first = emoji_data_entry (0);
-
-	g_assert_cmpstr (first->sequence, ==, GRINNING_FACE);
-	g_assert_cmpuint (first->group, ==, EMOJI_GROUP_SMILEYS_EMOTION);
-}
-
-static void
-test_groups (void)
-{
-	int group;
-	gboolean seen[EMOJI_GROUP_COUNT] = { FALSE };
-	gsize i;
-
-	for (group = 0; group < EMOJI_GROUP_COUNT; group++)
-	{
-		g_assert_true (*emoji_data_group_display_name (group) != '\0');
-		g_assert_true (*emoji_data_group_icon_sequence (group) != '\0');
-	}
-
-	for (i = 0; i < emoji_data_count (); i++)
-		seen[emoji_data_entry (i)->group] = TRUE;
-	for (group = 0; group < EMOJI_GROUP_COUNT; group++)
-		g_assert_true (seen[group]);
-}
-
-static void
-test_search_by_keyword (void)
-{
-	const EmojiEntry *duck = find_by_name ("duck");
-	char **tokens = emoji_search_tokenize ("Duck");
-
-	g_assert_nonnull (duck);
-	g_assert_cmpstr (duck->sequence, ==, DUCK);
-	g_assert_nonnull (tokens);
-	g_assert_true (emoji_entry_matches (duck, tokens));
-	g_strfreev (tokens);
-
-	tokens = emoji_search_tokenize ("bird");
-	g_assert_true (emoji_entry_matches (duck, tokens));
-	g_strfreev (tokens);
-
-	tokens = emoji_search_tokenize ("no-such-emoji-keyword");
-	g_assert_false (emoji_entry_matches (duck, tokens));
-	g_strfreev (tokens);
-}
-
-static void
-test_search_by_alias (void)
-{
-	const EmojiEntry *thumbs = find_by_name ("thumbs up");
-	char **tokens;
-
-	g_assert_nonnull (thumbs);
-	g_assert_nonnull (strstr (thumbs->aliases, "thumbsup"));
-
-	tokens = emoji_search_tokenize (":thumbsup:");
-	g_assert_nonnull (tokens);
-	g_assert_true (emoji_entry_matches (thumbs, tokens));
-	g_strfreev (tokens);
-}
-
-static void
-test_multi_token_search (void)
-{
-	const EmojiEntry *flag = find_by_name ("flag: Canada");
-	char **tokens = emoji_search_tokenize ("flag canada");
-
-	g_assert_nonnull (flag);
-	g_assert_cmpuint (flag->group, ==, EMOJI_GROUP_FLAGS);
-	g_assert_nonnull (tokens);
-	g_assert_true (emoji_entry_matches (flag, tokens));
-	g_strfreev (tokens);
-}
-
-static void
-test_skin_tones (void)
-{
-	const EmojiEntry *thumbs = find_by_name ("thumbs up");
-	const EmojiEntry *duck = find_by_name ("duck");
-	const char *toned;
-
-	g_assert_nonnull (thumbs);
-	g_assert_cmpint (thumbs->tone_set, >=, 0);
-
-	toned = emoji_entry_sequence_for_tone (thumbs, EMOJI_TONE_MEDIUM);
-	g_assert_cmpstr (toned, !=, thumbs->sequence);
-	g_assert_nonnull (strstr (toned, MEDIUM_TONE_MODIFIER));
-	g_assert_cmpstr (emoji_entry_sequence_for_tone (thumbs, EMOJI_TONE_NONE),
-						  ==, thumbs->sequence);
-
-	g_assert_cmpstr (emoji_entry_sequence_for_tone (thumbs, (EmojiTone) -1), ==, thumbs->sequence);
-	g_assert_cmpstr (emoji_entry_sequence_for_tone (thumbs, EMOJI_TONE_COUNT), ==, thumbs->sequence);
-	g_assert_nonnull (duck);
-	g_assert_cmpint (duck->tone_set, ==, -1);
-	g_assert_cmpstr (emoji_entry_sequence_for_tone (duck, EMOJI_TONE_DARK),
-						  ==, duck->sequence);
-}
-
-static void
-test_find_by_sequence (void)
-{
-	EmojiTone tone;
-	const EmojiEntry *entry;
-
-	entry = emoji_data_find_by_sequence (GRINNING_FACE, &tone);
-	g_assert_nonnull (entry);
-	g_assert_cmpstr (entry->name, ==, "grinning face");
-	g_assert_cmpuint (tone, ==, EMOJI_TONE_NONE);
-
-	entry = emoji_data_find_by_sequence (WAVE_DARK, &tone);
-	g_assert_nonnull (entry);
-	g_assert_cmpstr (entry->name, ==, "waving hand");
-	g_assert_cmpuint (tone, ==, EMOJI_TONE_DARK);
-
-	g_assert_null (emoji_data_find_by_sequence ("not an emoji", &tone));
-	g_assert_null (emoji_data_find_by_sequence ("", NULL));
-	g_assert_null (emoji_data_find_by_sequence (NULL, NULL));
-}
-
-static void
-test_grapheme_sequences_intact (void)
-{
-	const EmojiEntry *keycap = find_by_name ("keycap: #");
-	const EmojiEntry *family = find_by_name ("family: man, woman, boy");
-
-	g_assert_nonnull (keycap);
-	g_assert_cmpstr (keycap->sequence, ==, KEYCAP_HASH);
-
-	g_assert_nonnull (family);
-	g_assert_nonnull (strstr (family->sequence, "\342\200\215"));
-}
-
-static void
-test_tokenize_edge_cases (void)
-{
-	g_assert_null (emoji_search_tokenize (NULL));
-	g_assert_null (emoji_search_tokenize (""));
-	g_assert_null (emoji_search_tokenize ("   "));
-	g_assert_null (emoji_search_tokenize (":::"));
-	g_assert_null (emoji_search_tokenize ("\377"));
-}
-
-static void
-test_versions (void)
-{
-	g_assert_true (*emoji_data_unicode_version () != '\0');
-	g_assert_true (*emoji_data_cldr_version () != '\0');
-}
-
-int
-main (int argc, char **argv)
-{
-	g_test_init (&argc, &argv, NULL);
-	g_test_add_func ("/emoji-data/catalog-integrity", test_catalog_integrity);
-	g_test_add_func ("/emoji-data/cldr-order", test_cldr_order);
-	g_test_add_func ("/emoji-data/groups", test_groups);
-	g_test_add_func ("/emoji-data/search-by-keyword", test_search_by_keyword);
-	g_test_add_func ("/emoji-data/search-by-alias", test_search_by_alias);
-	g_test_add_func ("/emoji-data/multi-token-search", test_multi_token_search);
-	g_test_add_func ("/emoji-data/skin-tones", test_skin_tones);
-	g_test_add_func ("/emoji-data/find-by-sequence", test_find_by_sequence);
-	g_test_add_func ("/emoji-data/grapheme-sequences-intact",
-						  test_grapheme_sequences_intact);
-	g_test_add_func ("/emoji-data/tokenize-edge-cases",
-						  test_tokenize_edge_cases);
-	g_test_add_func ("/emoji-data/versions", test_versions);
-	return g_test_run ();
-}
@@ -1,117 +0,0 @@
-/* ZoiteChat
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include <string.h>
-
-#include <glib.h>
-
-#include "../hexcolor.h"
-#include "../util.h"
-
-static void
-test_parse_foreground (void)
-{
-	guint32 fg = 0, bg = 0xDEAD;
-	int has_bg = TRUE;
-
-	g_assert_cmpint (hexcolor_parse ("FF8800text", 10, &fg, &bg, &has_bg), ==, 6);
-	g_assert_cmphex (fg, ==, 0xFF8800);
-	g_assert_false (has_bg);
-	g_assert_cmphex (bg, ==, 0xDEAD);
-}
-
-static void
-test_parse_foreground_and_background (void)
-{
-	guint32 fg = 0, bg = 0;
-	int has_bg = FALSE;
-
-	g_assert_cmpint (hexcolor_parse ("112233,a0b0c0x", 14, &fg, &bg, &has_bg), ==, 13);
-	g_assert_cmphex (fg, ==, 0x112233);
-	g_assert_cmphex (bg, ==, 0xA0B0C0);
-	g_assert_true (has_bg);
-}
-
-static void
-test_parse_bad_background_keeps_foreground (void)
-{
-	guint32 fg = 0;
-	int has_bg = TRUE;
-
-	/* ",12" is plain text after a valid foreground, not a background */
-	g_assert_cmpint (hexcolor_parse ("112233,12 hi", 12, &fg, NULL, &has_bg), ==, 6);
-	g_assert_cmphex (fg, ==, 0x112233);
-	g_assert_false (has_bg);
-}
-
-static void
-test_parse_bare (void)
-{
-	/* a bare \004 resets colors, like a bare \003 */
-	g_assert_cmpint (hexcolor_parse (" text", 5, NULL, NULL, NULL), ==, 0);
-	g_assert_cmpint (hexcolor_parse ("12345G", 6, NULL, NULL, NULL), ==, 0);
-	g_assert_cmpint (hexcolor_parse ("", 0, NULL, NULL, NULL), ==, 0);
-}
-
-static void
-test_parse_respects_length (void)
-{
-	g_assert_cmpint (hexcolor_parse ("FF8800", 5, NULL, NULL, NULL), ==, 0);
-	g_assert_cmpint (hexcolor_parse ("FF8800,112233", 12, NULL, NULL, NULL), ==, 6);
-}
-
-static void
-assert_stripped (const char *in, int flags, const char *expected)
-{
-	char out[128];
-
-	strip_color2 (in, -1, out, flags);
-	g_assert_cmpstr (out, ==, expected);
-}
-
-static void
-test_strip (void)
-{
-	assert_stripped ("\004FF8800alice\017: hi", STRIP_ALL, "alice: hi");
-	assert_stripped ("\004112233,445566bg", STRIP_ALL, "bg");
-	assert_stripped ("a\004 b", STRIP_ALL, "a b");
-	assert_stripped ("\004FF8800\00312x", STRIP_ALL, "x");
-	/* a trailing code with too few digits leaves the rest as text */
-	assert_stripped ("x\004FF88", STRIP_ALL, "xFF88");
-}
-
-static void
-test_strip_keeps_hex_without_strip_color (void)
-{
-	assert_stripped ("\004FF8800red\002", STRIP_ATTRIB, "\004FF8800red");
-}
-
-int
-main (int argc, char *argv[])
-{
-	g_test_init (&argc, &argv, NULL);
-
-	g_test_add_func ("/hexcolor/parse/foreground", test_parse_foreground);
-	g_test_add_func ("/hexcolor/parse/foreground-and-background", test_parse_foreground_and_background);
-	g_test_add_func ("/hexcolor/parse/bad-background", test_parse_bad_background_keeps_foreground);
-	g_test_add_func ("/hexcolor/parse/bare", test_parse_bare);
-	g_test_add_func ("/hexcolor/parse/length", test_parse_respects_length);
-	g_test_add_func ("/hexcolor/strip/all", test_strip);
-	g_test_add_func ("/hexcolor/strip/attrib-only", test_strip_keeps_hex_without_strip_color);
-
-	return g_test_run ();
-}
@@ -47,7 +47,6 @@
 #include "zoitechatc.h"
 #include <ctype.h>
 #include "util.h"
-#include "hexcolor.h"

 #if defined (__FreeBSD__) || defined (__APPLE__)
 #include <sys/sysctl.h>
@@ -331,14 +330,6 @@ strip_color2 (const char *src, int len, char *dst, int flags)
 				if (!(flags & STRIP_COLOR)) goto pass_char;
 				rcol = 2;
 				break;
-			case '\004':			  /*ATTR_HEXCOLOR: */
-				if (!(flags & STRIP_COLOR)) goto pass_char;
-				{
-					int skip = hexcolor_parse (src + 1, len, NULL, NULL, NULL);
-					src += skip;
-					len -= skip;
-				}
-				break;
 			case HIDDEN_CHAR:	/* CL: invisible text (for event formats only) */	/* this takes care of the topic */
 				if (!(flags & STRIP_HIDDEN)) goto pass_char;
 				break;
@@ -95,7 +95,6 @@ int zoitechat_is_quitting = FALSE;
 /* command-line args */
 int arg_dont_autoconnect = FALSE;
 int arg_skip_plugins = FALSE;
-gint arg_run_as_root = FALSE;
 char *arg_url = NULL;
 char **arg_urls = NULL;
 char *arg_command = NULL;
@@ -464,6 +463,7 @@ doover:
 		while (list)
 		{
 			sess = list->data;
+			if (!sess->server->have_awaynotify)
 				sess->done_away_check = FALSE;
 			list = list->next;
 		}
@@ -1176,25 +1176,6 @@ main (int argc, char *argv[])
 	HRESULT coinit_result;
 #endif

-#ifdef __linux__
-	for (i = 1; i < argc; i++)
-	{
-		if (strcmp (argv[i], "--") == 0)
-			break;
-		if (strcmp (argv[i], "--run-as-root") == 0)
-		{
-			arg_run_as_root = TRUE;
-			break;
-		}
-	}
-
-	if (geteuid () == 0 && !arg_run_as_root)
-	{
-		fe_root_warning ();
-		return EXIT_FAILURE;
-	}
-#endif
-
 	srand ((unsigned int) time (NULL)); /* CL: do this only once! */

 	/* We must check for the config dir parameter, otherwise load_config() will behave incorrectly.
@@ -1283,7 +1264,7 @@ main (int argc, char *argv[])
 #ifndef WIN32
 #ifndef __EMX__
 	/* OS/2 uses UID 0 all the time */
-	if (getuid () == 0 && !arg_run_as_root)
+	if (getuid () == 0)
 		fe_message (_("* Running IRC as root is stupid! You should\n"
 			      "  create a User Account and use that to login.\n"), FE_MSG_WARN|FE_MSG_WAIT);
 #endif
@@ -204,7 +204,6 @@ struct zoitechatprefs
 	unsigned int hex_net_auto_reconnect;
 	unsigned int hex_net_auto_reconnectonfail;
 	unsigned int hex_net_proxy_auth;
-	unsigned int hex_net_remote_media;
 	unsigned int hex_net_throttle;
 	unsigned int hex_notify_whois_online;
 	unsigned int hex_perl_warnings;
@@ -261,7 +260,6 @@ struct zoitechatprefs
 	int hex_gui_dialog_left;
 	int hex_gui_dialog_top;
 	int hex_gui_dialog_width;
-	int hex_gui_emoji_skin_tone;
 	int hex_gui_lagometer;
 	int hex_gui_lang;
 	int hex_gui_pane_divider_position;
@@ -315,7 +313,6 @@ struct zoitechatprefs
 	char hex_dcc_completed_dir[PATHLEN + 1];
 	char hex_dcc_dir[PATHLEN + 1];
 	char hex_dcc_ip[DOMAINLEN + 1];
-	char hex_gui_tab_font[FONTNAMELEN + 1];
 	char hex_gui_ulist_doubleclick[256];
 	char hex_input_command_char[4];
 	char hex_irc_extra_hilight[300];
@@ -450,7 +447,6 @@ typedef struct session
 	int mode_timeout_tag;
 	int typing_timeout_tag;
 	int typing_status;
-	gint64 typing_last_sent;
 	int typing_animation_tag;
 	int typing_animation_frame;

@@ -25,7 +25,6 @@ extern struct zoitechatprefs prefs;
 extern int zoitechat_is_quitting;
 extern gint arg_skip_plugins;	/* command-line args */
 extern gint arg_dont_autoconnect;
-extern gint arg_run_as_root;
 extern char *arg_url;
 extern char **arg_urls;
 extern char *arg_command;
@@ -138,7 +138,7 @@ ascii_open (void)
 		{
 			table_pos++;
 			hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-			gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
+			gtk_container_add (GTK_CONTAINER (vbox), hbox);
 			gtk_widget_show (hbox);
 			i++;
 			continue;
@@ -155,14 +155,14 @@ ascii_open (void)
 								G_CALLBACK (ascii_click), NULL);
 		g_signal_connect (G_OBJECT (but), "enter-notify-event",
 								G_CALLBACK (ascii_enter), label);
-		gtk_box_pack_start (GTK_BOX (hbox), but, TRUE, TRUE, 0);
+		gtk_box_pack_start (GTK_BOX (hbox), but, 0, 0, 0);
 		gtk_widget_show (but);

 		table_pos += len;
 	}

 	frame = gtk_frame_new ("");
-	gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
+	gtk_container_add (GTK_CONTAINER (hbox), frame);
 	gtk_container_add (GTK_CONTAINER (frame), label);
 	gtk_widget_show (label);
 	gtk_widget_show (frame);
@@ -19,8 +19,6 @@

 /* file included in chanview.c */

-#include "theme/theme-css.h"
-
 typedef struct
 {
 	GtkWidget *outer;	/* outer box */
@@ -692,7 +690,6 @@ cv_tabs_add (chanview *cv, chan *ch, char *name, GtkTreeIter *parent)
 	GtkWidget *label;
 	GtkWidget *close_button;
 	GtkWidget *close_icon;
-	GtkCssProvider *close_css;

 	but = gtk_toggle_button_new ();
 	gtk_widget_set_name (but, "zoitechat-tab");
@@ -701,27 +698,9 @@ cv_tabs_add (chanview *cv, chan *ch, char *name, GtkTreeIter *parent)
 	cv_add_scroll_events (but);
 	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
 	label = gtk_label_new (name);
-	if (prefs.hex_gui_tab_font[0])
-	{
-		PangoFontDescription *font_desc;
-
-		/* Keep activity colours and the Smaller text scale in the label attributes. */
-		font_desc = pango_font_description_from_string (prefs.hex_gui_tab_font);
-		gtkutil_apply_palette (label, NULL, NULL, font_desc);
-		pango_font_description_free (font_desc);
-	}
 	close_button = gtk_button_new ();
 	cv_add_scroll_events (close_button);
 	gtk_style_context_add_class (gtk_widget_get_style_context (close_button), "flat");
-	gtk_style_context_add_class (gtk_widget_get_style_context (close_button), "zoitechat-tab-close");
-	/* Theme button minimums and padding must not determine the tab height. */
-	close_css = gtk_css_provider_new ();
-	gtk_css_provider_load_from_data (close_css,
-		".zoitechat-tab-close { min-width: 0; min-height: 0; padding: 1px; margin: 0; }",
-		-1, NULL);
-	theme_css_apply_widget_provider (close_button, GTK_STYLE_PROVIDER (close_css));
-	g_object_unref (close_css);
-	gtk_widget_set_valign (close_button, GTK_ALIGN_CENTER);
 	close_icon = gtk_image_new_from_icon_name ("window-close-symbolic", GTK_ICON_SIZE_MENU);
 	gtk_image_set_pixel_size (GTK_IMAGE (close_icon), 8);
 	gtk_button_set_always_show_image (GTK_BUTTON (close_button), TRUE);
@@ -300,14 +300,6 @@ cv_tree_focus (chan *ch)

 	path = gtk_tree_model_get_path (model, &ch->iter);
 	if (path)
-	{
-		if (!gtk_widget_get_realized (GTK_WIDGET (tree)))
-		{
-			/* Layout changes can restore focus before the new tree is realized.
-			 * Let GTK track the row and scroll once its geometry is available. */
-			gtk_tree_view_scroll_to_cell (tree, path, NULL, TRUE, 0.5, 0.5);
-		}
-		else
 	{
 		/* This full section does what
 		 * gtk_tree_view_scroll_to_cell (tree, path, NULL, TRUE, 0.5, 0.5);
@@ -330,7 +322,6 @@ cv_tree_focus (chan *ch)
 				dest_y = 0;
 			gtk_tree_view_scroll_to_point (tree, -1, dest_y);
 		}
-		}
 		/* theft done, now make it focused like */
 		gtk_tree_view_set_cursor (tree, path, NULL, FALSE);
 		gtk_tree_path_free (path);
@@ -1,117 +0,0 @@
-/* ZoiteChat -- shared, process-private emoji font rendering.
- * Distributed under GPL-2.0-or-later; see COPYING. */
-
-#include "fe-gtk.h"
-#include "emoji-font.h"
-
-#include <fontconfig/fontconfig.h>
-#include <pango/pangocairo.h>
-#include <pango/pangofc-fontmap.h>
-#ifdef G_OS_WIN32
-#include <glib/gwin32.h>
-#endif
-
-static char *
-emoji_font_path (void)
-{
-	const char *override = g_getenv ("ZOITECHAT_EMOJI_FONT");
-
-	if (override && *override)
-		return g_strdup (override);
-
-#ifdef G_OS_WIN32
-	{
-		char *base = g_win32_get_package_installation_directory_of_module (NULL);
-		char *path;
-
-		if (!base)
-			return NULL;
-		path = g_build_filename (base, "share", "fonts", "zoitechat",
-			"NotoColorEmoji.ttf", NULL);
-		g_free (base);
-		return path;
-	}
-#else
-	return g_build_filename (ZOITECHAT_DATADIR, "fonts", "zoitechat",
-		"NotoColorEmoji.ttf", NULL);
-#endif
-}
-
-PangoFontMap *
-emoji_font_get_map (void)
-{
-	static PangoFontMap *map;
-	static gboolean attempted;
-	FcConfig *config;
-	char *path, *escaped, *rules;
-	gboolean registered;
-
-	/* GTK widgets are used on the main thread. Keep the map alive for every
-	 * layout's lifetime, including detached chat windows and shutdown. */
-	if (attempted)
-		return map;
-	attempted = TRUE;
-
-	path = emoji_font_path ();
-	if (!path || !g_file_test (path, G_FILE_TEST_IS_REGULAR))
-	{
-		g_warning ("Bundled emoji font is missing: %s", path ? path : "(unknown path)");
-		g_free (path);
-		return NULL;
-	}
-
-	/* Keep the system configuration for normal fonts and user preferences.
-	 * Give ONLY our application font a private family so an older system
-	 * Noto cannot win the match. Never install fonts globally or override
-	 * digits, '#' or '*' in the widget's ordinary text font. */
-	config = FcInitLoadConfigAndFonts ();
-	if (!config)
-	{
-		g_warning ("Unable to load font configuration for emoji rendering");
-		g_free (path);
-		return NULL;
-	}
-	escaped = g_markup_escape_text (path, -1);
-	rules = g_strdup_printf (
-		"<fontconfig>"
-		"<match target='scan'><test name='file'><string>%s</string></test>"
-		"<edit name='family' mode='assign'><string>" ZOITECHAT_EMOJI_FAMILY
-		"</string></edit></match>"
-		"<match target='pattern'><test name='family'><string>emoji</string></test>"
-		/* System rules may already have prepended older emoji families.
-		 * Put our bundled family before those, not just before 'emoji'. */
-		"<edit name='family' mode='prepend_first' binding='strong'><string>"
-		ZOITECHAT_EMOJI_FAMILY "</string></edit></match>"
-		"</fontconfig>", escaped);
-	registered = FcConfigParseAndLoadFromMemory (config, (const FcChar8 *) rules, FcTrue) &&
-		FcConfigAppFontAddFile (config, (const FcChar8 *) path);
-	g_free (rules);
-	g_free (escaped);
-	g_free (path);
-
-	if (registered)
-	{
-		/* GDI cannot load Noto's CBDT/CBLC color glyphs. FreeType works on
-		 * Windows 7 too, and is shipped in all of our GTK dependency bundles. */
-		map = pango_cairo_font_map_new_for_font_type (CAIRO_FONT_TYPE_FT);
-		if (map && PANGO_IS_FC_FONT_MAP (map))
-			pango_fc_font_map_set_config (PANGO_FC_FONT_MAP (map), config);
-		else
-			g_clear_object (&map);
-	}
-	FcConfigDestroy (config);
-	if (!map)
-		g_warning ("Unable to initialize bundled emoji rendering; using system fonts");
-	return map;
-}
-
-void
-emoji_font_apply (GtkWidget *widget)
-{
-	PangoFontMap *map;
-
-	g_return_if_fail (GTK_IS_WIDGET (widget));
-	map = emoji_font_get_map ();
-	if (map && gtk_widget_get_font_map (widget) != map)
-		gtk_widget_set_font_map (widget, map);
-}
@@ -1,16 +0,0 @@
-#ifndef ZOITECHAT_EMOJI_FONT_H
-#define ZOITECHAT_EMOJI_FONT_H
-
-#include <gtk/gtk.h>
-
-/* Application-private family, distinct from any system Noto version. */
-#define ZOITECHAT_EMOJI_FAMILY "ZoiteChat Emoji"
-
-/* Use the shared FreeType font map without changing the widget's font/style.
- * Children inherit it. Call before creating layouts for the widget. */
-void emoji_font_apply (GtkWidget *widget);
-
-/* Borrowed reference, or NULL if registration failed. Also usable headlessly. */
-PangoFontMap *emoji_font_get_map (void);
-
-#endif
@@ -1,828 +0,0 @@
-/* ZoiteChat
- * Copyright (C) 2026 deepend-tildeclub.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-/* ZoiteChat's own emoji picker.  Replaces GTK's built-in "show-emoji-icon"
- * entry machinery so that every build offers the same catalog (bundled at
- * compile time from pinned Unicode/CLDR data, see src/common/emoji-data.h)
- * regardless of the GTK runtime version or distribution emoji data.
- * Selecting an emoji inserts the plain Unicode sequence at the cursor -
- * nothing about what is sent over IRC changes. */
-
-#include <string.h>
-
-#include "fe-gtk.h"
-
-#include "../common/zoitechat.h"
-#include "../common/zoitechatc.h"
-#include "../common/cfgfiles.h"
-#include "../common/emoji-data.h"
-
-#include "emoji-picker.h"
-#include "emoji-font.h"
-#include "preferences-persistence.h"
-
-#define EMOJI_CATEGORY_RECENT -1
-#define EMOJI_RECENTS_MAX 32
-#define EMOJI_SEARCH_MAX_RESULTS 256
-#define EMOJI_GRID_COLUMNS 9
-
-typedef struct
-{
-	GtkWidget *button;
-	GtkWidget *target;						/* weak pointer to the input entry */
-	GtkWidget *popover;
-	GtkWidget *search_entry;
-	GtkWidget *stack;
-	GtkWidget *grid;							/* GtkFlowBox */
-	GtkWidget *scroller;
-	GtkWidget *empty_label;
-	GtkWidget *category_buttons[EMOJI_GROUP_COUNT + 1];	/* [0] = recents */
-	GtkWidget *tone_buttons[EMOJI_TONE_COUNT];
-	int category;								/* EMOJI_CATEGORY_RECENT or EmojiGroup */
-	gboolean populated;
-	gboolean updating_buttons;
-} EmojiPicker;
-
-/* ------------------------------------------------------------------------ *
- * Recently used emoji, shared by all windows and persisted across runs
- * ------------------------------------------------------------------------ */
-
-static GPtrArray *recent_emoji = NULL;
-
-static void emoji_search_stop_cb (GtkSearchEntry *entry, gpointer userdata);
-
-static char *
-emoji_recents_filename (void)
-{
-	return g_build_filename (get_xdir (), "emoji-recents.conf", NULL);
-}
-
-static void
-emoji_recents_load (void)
-{
-	char *filename, *contents = NULL;
-	char **lines;
-	gsize i;
-
-	if (recent_emoji)
-		return;
-
-	recent_emoji = g_ptr_array_new_with_free_func (g_free);
-
-	filename = emoji_recents_filename ();
-	if (g_file_get_contents (filename, &contents, NULL, NULL))
-	{
-		lines = g_strsplit (contents, "\n", -1);
-		for (i = 0; lines[i] && recent_emoji->len < EMOJI_RECENTS_MAX; i++)
-		{
-			g_strstrip (lines[i]);
-			/* only keep sequences that exist in the bundled catalog */
-			if (*lines[i] && emoji_data_find_by_sequence (lines[i], NULL))
-				g_ptr_array_add (recent_emoji, g_strdup (lines[i]));
-		}
-		g_strfreev (lines);
-		g_free (contents);
-	}
-	g_free (filename);
-}
-
-static void
-emoji_recents_save (void)
-{
-	GString *contents = g_string_new (NULL);
-	char *filename;
-	gsize i;
-
-	for (i = 0; i < recent_emoji->len; i++)
-	{
-		g_string_append (contents, g_ptr_array_index (recent_emoji, i));
-		g_string_append_c (contents, '\n');
-	}
-
-	filename = emoji_recents_filename ();
-	g_file_set_contents (filename, contents->str, contents->len, NULL);
-	g_free (filename);
-	g_string_free (contents, TRUE);
-}
-
-static void
-emoji_recents_add (const char *sequence)
-{
-	GPtrArray *updated;
-	gsize i;
-
-	emoji_recents_load ();
-
-	updated = g_ptr_array_new_with_free_func (g_free);
-	g_ptr_array_add (updated, g_strdup (sequence));
-	for (i = 0; i < recent_emoji->len && updated->len < EMOJI_RECENTS_MAX; i++)
-	{
-		const char *old = g_ptr_array_index (recent_emoji, i);
-
-		if (strcmp (old, sequence) != 0)
-			g_ptr_array_add (updated, g_strdup (old));
-	}
-	g_ptr_array_free (recent_emoji, TRUE);
-	recent_emoji = updated;
-
-	emoji_recents_save ();
-}
-
-/* ------------------------------------------------------------------------ *
- * Appearance helpers
- * ------------------------------------------------------------------------ */
-
-/* One application-wide provider so every emoji cell prefers a color emoji
- * font without changing the fonts of surrounding widgets. The private
- * font map resolves ZoiteChat Emoji to the same bundled file everywhere. */
-static void
-emoji_picker_ensure_css (void)
-{
-	static gboolean done = FALSE;
-	GtkCssProvider *provider;
-
-	if (done)
-		return;
-	done = TRUE;
-
-	provider = gtk_css_provider_new ();
-	gtk_css_provider_load_from_data (provider,
-		".zc-emoji-cell {"
-		"  font-family: \"ZoiteChat Emoji\", \"Noto Color Emoji\","
-		"    \"Apple Color Emoji\", \"Twemoji Mozilla\", \"EmojiOne Color\";"
-		"  font-size: 15pt;"
-		"  padding: 2px;"
-		"}"
-		".zc-emoji-cell-small {"
-		"  font-family: \"ZoiteChat Emoji\", \"Noto Color Emoji\","
-		"    \"Apple Color Emoji\", \"Twemoji Mozilla\", \"EmojiOne Color\";"
-		"}",
-		-1, NULL);
-	gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
-		GTK_STYLE_PROVIDER (provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-	g_object_unref (provider);
-}
-
-static GtkWidget *
-emoji_label_new (const char *sequence, gboolean small_cell)
-{
-	GtkWidget *label = gtk_label_new (sequence);
-
-	gtk_style_context_add_class (gtk_widget_get_style_context (label),
-										  small_cell ? "zc-emoji-cell-small" : "zc-emoji-cell");
-
-	return label;
-}
-
-static void
-emoji_picker_set_a11y_name (GtkWidget *widget, const char *name)
-{
-	AtkObject *accessible = gtk_widget_get_accessible (widget);
-
-	if (accessible)
-		atk_object_set_name (accessible, name);
-}
-
-static EmojiTone
-emoji_picker_current_tone (void)
-{
-	int tone = prefs.hex_gui_emoji_skin_tone;
-
-	if (tone < EMOJI_TONE_NONE || tone >= EMOJI_TONE_COUNT)
-		return EMOJI_TONE_NONE;
-
-	return (EmojiTone) tone;
-}
-
-/* "waving hand" / "waving hand (Dark skin tone)", with :shortcodes: on a
- * second line - used for both tooltips and accessible names. */
-static char *
-emoji_picker_describe (const EmojiEntry *entry, EmojiTone tone)
-{
-	GString *desc = g_string_new (NULL);
-	char **aliases;
-	gsize i;
-
-	if (tone != EMOJI_TONE_NONE && entry->tone_set >= 0)
-		g_string_append_printf (desc, "%s (%s)", entry->name,
-										emoji_data_tone_display_name (tone));
-	else
-		g_string_append (desc, entry->name);
-
-	if (*entry->aliases)
-	{
-		g_string_append_c (desc, '\n');
-		aliases = g_strsplit (entry->aliases, " ", -1);
-		for (i = 0; aliases[i]; i++)
-		{
-			if (i > 0)
-				g_string_append_c (desc, ' ');
-			g_string_append_printf (desc, ":%s:", aliases[i]);
-		}
-		g_strfreev (aliases);
-	}
-
-	return g_string_free (desc, FALSE);
-}
-
-/* ------------------------------------------------------------------------ *
- * Insertion
- * ------------------------------------------------------------------------ */
-
-/* GtkEntry can select all text when focused; preserve its selection and
- * editability instead of temporarily making a read-only entry writable. */
-static void
-emoji_picker_focus_target (EmojiPicker *picker)
-{
-	GtkEditable *editable;
-	int start, end, pos;
-	gboolean selected;
-
-	if (!picker->target)
-		return;
-	/* Closing a window also closes its popovers. Moving focus during that
-	 * teardown can make GtkWindow reference an already destroyed widget. */
-	if (gtk_widget_in_destruction (picker->target) ||
-		gtk_widget_in_destruction (gtk_widget_get_toplevel (picker->target)))
-		return;
-	editable = GTK_EDITABLE (picker->target);
-	pos = gtk_editable_get_position (editable);
-	selected = gtk_editable_get_selection_bounds (editable, &start, &end);
-	gtk_widget_grab_focus (picker->target);
-	if (selected)
-		gtk_editable_select_region (editable, pos == start ? end : start, pos);
-	else
-		gtk_editable_set_position (editable, pos);
-}
-
-static void
-emoji_picker_insert (EmojiPicker *picker, const char *sequence)
-{
-	GtkEditable *editable;
-	int pos, start, end, max_length, length;
-
-	if (!picker->target || !sequence || !*sequence)
-		return;
-	editable = GTK_EDITABLE (picker->target);
-	if (!gtk_editable_get_editable (editable))
-		return;
-
-	/* GtkEntry otherwise truncates at a code point, possibly leaving half
-	 * a flag, a dangling joiner or a skin-tone modifier. Reject as a unit. */
-	max_length = gtk_entry_get_max_length (GTK_ENTRY (editable));
-	length = gtk_entry_get_text_length (GTK_ENTRY (editable));
-	if (gtk_editable_get_selection_bounds (editable, &start, &end))
-		length -= end - start;
-	if (length + g_utf8_strlen (sequence, -1) > (max_length ? max_length : 65535))
-	{
-		gtk_widget_error_bell (picker->target);
-		return;
-	}
-
-	gtk_editable_delete_selection (editable);
-	pos = gtk_editable_get_position (editable);
-	gtk_editable_insert_text (editable, sequence, strlen (sequence), &pos);
-	gtk_editable_set_position (editable, pos);
-	emoji_recents_add (sequence);
-	gtk_popover_popdown (GTK_POPOVER (picker->popover));
-	emoji_picker_focus_target (picker);
-}
-
-static void
-emoji_picker_activate_child (EmojiPicker *picker, GtkFlowBoxChild *child)
-{
-	emoji_picker_insert (picker,
-		g_object_get_data (G_OBJECT (child), "emoji-sequence"));
-}
-
-static void
-emoji_grid_child_activated_cb (GtkFlowBox *grid, GtkFlowBoxChild *child,
-										 gpointer userdata)
-{
-	emoji_picker_activate_child (userdata, child);
-}
-
-/* ------------------------------------------------------------------------ *
- * Grid contents
- * ------------------------------------------------------------------------ */
-
-static void
-emoji_grid_add (EmojiPicker *picker, const EmojiEntry *entry,
-					 const char *sequence, EmojiTone tone)
-{
-	GtkWidget *child, *label;
-	char *desc;
-
-	label = emoji_label_new (sequence, FALSE);
-	child = gtk_flow_box_child_new ();
-	gtk_container_add (GTK_CONTAINER (child), label);
-	g_object_set_data_full (G_OBJECT (child), "emoji-sequence",
-									g_strdup (sequence), g_free);
-
-	desc = emoji_picker_describe (entry, tone);
-	gtk_widget_set_tooltip_text (child, desc);
-	emoji_picker_set_a11y_name (child, desc);
-	g_free (desc);
-
-	gtk_container_add (GTK_CONTAINER (picker->grid), child);
-}
-
-static void
-emoji_picker_refresh (EmojiPicker *picker)
-{
-	const char *text = gtk_entry_get_text (GTK_ENTRY (picker->search_entry));
-	EmojiTone tone = emoji_picker_current_tone ();
-	GtkAdjustment *vadj;
-	gboolean any = FALSE;
-	gsize i, results = 0;
-
-	gtk_container_foreach (GTK_CONTAINER (picker->grid),
-								  (GtkCallback) gtk_widget_destroy, NULL);
-
-	if (text && *text)
-	{
-		char **tokens = emoji_search_tokenize (text);
-
-		if (tokens)
-		{
-			for (i = 0; i < emoji_data_count () &&
-							results < EMOJI_SEARCH_MAX_RESULTS; i++)
-			{
-				const EmojiEntry *entry = emoji_data_entry (i);
-
-				if (!emoji_entry_matches (entry, tokens))
-					continue;
-				emoji_grid_add (picker, entry,
-									 emoji_entry_sequence_for_tone (entry, tone), tone);
-				results++;
-			}
-			g_strfreev (tokens);
-			any = results > 0;
-		}
-		gtk_label_set_text (GTK_LABEL (picker->empty_label),
-								  _("No emoji found"));
-	}
-	else if (picker->category == EMOJI_CATEGORY_RECENT)
-	{
-		emoji_recents_load ();
-		for (i = 0; i < recent_emoji->len; i++)
-		{
-			const char *sequence = g_ptr_array_index (recent_emoji, i);
-			EmojiTone seq_tone;
-			const EmojiEntry *entry =
-				emoji_data_find_by_sequence (sequence, &seq_tone);
-
-			if (!entry)
-				continue;
-			emoji_grid_add (picker, entry, sequence, seq_tone);
-			any = TRUE;
-		}
-		gtk_label_set_text (GTK_LABEL (picker->empty_label),
-								  _("No recently used emoji"));
-	}
-	else
-	{
-		for (i = 0; i < emoji_data_count (); i++)
-		{
-			const EmojiEntry *entry = emoji_data_entry (i);
-
-			if (entry->group != picker->category)
-				continue;
-			emoji_grid_add (picker, entry,
-								 emoji_entry_sequence_for_tone (entry, tone), tone);
-			any = TRUE;
-		}
-	}
-
-	gtk_widget_show_all (picker->grid);
-	gtk_stack_set_visible_child_name (GTK_STACK (picker->stack),
-												 any ? "grid" : "empty");
-
-	vadj = gtk_scrolled_window_get_vadjustment (
-		GTK_SCROLLED_WINDOW (picker->scroller));
-	gtk_adjustment_set_value (vadj, gtk_adjustment_get_lower (vadj));
-}
-
-/* ------------------------------------------------------------------------ *
- * Categories
- * ------------------------------------------------------------------------ */
-
-static void
-emoji_picker_sync_category_buttons (EmojiPicker *picker)
-{
-	gsize i;
-
-	picker->updating_buttons = TRUE;
-	for (i = 0; i < G_N_ELEMENTS (picker->category_buttons); i++)
-	{
-		int category = (int) i - 1;
-
-		gtk_toggle_button_set_active (
-			GTK_TOGGLE_BUTTON (picker->category_buttons[i]),
-			category == picker->category);
-	}
-	picker->updating_buttons = FALSE;
-}
-
-static void
-emoji_category_toggled_cb (GtkToggleButton *button, gpointer userdata)
-{
-	EmojiPicker *picker = userdata;
-	int category = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button),
-																		"emoji-category"));
-
-	if (picker->updating_buttons)
-		return;
-
-	if (!gtk_toggle_button_get_active (button))
-	{
-		/* the active category cannot be untoggled */
-		if (picker->category == category)
-			emoji_picker_sync_category_buttons (picker);
-		return;
-	}
-
-	picker->category = category;
-	emoji_picker_sync_category_buttons (picker);
-
-	/* leave search mode; clearing the entry triggers the refresh */
-	if (*gtk_entry_get_text (GTK_ENTRY (picker->search_entry)))
-		gtk_entry_set_text (GTK_ENTRY (picker->search_entry), "");
-	else
-		emoji_picker_refresh (picker);
-}
-
-static GtkWidget *
-emoji_category_button_new (EmojiPicker *picker, int category,
-									const char *icon_sequence, const char *name)
-{
-	GtkWidget *button = gtk_toggle_button_new ();
-
-	gtk_container_add (GTK_CONTAINER (button),
-							 emoji_label_new (icon_sequence, TRUE));
-	gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
-	gtk_widget_set_tooltip_text (button, name);
-	emoji_picker_set_a11y_name (button, name);
-	g_object_set_data (G_OBJECT (button), "emoji-category",
-							 GINT_TO_POINTER (category));
-	g_signal_connect (G_OBJECT (button), "toggled",
-							G_CALLBACK (emoji_category_toggled_cb), picker);
-
-	return button;
-}
-
-/* ------------------------------------------------------------------------ *
- * Skin tones
- * ------------------------------------------------------------------------ */
-
-#define EMOJI_TONE_SAMPLE "\342\234\213"		/* ✋ raised hand */
-
-static void
-emoji_tone_toggled_cb (GtkToggleButton *button, gpointer userdata)
-{
-	EmojiPicker *picker = userdata;
-	int tone = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button),
-																  "emoji-tone"));
-
-	if (!gtk_toggle_button_get_active (button))
-		return;
-	if (prefs.hex_gui_emoji_skin_tone == tone)
-		return;
-
-	prefs.hex_gui_emoji_skin_tone = tone;
-	preferences_persistence_save_all ();
-	emoji_picker_refresh (picker);
-}
-
-static GtkWidget *
-emoji_tone_row_new (EmojiPicker *picker)
-{
-	GtkWidget *box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-	GtkWidget *button;
-	GSList *group = NULL;
-	const EmojiEntry *sample = emoji_data_find_by_sequence (EMOJI_TONE_SAMPLE,
-																			  NULL);
-	int tone;
-
-	gtk_widget_set_halign (box, GTK_ALIGN_CENTER);
-
-	for (tone = EMOJI_TONE_NONE; tone < EMOJI_TONE_COUNT; tone++)
-	{
-		const char *sequence = EMOJI_TONE_SAMPLE;
-
-		if (sample)
-			sequence = emoji_entry_sequence_for_tone (sample, tone);
-
-		button = gtk_radio_button_new (group);
-		group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button));
-		gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (button), FALSE);
-		gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
-		gtk_container_add (GTK_CONTAINER (button),
-								 emoji_label_new (sequence, TRUE));
-		gtk_widget_set_tooltip_text (button,
-											  emoji_data_tone_display_name (tone));
-		emoji_picker_set_a11y_name (button,
-											 emoji_data_tone_display_name (tone));
-		g_object_set_data (G_OBJECT (button), "emoji-tone",
-								 GINT_TO_POINTER (tone));
-		picker->tone_buttons[tone] = button;
-
-		if (emoji_picker_current_tone () == tone)
-			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
-
-		g_signal_connect (G_OBJECT (button), "toggled",
-								G_CALLBACK (emoji_tone_toggled_cb), picker);
-
-		gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
-	}
-
-	return box;
-}
-
-/* the pref can also change externally (/set gui_emoji_skin_tone) */
-static void
-emoji_picker_sync_tone_buttons (EmojiPicker *picker)
-{
-	EmojiTone tone = emoji_picker_current_tone ();
-
-	gtk_toggle_button_set_active (
-		GTK_TOGGLE_BUTTON (picker->tone_buttons[tone]), TRUE);
-}
-
-/* ------------------------------------------------------------------------ *
- * Search
- * ------------------------------------------------------------------------ */
-
-static void
-emoji_search_changed_cb (GtkSearchEntry *entry, gpointer userdata)
-{
-	emoji_picker_refresh (userdata);
-}
-
-static void
-emoji_search_activate_cb (GtkEntry *entry, gpointer userdata)
-{
-	EmojiPicker *picker = userdata;
-	GtkFlowBoxChild *child;
-
-	/* search-changed is delayed by GTK; Enter must use the current query. */
-	emoji_picker_refresh (picker);
-	child = gtk_flow_box_get_child_at_index (GTK_FLOW_BOX (picker->grid), 0);
-
-	/* Enter inserts the first hit */
-	if (child)
-		emoji_picker_activate_child (picker, child);
-}
-
-static gboolean
-emoji_search_key_press_cb (GtkWidget *entry, GdkEventKey *event,
-									gpointer userdata)
-{
-	EmojiPicker *picker = userdata;
-	GtkFlowBoxChild *child;
-
-	if (event->keyval == GDK_KEY_Down || event->keyval == GDK_KEY_KP_Down)
-	{
-		emoji_picker_refresh (picker);
-		child = gtk_flow_box_get_child_at_index (GTK_FLOW_BOX (picker->grid), 0);
-		if (child)
-		{
-			gtk_widget_grab_focus (GTK_WIDGET (child));
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-/* ------------------------------------------------------------------------ *
- * Popover assembly
- * ------------------------------------------------------------------------ */
-
-static void
-emoji_picker_build_contents (EmojiPicker *picker)
-{
-	GtkWidget *vbox, *categories, *button;
-	int group;
-
-	emoji_picker_ensure_css ();
-
-	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-	g_object_set (vbox, "margin", 6, NULL);
-
-	picker->search_entry = gtk_search_entry_new ();
-	gtk_entry_set_placeholder_text (GTK_ENTRY (picker->search_entry),
-											  _("Search emoji"));
-	emoji_picker_set_a11y_name (picker->search_entry, _("Search emoji"));
-	g_signal_connect (G_OBJECT (picker->search_entry), "search-changed",
-							G_CALLBACK (emoji_search_changed_cb), picker);
-	g_signal_connect (G_OBJECT (picker->search_entry), "stop-search",
-		G_CALLBACK (emoji_search_stop_cb), picker);
-	g_signal_connect (G_OBJECT (picker->search_entry), "activate",
-							G_CALLBACK (emoji_search_activate_cb), picker);
-	g_signal_connect (G_OBJECT (picker->search_entry), "key-press-event",
-							G_CALLBACK (emoji_search_key_press_cb), picker);
-	gtk_box_pack_start (GTK_BOX (vbox), picker->search_entry, FALSE, FALSE, 0);
-
-	categories = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-	gtk_box_set_homogeneous (GTK_BOX (categories), TRUE);
-
-	picker->category_buttons[0] = emoji_category_button_new (picker,
-		EMOJI_CATEGORY_RECENT, "\360\237\225\230" /* 🕘 */,
-		_("Recently Used"));
-	gtk_box_pack_start (GTK_BOX (categories), picker->category_buttons[0],
-							  TRUE, TRUE, 0);
-	for (group = 0; group < EMOJI_GROUP_COUNT; group++)
-	{
-		button = emoji_category_button_new (picker, group,
-			emoji_data_group_icon_sequence (group),
-			emoji_data_group_display_name (group));
-		picker->category_buttons[group + 1] = button;
-		gtk_box_pack_start (GTK_BOX (categories), button, TRUE, TRUE, 0);
-	}
-	gtk_box_pack_start (GTK_BOX (vbox), categories, FALSE, FALSE, 0);
-
-	picker->grid = gtk_flow_box_new ();
-	gtk_flow_box_set_selection_mode (GTK_FLOW_BOX (picker->grid),
-												GTK_SELECTION_NONE);
-	gtk_flow_box_set_activate_on_single_click (GTK_FLOW_BOX (picker->grid),
-															 TRUE);
-	gtk_flow_box_set_min_children_per_line (GTK_FLOW_BOX (picker->grid),
-														 EMOJI_GRID_COLUMNS);
-	gtk_flow_box_set_max_children_per_line (GTK_FLOW_BOX (picker->grid),
-														 EMOJI_GRID_COLUMNS);
-	gtk_flow_box_set_homogeneous (GTK_FLOW_BOX (picker->grid), TRUE);
-	gtk_widget_set_valign (picker->grid, GTK_ALIGN_START);
-	g_signal_connect (G_OBJECT (picker->grid), "child-activated",
-							G_CALLBACK (emoji_grid_child_activated_cb), picker);
-
-	picker->scroller = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (picker->scroller),
-											  GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-	gtk_scrolled_window_set_min_content_height (
-		GTK_SCROLLED_WINDOW (picker->scroller), 300);
-	gtk_container_add (GTK_CONTAINER (picker->scroller), picker->grid);
-
-	picker->empty_label = gtk_label_new (_("No emoji found"));
-	gtk_style_context_add_class (
-		gtk_widget_get_style_context (picker->empty_label), "dim-label");
-
-	picker->stack = gtk_stack_new ();
-	gtk_widget_set_size_request (picker->stack, 380, -1);
-	gtk_stack_add_named (GTK_STACK (picker->stack), picker->scroller, "grid");
-	gtk_stack_add_named (GTK_STACK (picker->stack), picker->empty_label,
-								"empty");
-	gtk_box_pack_start (GTK_BOX (vbox), picker->stack, TRUE, TRUE, 0);
-
-	gtk_box_pack_start (GTK_BOX (vbox), emoji_tone_row_new (picker),
-							  FALSE, FALSE, 0);
-
-	gtk_container_add (GTK_CONTAINER (picker->popover), vbox);
-	gtk_widget_show_all (vbox);
-
-	emoji_picker_sync_category_buttons (picker);
-}
-
-static void
-emoji_popover_show_cb (GtkWidget *popover, gpointer userdata)
-{
-	EmojiPicker *picker = userdata;
-
-	if (!picker->populated)
-	{
-		picker->populated = TRUE;
-		emoji_picker_build_contents (picker);
-	}
-	else if (*gtk_entry_get_text (GTK_ENTRY (picker->search_entry)))
-	{
-		gtk_entry_set_text (GTK_ENTRY (picker->search_entry), "");
-	}
-
-	gtk_widget_grab_focus (picker->search_entry);
-	emoji_picker_sync_tone_buttons (picker);
-	emoji_picker_refresh (picker);
-}
-
-static void
-emoji_search_stop_cb (GtkSearchEntry *entry, gpointer userdata)
-{
-	EmojiPicker *picker = userdata;
-
-	gtk_popover_popdown (GTK_POPOVER (picker->popover));
-}
-
-static void
-emoji_entry_insert_cb (GtkEntry *entry, GtkWidget *button)
-{
-	/* Covers GtkEntry's context menu and Ctrl+period/Ctrl+semicolon. */
-	g_signal_stop_emission_by_name (entry, "insert-emoji");
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
-}
-
-static const char *
-emoji_picker_button_icon_name (void)
-{
-	static const char *icon_names[] = {
-		"face-smile-symbolic",
-		"face-smile",
-		"insert-emoticon-symbolic",
-		"insert-emoticon",
-		"zc-menu-emoji",
-	};
-	GtkIconTheme *theme = gtk_icon_theme_get_default ();
-	gsize i;
-
-	if (!theme)
-		return NULL;
-
-	for (i = 0; i < G_N_ELEMENTS (icon_names); i++)
-	{
-		if (gtk_icon_theme_has_icon (theme, icon_names[i]))
-			return icon_names[i];
-	}
-
-	return NULL;
-}
-
-static void
-emoji_picker_free (gpointer data)
-{
-	EmojiPicker *picker = data;
-
-	if (picker->target)
-		g_object_remove_weak_pointer (G_OBJECT (picker->target),
-												(gpointer *) &picker->target);
-	g_free (picker);
-}
-
-GtkWidget *
-emoji_picker_button_new (GtkWidget *target_entry)
-{
-	EmojiPicker *picker;
-	const char *icon_name;
-
-	g_return_val_if_fail (GTK_IS_ENTRY (target_entry), NULL);
-
-	picker = g_new0 (EmojiPicker, 1);
-	picker->target = target_entry;
-	picker->category = EMOJI_GROUP_SMILEYS_EMOTION;
-	g_object_add_weak_pointer (G_OBJECT (target_entry),
-										(gpointer *) &picker->target);
-
-	picker->button = gtk_menu_button_new ();
-	emoji_font_apply (picker->button);
-	gtk_button_set_relief (GTK_BUTTON (picker->button), GTK_RELIEF_NONE);
-	gtk_widget_set_can_focus (picker->button, TRUE);
-	gtk_widget_set_focus_on_click (picker->button, FALSE);
-	gtk_widget_set_tooltip_text (picker->button, _("Insert Emoji"));
-	emoji_picker_set_a11y_name (picker->button, _("Insert Emoji"));
-
-	icon_name = emoji_picker_button_icon_name ();
-	if (icon_name)
-	{
-		gtk_button_set_image (GTK_BUTTON (picker->button),
-			gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU));
-	}
-	else
-	{
-		/* no themed icon anywhere: fall back to an emoji label so the
-		 * button never turns into an unusable placeholder */
-		emoji_picker_ensure_css ();
-		gtk_container_add (GTK_CONTAINER (picker->button),
-								 emoji_label_new ("\360\237\231\202" /* 🙂 */, TRUE));
-	}
-
-	/* the popover shell is cheap; its contents are built on first open so
-	 * startup cost stays unchanged */
-	picker->popover = gtk_popover_new (picker->button);
-	emoji_font_apply (picker->popover);
-	g_object_set_data_full (G_OBJECT (picker->popover), "emoji-picker",
-		picker, emoji_picker_free);
-	/* GtkEntry added this action in 3.22.27; earlier supported GTK 3.22
-	 * runtimes still use the button without emitting an unknown signal. */
-	if (g_signal_lookup ("insert-emoji", GTK_TYPE_ENTRY))
-		g_signal_connect_object (target_entry, "insert-emoji",
-			G_CALLBACK (emoji_entry_insert_cb), picker->button, 0);
-	gtk_popover_set_position (GTK_POPOVER (picker->popover), GTK_POS_TOP);
-	g_signal_connect (G_OBJECT (picker->popover), "show",
-							G_CALLBACK (emoji_popover_show_cb), picker);
-	gtk_menu_button_set_popover (GTK_MENU_BUTTON (picker->button),
-										  picker->popover);
-
-	return picker->button;
-}
@@ -1,31 +0,0 @@
-/* ZoiteChat
- * Copyright (C) 2026 deepend-tildeclub.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef ZOITECHAT_EMOJI_PICKER_H
-#define ZOITECHAT_EMOJI_PICKER_H
-
-#include <gtk/gtk.h>
-
-/* Creates the emoji picker button for an input entry.  The returned
- * GtkMenuButton opens a popover with search, categories, recently used
- * emoji and skin-tone selection; activating an emoji inserts its Unicode
- * sequence into target_entry at the cursor.  The popover contents are
- * built lazily on first open. */
-GtkWidget *emoji_picker_button_new (GtkWidget *target_entry);
-
-#endif
@@ -49,7 +49,6 @@
 #include "chanlist.h"
 #include "joind.h"
 #include "xtext.h"
-#include "inline-image.h"
 #include "theme/theme-gtk.h"
 #include "menu.h"
 #include "notifygui.h"
@@ -90,9 +89,6 @@ static const GOptionEntry gopt_entries[] =
 {"no-auto",	'a', 0, G_OPTION_ARG_NONE,	&arg_dont_autoconnect, N_("Don't auto connect to servers"), NULL},
 {"cfgdir",	'd', 0, G_OPTION_ARG_STRING,	&arg_cfgdir, N_("Use a different config directory"), "PATH"},
 {"no-plugins",	'n', 0, G_OPTION_ARG_NONE,	&arg_skip_plugins, N_("Don't auto load any plugins"), NULL},
-#ifdef __linux__
- {"run-as-root", 0, 0, G_OPTION_ARG_NONE, &arg_run_as_root, N_("Allow ZoiteChat to run as root (unsafe)"), NULL},
-#endif
 {"plugindir",	'p', 0, G_OPTION_ARG_NONE,	&arg_show_autoload, N_("Show plugin/script auto-load directory"), NULL},
 {"configdir",	'u', 0, G_OPTION_ARG_NONE,	&arg_show_config, N_("Show user config directory"), NULL},
 {"url",	 0,  G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, &arg_url, N_("Open an irc://server:port/channel?key URL"), "URL"},
@@ -106,33 +102,6 @@ static const GOptionEntry gopt_entries[] =
 {NULL}
 };

-#ifdef __linux__
-void
-fe_root_warning (void)
-{
-	const char *message =
-		"ZoiteChat refuses to run as root on Linux.\n\n"
-		"Run it as a normal user, or pass --run-as-root to override this protection.";
-	GtkWidget *dialog;
-
-	g_printerr ("%s\n", message);
-
-	/* A graphical session may not be accessible to root, particularly under
-	 * Wayland. Keep stderr as the fallback if GTK cannot open the display. */
-	if (!gtk_init_check (NULL, NULL))
-		return;
-
-	dialog = gtk_message_dialog_new (NULL,
-	                                 GTK_DIALOG_MODAL,
-	                                 GTK_MESSAGE_ERROR,
-	                                 GTK_BUTTONS_CLOSE,
-	                                 "%s", message);
-	gtk_window_set_title (GTK_WINDOW (dialog), "ZoiteChat");
-	gtk_dialog_run (GTK_DIALOG (dialog));
-	gtk_widget_destroy (dialog);
-}
-#endif
-
 #ifdef WIN32
 static void
 create_msg_dialog (gchar *title, gchar *message)
@@ -974,13 +943,7 @@ void
 fe_print_text (struct session *sess, char *text, time_t stamp,
 			   gboolean no_activity)
 {
-	/* image links become a "[view image]" placeholder with a hidden URL */
-	char *filtered = inline_image_filter_text (text);
-
-	PrintTextRaw (sess->res->buffer,
-					  (unsigned char *)(filtered ? filtered : text),
-					  prefs.hex_text_indent, stamp);
-	g_free (filtered);
+	PrintTextRaw (sess->res->buffer, (unsigned char *)text, prefs.hex_text_indent, stamp);

 	if (no_activity || !sess->gui->is_tab)
 		return;
@@ -114,7 +114,7 @@ typedef struct restore_gui

 	/* information stored when this tab isn't front-most */
 	GtkListStore *user_model;	/* for filling the GtkTreeView */
-	GHashTable *user_row_refs;
+	GHashTable *user_row_iters; /* User * -> persistent GtkTreeIter * */
 	void *buffer;		/* xtext_Buffer */
 	char *input_text;	/* input text buffer (while not-front tab) */
 	char *topic_text;	/* topic GtkEntry buffer */
@@ -31,7 +31,7 @@
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>$(ArchiveLibDir);$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(DepLibs);$(ZoiteChatLib)common.lib;wbemuuid.lib;dwmapi.lib;pangoft2-1.0.lib;fontconfig.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(DepLibs);$(ZoiteChatLib)common.lib;wbemuuid.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
    </Link>
  </ItemDefinitionGroup>
@@ -59,7 +59,6 @@ powershell "Get-Content -Encoding UTF8 '$(ZoiteChatLib)zoitechat.rc.utf8' | Out-
    <ClInclude Include="fkeys.h" />
    <ClInclude Include="gtkutil.h" />
    <ClInclude Include="icon-resolver.h" />
-    <ClInclude Include="inline-image.h" />
    <ClInclude Include="joind.h" />
    <ClInclude Include="maingui.h" />
    <ClInclude Include="preferences-persistence.h" />
@@ -98,14 +97,11 @@ powershell "Get-Content -Encoding UTF8 '$(ZoiteChatLib)zoitechat.rc.utf8' | Out-
    <ClCompile Include="custom-list.c" />
    <ClCompile Include="dccgui.c" />
    <ClCompile Include="editlist.c" />
-    <ClCompile Include="emoji-picker.c" />
-    <ClCompile Include="emoji-font.c" />
    <ClCompile Include="fe-gtk.c" />
    <ClCompile Include="fkeys.c" />
    <ClCompile Include="gtkutil.c" />
    <ClCompile Include="icon-resolver.c" />
    <ClCompile Include="ignoregui.c" />
-    <ClCompile Include="inline-image.c" />
    <ClCompile Include="joind.c" />
    <ClCompile Include="maingui.c" />
    <ClCompile Include="menu.c" />
@@ -45,9 +45,6 @@
    <ClInclude Include="icon-resolver.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="inline-image.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="joind.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -173,9 +170,6 @@
    <ClCompile Include="ignoregui.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="inline-image.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
    <ClCompile Include="joind.c">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -1221,7 +1221,7 @@ key_dialog_load (GtkListStore *store)
 void
 key_dialog_show ()
 {
-	GtkWidget *vbox, *box, *pane, *scroll;
+	GtkWidget *vbox, *box;
 	GtkWidget *view, *xtext, *delete_button;
 	GtkListStore *store;
 	XTextColor xtext_palette[XTEXT_COLS];
@@ -1237,20 +1237,10 @@ key_dialog_show ()
 	key_dialog = mg_create_generic_tab ("editkeys", buf, TRUE, FALSE, key_dialog_close,
 									NULL, 600, 360, &vbox, 0);

-	pane = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
-	gtk_box_pack_start (GTK_BOX (vbox), pane, TRUE, TRUE, 0);
-	box = gtkutil_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
-	gtk_paned_pack1 (GTK_PANED (pane), box, TRUE, FALSE);
-	view = key_dialog_treeview_new (box);
-	scroll = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll),
-	                                GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-	gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (scroll), 80);
-	gtk_paned_pack2 (GTK_PANED (pane), scroll, TRUE, FALSE);
-	gtk_paned_set_position (GTK_PANED (pane), 220);
+	view = key_dialog_treeview_new (vbox);
 	theme_get_xtext_colors (xtext_palette, XTEXT_COLS);
 	xtext = gtk_xtext_new (xtext_palette, 0);
-	gtk_container_add (GTK_CONTAINER (scroll), xtext);
+	gtk_box_pack_start (GTK_BOX (vbox), xtext, FALSE, TRUE, 2);
 	gtk_xtext_set_font (GTK_XTEXT (xtext), prefs.hex_text_font);

 	g_object_set_data (G_OBJECT (key_dialog), "view", view);
@@ -168,36 +168,7 @@ gtkutil_append_font_css (GString *css, const PangoFontDescription *font_desc)
 		const char *family = pango_font_description_get_family (font_desc);

 		if (family && *family)
-		{
-			char **families = g_strsplit (family, ",", -1);
-			gboolean appended = FALSE;
-			int i;
-
-			for (i = 0; families[i]; i++)
-			{
-				char *name = g_strstrip (families[i]);
-
-				if (!*name)
-					continue;
-
-				g_string_append (css, appended ? "," : " font-family:");
-				g_string_append (css, " \"");
-				for (; *name; name++)
-				{
-					if (*name == '\\' || *name == '\"')
-						g_string_append_c (css, '\\');
-					if (*name == '\n' || *name == '\r' || *name == '\f')
-						g_string_append_printf (css, "\\%x ", (unsigned char) *name);
-					else
-						g_string_append_c (css, *name);
-				}
-				g_string_append_c (css, '\"');
-				appended = TRUE;
-			}
-			if (appended)
-				g_string_append (css, ";");
-			g_strfreev (families);
-		}
+			g_string_append_printf (css, " font-family: \"%s\";", family);
 	}

 	if (mask & PANGO_FONT_MASK_STYLE)
@@ -641,8 +612,9 @@ gtkutil_get_str (char *msg, char *def, void *callback, void *userdata, gboolean
 	if (parent_window && GTK_IS_WINDOW (parent_window))
 		gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent_window));
 	gtkutil_place_dialog (dialog);
+	gtk_box_set_homogeneous (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), TRUE);

-	hbox = gtkutil_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 6);
+	hbox = gtkutil_box_new (GTK_ORIENTATION_HORIZONTAL, TRUE, 0);

 	g_object_set_data (G_OBJECT (dialog), "cb", callback);
 	g_object_set_data (G_OBJECT (dialog), "ud", userdata);
@@ -652,8 +624,7 @@ gtkutil_get_str (char *msg, char *def, void *callback, void *userdata, gboolean
 						 	G_CALLBACK (gtkutil_str_enter), dialog);
 	gtk_entry_set_text (GTK_ENTRY (entry), def ? def : "");
 	gtk_entry_set_visibility (GTK_ENTRY (entry), visible);
-	gtk_widget_set_valign (entry, GTK_ALIGN_CENTER);
-	gtk_box_pack_end (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
+	gtk_box_pack_end (GTK_BOX (hbox), entry, 0, 0, 0);

 	label = gtk_label_new (msg);
 	gtk_box_pack_end (GTK_BOX (hbox), label, 0, 0, 0);
@@ -661,8 +632,7 @@ gtkutil_get_str (char *msg, char *def, void *callback, void *userdata, gboolean
 	g_signal_connect (G_OBJECT (dialog), "response",
 						   G_CALLBACK (gtkutil_get_str_response), entry);

-	gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
-	                    hbox, TRUE, TRUE, 0);
+	gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox);

 	gtk_widget_show_all (dialog);
 }
@@ -743,8 +713,9 @@ fe_get_int (char *msg, int def, void *callback, void *userdata)
 	if (parent_window && GTK_IS_WINDOW (parent_window))
 		gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent_window));
 	gtkutil_place_dialog (dialog);
+	gtk_box_set_homogeneous (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), TRUE);

-	hbox = gtkutil_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 6);
+	hbox = gtkutil_box_new (GTK_ORIENTATION_HORIZONTAL, TRUE, 0);

 	g_object_set_data (G_OBJECT (dialog), "cb", callback);
 	g_object_set_data (G_OBJECT (dialog), "ud", userdata);
@@ -755,8 +726,7 @@ fe_get_int (char *msg, int def, void *callback, void *userdata)
 	gtk_adjustment_set_upper (adj, 1024);
 	gtk_adjustment_set_step_increment (adj, 1);
 	gtk_spin_button_set_value ((GtkSpinButton*)spin, def);
-	gtk_widget_set_valign (spin, GTK_ALIGN_CENTER);
-	gtk_box_pack_end (GTK_BOX (hbox), spin, TRUE, TRUE, 0);
+	gtk_box_pack_end (GTK_BOX (hbox), spin, 0, 0, 0);

 	label = gtk_label_new (msg);
 	gtk_box_pack_end (GTK_BOX (hbox), label, 0, 0, 0);
@@ -764,8 +734,7 @@ fe_get_int (char *msg, int def, void *callback, void *userdata)
 	g_signal_connect (G_OBJECT (dialog), "response",
 						   G_CALLBACK (gtkutil_get_number_response), spin);

-	gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
-	                    hbox, TRUE, TRUE, 0);
+	gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox);

 	gtk_widget_show_all (dialog);
 }
@@ -785,18 +754,17 @@ fe_get_bool (char *title, char *prompt, void *callback, void *userdata)
 	if (parent_window && GTK_IS_WINDOW (parent_window))
 		gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent_window));
 	gtkutil_place_dialog (dialog);
+	gtk_box_set_homogeneous (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), TRUE);

 	g_object_set_data (G_OBJECT (dialog), "cb", callback);
 	g_object_set_data (G_OBJECT (dialog), "ud", userdata);

 	prompt_label = gtk_label_new (prompt);
-	gtk_label_set_line_wrap (GTK_LABEL (prompt_label), TRUE);

 	g_signal_connect (G_OBJECT (dialog), "response",
 		G_CALLBACK (gtkutil_get_bool_response), NULL);

-	gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
-	                    prompt_label, TRUE, TRUE, 0);
+	gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), prompt_label);

 	gtk_widget_show_all (dialog);
 }
@@ -888,10 +856,7 @@ gtkutil_window_new (char *title, char *role, int width, int height, int flags)
 	gtk_window_set_wmclass (GTK_WINDOW (win), "ZoiteChat", "zoitechat");
 #endif
 	gtk_window_set_title (GTK_WINDOW (win), title);
-	/* Zero means content-sized to callers; GTK requires -1 for that. */
-	gtk_window_set_default_size (GTK_WINDOW (win),
-	                             width > 0 ? width : -1,
-	                             height > 0 ? height : -1);
+	gtk_window_set_default_size (GTK_WINDOW (win), width, height);
 	gtk_window_set_role (GTK_WINDOW (win), role);
 	if (flags & 1)
 		gtk_window_set_position (GTK_WINDOW (win), GTK_WIN_POS_MOUSE);
@@ -1,45 +0,0 @@
-/* ZoiteChat
- * Copyright (C) 2026 ZoiteChat contributors.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef ZOITECHAT_INLINE_IMAGE_H
-#define ZOITECHAT_INLINE_IMAGE_H
-
-#include "xtext.h"
-
-/* does this look like a direct http(s) link to an image file? */
-gboolean inline_image_is_image_url (const char *url);
-
-/* show the image behind 'url' inline below 'ent', or hide it again if it is
- * already shown.  Errors are reported to 'sess'. */
-void inline_image_toggle (session *sess, GtkXText *xtext, textentry *ent,
-								  const char *url);
-
-/* replace image links in a message with a clickable placeholder label that
- * hides the URL.  Returns a newly allocated string, or NULL if the text has
- * no image links (or the feature is off). */
-char *inline_image_filter_text (const char *text);
-
-/* pop up a window with a larger version of the entry's inline image */
-void inline_image_show_viewer (GtkXText *xtext, textentry *ent);
-
-/* can downloads go through the proxy configured for ZoiteChat (or is no
- * proxy configured)?  FALSE means loading media would have to bypass the
- * user's proxy, which is never done. */
-gboolean inline_image_proxy_usable (void);
-
-#endif
@@ -137,6 +137,7 @@ joind_show_dialog (server *serv)
 	gtk_window_set_position (GTK_WINDOW (dialog1), GTK_WIN_POS_CENTER_ON_PARENT);
 	gtk_window_set_transient_for (GTK_WINDOW(dialog1), GTK_WINDOW(serv->front_session->gui->window));
 	gtk_window_set_modal (GTK_WINDOW (dialog1), TRUE);
+	gtk_window_set_resizable (GTK_WINDOW (dialog1), FALSE);

 	dialog_vbox1 = gtk_dialog_get_content_area (GTK_DIALOG (dialog1));
 	gtk_widget_show (dialog_vbox1);
@@ -45,8 +45,6 @@
 #include "theme/theme-manager.h"
 #include "theme/theme-css.h"
 #include "banlist.h"
-#include "emoji-picker.h"
-#include "emoji-font.h"
 #include "gtkutil.h"
 #include "icon-resolver.h"
 #include "joind.h"
@@ -61,7 +59,6 @@
 #include "pixmaps.h"
 #include "plugin-tray.h"
 #include "xtext.h"
-#include "inline-image.h"
 #include "sexy-spell-entry.h"
 #include "gtkutil.h"

@@ -203,6 +200,7 @@ enum
 #define TAG_IRC 0               /* server, channel, dialog */
 #define TAG_UTIL 1      /* dcc, notify, chanlist */

+static void mg_apply_emoji_fallback_widget (GtkWidget *widget);
 static void mg_reply_show_child (GtkWidget *widget, gpointer data);

 #define MG_CONFIG_SAVE_DEBOUNCE_MS 250
@@ -778,13 +776,10 @@ mg_inputbox_focus (GtkWidget *widget, GdkEventFocus *event, session_gui *gui)
 }


-#define TYPING_THROTTLE_USEC (3 * G_USEC_PER_SEC)
-
 static gboolean
 mg_client_tag_allowed (server *serv, const char *tag)
 {
        char **deny;
-        gboolean blocked = FALSE;
        int i;

        if (!serv->have_message_tags)
@@ -796,42 +791,30 @@ mg_client_tag_allowed (server *serv, const char *tag)
        deny = g_strsplit (serv->clienttagdeny, ",", 0);
        for (i = 0; deny[i]; i++)
        {
-                if (!strcmp (deny[i], "*"))
-                        blocked = TRUE;
-                else if (deny[i][0] == '-' && !strcmp (deny[i] + 1, tag))
-                        blocked = FALSE;
-                else if (!strcmp (deny[i], tag) || (deny[i][0] == '+' && !strcmp (deny[i] + 1, tag)))
-                        blocked = TRUE;
+                if (!strcmp (deny[i], "*") || !strcmp (deny[i], tag) || (deny[i][0] == '+' && !strcmp (deny[i] + 1, tag)))
+                {
+                        g_strfreev (deny);
+                        return FALSE;
+                }
        }

        g_strfreev (deny);
-        return !blocked;
+        return TRUE;
 }

-static gboolean
-mg_typing_can_send (session *sess)
-{
-        gint64 now = g_get_monotonic_time ();
-
-        return sess->typing_last_sent == 0 ||
-               now - sess->typing_last_sent >= TYPING_THROTTLE_USEC;
-}
-
-static gboolean
+static void
 mg_send_typing (session *sess, const char *state)
 {
        char tags[32];

        if (!sess || !sess->server->connected || !mg_client_tag_allowed (sess->server, "typing") || !sess->channel[0])
-                return FALSE;
+                return;

        if (sess->type != SESS_CHANNEL && sess->type != SESS_DIALOG)
-                return FALSE;
+                return;

        g_snprintf (tags, sizeof (tags), "+typing=%s", state);
        sess->server->p_tagmsg (sess->server, tags, sess->channel);
-        sess->typing_last_sent = g_get_monotonic_time ();
-        return TRUE;
 }

 static int
@@ -860,15 +843,17 @@ mg_typing_update (session *sess, const char *text)

        if (!text || !*text || text[0] == prefs.hex_input_command_char[0])
        {
-                if (sess->typing_status && mg_typing_can_send (sess))
+                if (sess->typing_status)
                        mg_send_typing (sess, "done");
                sess->typing_status = 0;
                return;
        }

-        if (mg_typing_can_send (sess))
+        if (sess->typing_status != 1)
+        {
                mg_send_typing (sess, "active");
                sess->typing_status = 1;
+        }
        sess->typing_timeout_tag = fe_timeout_add_seconds (6, mg_typing_pause_cb, sess);
 }

@@ -940,236 +925,10 @@ mg_send_reply_or_text (session *sess, char *cmd)
 	mg_reply_update (sess);
 }

-typedef struct
-{
-	gboolean bold;
-	gboolean italic;
-	gboolean underline;
-	gboolean strikethrough;
-	gboolean reverse;
-	gint foreground;
-	gint background;
-	gboolean pending_foreground;
-	gboolean pending_background;
-} MgInputFormatState;
-
-static void
-mg_input_format_state_at_cursor (GtkEntry *entry, MgInputFormatState *state)
-{
-	const char *text;
-	const char *cursor;
-	gsize limit;
-	gsize i;
-	gint cursor_pos;
-
-	memset (state, 0, sizeof (*state));
-	state->foreground = -1;
-	state->background = -1;
-
-	text = gtk_entry_get_text (entry);
-	cursor_pos = gtk_editable_get_position (GTK_EDITABLE (entry));
-	if (!text || cursor_pos < 0)
-		return;
-
-	cursor = g_utf8_offset_to_pointer (text, cursor_pos);
-	limit = (gsize) (cursor - text);
-
-	for (i = 0; i < limit;)
-	{
-		guchar ch = (guchar) text[i++];
-
-		switch (ch)
-		{
-		case ATTR_BOLD:
-			state->bold = !state->bold;
-			break;
-		case ATTR_ITALICS:
-			state->italic = !state->italic;
-			break;
-		case ATTR_UNDERLINE:
-			state->underline = !state->underline;
-			break;
-		case ATTR_STRIKETHROUGH:
-			state->strikethrough = !state->strikethrough;
-			break;
-		case ATTR_REVERSE:
-			state->reverse = !state->reverse;
-			break;
-		case ATTR_RESET:
-		case '\n':
-			state->bold = FALSE;
-			state->italic = FALSE;
-			state->underline = FALSE;
-			state->strikethrough = FALSE;
-			state->reverse = FALSE;
-			state->foreground = -1;
-			state->background = -1;
-			state->pending_foreground = FALSE;
-			state->pending_background = FALSE;
-			break;
-		case ATTR_COLOR:
-			{
-				gint value = 0;
-				gint digits = 0;
-
-				state->pending_foreground = FALSE;
-				state->pending_background = FALSE;
-
-				if (i >= limit)
-				{
-					state->pending_foreground = TRUE;
-					break;
-				}
-
-				if (!g_ascii_isdigit (text[i]))
-				{
-					state->foreground = -1;
-					state->background = -1;
-					break;
-				}
-
-				while (i < limit && digits < 2 && g_ascii_isdigit (text[i]))
-				{
-					value = (value * 10) + (text[i] - '0');
-					i++;
-					digits++;
-				}
-				state->foreground = value;
-				state->background = -1;
-
-				if (i < limit && text[i] == ',')
-				{
-					i++;
-					if (i >= limit)
-					{
-						state->pending_background = TRUE;
-						break;
-					}
-
-					value = 0;
-					digits = 0;
-					while (i < limit && digits < 2 && g_ascii_isdigit (text[i]))
-					{
-						value = (value * 10) + (text[i] - '0');
-						i++;
-						digits++;
-					}
-					if (digits > 0)
-						state->background = value;
-				}
-			}
-			break;
-		default:
-			break;
-		}
-	}
-}
-
-static void
-mg_input_format_append (GString *summary, const char *text)
-{
-	if (summary->len > 0)
-		g_string_append (summary, " · ");
-	g_string_append (summary, text);
-}
-
-static void
-mg_input_format_color_value (char *buffer, gsize buffer_len, const char *label, gint color_index)
-{
-	guint16 red;
-	guint16 green;
-	guint16 blue;
-
-	if (theme_get_mirc_color_rgb16 ((unsigned int) color_index, &red, &green, &blue))
-	{
-		g_snprintf (buffer, buffer_len,
-					"%s <b>%02d</b> <span foreground=\"#%02x%02x%02x\">■</span>",
-					label, color_index, (guint) (red >> 8), (guint) (green >> 8),
-					(guint) (blue >> 8));
-		return;
-	}
-
-	g_snprintf (buffer, buffer_len, "%s <b>%02d</b>", label, color_index);
-}
-
-static void
-mg_input_format_update (GtkEntry *entry)
-{
-	GtkWidget *format_box;
-	GtkWidget *format_label;
-	MgInputFormatState state;
-	GString *summary;
-	char color[96];
-	char *markup;
-
-	format_box = g_object_get_data (G_OBJECT (entry), "zoitechat-format-box");
-	format_label = g_object_get_data (G_OBJECT (entry), "zoitechat-format-label");
-	if (!format_box || !format_label)
-		return;
-
-	if (!prefs.hex_gui_input_attr)
-	{
-		gtk_widget_hide (format_box);
-		return;
-	}
-
-	mg_input_format_state_at_cursor (entry, &state);
-	summary = g_string_new (NULL);
-
-	if (state.bold)
-		mg_input_format_append (summary, "<b>Bold</b>");
-	if (state.italic)
-		mg_input_format_append (summary, "<i>Italic</i>");
-	if (state.underline)
-		mg_input_format_append (summary, "<u>Underline</u>");
-	if (state.strikethrough)
-		mg_input_format_append (summary, "<s>Strikethrough</s>");
-	if (state.reverse)
-		mg_input_format_append (summary, "Reverse");
-
-	if (state.foreground >= 0)
-	{
-		mg_input_format_color_value (color, sizeof (color), "Text color", state.foreground);
-		mg_input_format_append (summary, color);
-	}
-	if (state.background >= 0)
-	{
-		mg_input_format_color_value (color, sizeof (color), "Background", state.background);
-		mg_input_format_append (summary, color);
-	}
-	if (state.pending_foreground)
-		mg_input_format_append (summary, "Color: type foreground[,background]");
-	else if (state.pending_background)
-		mg_input_format_append (summary, "Background: type color");
-
-	if (summary->len == 0)
-	{
-		gtk_widget_hide (format_box);
-		g_string_free (summary, TRUE);
-		return;
-	}
-
-	markup = g_strdup_printf ("<span foreground='#7d8790'>Formatting · %s</span>", summary->str);
-	gtk_label_set_markup (GTK_LABEL (format_label), markup);
-	gtk_widget_show (format_label);
-	gtk_widget_show (format_box);
-	g_free (markup);
-	g_string_free (summary, TRUE);
-}
-
-static void
-mg_inputbox_cursor_changed (GObject *object, GParamSpec *pspec, gpointer userdata)
-{
-	(void) pspec;
-	(void) userdata;
-	mg_input_format_update (GTK_ENTRY (object));
-}
-
 static void
 mg_inputbox_changed (GtkEditable *editable, session_gui *gui)
 {
        key_check_replace_on_change (editable, NULL);
-        mg_input_format_update (GTK_ENTRY (editable));
        if (current_sess && current_sess->gui == gui)
                mg_typing_update (current_sess, gtk_entry_get_text (GTK_ENTRY (editable)));
 }
@@ -2330,6 +2089,7 @@ mg_open_quit_dialog (gboolean minimize_button)
        gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
        gtk_window_set_title (GTK_WINDOW (dialog), _("Quit ZoiteChat?"));
        gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent_window));
+        gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);

        dialog_vbox1 = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
        gtk_widget_show (dialog_vbox1);
@@ -3486,7 +3246,7 @@ mg_create_chanmodebuttons (session_gui *gui, GtkWidget *box)
        gtk_entry_set_max_length (GTK_ENTRY (gui->key_entry), 23);
        gtk_widget_set_size_request (gui->key_entry, 58, 11);
        gtk_box_pack_start (GTK_BOX (box), gui->key_entry, 0, 0, 0);
-        emoji_font_apply (gui->key_entry);
+        mg_apply_emoji_fallback_widget (gui->key_entry);
        mg_apply_compact_mode_css (gui->key_entry);
        g_signal_connect (G_OBJECT (gui->key_entry), "activate",
                                                        G_CALLBACK (mg_key_entry_cb), NULL);
@@ -3504,7 +3264,7 @@ mg_create_chanmodebuttons (session_gui *gui, GtkWidget *box)
 	gtk_entry_set_width_chars (GTK_ENTRY (gui->limit_entry), 5);
        gtk_widget_set_size_request (gui->limit_entry, 45, 11);
        gtk_box_pack_start (GTK_BOX (box), gui->limit_entry, 0, 0, 0);
-        emoji_font_apply (gui->limit_entry);
+        mg_apply_emoji_fallback_widget (gui->limit_entry);
        mg_apply_compact_mode_css (gui->limit_entry);
        g_signal_connect (G_OBJECT (gui->limit_entry), "activate",
                                                        G_CALLBACK (mg_limit_entry_cb), NULL);
@@ -3769,12 +3529,8 @@ mg_apply_session_font_prefs (session_gui *gui)
 		mg_topicbar_update_height (gui->topic_entry);
 	}

-	if (gui->input_box)
-	{
-		if (prefs.hex_gui_input_style)
+	if (gui->input_box && prefs.hex_gui_input_style)
 		theme_manager_apply_entry_palette (gui->input_box, font);
-		emoji_font_apply (gui->input_box);
-	}

 	if (gui->chanview)
 		chanview_apply_theme (gui->chanview);
@@ -3931,12 +3687,6 @@ mg_word_clicked (GtkWidget *xtext, char *word, GdkEventButton *even)
        {
                if (word == NULL)
                {
-                        /* a click on a shown inline image opens the viewer */
-                        textentry *img_ent = gtk_xtext_get_clicked_image_entry (GTK_XTEXT (xtext));
-
-                        if (img_ent)
-                                inline_image_show_viewer (GTK_XTEXT (xtext), img_ent);
-                        else
                        mg_focus (sess);
                        return;
                }
@@ -3949,20 +3699,6 @@ mg_word_clicked (GtkWidget *xtext, char *word, GdkEventButton *even)
                        case WORD_HOST6:
                        case WORD_HOST:
                                word[end] = 0;
-                                /* image links toggle an inline preview instead
-                                   of opening the browser */
-                                if (word_type == WORD_URL &&
-                                    prefs.hex_net_remote_media &&
-                                    inline_image_is_image_url (word + start))
-                                {
-                                        textentry *ent = gtk_xtext_get_clicked_entry (GTK_XTEXT (xtext));
-
-                                        if (ent)
-                                        {
-                                                inline_image_toggle (sess, GTK_XTEXT (xtext), ent, word + start);
-                                                break;
-                                        }
-                                }
                                fe_open_url (word + start);
                        }
                }
@@ -3991,8 +3727,7 @@ mg_word_clicked (GtkWidget *xtext, char *word, GdkEventButton *even)
        case WORD_HOST:
                word[end] = 0;
                word += start;
-                menu_urlmenu_entry (even, word, xtext,
-                                    gtk_xtext_get_clicked_entry (GTK_XTEXT (xtext)));
+                menu_urlmenu (even, word);
                break;
        case WORD_NICK:
                word[end] = 0;
@@ -4681,6 +4416,131 @@ mg_inputbox_rightclick (GtkEntry *entry, GtkWidget *menu)
        mg_create_color_menu (menu, NULL);
 }

+/* ------------------------------------------------------------------------- *
+ * Emoji font handling
+ *
+ * Goal: prefer color emoji fonts when available, without changing existing
+ *       font size/style/weight, and without breaking user-configured fonts.
+ * ------------------------------------------------------------------------- */
+
+static const char *mg_emoji_family_fallback =
+#ifdef G_OS_WIN32
+        "Segoe UI Emoji, Segoe UI Symbol, Noto Color Emoji, Apple Color Emoji, Twemoji Mozilla, EmojiOne Color";
+#else
+        "Noto Color Emoji, Segoe UI Emoji, Apple Color Emoji, Twemoji Mozilla, EmojiOne Color";
+#endif
+
+static const char *
+mg_find_available_icon_name (const char *const *icon_names)
+{
+        GtkIconTheme *theme;
+        int i;
+
+        theme = gtk_icon_theme_get_default ();
+        if (!theme || !icon_names)
+                return NULL;
+
+        for (i = 0; icon_names[i] != NULL; i++)
+        {
+                int action;
+
+                if (gtk_icon_theme_has_icon (theme, icon_names[i]))
+                        return icon_names[i];
+
+                if (icon_resolver_menu_action_from_name (icon_names[i], &action))
+                {
+                        char *resource_path = icon_resolver_resolve_path (ICON_RESOLVER_ROLE_MENU_ACTION, action, GTK_ICON_SIZE_MENU, "menu", ICON_RESOLVER_THEME_SYSTEM, NULL);
+
+                        if (resource_path)
+                        {
+                                g_free (resource_path);
+                                return icon_names[i];
+                        }
+                }
+        }
+
+        return NULL;
+}
+
+static gboolean
+mg_family_already_has_emoji (const gchar *family)
+{
+        if (!family || !*family)
+                return FALSE;
+
+        /* cheap but effective */
+        return (strstr (family, "Noto Color Emoji") != NULL) ||
+               (strstr (family, "Segoe UI Emoji") != NULL) ||
+               (strstr (family, "Apple Color Emoji") != NULL) ||
+               (strstr (family, "Twemoji") != NULL) ||
+               (strstr (family, "EmojiOne") != NULL);
+}
+
+static PangoFontDescription *
+mg_fontdesc_with_fallback (const PangoFontDescription *base_desc, gboolean emoji_first)
+{
+        PangoFontDescription *desc;
+        const gchar *base_family;
+        gchar *family_list;
+
+        if (!base_desc)
+                return NULL;
+
+        desc = pango_font_description_copy (base_desc);
+        base_family = pango_font_description_get_family (desc);
+
+        if (mg_family_already_has_emoji (base_family))
+                return desc;
+
+        if (emoji_first)
+        {
+                family_list = g_strdup_printf ("%s, %s",
+                        mg_emoji_family_fallback,
+                        (base_family && *base_family) ? base_family : "Sans");
+        }
+        else
+        {
+                family_list = g_strdup_printf ("%s, %s",
+                        (base_family && *base_family) ? base_family : "Sans",
+                        mg_emoji_family_fallback);
+        }
+
+        pango_font_description_set_family (desc, family_list);
+        g_free (family_list);
+
+        return desc;
+}
+
+static void
+mg_apply_emoji_fallback_widget (GtkWidget *widget)
+{
+        PangoFontDescription *desc;
+        GtkStyleContext *context;
+        PangoFontDescription *base_desc = NULL;
+
+        if (!widget)
+                return;
+
+        context = gtk_widget_get_style_context (widget);
+        if (!context)
+                return;
+
+        gtk_style_context_get (context, GTK_STATE_FLAG_NORMAL,
+                               "font", &base_desc,
+                               NULL);
+        if (!base_desc)
+                return;
+
+        desc = mg_fontdesc_with_fallback (base_desc, FALSE);
+        pango_font_description_free (base_desc);
+        if (!desc)
+                return;
+
+        mg_apply_font_css (widget, desc, "zoitechat-emoji-font",
+                           "zoitechat-emoji-font-provider");
+        pango_font_description_free (desc);
+}
+
 /* Search bar adapted from Conspire's by William Pitcock */

 #define SEARCH_CHANGE           1
@@ -4885,7 +4745,7 @@ mg_create_search(session *sess, GtkWidget *box)
        gui->shentry = entry = gtk_entry_new();
        gtk_box_pack_start(GTK_BOX(gui->shbox), entry, FALSE, FALSE, 0);
        gtk_widget_set_size_request (gui->shentry, 180, -1);
-        emoji_font_apply (entry);
+        mg_apply_emoji_fallback_widget (entry);
        mg_apply_entry_scroll_artifact_fix (entry);
        gui->search_changed_signal = g_signal_connect(G_OBJECT(entry), "changed", G_CALLBACK(search_handle_change), sess);
        g_signal_connect (G_OBJECT (entry), "key-press-event", G_CALLBACK (search_handle_keypress), sess);
@@ -4939,18 +4799,17 @@ mg_create_search(session *sess, GtkWidget *box)
 static void
 mg_create_entry (session *sess, GtkWidget *box)
 {
-        GtkWidget *hbox, *but, *entry, *format_box, *format_label;
+        GtkWidget *hbox, *but, *entry;
        session_gui *gui = sess->gui;
-
-        format_box = mg_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 6);
-        gtk_widget_set_name (format_box, "zoitechat-formatbar");
-        gtk_widget_set_no_show_all (format_box, TRUE);
-        gtk_box_pack_start (GTK_BOX (box), format_box, 0, 0, 0);
-        format_label = gtk_label_new ("");
-        gtk_label_set_ellipsize (GTK_LABEL (format_label), PANGO_ELLIPSIZE_END);
-        gtk_box_pack_start (GTK_BOX (format_box), format_label, TRUE, TRUE, 8);
-        gtk_widget_show (format_label);
-        gtk_widget_hide (format_box);
+        const char *emoji_fallback_icon_names[] = {
+                "face-smile-symbolic",
+                "face-smile",
+                "insert-emoticon-symbolic",
+                "insert-emoticon",
+                "zc-menu-emoji",
+                NULL
+        };
+        const char *emoji_fallback_icon_name;

        gui->reply_box = mg_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 6);
        gtk_widget_set_name (gui->reply_box, "zoitechat-replybar");
@@ -4982,16 +4841,12 @@ mg_create_entry (session *sess, GtkWidget *box)
        gui->input_box = entry = sexy_spell_entry_new ();
        sexy_spell_entry_set_checked ((SexySpellEntry *)entry, prefs.hex_gui_input_spell);
        sexy_spell_entry_set_parse_attributes ((SexySpellEntry *)entry, prefs.hex_gui_input_attr);
-        g_object_set_data (G_OBJECT (entry), "zoitechat-format-box", format_box);
-        g_object_set_data (G_OBJECT (entry), "zoitechat-format-label", format_label);

        gtk_entry_set_max_length (GTK_ENTRY (gui->input_box), 0);
        g_signal_connect (G_OBJECT (entry), "activate",
                                                        G_CALLBACK (mg_inputbox_cb), gui);
        g_signal_connect (G_OBJECT (entry), "changed",
                                                        G_CALLBACK (mg_inputbox_changed), gui);
-        g_signal_connect (G_OBJECT (entry), "notify::cursor-position",
-                                                        G_CALLBACK (mg_inputbox_cursor_changed), gui);
        gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);

        gtk_widget_set_name (entry, "zoitechat-inputbox");
@@ -5007,14 +4862,16 @@ mg_create_entry (session *sess, GtkWidget *box)

        if (prefs.hex_gui_input_style)
                mg_apply_entry_style (entry);
-        emoji_font_apply (entry);
        mg_apply_entry_scroll_artifact_fix (entry);

-        /* ZoiteChat's own emoji picker; deliberately not GTK's
-         * "show-emoji-icon" machinery, so the catalog is the same on every
-         * GTK runtime and the button always has a working callback */
-        but = emoji_picker_button_new (entry);
-        gtk_box_pack_start (GTK_BOX (hbox), but, FALSE, FALSE, 0);
+        g_object_set (G_OBJECT (entry), "show-emoji-icon", TRUE, NULL);
+
+        if (gtk_entry_get_icon_storage_type (GTK_ENTRY (entry), GTK_ENTRY_ICON_SECONDARY) == GTK_IMAGE_EMPTY)
+        {
+                emoji_fallback_icon_name = mg_find_available_icon_name (emoji_fallback_icon_names);
+                if (emoji_fallback_icon_name)
+                        gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry), GTK_ENTRY_ICON_SECONDARY, emoji_fallback_icon_name);
+        }
 }

 static void
@@ -5162,7 +5019,6 @@ mg_create_topwindow (session *sess)
                                                                                  prefs.hex_gui_win_width,
                                                                                  prefs.hex_gui_win_height, 0);
        sess->gui->window = win;
-        emoji_font_apply (win);
        gtk_container_set_border_width (GTK_CONTAINER (win), GUI_BORDER);
        gtk_widget_set_opacity (win, (prefs.hex_gui_transparency / 255.));

@@ -5367,7 +5223,6 @@ mg_create_tabwindow (session *sess)
        win = gtkutil_window_new ("ZoiteChat", NULL, prefs.hex_gui_win_width,
                                                                          prefs.hex_gui_win_height, 0);
        sess->gui->window = win;
-        emoji_font_apply (win);
        gtk_window_move (GTK_WINDOW (win), prefs.hex_gui_win_left,
                                                  prefs.hex_gui_win_top);
        if (prefs.hex_gui_win_state)
@@ -5931,9 +5786,9 @@ void
 fe_session_callback (session *sess)
 {
        gtk_xtext_buffer_free (sess->res->buffer);
+        if (sess->res->user_row_iters)
+                g_hash_table_destroy (sess->res->user_row_iters);
        g_object_unref (G_OBJECT (sess->res->user_model));
-        if (sess->res->user_row_refs)
-                g_hash_table_destroy (sess->res->user_row_refs);

        if (sess->res->banlist && sess->res->banlist->window)
                mg_close_gen (NULL, sess->res->banlist->window);
@@ -45,7 +45,6 @@
 #include "../common/util.h"
 #include "../common/text.h"
 #include "xtext.h"
-#include "inline-image.h"
 #include "ascii.h"
 #include "banlist.h"
 #include "chanlist.h"
@@ -1057,40 +1056,8 @@ open_url_cb (GtkWidget *item, char *url)
 	handle_command (current_sess, buf, FALSE);
 }

-/* the text entry the open URL menu was created for; the widget pointer is
-   nulled automatically if the widget dies while the menu is up */
-static GtkXText *urlmenu_xtext = NULL;
-static textentry *urlmenu_ent = NULL;
-
-static void
-menu_urlmenu_set_entry (GtkWidget *xtext, textentry *ent)
-{
-	if (urlmenu_xtext)
-		g_object_remove_weak_pointer (G_OBJECT (urlmenu_xtext),
-												(gpointer *) &urlmenu_xtext);
-	urlmenu_xtext = xtext ? GTK_XTEXT (xtext) : NULL;
-	urlmenu_ent = ent;
-	if (urlmenu_xtext)
-		g_object_add_weak_pointer (G_OBJECT (urlmenu_xtext),
-											(gpointer *) &urlmenu_xtext);
-}
-
-static void
-inline_image_menu_cb (GtkWidget *item, char *url)
-{
-	if (urlmenu_xtext == NULL || urlmenu_ent == NULL)
-		return;
-
-	/* the line may have scrolled out of the buffer since the menu opened */
-	if (!gtk_xtext_buffer_contains (urlmenu_xtext, urlmenu_ent))
-		return;
-
-	inline_image_toggle (current_sess, urlmenu_xtext, urlmenu_ent, url);
-}
-
 void
-menu_urlmenu_entry (GdkEventButton *event, char *url, GtkWidget *xtext,
-						  textentry *ent)
+menu_urlmenu (GdkEventButton *event, char *url)
 {
 	GtkWidget *menu;
 	char *tmp, *chop;
@@ -1098,14 +1065,6 @@ menu_urlmenu_entry (GdkEventButton *event, char *url, GtkWidget *xtext,
 	g_free (str_copy);
 	str_copy = g_strdup (url);

-	if (xtext == NULL || ent == NULL || !prefs.hex_net_remote_media ||
-		 !inline_image_is_image_url (str_copy))
-	{
-		xtext = NULL;
-		ent = NULL;
-	}
-	menu_urlmenu_set_entry (xtext, ent);
-
 	menu = menu_new ();
 	/* more than 51 chars? Chop it */
 	if (g_utf8_strlen (str_copy, -1) >= 52)
@@ -1128,15 +1087,6 @@ menu_urlmenu_entry (GdkEventButton *event, char *url, GtkWidget *xtext,
 		menu_quick_item_with_callback (open_url_cb, _("Connect"), menu, str_copy);
 	else
 		menu_quick_item_with_callback (open_url_cb, _("Open Link in Browser"), menu, str_copy);
-	if (ent)
-	{
-		const char *shown = gtk_xtext_entry_get_image_url (GTK_XTEXT (xtext), ent);
-
-		menu_quick_item_with_callback (inline_image_menu_cb,
-			shown && strcmp (shown, str_copy) == 0 ?
-				_("Hide Inline Image") : _("Show Image Inline"),
-			menu, str_copy);
-	}
 	menu_quick_item_with_callback (copy_to_clipboard_cb, _("Copy Selected Link"), menu, str_copy);
 	/* custom ones from urlhandlers.conf */
 	menu_create (menu, urlhandler_list, str_copy, TRUE);
@@ -1144,12 +1094,6 @@ menu_urlmenu_entry (GdkEventButton *event, char *url, GtkWidget *xtext,
 	menu_popup (menu, event, NULL);
 }

-void
-menu_urlmenu (GdkEventButton *event, char *url)
-{
-	menu_urlmenu_entry (event, url, NULL, NULL);
-}
-
 static void
 menu_chan_cycle (GtkWidget * menu, char *chan)
 {
@@ -1595,16 +1539,16 @@ menu_join (GtkWidget * wid, gpointer none)
 									NULL);
 	theme_manager_attach_window (dialog);
 	content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+	gtk_box_set_homogeneous (GTK_BOX (content_area), TRUE);
 	gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
-	hbox = gtkutil_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 6);
+	hbox = gtkutil_box_new (GTK_ORIENTATION_HORIZONTAL, TRUE, 0);

 	entry = gtk_entry_new ();
 	gtk_editable_set_editable (GTK_EDITABLE (entry), FALSE);	/* avoid auto-selection */
 	gtk_entry_set_text (GTK_ENTRY (entry), "#");
 	g_signal_connect (G_OBJECT (entry), "activate",
 						 	G_CALLBACK (menu_join_entry_cb), dialog);
-	gtk_widget_set_valign (entry, GTK_ALIGN_CENTER);
-	gtk_box_pack_end (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
+	gtk_box_pack_end (GTK_BOX (hbox), entry, 0, 0, 0);

 	label = gtk_label_new (_("Enter Channel to Join:"));
 	gtk_box_pack_end (GTK_BOX (hbox), label, 0, 0, 0);
@@ -1612,7 +1556,7 @@ menu_join (GtkWidget * wid, gpointer none)
 	g_signal_connect (G_OBJECT (dialog), "response",
 						   G_CALLBACK (menu_join_cb), entry);

-	gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0);
+	gtk_container_add (GTK_CONTAINER (content_area), hbox);

 	gtk_widget_show_all (dialog);

@@ -20,11 +20,8 @@
 #ifndef ZOITECHAT_MENU_H
 #define ZOITECHAT_MENU_H

-#include "xtext.h"
-
 GtkWidget *menu_create_main (void *accel_group, int bar, int away, int toplevel, GtkWidget **menu_widgets);
 void menu_urlmenu (GdkEventButton * event, char *url);
-void menu_urlmenu_entry (GdkEventButton *event, char *url, GtkWidget *xtext, textentry *ent);
 void menu_chanmenu (session *sess, GdkEventButton * event, char *chan);
 void menu_addfavoritemenu (server *serv, GtkWidget *menu, char *channel, gboolean istree);
 void menu_addconnectmenu (server *serv, GtkWidget *menu);
@@ -18,14 +18,11 @@ zoitechat_gtk_sources = [
  'custom-list.c',
  'dccgui.c',
  'editlist.c',
-  'emoji-picker.c',
-  'emoji-font.c',
  'fe-gtk.c',
  'fkeys.c',
  'gtkutil.c',
  'icon-resolver.c',
  'ignoregui.c',
-  'inline-image.c',
  'joind.c',
  'menu.c',
  'maingui.c',
@@ -75,8 +72,7 @@ if host_machine.system() != 'windows'
  endif
 endif

-emoji_font_deps = [gtk_dep, dependency('pangoft2', version: '>= 1.44'), dependency('fontconfig', version: '>= 2.13')]
-zoitechat_gtk_deps += emoji_font_deps
+zoitechat_gtk_deps += gtk_dep

 if host_machine.system() != 'windows'
  gdk_x11_dep = dependency('gdk-x11-3.0', required: false)
@@ -111,7 +107,7 @@ zoitechat_theme_lib = static_library('zoitechat_theme',
 iso_codes = dependency('iso-codes', required: false)
 if iso_codes.found()
  zoitechat_gtk_sources += 'sexy-iso-codes.c'
-  iso_codes_prefix = iso_codes.get_variable(pkgconfig : 'prefix')
+  iso_codes_prefix = iso_codes.get_pkgconfig_variable('prefix')
  zoitechat_gtk_cflags += '-DISO_CODES_PREFIX="@0@"'.format(iso_codes_prefix)
  zoitechat_gtk_cflags += '-DISO_CODES_LOCALEDIR="@0@"'.format(
                        join_paths(iso_codes_prefix, 'share/locale'))
@@ -140,19 +136,7 @@ executable('zoitechat',
  link_args: zoitechat_gtk_ldflags,
  pie: true,
  install: true,
-  win_subsystem: 'windows',
-)
-
-emoji_ui_tests = executable('emoji_ui_tests',
-  ['tests/test-emoji-ui.c', 'emoji-font.c', 'emoji-picker.c',
-   '../common/emoji-data.c', emoji_data_table],
-  include_directories: [config_h_include, include_directories('../common')],
-  dependencies: emoji_font_deps,
-)
-test('Emoji UI Tests', emoji_ui_tests,
-  env: ['ZOITECHAT_EMOJI_FONT=' + join_paths(meson.source_root(), 'data/fonts/NotoColorEmoji.ttf')],
-  protocol: 'tap',
-  timeout: 120,
+  gui_app: true,
 )

 theme_manager_policy_tests = executable('theme_manager_policy_tests',
@@ -267,21 +251,3 @@ test('Theme Preferences GTK3 Populate Tests', theme_preferences_gtk3_populate_te
  protocol: 'tap',
  timeout: 120,
 )
-
-emoji_font_tests = executable('emoji_font_tests',
-  ['tests/test-emoji-font.c', 'emoji-font.c', '../common/emoji-data.c', emoji_data_table],
-  include_directories: [config_h_include, include_directories('../common')],
-  dependencies: emoji_font_deps,
-)
-test('Emoji Font Tests', emoji_font_tests,
-  env: ['ZOITECHAT_EMOJI_FONT=' + join_paths(meson.source_root(), 'data/fonts/NotoColorEmoji.ttf')],
-  protocol: 'tap',
-  timeout: 120,
-)
-
-xtext_tests = executable('xtext_tests',
-  ['tests/test-xtext.c', '../common/hexcolor.c'],
-  include_directories: [config_h_include],
-  dependencies: [gtk_dep],
-)
-test('XText Tests', xtext_tests, protocol: 'tap', timeout: 120)
@@ -391,39 +391,34 @@ fe_notify_ask (char *nick, char *networks)
 	gtk_container_set_border_width (GTK_CONTAINER (table), 12);
 	gtk_grid_set_row_spacing (GTK_GRID (table), 3);
 	gtk_grid_set_column_spacing (GTK_GRID (table), 8);
-	gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
-	                    table, TRUE, TRUE, 0);
+	gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), table);

 	label = gtk_label_new (msg);
-	gtk_label_set_xalign (GTK_LABEL (label), 0.0f);
-	gtkutil_grid_attach (table, label, 0, 1, 0, 1, GTKUTIL_ATTACH_FILL, 0, 0, 0);
+	gtkutil_grid_attach_defaults (table, label, 0, 1, 0, 1);

 	entry = gtk_entry_new ();
 	gtk_entry_set_text (GTK_ENTRY (entry), nick);
 	g_signal_connect (G_OBJECT (entry), "activate",
 						 	G_CALLBACK (notifygui_add_enter), dialog);
-	gtkutil_grid_attach (table, entry, 1, 2, 0, 1,
-	                     GTKUTIL_ATTACH_EXPAND | GTKUTIL_ATTACH_FILL, 0, 0, 0);
+	gtkutil_grid_attach_defaults (table, entry, 1, 2, 0, 1);

 	g_signal_connect (G_OBJECT (dialog), "response",
 						   G_CALLBACK (notifygui_add_cb), entry);

 	label = gtk_label_new (_("Notify on these networks:"));
-	gtk_label_set_xalign (GTK_LABEL (label), 0.0f);
-	gtkutil_grid_attach (table, label, 0, 1, 2, 3, GTKUTIL_ATTACH_FILL, 0, 0, 0);
+	gtkutil_grid_attach_defaults (table, label, 0, 1, 2, 3);

 	wid = gtk_entry_new ();
 	g_object_set_data (G_OBJECT (entry), "net", wid);
 	g_signal_connect (G_OBJECT (wid), "activate",
 						 	G_CALLBACK (notifygui_add_enter), dialog);
 	gtk_entry_set_text (GTK_ENTRY (wid), networks ? networks : "ALL");
-	gtkutil_grid_attach (table, wid, 1, 2, 2, 3,
-	                     GTKUTIL_ATTACH_EXPAND | GTKUTIL_ATTACH_FILL, 0, 0, 0);
+	gtkutil_grid_attach_defaults (table, wid, 1, 2, 2, 3);

 	label = gtk_label_new (NULL);
 	g_snprintf (buf, sizeof (buf), "<i><span size=\"smaller\">%s</span></i>", _("Comma separated list of networks is accepted."));
 	gtk_label_set_markup (GTK_LABEL (label), buf);
-	gtkutil_grid_attach (table, label, 1, 2, 3, 4, GTKUTIL_ATTACH_FILL, 0, 0, 0);
+	gtkutil_grid_attach_defaults (table, label, 1, 2, 3, 4);

 	gtk_widget_show_all (dialog);
 }
@@ -2423,8 +2423,6 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)
 	GtkWidget *comboboxentry_charset;
 	GtkWidget *combobox_logintypes;
 	GtkWidget *hbox1;
-	GtkWidget *content_scroll;
-	GtkWidget *content_box;
 	GtkWidget *scrolledwindow2;
 	GtkWidget *scrolledwindow4;
 	GtkWidget *scrolledwindow5;
@@ -2451,9 +2449,7 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)
 	gtk_container_set_border_width (GTK_CONTAINER (editwindow), 4);
 	g_snprintf (buf, sizeof (buf), _("Edit %s - %s"), net->name, _(DISPLAY_NAME));
 	gtk_window_set_title (GTK_WINDOW (editwindow), buf);
-	gtk_window_set_default_size (GTK_WINDOW (editwindow),
-	                             netedit_win_width > 0 ? netedit_win_width : -1,
-	                             netedit_win_height > 0 ? netedit_win_height : -1);
+	gtk_window_set_default_size (GTK_WINDOW (editwindow), netedit_win_width, netedit_win_height);
 	gtk_window_set_transient_for (GTK_WINDOW (editwindow), GTK_WINDOW (parent));
 	gtk_window_set_modal (GTK_WINDOW (editwindow), TRUE);
 	gtk_window_set_type_hint (GTK_WINDOW (editwindow), GDK_WINDOW_TYPE_HINT_DIALOG);
@@ -2462,20 +2458,10 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)
 	vbox5 = gtkutil_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
 	gtk_container_add (GTK_CONTAINER (editwindow), vbox5);

-	/* Keep Close accessible on small screens, while the lists still receive
-	   all spare space when the complete form fits in the window. */
-	content_scroll = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (content_scroll),
-	                                GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	gtk_scrolled_window_set_propagate_natural_width (GTK_SCROLLED_WINDOW (content_scroll), TRUE);
-	gtk_scrolled_window_set_propagate_natural_height (GTK_SCROLLED_WINDOW (content_scroll), TRUE);
-	gtk_box_pack_start (GTK_BOX (vbox5), content_scroll, TRUE, TRUE, 0);
-	content_box = gtkutil_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (content_scroll), content_box);

 	/* Tabs and buttons */
 	hbox1 = gtkutil_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (content_box), hbox1, TRUE, TRUE, 4);
+	gtk_box_pack_start (GTK_BOX (vbox5), hbox1, TRUE, TRUE, 4);

 	scrolledwindow2 = gtk_scrolled_window_new (NULL, NULL);
 	scrolledwindow4 = gtk_scrolled_window_new (NULL, NULL);
@@ -2613,7 +2599,7 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)

 	/* Checkboxes and entries */
 	table3 = gtkutil_grid_new (19, 2, FALSE);
-	gtk_box_pack_start (GTK_BOX (content_box), table3, FALSE, FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (vbox5), table3, FALSE, FALSE, 0);
 	gtk_grid_set_row_spacing (GTK_GRID (table3), 2);
 	gtk_grid_set_column_spacing (GTK_GRID (table3), 8);

@@ -2842,9 +2828,7 @@ servlist_open_networks (void)
 	gtk_container_set_border_width (GTK_CONTAINER (servlist), 4);
 	g_snprintf(buf, sizeof(buf), _("Network List - %s"), _(DISPLAY_NAME));
 	gtk_window_set_title (GTK_WINDOW (servlist), buf);
-	gtk_window_set_default_size (GTK_WINDOW (servlist),
-	                             netlist_win_width > 0 ? netlist_win_width : -1,
-	                             netlist_win_height > 0 ? netlist_win_height : -1);
+	gtk_window_set_default_size (GTK_WINDOW (servlist), netlist_win_width, netlist_win_height);
 	gtk_window_set_role (GTK_WINDOW (servlist), "servlist");
 	gtk_window_set_type_hint (GTK_WINDOW (servlist), GDK_WINDOW_TYPE_HINT_DIALOG);
 	if (current_sess)
@@ -340,9 +340,6 @@ static const setting tabs_settings[] =
        {ST_TOGGLE, N_("Show close button on tabs"), P_OFFINTNL(hex_gui_tab_closebuttons), 0, 0, 0},
        {ST_TOGGLE, N_("Middle click to close tab"), P_OFFINTNL(hex_gui_tab_middleclose), 0, 0, 0},
        {ST_TOGGLE, N_("Smaller text"), P_OFFINTNL(hex_gui_tab_small), 0, 0, 0},
-        {ST_EFONT,  N_("Tab font:"), P_OFFSETNL(hex_gui_tab_font),
-                N_("Font for server and channel tabs in the Tabs layout. Leave blank to use the theme font. Smaller text still applies."),
-                0, sizeof prefs.hex_gui_tab_font},
        {ST_MENU,       N_("Focus new tabs:"), P_OFFINTNL(hex_gui_tab_newtofront), 0, focusnewtabsmenu, 0},
        {ST_MENU,       N_("Placement of notices:"), P_OFFINTNL(hex_irc_notice_pos), 0, noticeposmenu, 0},
        {ST_MENU,       N_("Show channel switcher at:"), P_OFFINTNL(hex_gui_tab_pos), 0, cspos, 1},
@@ -677,11 +674,6 @@ static const setting network_settings[] =
        {ST_ENTRY,      N_("Username:"), P_OFFSETNL(hex_net_proxy_user), 0, 0, sizeof prefs.hex_net_proxy_user},
        {ST_ENTRY,      N_("Password:"), P_OFFSETNL(hex_net_proxy_pass), 0, GINT_TO_POINTER(1), sizeof prefs.hex_net_proxy_pass},

-        {ST_HEADER,     N_("Remote Media"), 0, 0, 0, 0},
-        {ST_TOGGLE,     N_("Allow loading remote media (inline images) when clicked"),
-                                        P_OFFINTNL(hex_net_remote_media),
-                                        N_("Loading remote media contacts the site hosting it, which can reveal your IP address and that you viewed the message. You are asked for confirmation before each new domain is contacted."), 0, 0},
-
        {ST_END, 0, 0, 0, 0, 0}
 };

@@ -1256,7 +1248,7 @@ setup_create_id_menu (GtkWidget *table, char *label, int row, char *dest)
 static void
 setup_create_menu (GtkWidget *table, int row, const setting *set)
 {
-        GtkWidget *wid, *cbox;
+        GtkWidget *wid, *cbox, *box;
        const char **text = (const char **)set->list;
        int i;

@@ -1277,7 +1269,9 @@ setup_create_menu (GtkWidget *table, int row, const setting *set)
        g_signal_connect (G_OBJECT (cbox), "changed",
                                                        G_CALLBACK (setup_menu_cb), (gpointer)set);

-        setup_table_attach (table, cbox, 3, 6, row, row + 1, TRUE, FALSE,
+        box = gtkutil_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
+        gtk_box_pack_start (GTK_BOX (box), cbox, 0, 0, 0);
+        setup_table_attach (table, box, 3, 4, row, row + 1, TRUE, FALSE,
                            SETUP_ALIGN_FILL, SETUP_ALIGN_FILL, 0, 0);
 }

@@ -1961,8 +1955,7 @@ setup_add_page (const char *title, GtkWidget *book, GtkWidget *tab)

        sw = GTK_SCROLLED_WINDOW(gtk_scrolled_window_new (NULL, NULL));
        gtk_scrolled_window_set_shadow_type (sw, GTK_SHADOW_IN);
-        gtk_scrolled_window_set_policy (sw, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-        gtk_scrolled_window_set_propagate_natural_width (sw, TRUE);
+        gtk_scrolled_window_set_policy (sw, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
        gtk_container_add (GTK_CONTAINER (sw), vvbox);

        viewport = gtk_bin_get_child (GTK_BIN(sw));
@@ -2006,9 +1999,7 @@ setup_ensure_page_created (int page)
        }

        page_widget = setup_page_factories[page] (setup_page_settings[page]);
-        /* Lazy pages must pass the notebook's spare space to their content,
-           particularly the independently scrolling Sounds list. */
-        gtk_box_pack_start (GTK_BOX (container), page_widget, TRUE, TRUE, 0);
+        gtk_container_add (GTK_CONTAINER (container), page_widget);
        gtk_widget_show_all (container);
 }

@@ -2186,14 +2177,9 @@ setup_create_tree (GtkWidget *box, GtkWidget *book)
                                                            -1, _("Categories"), renderer, "text", 0, NULL);
        gtk_tree_view_expand_all (GTK_TREE_VIEW (tree));

-        frame = gtk_scrolled_window_new (NULL, NULL);
-        gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (frame),
-                                       GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-        gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (frame), GTK_SHADOW_IN);
-        gtk_scrolled_window_set_propagate_natural_width (GTK_SCROLLED_WINDOW (frame), TRUE);
-        gtk_widget_set_vexpand (frame, TRUE);
+        frame = gtk_frame_new (NULL);
        gtk_container_add (GTK_CONTAINER (frame), tree);
-        gtk_box_pack_start (GTK_BOX (box), frame, FALSE, TRUE, 0);
+        gtk_box_pack_start (GTK_BOX (box), frame, 0, 0, 0);
        gtk_box_reorder_child (GTK_BOX (box), frame, 0);

        if (sel_iter)
@@ -2344,9 +2330,6 @@ setup_apply (struct zoitechatprefs *pr)
        if (DIFF (hex_gui_tab_icons) || DIFF (hex_gui_tab_closebuttons) ||
                 DIFF (hex_gui_tab_small))
                live_changes.chanview = TRUE;
-        if (pr->hex_gui_tab_layout == 0 &&
-                strcmp (pr->hex_gui_tab_font, prefs.hex_gui_tab_font) != 0)
-                live_changes.chanview = TRUE;
        if (DIFF (hex_gui_tab_sort))
                live_changes.tab_resort = TRUE;
        if (DIFF (hex_gui_tab_trunc))
@@ -1266,6 +1266,8 @@ attr_list_has_attrs (PangoAttrList *attrs)
 static void
 sexy_spell_entry_recheck_all(SexySpellEntry *entry)
 {
+	GdkRectangle rect;
+	GtkAllocation allocation;
 	GtkWidget *widget = GTK_WIDGET(entry);
 	int length, i, text_len;
 	const char *text;
@@ -1297,8 +1299,15 @@ sexy_spell_entry_recheck_all(SexySpellEntry *entry)

 	gtk_entry_set_attributes (GTK_ENTRY (entry), attr_list_has_attrs (entry->priv->attr_list) ? entry->priv->attr_list : NULL);

-	/* GtkEntry shares its parent's GdkWindow in GTK3; redraw the widget area. */
-	gtk_widget_queue_draw (widget);
+	if (gtk_widget_get_realized (GTK_WIDGET(entry)))
+	{
+		gtk_widget_get_allocation (GTK_WIDGET(entry), &allocation);
+		
+		rect.x = 0; rect.y = 0;
+		rect.width  = allocation.width;
+		rect.height = allocation.height;
+		gdk_window_invalidate_rect(gtk_widget_get_window (widget), &rect, TRUE);
+	}
 }

 static gboolean
@@ -1,174 +0,0 @@
-/* Shared headless font coverage and ordinary text regression tests.
- * Distributed under GPL-2.0-or-later; see COPYING. */
-#include "../emoji-font.h"
-#include "../../common/emoji-data.h"
-#include <pango/pangofc-fontmap.h>
-#include <pango/pangofc-font.h>
-
-static GHashTable *font_checksums;
-static char *bundled_checksum;
-
-static const char *
-font_checksum (const char *path)
-{
-	const char *cached = g_hash_table_lookup (font_checksums, path);
-	char *contents, *checksum;
-	gsize length;
-
-	if (cached)
-		return cached;
-	g_assert_true (g_file_get_contents (path, &contents, &length, NULL));
-	checksum = g_compute_checksum_for_data (G_CHECKSUM_SHA256,
-		(const guchar *) contents, length);
-	g_free (contents);
-	g_hash_table_insert (font_checksums, g_strdup (path), checksum);
-	return checksum;
-}
-
-static void
-assert_bundled_font (PangoFont *font, gboolean expected)
-{
-	FcPattern *pattern;
-	FcChar8 *path;
-	const char *checksum;
-
-	/* Pango can describe a face by its embedded name rather than its
-	 * Fontconfig alias. Verify the resolved file's bytes, not that name.
-	 * Cache by filename so catalog coverage does not reread the font for
-	 * every glyph. An older system Noto must still fail this assertion. */
-	g_assert_true (PANGO_IS_FC_FONT (font));
-#if PANGO_VERSION_CHECK(1, 48, 0)
-	pattern = pango_fc_font_get_pattern (PANGO_FC_FONT (font));
-#else
-	pattern = PANGO_FC_FONT (font)->font_pattern;
-#endif
-	g_assert_cmpint (FcPatternGetString (pattern, FC_FILE, 0, &path), ==, FcResultMatch);
-	checksum = font_checksum ((const char *) path);
-	if (expected)
-		g_assert_cmpstr (checksum, ==, bundled_checksum);
-	else
-		g_assert_cmpstr (checksum, !=, bundled_checksum);
-}
-
-static void
-test_font_catalog (void)
-{
-	PangoFontMap *map = emoji_font_get_map ();
-	PangoContext *context;
-	PangoLayout *layout;
-	PangoFontDescription *desc;
-	gsize i;
-	int tone;
-
-	g_assert_nonnull (map);
-	context = pango_font_map_create_context (map);
-	g_assert_true (PANGO_IS_FC_FONT_MAP (map));
-	layout = pango_layout_new (context);
-	desc = pango_font_description_from_string (ZOITECHAT_EMOJI_FAMILY " 15");
-	pango_layout_set_font_description (layout, desc);
-	for (i = 0; i < emoji_data_count (); i++)
-	{
-		const EmojiEntry *entry = emoji_data_entry (i);
-		for (tone = 0; tone < (entry->tone_set < 0 ? 1 : EMOJI_TONE_COUNT); tone++)
-		{
-			PangoLayoutIter *iter;
-			pango_layout_set_text (layout, emoji_entry_sequence_for_tone (entry, tone), -1);
-			g_assert_cmpint (pango_layout_get_unknown_glyphs_count (layout), ==, 0);
-			iter = pango_layout_get_iter (layout);
-			do
-			{
-				PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
-				if (run)
-				{
-					assert_bundled_font (run->item->analysis.font, TRUE);
-				}
-			} while (pango_layout_iter_next_run (iter));
-			pango_layout_iter_free (iter);
-		}
-	}
-	pango_font_description_free (desc);
-	g_object_unref (layout);
-	g_object_unref (context);
-}
-
-static void
-test_plain_text_font (void)
-{
-	PangoFontMap *map = emoji_font_get_map ();
-	PangoContext *context;
-	PangoLayout *layout;
-	PangoLayoutIter *iter;
-	PangoFontDescription *desc;
-
-	g_assert_nonnull (map);
-	context = pango_font_map_create_context (map);
-	layout = pango_layout_new (context);
-	pango_layout_set_text (layout, "/join #channel 0123456789 *", -1);
-	desc = pango_font_description_from_string ("Monospace 12");
-	pango_layout_set_font_description (layout, desc);
-	iter = pango_layout_get_iter (layout);
-	do
-	{
-		PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
-		if (run)
-		{
-			assert_bundled_font (run->item->analysis.font, FALSE);
-		}
-	} while (pango_layout_iter_next_run (iter));
-	pango_layout_iter_free (iter);
-	pango_font_description_free (desc);
-	g_object_unref (layout);
-	g_object_unref (context);
-}
-
-static void
-test_implicit_emoji_font (void)
-{
-	PangoFontMap *map = emoji_font_get_map ();
-	PangoContext *context = pango_font_map_create_context (map);
-	PangoLayout *layout = pango_layout_new (context);
-	PangoFontDescription *desc = pango_font_description_from_string ("Monospace 12");
-	const char *samples[] = { "\360\237\230\200", "#\357\270\217\342\203\243", "\360\237\253\252" };
-	gsize i;
-
-	pango_layout_set_font_description (layout, desc);
-	for (i = 0; i < G_N_ELEMENTS (samples); i++)
-	{
-		PangoLayoutIter *iter;
-		pango_layout_set_text (layout, samples[i], -1);
-		g_assert_cmpint (pango_layout_get_unknown_glyphs_count (layout), ==, 0);
-		iter = pango_layout_get_iter (layout);
-		do
-		{
-			PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
-			if (run)
-			{
-				assert_bundled_font (run->item->analysis.font, TRUE);
-			}
-		} while (pango_layout_iter_next_run (iter));
-		pango_layout_iter_free (iter);
-	}
-	pango_font_description_free (desc);
-	g_object_unref (layout);
-	g_object_unref (context);
-}
-
-int
-main (int argc, char **argv)
-{
-	const char *path;
-	int result;
-
-	g_test_init (&argc, &argv, NULL);
-	path = g_getenv ("ZOITECHAT_EMOJI_FONT");
-	g_assert_nonnull (path);
-	font_checksums = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
-	bundled_checksum = g_strdup (font_checksum (path));
-	g_test_add_func ("/emoji-font/catalog", test_font_catalog);
-	g_test_add_func ("/emoji-font/plain-text", test_plain_text_font);
-	g_test_add_func ("/emoji-font/implicit-emoji", test_implicit_emoji_font);
-	result = g_test_run ();
-	g_free (bundled_checksum);
-	g_hash_table_destroy (font_checksums);
-	return result;
-}
@@ -1,156 +0,0 @@
-/* Regression coverage shared by Meson and the Windows CI build.
- * Distributed under GPL-2.0-or-later; see COPYING. */
-#include "../fe-gtk.h"
-#include "../../common/zoitechat.h"
-#include "../../common/emoji-data.h"
-#include "../emoji-font.h"
-#include "../emoji-picker.h"
-#include "../preferences-persistence.h"
-#include <pango/pangofc-fontmap.h>
-#include <glib/gstdio.h>
-
-struct zoitechatprefs prefs;
-static char *config_dir;
-
-static void
-test_theme_svg_loader (void)
-{
-	GError *error = NULL;
-	GdkPixbuf *pixbuf;
-
-	/* Exercise the theme asset that failed in the packaged Windows runtime. */
-	pixbuf = gdk_pixbuf_new_from_resource (
-		"/org/gtk/libgtk/theme/Adwaita/assets/bullet-symbolic.svg", &error);
-	g_assert_no_error (error);
-	g_assert_nonnull (pixbuf);
-	g_assert_cmpint (gdk_pixbuf_get_width (pixbuf), >, 0);
-	g_assert_cmpint (gdk_pixbuf_get_height (pixbuf), >, 0);
-	g_object_unref (pixbuf);
-}
-
-char *get_xdir (void) { return config_dir; }
-PreferencesPersistenceResult preferences_persistence_save_all (void)
-{
-	PreferencesPersistenceResult result = {0};
-	result.success = TRUE;
-	return result;
-}
-
-static GtkWidget *
-find_widget (GtkWidget *widget, GType type)
-{
-	GList *children, *item;
-	GtkWidget *found = NULL;
-
-	if (G_TYPE_CHECK_INSTANCE_TYPE (widget, type))
-		return widget;
-	if (!GTK_IS_CONTAINER (widget))
-		return NULL;
-	children = gtk_container_get_children (GTK_CONTAINER (widget));
-	for (item = children; item && !found; item = item->next)
-		found = find_widget (item->data, type);
-	g_list_free (children);
-	return found;
-}
-
-typedef struct { GtkWidget *window, *entry, *button, *popover, *search; } PickerFixture;
-
-static void
-fixture_setup (PickerFixture *f, gconstpointer data)
-{
-	GtkWidget *box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-	f->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	f->entry = gtk_entry_new ();
-	f->button = emoji_picker_button_new (f->entry);
-	gtk_container_add (GTK_CONTAINER (f->window), box);
-	gtk_box_pack_start (GTK_BOX (box), f->entry, TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (box), f->button, FALSE, FALSE, 0);
-	gtk_widget_show_all (f->window);
-	while (gtk_events_pending ()) gtk_main_iteration ();
-	f->popover = GTK_WIDGET (gtk_menu_button_get_popover (GTK_MENU_BUTTON (f->button)));
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (f->button), TRUE);
-	f->search = find_widget (f->popover, GTK_TYPE_SEARCH_ENTRY);
-	g_assert_nonnull (f->search);
-}
-
-static void
-fixture_teardown (PickerFixture *f, gconstpointer data)
-{
-	gtk_widget_destroy (f->window);
-	while (gtk_events_pending ()) gtk_main_iteration ();
-}
-
-static void
-insert_duck (PickerFixture *f)
-{
-	gtk_entry_set_text (GTK_ENTRY (f->search), "bird duck");
-	/* Do not wait for GTK's debounced search-changed signal. */
-	g_signal_emit_by_name (f->search, "activate");
-}
-
-static void
-test_search_insertion (PickerFixture *f, gconstpointer data)
-{
-	gtk_entry_set_text (GTK_ENTRY (f->entry), "before after");
-	gtk_editable_select_region (GTK_EDITABLE (f->entry), 7, 12);
-	insert_duck (f);
-	g_assert_cmpstr (gtk_entry_get_text (GTK_ENTRY (f->entry)), ==, "before \360\237\246\206");
-	g_assert_cmpint (gtk_editable_get_position (GTK_EDITABLE (f->entry)), ==, 8);
-}
-
-static void
-test_read_only (PickerFixture *f, gconstpointer data)
-{
-	gtk_entry_set_text (GTK_ENTRY (f->entry), "unchanged");
-	gtk_editable_set_editable (GTK_EDITABLE (f->entry), FALSE);
-	insert_duck (f);
-	g_signal_emit_by_name (f->search, "stop-search");
-	g_assert_false (gtk_editable_get_editable (GTK_EDITABLE (f->entry)));
-	g_assert_cmpstr (gtk_entry_get_text (GTK_ENTRY (f->entry)), ==, "unchanged");
-}
-
-static void
-test_sequence_limit (PickerFixture *f, gconstpointer data)
-{
-	gtk_entry_set_max_length (GTK_ENTRY (f->entry), 1);
-	gtk_entry_set_text (GTK_ENTRY (f->search), "flag canada");
-	g_signal_emit_by_name (f->search, "activate");
-	g_assert_cmpstr (gtk_entry_get_text (GTK_ENTRY (f->entry)), ==, "");
-	gtk_entry_set_max_length (GTK_ENTRY (f->entry), 2);
-	g_signal_emit_by_name (f->search, "activate");
-	g_assert_cmpstr (gtk_entry_get_text (GTK_ENTRY (f->entry)), ==, "\360\237\207\250\360\237\207\246");
-}
-
-static void
-test_entry_action (PickerFixture *f, gconstpointer data)
-{
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (f->button), FALSE);
-	if (g_signal_lookup ("insert-emoji", GTK_TYPE_ENTRY))
-	{
-		g_signal_emit_by_name (f->entry, "insert-emoji");
-		g_assert_true (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (f->button)));
-		g_assert_true (gtk_widget_get_visible (f->popover));
-	}
-}
-
-int
-main (int argc, char **argv)
-{
-	char *recents;
-	gtk_test_init (&argc, &argv, NULL);
-	g_object_set (gtk_settings_get_default (), "gtk-enable-animations", FALSE, NULL);
-	config_dir = g_dir_make_tmp ("zoitechat-emoji-tests-XXXXXX", NULL);
-	g_assert_nonnull (config_dir);
-	g_test_add_func ("/emoji-ui/theme-svg-loader", test_theme_svg_loader);
-	g_test_add ("/emoji-ui/search-insertion", PickerFixture, NULL, fixture_setup, test_search_insertion, fixture_teardown);
-	g_test_add ("/emoji-ui/read-only", PickerFixture, NULL, fixture_setup, test_read_only, fixture_teardown);
-	g_test_add ("/emoji-ui/sequence-limit", PickerFixture, NULL, fixture_setup, test_sequence_limit, fixture_teardown);
-	g_test_add ("/emoji-ui/entry-action", PickerFixture, NULL, fixture_setup, test_entry_action, fixture_teardown);
-	argc = g_test_run ();
-	recents = g_build_filename (config_dir, "emoji-recents.conf", NULL);
-	g_unlink (recents);
-	g_rmdir (config_dir);
-	g_free (recents);
-	g_free (config_dir);
-	return argc;
-}
@@ -1,597 +0,0 @@
-/* XText regression tests. Distributed under GPL-2.0-or-later; see COPYING.
- * Include the implementation to check layout/selection invariants without
- * adding test-only symbols to the widget's public API. Application services
- * are stubbed; GTK, Pango, Cairo and the widget itself are exercised normally. */
-#include "../xtext.c"
-#include <glib/gstdio.h>
-
-struct zoitechatprefs prefs;
-
-void emoji_font_apply (GtkWidget *widget) { }
-int url_last (int *start, int *end) { return 0; }
-gsize strftime_utf8 (char *dest, gsize size, const char *format, time_t stamp)
-{
-	return strftime (dest, size, format, localtime (&stamp));
-}
-int xtext_get_stamp_str (time_t stamp, char **out)
-{
-	*out = g_strdup ("[12:34] ");
-	return strlen (*out);
-}
-void theme_get_xtext_colors_for_widget (GtkWidget *widget, XTextColor *colors, size_t len)
-{
-	size_t i;
-	for (i = 0; i < len; i++)
-	{
-		colors[i].red = colors[i].green = colors[i].blue = 0.0;
-		colors[i].alpha = 1.0;
-	}
-	colors[XTEXT_FG].red = colors[XTEXT_FG].green = colors[XTEXT_FG].blue = 1.0;
-	colors[XTEXT_MARK_BG].blue = 1.0;
-	colors[XTEXT_MARK_FG] = colors[XTEXT_FG];
-	colors[XTEXT_MARKER].red = 1.0;
-}
-
-typedef struct { GtkWidget *window; GtkXText *xtext; } Fixture;
-
-static void drain_events (void)
-{
-	while (g_main_context_iteration (NULL, FALSE)) { }
-}
-
-static void fixture_setup (Fixture *f, gconstpointer data)
-{
-	XTextColor colors[XTEXT_COLS];
-	GtkWidget *scrolled = gtk_scrolled_window_new (NULL, NULL);
-	theme_get_xtext_colors_for_widget (NULL, colors, G_N_ELEMENTS (colors));
-	f->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_default_size (GTK_WINDOW (f->window), 640, 360);
-	f->xtext = GTK_XTEXT (gtk_xtext_new (colors, TRUE));
-	g_object_ref (f->xtext);
-	gtk_container_add (GTK_CONTAINER (scrolled), GTK_WIDGET (f->xtext));
-	gtk_container_add (GTK_CONTAINER (f->window), scrolled);
-	g_assert_true (gtk_xtext_set_font (f->xtext, "monospace 12"));
-	gtk_widget_show_all (f->window);
-	drain_events ();
-}
-
-static void fixture_teardown (Fixture *f, gconstpointer data)
-{
-	gtk_widget_destroy (f->window);
-	g_object_unref (f->xtext);
-	drain_events ();
-	g_assert_null (image_pending_list);
-}
-
-static void append (Fixture *f, const char *text)
-{
-	gtk_xtext_append (f->xtext->buffer, (guchar *)text, -1, 1234);
-}
-
-static cairo_surface_t *snapshot (Fixture *f, gboolean partial)
-{
-	GtkWidget *widget = GTK_WIDGET (f->xtext);
-	int width = gtk_widget_get_allocated_width (widget);
-	int height = gtk_widget_get_allocated_height (widget);
-	cairo_surface_t *surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height);
-	cairo_t *cr = cairo_create (surface);
-	if (partial)
-	{
-		cairo_rectangle (cr, 0, f->xtext->fontsize, width, height - f->xtext->fontsize);
-		cairo_clip (cr);
-	}
-	gtk_widget_draw (widget, cr);
-	g_assert_cmpint (cairo_status (cr), ==, CAIRO_STATUS_SUCCESS);
-	cairo_destroy (cr);
-	cairo_surface_flush (surface);
-	return surface;
-}
-
-static void test_empty_and_bounded_append (Fixture *f, gconstpointer data)
-{
-	const guchar bytes[] = {'a', 'b', 'c'}; /* deliberately no terminating NUL */
-	append (f, "");
-	g_assert_cmpstr ((char *)f->xtext->buffer->text_last->str, ==, "");
-	g_assert_cmpint (f->xtext->buffer->text_last->subline_count, ==, 1);
-	append (f, "\n");
-	g_assert_cmpint (f->xtext->buffer->text_last->str_len, ==, 0);
-	gtk_xtext_append (f->xtext->buffer, (guchar *)bytes, sizeof (bytes), 1234);
-	g_assert_cmpstr ((char *)f->xtext->buffer->text_last->str, ==, "abc");
-	gtk_xtext_append_indent (f->xtext->buffer, (guchar *)"", 0, (guchar *)"", 0, 1234);
-	g_assert_cmpstr ((char *)f->xtext->buffer->text_last->str, ==, " ");
-}
-
-static void test_utf8_limits (Fixture *f, gconstpointer data)
-{
-	GString *text = g_string_new (NULL);
-	int i;
-	for (i = 0; i < 1500; i++) g_string_append (text, "猫");
-	gtk_xtext_append (f->xtext->buffer, (guchar *)text->str, text->len, 1234);
-	g_assert_cmpint (f->xtext->buffer->text_last->str_len, ==, 4095);
-	g_assert_true (g_utf8_validate ((char *)f->xtext->buffer->text_last->str, -1, NULL));
-	gtk_xtext_append_indent (f->xtext->buffer, (guchar *)text->str, text->len,
-		(guchar *)"猫", -1, 1234);
-	g_assert_cmpint (f->xtext->buffer->text_last->str_len, <=, 4095);
-	g_assert_true (g_utf8_validate ((char *)f->xtext->buffer->text_last->str, -1, NULL));
-	gtk_xtext_append (f->xtext->buffer, (guchar *)"hello 猫", 8, 1234);
-	g_assert_cmpstr ((char *)f->xtext->buffer->text_last->str, ==, "hello ");
-	gtk_xtext_append (f->xtext->buffer, (guchar *)"ok\xff" "bad", 6, 1234);
-	g_assert_cmpstr ((char *)f->xtext->buffer->text_last->str, ==, "ok");
-	g_string_free (text, TRUE);
-}
-
-static void test_null_empty_prefix (Fixture *f, gconstpointer data)
-{
-	xtext_buffer *buf = f->xtext->buffer;
-	/* PrintTextLine passes NULL/0 for indented server text without a tab. */
-	gtk_xtext_append_indent (buf, NULL, 0, (guchar *)"server notice", -1, 1234);
-	g_assert_cmpstr ((char *)buf->text_last->str, ==, " server notice");
-	g_assert_cmpint (buf->text_last->left_len, ==, 0);
-	g_assert_cmpint (buf->text_last->stamp, ==, 1234);
-	gtk_xtext_append_indent (buf, (guchar *)"nick", -1, NULL, 0, 1234);
-	g_assert_cmpstr ((char *)buf->text_last->str, ==, "nick ");
-	gtk_xtext_append_indent (buf, NULL, 0, NULL, 0, 1234);
-	g_assert_cmpstr ((char *)buf->text_last->str, ==, " ");
-	g_assert_cmpint (buf->num_lines, ==, 3);
-	cairo_surface_destroy (snapshot (f, FALSE));
-}
-
-static void test_wrapping (Fixture *f, gconstpointer data)
-{
-	xtext_buffer *buf = f->xtext->buffer;
-	textentry *ent;
-	int start = 0, i;
-	append (f, "猫猫猫猫猫猫猫猫猫猫");
-	ent = buf->text_last;
-	/* A character wider than the row must still be kept whole. */
-	buf->window_width = 3;
-	gtk_xtext_lines_taken (buf, ent);
-	g_assert_cmpint (ent->subline_count, ==, 10);
-	for (i = 0; i < ent->subline_count; i++)
-	{
-		int end = gtk_xtext_subline_end (ent, i);
-		g_assert_cmpint (end, >, start);
-		g_assert_true (g_utf8_validate ((char *)ent->str + start, end - start, NULL));
-		start = end;
-	}
-	buf->window_width = 120;
-	gtk_xtext_lines_taken (buf, ent);
-	g_assert_cmpint (ent->subline_count, >, 1);
-	buf->window_width = 640;
-	gtk_xtext_lines_taken (buf, ent);
-	g_assert_cmpint (ent->subline_count, ==, 1);
-}
-
-static void test_font_isolation (Fixture *f, gconstpointer data)
-{
-	Fixture second;
-	int original = gtk_xtext_text_width (f->xtext, (guchar *)"WWii hello", 10);
-	fixture_setup (&second, NULL);
-	g_assert_true (gtk_xtext_set_font (second.xtext, "sans 30"));
-	g_assert_cmpint (gtk_xtext_text_width (second.xtext, (guchar *)"WWii hello", 10), >, original);
-	g_assert_cmpint (gtk_xtext_text_width (f->xtext, (guchar *)"WWii hello", 10), ==, original);
-	fixture_teardown (&second, NULL);
-	g_assert_cmpint (gtk_xtext_text_width (f->xtext, (guchar *)"WWii hello", 10), ==, original);
-}
-
-static void test_wide_metrics (Fixture *f, gconstpointer data)
-{
-	char *text = g_strnfill (4000, 'W');
-	g_assert_true (gtk_xtext_set_font (f->xtext, "sans 40"));
-	append (f, text);
-	g_assert_cmpint (f->xtext->buffer->text_last->str_width, >, 65535);
-	g_assert_cmpint (f->xtext->buffer->text_last->subline_count, >, 1);
-	g_free (text);
-}
-
-static void test_formatting (Fixture *f, gconstpointer data)
-{
-	const char *formatted = "a\002bold\002 \035italic\035 \00304,02red\017 \037u\037 \036s\036 \026r\026";
-	char *plain;
-	GSList *runs = NULL;
-	int len;
-	plain = (char *)gtk_xtext_strip_color ((guchar *)formatted, strlen (formatted), NULL, &len, &runs, FALSE);
-	g_assert_cmpstr (plain, ==, "abold italic red u s r");
-	g_assert_cmpint (len, ==, strlen (plain));
-	g_assert_cmpint (((offlen_t *)runs->data)->off, ==, 0);
-	g_slist_free_full (runs, g_free);
-	g_free (plain);
-	plain = (char *)gtk_xtext_strip_color ((guchar *)"a\010secret\010b", 10, NULL, &len, NULL, TRUE);
-	g_assert_cmpstr (plain, ==, "ab");
-	g_free (plain);
-	append (f, formatted);
-	gtk_xtext_append_indent (f->xtext->buffer, (guchar *)"nick", -1, (guchar *)formatted, -1, 1234);
-	f->xtext->auto_indent = TRUE;
-	f->xtext->buffer->time_stamp = TRUE;
-	f->xtext->buffer->indent = 130;
-	gtk_xtext_recalc_widths (f->xtext->buffer, FALSE);
-	cairo_surface_destroy (snapshot (f, FALSE));
-	g_assert_cmpstr ((char *)f->xtext->buffer->text_last->str, ==,
-		"nick a\002bold\002 \035italic\035 \00304,02red\017 \037u\037 \036s\036 \026r\026");
-}
-
-static void select_entries (Fixture *f, textentry *start, textentry *end)
-{
-	textentry *ent;
-	for (ent = start; ent; ent = ent->next)
-	{
-		ent->mark_start = 0;
-		ent->mark_end = ent->str_len;
-		if (ent == end) break;
-	}
-	gtk_xtext_selection_render (f->xtext, start, end);
-	f->xtext->selection_buffer = f->xtext->buffer;
-}
-
-static void test_selection_and_clipboard (Fixture *f, gconstpointer data)
-{
-	char *selected;
-	int len;
-	append (f, "");
-	append (f, "\002bold\002 猫");
-	append (f, "last");
-	select_entries (f, f->xtext->buffer->text_first, f->xtext->buffer->text_last);
-	selected = gtk_xtext_selection_get_text (f->xtext, &len);
-	g_assert_cmpstr (selected, ==, "\nbold 猫\nlast");
-	g_assert_cmpint (len, ==, strlen (selected));
-	g_free (selected);
-	f->xtext->color_paste = TRUE;
-	f->xtext->mark_stamp = TRUE;
-	selected = gtk_xtext_selection_get_text (f->xtext, &len);
-	g_assert_cmpstr (selected, ==, "\n[12:34] \002bold\002 猫\n[12:34] last");
-	g_free (selected);
-	f->xtext->color_paste = f->xtext->mark_stamp = FALSE;
-	gtk_xtext_copy_selection (f->xtext);
-	selected = gtk_clipboard_wait_for_text (gtk_widget_get_clipboard (GTK_WIDGET (f->xtext), GDK_SELECTION_CLIPBOARD));
-	g_assert_cmpstr (selected, ==, "\nbold 猫\nlast");
-	g_free (selected);
-	selected = gtk_clipboard_wait_for_text (gtk_widget_get_clipboard (GTK_WIDGET (f->xtext), GDK_SELECTION_PRIMARY));
-	g_assert_cmpstr (selected, ==, "\nbold 猫\nlast");
-	g_free (selected);
-	gtk_xtext_unselect (f->xtext);
-	g_assert_false (gtk_xtext_is_selecting (f->xtext));
-}
-
-static void test_search (Fixture *f, gconstpointer data)
-{
-	GError *error = NULL;
-	textentry *first;
-	xtext_buffer *buf = f->xtext->buffer;
-	append (f, "one \002needle\002 then NEEDLE");
-	first = buf->text_last;
-	append (f, "second needle");
-	g_assert_true (gtk_xtext_search (f->xtext, "needle", highlight, &error) == first);
-	g_assert_no_error (error);
-	g_assert_cmpint (g_list_length (first->marks), ==, 2);
-	g_assert_true (gtk_xtext_search (f->xtext, "needle", highlight, &error) == first);
-	g_assert_true (gtk_xtext_search (f->xtext, "needle", highlight, &error) == buf->text_last);
-	gtk_xtext_search (f->xtext, "", 0, &error);
-	g_assert_null (buf->search_found);
-	g_assert_true (gtk_xtext_search (f->xtext, "needle", backward | case_match, &error) == buf->text_last);
-	gtk_xtext_search (f->xtext, "n[a-z]+", regexp | case_match, &error);
-	g_assert_no_error (error);
-	g_assert_nonnull (buf->search_re);
-	gtk_xtext_search (f->xtext, "[", regexp, &error);
-	g_assert_error (error, G_REGEX_ERROR, G_REGEX_ERROR_UNTERMINATED_CHARACTER_CLASS);
-	g_clear_error (&error);
-	/* A no-match search must also release its regex/text on clear. */
-	gtk_xtext_search (f->xtext, "nomatch", regexp, &error);
-	g_assert_null (buf->search_found);
-	gtk_xtext_clear (buf, 0);
-	g_assert_null (buf->search_re);
-	g_assert_null (buf->search_text);
-}
-
-static void test_follow_search (Fixture *f, gconstpointer data)
-{
-	xtext_buffer *buf = f->xtext->buffer;
-	append (f, "match first");
-	gtk_xtext_search (f->xtext, "match", 0, NULL);
-	append (f, "match second");
-	gtk_xtext_search (f->xtext, NULL, follow, NULL);
-	g_assert_cmpint (g_list_length (buf->search_found), ==, 2);
-	GList *current = buf->curmark;
-	gtk_xtext_search (f->xtext, NULL, 0, NULL);
-	gtk_xtext_search (f->xtext, NULL, follow, NULL);
-	g_assert_cmpint (g_list_length (buf->search_found), ==, 2);
-	g_assert_true (buf->curmark == current);
-	append (f, "match third");
-	g_assert_cmpint (g_list_length (buf->search_found), ==, 3);
-}
-
-static void test_search_unicode_offsets (Fixture *f, gconstpointer data)
-{
-	xtext_buffer *buf = f->xtext->buffer;
-	offsets_t mark;
-	append (f, "İ \002NEEDLE\002 Straße");
-	gtk_xtext_search (f->xtext, "needle", 0, NULL);
-	mark.u = GPOINTER_TO_UINT (buf->text_first->marks->data);
-	g_assert_cmpint (mark.o.start, ==, 4);
-	/* The established color-offset mapping includes the closing control. */
-	g_assert_cmpint (mark.o.end, ==, 11);
-	gtk_xtext_search (f->xtext, "ss", 0, NULL);
-	mark.u = GPOINTER_TO_UINT (buf->text_first->marks->data);
-	g_assert_cmpint (mark.o.start, ==, 16);
-	g_assert_cmpint (mark.o.end, ==, 18);
-	gtk_xtext_clear (buf, 0);
-	append (f, "ſ needle");
-	gtk_xtext_search (f->xtext, "needle", 0, NULL);
-	mark.u = GPOINTER_TO_UINT (buf->text_first->marks->data);
-	g_assert_cmpint (mark.o.start, ==, 3);
-	g_assert_cmpint (mark.o.end, ==, 9);
-}
-
-static void test_rawlog_hidden_text (Fixture *f, gconstpointer data)
-{
-	int hidden, visible;
-	append (f, "a\010secret\010b");
-	hidden = f->xtext->buffer->text_last->str_width;
-	f->xtext->ignore_hidden = TRUE;
-	gtk_xtext_recalc_widths (f->xtext->buffer, TRUE);
-	visible = f->xtext->buffer->text_last->str_width;
-	g_assert_cmpint (visible, >, hidden);
-	g_assert_cmpint (visible, ==, gtk_xtext_text_width (f->xtext, (guchar *)"asecretb", 8));
-}
-
-static void test_save (Fixture *f, gconstpointer data)
-{
-	char *path, *saved;
-	GError *error = NULL;
-	int fd = g_file_open_tmp ("zoitechat-xtext-XXXXXX", &path, &error);
-	g_assert_no_error (error);
-	append (f, "\002bold\002 猫");
-	append (f, "");
-	append (f, "last");
-	gtk_xtext_save (f->xtext, fd);
-	close (fd);
-	g_assert_true (g_file_get_contents (path, &saved, NULL, &error));
-	g_assert_no_error (error);
-	g_assert_cmpstr (saved, ==, "bold 猫\n\nlast\n");
-	g_free (saved);
-	g_unlink (path);
-	g_free (path);
-}
-
-static void test_scrollable_ownership (Fixture *f, gconstpointer data)
-{
-	GtkAdjustment *horizontal = GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, 1, 1, 1, 1));
-	GtkAdjustment *vertical = GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, 100, 1, 10, 10));
-	GtkAdjustment *old = g_object_ref (f->xtext->adj);
-	g_object_set (f->xtext, "hadjustment", horizontal, "vadjustment", vertical, NULL);
-	g_assert_false (g_object_is_floating (horizontal));
-	g_assert_false (g_object_is_floating (vertical));
-	g_assert_true (f->xtext->hadj == horizontal);
-	g_assert_true (f->xtext->adj == vertical);
-	/* A replaced adjustment must no longer call into the widget. */
-	g_assert_cmpuint (g_signal_handler_find (old, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, f->xtext), ==, 0);
-	g_signal_emit_by_name (f->xtext, "set-scroll-adjustments", horizontal, vertical);
-	g_assert_true (f->xtext->adj == vertical);
-	g_object_set (f->xtext, "hadjustment", NULL, "vadjustment", NULL, NULL);
-	g_assert_true (GTK_IS_ADJUSTMENT (f->xtext->hadj));
-	g_assert_true (GTK_IS_ADJUSTMENT (f->xtext->adj));
-	g_object_unref (old);
-}
-
-static void test_clear_and_marker (Fixture *f, gconstpointer data)
-{
-	xtext_buffer *buf = f->xtext->buffer;
-	append (f, "first"); append (f, "second"); append (f, "third");
-	buf->marker_pos = buf->text_first;
-	buf->marker_state = MARKER_IS_SET;
-	gtk_xtext_clear (buf, 1);
-	g_assert_cmpstr ((char *)buf->text_first->str, ==, "second");
-	g_assert_cmpint (buf->marker_state, ==, MARKER_RESET_BY_CLEAR);
-	gtk_xtext_clear (buf, -1);
-	g_assert_cmpstr ((char *)buf->text_last->str, ==, "second");
-	select_entries (f, buf->text_first, buf->text_last);
-	f->xtext->hilight_ent = buf->text_first;
-	gtk_xtext_clear (buf, 0);
-	g_assert_null (f->xtext->hilight_ent);
-	g_assert_null (buf->pagetop_ent);
-	g_assert_null (buf->last_ent_start);
-	g_assert_cmpint (buf->num_lines, ==, 0);
-	g_assert_true (gtk_xtext_is_empty (buf));
-	append (f, "after clear");
-	g_assert_cmpint (buf->num_lines, ==, 1);
-}
-
-static void test_scrollback_limit (Fixture *f, gconstpointer data)
-{
-	int i;
-	xtext_buffer *buf = f->xtext->buffer;
-	gtk_xtext_set_max_lines (f->xtext, 10);
-	for (i = 0; i < 100; i++) append (f, "line");
-	g_assert_cmpint (buf->num_lines, ==, 10);
-	g_assert_null (buf->text_first->prev);
-	g_assert_null (buf->text_last->next);
-	g_assert_cmpfloat (gtk_adjustment_get_value (f->xtext->adj), >=, 0);
-}
-
-static void test_follow_trim_oversized_entry (Fixture *f, gconstpointer data)
-{
-	char *long_text = g_strnfill (4000, 'W');
-	gtk_xtext_set_max_lines (f->xtext, 3);
-	append (f, "needle");
-	gtk_xtext_search (f->xtext, "W", follow, NULL);
-	gtk_xtext_clear (f->xtext->buffer, 1);
-	append (f, long_text);
-	g_assert_true (gtk_xtext_is_empty (f->xtext->buffer));
-	g_assert_null (f->xtext->buffer->search_found);
-	g_free (long_text);
-	append (f, "after oversized");
-	gtk_xtext_clear (f->xtext->buffer, G_MININT);
-	g_assert_true (gtk_xtext_is_empty (f->xtext->buffer));
-}
-
-static void test_stress (Fixture *f, gconstpointer data)
-{
-	static const char *tokens[] = {"text ", "猫", "😀", "\002bold\002", "\00304,02red\017", "\010hidden\010", "\037u\037", "\036s\036"};
-	GRand *random = g_rand_new_with_seed (0x78746578);
-	xtext_buffer *buf = f->xtext->buffer;
-	int i;
-	gtk_xtext_set_max_lines (f->xtext, 80);
-	for (i = 0; i < 2000; i++)
-	{
-		GString *text = g_string_new (NULL);
-		textentry *ent;
-		int j, lines = 0;
-		for (j = 0; j < 30; j++)
-			g_string_append (text, tokens[g_rand_int_range (random, 0, G_N_ELEMENTS (tokens))]);
-		if (i % 2)
-			gtk_xtext_append_indent (buf, (guchar *)"nick", -1, (guchar *)text->str, text->len, 1234);
-		else
-			gtk_xtext_append (buf, (guchar *)text->str, text->len, 1234);
-		g_string_free (text, TRUE);
-		if (i % 29 == 0) gtk_xtext_search (f->xtext, "text", follow | highlight, NULL);
-		if (i % 31 == 0) gtk_xtext_clear (buf, 1);
-		if (i % 37 == 0) gtk_xtext_clear (buf, -1);
-		if (i % 101 == 0) gtk_xtext_clear (buf, 0);
-		for (ent = buf->text_first; ent; ent = ent->next)
-		{
-			g_assert_true (g_utf8_validate ((char *)ent->str, ent->str_len, NULL));
-			g_assert_cmpint (ent->subline_count, >, 0);
-			lines += ent->subline_count;
-		}
-		g_assert_cmpint (buf->num_lines, ==, lines);
-		if (i % 43 == 0) cairo_surface_destroy (snapshot (f, FALSE));
-	}
-	g_rand_free (random);
-}
-
-static void test_buffers (Fixture *f, gconstpointer data)
-{
-	xtext_buffer *original = f->xtext->buffer;
-	xtext_buffer *second = gtk_xtext_buffer_new (f->xtext);
-	append (f, "original");
-	gtk_xtext_append (second, (guchar *)"alternate", -1, 1234);
-	gtk_xtext_buffer_show (f->xtext, second, TRUE);
-	g_assert_true (f->xtext->buffer == second);
-	cairo_surface_destroy (snapshot (f, FALSE));
-	gtk_xtext_buffer_show (f->xtext, original, TRUE);
-	g_assert_cmpstr ((char *)f->xtext->buffer->text_first->str, ==, "original");
-	gtk_xtext_buffer_free (second);
-}
-
-static void test_partial_draw_after_scroll (Fixture *f, gconstpointer data)
-{
-	cairo_surface_t *partial, *full;
-	int i, stride, height, y;
-	for (i = 0; i < 80; i++)
-	{
-		char *line = g_strdup_printf ("line %d — 猫 \002bold\002", i);
-		append (f, line);
-		g_free (line);
-	}
-	cairo_surface_destroy (snapshot (f, FALSE));
-	gtk_adjustment_set_value (f->xtext->adj, 12.5);
-	partial = snapshot (f, TRUE);
-	full = snapshot (f, FALSE);
-	stride = cairo_image_surface_get_stride (full);
-	height = cairo_image_surface_get_height (full);
-	for (y = f->xtext->fontsize; y < height; y++)
-		g_assert_cmpmem (cairo_image_surface_get_data (partial) + y * stride, stride,
-			cairo_image_surface_get_data (full) + y * stride, stride);
-	cairo_surface_destroy (partial);
-	cairo_surface_destroy (full);
-}
-
-static void test_image_lifecycle (Fixture *f, gconstpointer data)
-{
-	GdkPixbuf *image = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, 800, 600);
-	xtext_buffer *buf = f->xtext->buffer;
-	textentry *ent;
-	guint handle;
-	int before;
-	gdk_pixbuf_fill (image, 0xff0000ff);
-	append (f, "image");
-	ent = buf->text_last;
-	before = buf->num_lines;
-	handle = gtk_xtext_image_load_begin (f->xtext, ent, "https://example.invalid/image.png");
-	g_assert_cmpuint (handle, !=, 0);
-	g_assert_cmpuint (gtk_xtext_image_load_begin (f->xtext, ent, "duplicate"), ==, 0);
-	g_assert_true (gtk_xtext_image_load_finish (handle, image));
-	g_assert_cmpint (buf->num_lines, >, before);
-	g_assert_true (gtk_xtext_entry_has_image (f->xtext, ent));
-	g_assert_cmpint (gdk_pixbuf_get_width (ent->image), <=, XTEXT_IMAGE_MAX_WIDTH);
-	g_assert_true (gtk_xtext_entry_get_full_image (f->xtext, ent) == image);
-	cairo_surface_destroy (snapshot (f, FALSE));
-	g_assert_true (gtk_xtext_image_remove (f->xtext, ent));
-	g_assert_cmpint (buf->num_lines, ==, before);
-	handle = gtk_xtext_image_load_begin (f->xtext, ent, "late");
-	gtk_xtext_clear (buf, 0);
-	g_assert_false (gtk_xtext_image_load_finish (handle, image));
-	g_assert_false (gtk_xtext_entry_has_image (f->xtext, ent));
-	g_assert_null (gtk_xtext_entry_get_full_image (f->xtext, ent));
-	g_object_unref (image);
-}
-
-static void test_background (Fixture *f, gconstpointer data)
-{
-	cairo_surface_t *background = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 32, 32);
-	cairo_t *cr = cairo_create (background);
-	cairo_set_source_rgb (cr, 0.2, 0.3, 0.4);
-	cairo_paint (cr);
-	cairo_destroy (cr);
-	gtk_xtext_set_background (f->xtext, background);
-	cairo_surface_destroy (background);
-	gtk_xtext_set_background (f->xtext, f->xtext->background_surface);
-	append (f, "background text");
-	cairo_surface_destroy (snapshot (f, FALSE));
-	gtk_xtext_set_background (f->xtext, NULL);
-	cairo_surface_destroy (snapshot (f, FALSE));
-}
-
-static void test_destroy_pending_sources (Fixture *f, gconstpointer data)
-{
-	guint image;
-	append (f, "pending");
-	image = gtk_xtext_image_load_begin (f->xtext, f->xtext->buffer->text_last, "late");
-	f->xtext->io_tag = g_timeout_add (10000, gtk_xtext_adjustment_timeout, f->xtext);
-	f->xtext->add_io_tag = g_timeout_add (10000, gtk_xtext_render_page_timeout, f->xtext);
-	f->xtext->scroll_tag = g_timeout_add (10000, gtk_xtext_scrollup_timeout, f->xtext);
-	gtk_widget_destroy (f->window);
-	g_assert_cmpint (f->xtext->io_tag, ==, 0);
-	g_assert_cmpint (f->xtext->add_io_tag, ==, 0);
-	g_assert_cmpint (f->xtext->scroll_tag, ==, 0);
-	g_assert_false (gtk_xtext_image_load_finish (image, NULL));
-	/* GtkWidget destruction must be safe if GObject dispose runs again. */
-	g_object_run_dispose (G_OBJECT (f->xtext));
-	f->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-}
-
-int main (int argc, char **argv)
-{
-	g_test_init (&argc, &argv, NULL);
-	if (!gtk_init_check (&argc, &argv))
-	{
-		g_test_message ("GTK display unavailable; run under Xvfb for widget coverage");
-		return 77;
-	}
-	prefs.hex_gui_mouse_scroll_speed = 10;
-#define ADD(name, function) g_test_add ("/xtext/" name, Fixture, NULL, fixture_setup, function, fixture_teardown)
-	ADD ("append/empty-bounded", test_empty_and_bounded_append);
-	ADD ("append/utf8-limits", test_utf8_limits);
-	ADD ("append/null-empty-prefix", test_null_empty_prefix);
-	ADD ("layout/wrapping", test_wrapping);
-	ADD ("layout/font-isolation", test_font_isolation);
-	ADD ("layout/wide-metrics", test_wide_metrics);
-	ADD ("render/formatting-timestamps", test_formatting);
-	ADD ("selection/clipboard", test_selection_and_clipboard);
-	ADD ("search/navigation-regex-clear", test_search);
-	ADD ("search/follow", test_follow_search);
-	ADD ("search/unicode-offsets", test_search_unicode_offsets);
-	ADD ("render/rawlog-hidden", test_rawlog_hidden_text);
-	ADD ("buffer/save", test_save);
-	ADD ("lifecycle/scrollable-ownership", test_scrollable_ownership);
-	ADD ("buffer/clear-marker", test_clear_and_marker);
-	ADD ("buffer/scrollback-limit", test_scrollback_limit);
-	ADD ("buffer/follow-trim-oversized", test_follow_trim_oversized_entry);
-	ADD ("buffer/stress", test_stress);
-	ADD ("buffer/switch", test_buffers);
-	ADD ("render/partial-scroll", test_partial_draw_after_scroll);
-	ADD ("images/lifecycle", test_image_lifecycle);
-	ADD ("render/background", test_background);
-	ADD ("lifecycle/pending-sources", test_destroy_pending_sources);
-#undef ADD
-	return g_test_run ();
-}
@@ -400,6 +400,7 @@ pevent_treeview_new (GtkWidget *box)
 	scroll = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scroll), GTK_SHADOW_IN);
+	gtk_widget_set_size_request (GTK_WIDGET (scroll), -1, 250);

 	store = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT);
 	g_return_val_if_fail (store != NULL, NULL);
@@ -436,7 +437,7 @@ pevent_treeview_new (GtkWidget *box)
 	gtk_tree_view_column_set_min_width (col, 100);

 	gtk_container_add (GTK_CONTAINER (scroll), view);
-	gtk_paned_pack1 (GTK_PANED (box), scroll, TRUE, FALSE);
+	gtk_container_add (GTK_CONTAINER (box), scroll);

 	return view;
 }
@@ -480,7 +481,7 @@ pevent_hlist_treeview_new (GtkWidget *box)
 	gtk_tree_view_column_set_sizing (col, GTK_TREE_VIEW_COLUMN_AUTOSIZE);

 	gtk_container_add (GTK_CONTAINER (scroll), view);
-	gtk_paned_pack2 (GTK_PANED (box), scroll, TRUE, FALSE);
+	gtk_container_add (GTK_CONTAINER (box), scroll);

 	return view;
 }
@@ -488,7 +489,7 @@ pevent_hlist_treeview_new (GtkWidget *box)
 void
 pevent_dialog_show ()
 {
-	GtkWidget *vbox, *hbox, *wid, *pane, *preview_pane;
+	GtkWidget *vbox, *hbox, *wid, *pane;
 	XTextColor xtext_palette[XTEXT_COLS];

 	if (pevent_dialog)
@@ -502,12 +503,8 @@ pevent_dialog_show ()
 											 TRUE, FALSE, pevent_dialog_close, NULL,
 											 600, 455, &vbox, 0);

-	preview_pane = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
-	gtk_box_pack_start (GTK_BOX (vbox), preview_pane, TRUE, TRUE, 0);
 	pane = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
-	gtk_paned_pack1 (GTK_PANED (preview_pane), pane, TRUE, FALSE);
-	gtk_paned_set_position (GTK_PANED (pane), 220);
-	gtk_paned_set_position (GTK_PANED (preview_pane), 330);
+	gtk_box_pack_start (GTK_BOX (vbox), pane, TRUE, TRUE, 0);
 	
 	pevent_dialog_list = pevent_treeview_new (pane);
 	pevent_dialog_fill (pevent_dialog_list);
@@ -516,12 +513,12 @@ pevent_dialog_show ()

 	wid = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (wid), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
-	gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (wid), 75);
-	gtk_paned_pack2 (GTK_PANED (preview_pane), wid, TRUE, FALSE);
+	gtk_box_pack_start (GTK_BOX (vbox), wid, FALSE, TRUE, 0);

 	theme_get_xtext_colors_for_widget (wid, xtext_palette, XTEXT_COLS);
 	pevent_dialog_twid = gtk_xtext_new (xtext_palette, 0);
 	gtk_widget_set_sensitive (pevent_dialog_twid, FALSE);
+	gtk_widget_set_size_request (pevent_dialog_twid, -1, 75);
 	gtk_container_add (GTK_CONTAINER (wid), pevent_dialog_twid);
 	gtk_xtext_set_font (GTK_XTEXT (pevent_dialog_twid), prefs.hex_text_font);
 	g_object_set_data (G_OBJECT (pevent_dialog), "xtext", pevent_dialog_twid);
@@ -683,7 +683,7 @@ theme_manager_get_userlist_palette_behavior (const PangoFontDescription *font_de

 	behavior.font_desc = font_desc;
 	behavior.apply_background = TRUE;
-	behavior.apply_foreground = prefs.hex_gui_ulist_color ? FALSE : TRUE;
+	behavior.apply_foreground = (prefs.hex_gui_ulist_color || prefs.hex_text_color_nicks) ? FALSE : TRUE;

 	return behavior;
 }
@@ -1911,7 +1911,6 @@ theme_preferences_create_page (GtkWindow *parent,
                                         G_TYPE_STRING,
                                         G_TYPE_INT);
        ui->gtk3_combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (gtk3_store));
-        gtk_widget_set_hexpand (ui->gtk3_combo, TRUE);
        g_object_unref (gtk3_store);
        renderer = gtk_cell_renderer_text_new ();
        gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (ui->gtk3_combo), renderer, TRUE);
@@ -218,75 +218,49 @@ scroll_to_iter (GtkTreeIter *iter, GtkTreeView *treeview, GtkTreeModel *model)
 static GHashTable *
 userlist_row_map_ensure (session *sess)
 {
-	if (!sess->res->user_row_refs)
-		sess->res->user_row_refs = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, (GDestroyNotify) gtk_tree_row_reference_free);
+	if (!sess->res->user_row_iters)
+		sess->res->user_row_iters = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, (GDestroyNotify) gtk_tree_iter_free);

-	return sess->res->user_row_refs;
+	return sess->res->user_row_iters;
 }

 static void
 userlist_row_map_remove (session *sess, struct User *user)
 {
-	if (!sess->res->user_row_refs)
+	if (!sess->res->user_row_iters)
 		return;

-	g_hash_table_remove (sess->res->user_row_refs, user);
+	g_hash_table_remove (sess->res->user_row_iters, user);
 }

 static void
 userlist_row_map_set (session *sess, GtkTreeModel *model, struct User *user, GtkTreeIter *iter)
 {
-	GtkTreePath *path;
-	GtkTreeRowReference *ref;
-
-	path = gtk_tree_model_get_path (model, iter);
-	if (!path)
+	/* The shared tree view can still show another session's model while a
+	 * tab switch is pending. Never cache an iterator from that model. */
+	if (model != GTK_TREE_MODEL (sess->res->user_model))
 		return;

-	ref = gtk_tree_row_reference_new (model, path);
-	gtk_tree_path_free (path);
-	if (!ref)
-		return;
-
-	g_hash_table_replace (userlist_row_map_ensure (sess), user, ref);
+	/* GtkListStore guarantees persistent iterators until their row is
+	 * removed, including across sorting. Unlike row references, these do
+	 * not require every cached position to be updated on each insertion. */
+	g_hash_table_replace (userlist_row_map_ensure (sess), user, gtk_tree_iter_copy (iter));
 }

 static gboolean
 userlist_row_map_get_iter (session *sess, GtkTreeModel *model, struct User *user, GtkTreeIter *iter)
 {
-	GtkTreeRowReference *ref;
-	GtkTreePath *path;
-	struct User *row_user;
+	GtkTreeIter *cached;

-	if (!sess->res->user_row_refs)
+	if (model != GTK_TREE_MODEL (sess->res->user_model) || !sess->res->user_row_iters)
 		return FALSE;

-	ref = g_hash_table_lookup (sess->res->user_row_refs, user);
-	if (!ref)
+	cached = g_hash_table_lookup (sess->res->user_row_iters, user);
+	if (!cached)
 		return FALSE;

-	path = gtk_tree_row_reference_get_path (ref);
-	if (!path)
-	{
-		g_hash_table_remove (sess->res->user_row_refs, user);
-		return FALSE;
-	}
-
-	if (!gtk_tree_model_get_iter (model, iter, path))
-	{
-		gtk_tree_path_free (path);
-		g_hash_table_remove (sess->res->user_row_refs, user);
-		return FALSE;
-	}
-	gtk_tree_path_free (path);
-
-	gtk_tree_model_get (model, iter, COL_USER, &row_user, -1);
-	if (row_user != user)
-	{
-		g_hash_table_remove (sess->res->user_row_refs, user);
-		return FALSE;
-	}
-
+	/* Removal and clear invalidate the cache before deleting model rows. */
+	*iter = *cached;
 	return TRUE;
 }

@@ -587,14 +561,13 @@ fe_userlist_rehash (session *sess, struct User *user)
 					  GTK_TREE_MODEL(sess->res->user_model), user, &sel);
 	if (!iter)
 		return;
-	userlist_row_map_set (sess, GTK_TREE_MODEL (sess->res->user_model), user, iter);

 	if (prefs.hex_away_track && user->away)
 	{
 		nick_token = THEME_TOKEN_TAB_AWAY;
 		have_nick_token = TRUE;
 	}
-	else if (prefs.hex_gui_ulist_color)
+	else if (prefs.hex_gui_ulist_color || prefs.hex_text_color_nicks)
 	{
 		int mirc_index = text_color_of (user->nick);

@@ -635,7 +608,7 @@ fe_userlist_insert (session *sess, struct User *newuser, gboolean sel)
 		nick_token = THEME_TOKEN_TAB_AWAY;
 		have_nick_token = TRUE;
 	}
-	else if (prefs.hex_gui_ulist_color)
+	else if (prefs.hex_gui_ulist_color || prefs.hex_text_color_nicks)
 	{
 		int mirc_index = text_color_of (newuser->nick);

@@ -698,8 +671,8 @@ fe_userlist_insert (session *sess, struct User *newuser, gboolean sel)
 void
 fe_userlist_clear (session *sess)
 {
-	if (sess->res->user_row_refs)
-		g_hash_table_remove_all (sess->res->user_row_refs);
+	if (sess->res->user_row_iters)
+		g_hash_table_remove_all (sess->res->user_row_iters);
 	gtk_list_store_clear (sess->res->user_model);
 }

@@ -38,7 +38,6 @@ GType gtk_xtext_get_type (void);

 #define ATTR_BOLD				'\002'
 #define ATTR_COLOR			'\003'
-#define ATTR_HEXCOLOR		'\004'
 #define ATTR_BLINK			'\006'
 #define ATTR_BEEP				'\007'
 #define ATTR_HIDDEN			'\010'
@@ -58,8 +57,6 @@ GType gtk_xtext_get_type (void);
 #define XTEXT_BG 102
 #define XTEXT_MARKER 103	/* for marker line */
 #define XTEXT_MAX_COLOR 98
-#define XTEXT_HEX_FG 200	/* not palette slots: colors from \004RRGGBB */
-#define XTEXT_HEX_BG 201
 typedef struct textentry textentry;

 /*
@@ -184,8 +181,6 @@ struct _GtkXText

 	int col_fore;
 	int col_back;
-	XTextColor hex_fg;
-	XTextColor hex_bg;

 	int depth;						  /* gdk window depth */

@@ -197,7 +192,6 @@ struct _GtkXText
 	int hilight_end;
 	time_t tooltip_stamp;
 	unsigned int tooltip_stamp_set:1;
-	char *tooltip_url;			  /* URL shown while hovering a placeholder */

 	guint16 fontwidth[128];	  /* each char's width, only the ASCII ones */

@@ -260,9 +254,6 @@ struct _GtkXText
 	unsigned int force_render:1;
 	unsigned int color_paste:1; /* CTRL was pressed when selection finished */

-	textentry *clicked_ent;		  /* entry under the last word_click, or NULL */
-	textentry *clicked_image_ent; /* entry whose inline image was clicked */
-
 	/* settings/prefs */
 	unsigned int auto_indent:1;
 	unsigned int thinline:1;
@@ -318,19 +309,4 @@ void gtk_xtext_buffer_free (xtext_buffer *buf);
 void gtk_xtext_buffer_show (GtkXText *xtext, xtext_buffer *buf, int render);
 void gtk_xtext_copy_selection (GtkXText *xtext);

-/* inline image support.  A textentry can have one image attached, which is
- * rendered below its text.  Loading is asynchronous: begin() registers the
- * target entry and returns a handle, finish() attaches the downloaded pixbuf
- * if the entry still exists.  The handle stays valid even if the entry, its
- * buffer or the widget are destroyed in the meantime. */
-textentry *gtk_xtext_get_clicked_entry (GtkXText *xtext);
-textentry *gtk_xtext_get_clicked_image_entry (GtkXText *xtext);
-gboolean gtk_xtext_buffer_contains (GtkXText *xtext, textentry *ent);
-gboolean gtk_xtext_entry_has_image (GtkXText *xtext, textentry *ent);
-const char *gtk_xtext_entry_get_image_url (GtkXText *xtext, textentry *ent);
-GdkPixbuf *gtk_xtext_entry_get_full_image (GtkXText *xtext, textentry *ent);
-guint gtk_xtext_image_load_begin (GtkXText *xtext, textentry *ent, const char *url);
-gboolean gtk_xtext_image_load_finish (guint handle, GdkPixbuf *pixbuf);
-gboolean gtk_xtext_image_remove (GtkXText *xtext, textentry *ent);
-
 #endif
@@ -467,9 +467,6 @@ static const GOptionEntry gopt_entries[] =
 {"no-auto",	'a', 0, G_OPTION_ARG_NONE,	&arg_dont_autoconnect, N_("Don't auto connect to servers"), NULL},
 {"cfgdir",	'd', 0, G_OPTION_ARG_STRING,	&arg_cfgdir, N_("Use a different config directory"), "PATH"},
 {"no-plugins",	'n', 0, G_OPTION_ARG_NONE,	&arg_skip_plugins, N_("Don't auto load any plugins"), NULL},
-#ifdef __linux__
- {"run-as-root", 0, 0, G_OPTION_ARG_NONE, &arg_run_as_root, N_("Allow ZoiteChat to run as root (unsafe)"), NULL},
-#endif
 {"plugindir",	'p', 0, G_OPTION_ARG_NONE,	&arg_show_autoload, N_("Show plugin/script auto-load directory"), NULL},
 {"configdir",	'u', 0, G_OPTION_ARG_NONE,	&arg_show_config, N_("Show user config directory"), NULL},
 {"url",	 0,  G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING,	&arg_url, N_("Open an irc://server:port/channel URL"), "URL"},
@@ -478,16 +475,6 @@ static const GOptionEntry gopt_entries[] =
 {NULL}
 };

-#ifdef __linux__
-void
-fe_root_warning (void)
-{
-	fputs ("ZoiteChat refuses to run as root on Linux.\n"
-	       "Run it as a normal user, or pass --run-as-root to override this protection.\n",
-	       stderr);
-}
-#endif
-
 int
 fe_args (int argc, char *argv[])
 {
@@ -1,280 +0,0 @@
-#!/usr/bin/env python3
-#
-# gen-emoji-data.py - generate ZoiteChat's bundled emoji catalog
-#
-# Consumes the pinned data files checked in under data/emoji/ and emits a
-# C table that is compiled into the application, so every ZoiteChat package
-# ships the same emoji, names, categories and search keywords regardless of
-# which GTK runtime or /usr/share/gtk-3.0/emoji data a distribution provides.
-#
-# Inputs:
-#   emoji-test.txt                 Unicode emoji-test data file (catalog,
-#                                  CLDR ordering, groups, short names)
-#   cldr-annotations-en.xml        CLDR annotations (search keywords)
-#   cldr-annotations-derived-en.xml CLDR derived annotations (sequences)
-#   gemoji.json                    gemoji database (:shortcode: aliases, tags)
-#
-# Usage:
-#   gen-emoji-data.py EMOJI_TEST ANNOTATIONS DERIVED_ANNOTATIONS GEMOJI \
-#                     VERSIONS OUTPUT
-#
-# Only fully-qualified sequences are emitted, so everything the picker
-# inserts is a well-formed emoji presentation sequence.  Skin-tone variants
-# are folded into per-base tone sets: the picker shows the neutral emoji and
-# swaps in the modified sequence for the user's preferred tone.  Sequences
-# that mix two different skin tones are not emitted.
-
-import json
-import re
-import sys
-import xml.etree.ElementTree as ET
-
-# Must match the EmojiGroup enum in src/common/emoji-data.h.  "Component"
-# entries (bare tone swatches, hair styles) are not meaningful to insert.
-GROUPS = [
-    "Smileys & Emotion",
-    "People & Body",
-    "Animals & Nature",
-    "Food & Drink",
-    "Travel & Places",
-    "Activities",
-    "Objects",
-    "Symbols",
-    "Flags",
-]
-SKIPPED_GROUPS = {"Component"}
-
-# Order must match the EmojiTone enum (minus EMOJI_TONE_NONE).
-TONE_DESCRIPTORS = [
-    "light skin tone",
-    "medium-light skin tone",
-    "medium skin tone",
-    "medium-dark skin tone",
-    "dark skin tone",
-]
-TONE_MODIFIERS = set(range(0x1F3FB, 0x1F3FF + 1))
-VS16 = 0xFE0F
-
-DATA_LINE = re.compile(
-    r"^(?P<cps>[0-9A-F ]+?)\s*;\s*(?P<status>[\w-]+)\s*#\s*(?P<emoji>\S+)"
-    r"\s+E\d+\.\d+\s+(?P<name>.+)$"
-)
-
-
-def parse_emoji_test(path):
-    """Yield (group, codepoints, string, name) for fully-qualified entries."""
-    group = None
-    unicode_version = None
-    with open(path, encoding="utf-8") as fp:
-        for line in fp:
-            line = line.rstrip("\n")
-            if line.startswith("# group:"):
-                group = line.split(":", 1)[1].strip()
-                continue
-            if line.startswith("# Version:"):
-                unicode_version = line.split(":", 1)[1].strip()
-                continue
-            if not line or line.startswith("#"):
-                continue
-            m = DATA_LINE.match(line)
-            if not m:
-                continue
-            if m.group("status") != "fully-qualified":
-                continue
-            if group in SKIPPED_GROUPS:
-                continue
-            if group not in GROUPS:
-                sys.exit("gen-emoji-data.py: unknown emoji group %r; "
-                         "update GROUPS and the EmojiGroup enum" % group)
-            cps = [int(cp, 16) for cp in m.group("cps").split()]
-            yield group, cps, "".join(map(chr, cps)), m.group("name")
-    if unicode_version is None:
-        sys.exit("gen-emoji-data.py: no '# Version:' header in emoji-test.txt")
-    parse_emoji_test.version = unicode_version
-
-
-def parse_annotations(path, keywords, names):
-    root = ET.parse(path).getroot()
-    for node in root.iter("annotation"):
-        cp = node.attrib["cp"]
-        if node.attrib.get("type") == "tts":
-            names[cp] = node.text.strip()
-        else:
-            keywords[cp] = [k.strip() for k in node.text.split("|")]
-
-
-def parse_versions(path):
-    versions = {}
-    with open(path, encoding="utf-8") as fp:
-        for line in fp:
-            line = line.strip()
-            if line and not line.startswith("#") and "=" in line:
-                key, value = line.split("=", 1)
-                versions[key.strip()] = value.strip()
-    for key in ("unicode-emoji", "cldr", "gemoji"):
-        if key not in versions:
-            sys.exit("gen-emoji-data.py: %r missing from %s" % (key, path))
-    return versions
-
-
-def strip_vs16(text):
-    return text.replace(chr(VS16), "")
-
-
-def split_name(name):
-    """Split 'kiss: woman, man, light skin tone' into a base name and the
-    list of tone descriptors it contains."""
-    if ": " not in name:
-        return name, []
-    head, qualifier = name.split(": ", 1)
-    parts = [p.strip() for p in qualifier.split(",")]
-    tones = [p for p in parts if p in TONE_DESCRIPTORS]
-    rest = [p for p in parts if p not in TONE_DESCRIPTORS]
-    base = head if not rest else head + ": " + ", ".join(rest)
-    return base, tones
-
-
-def c_escape(text):
-    """Escape text as the body of a C string literal.  Non-ASCII bytes use
-    three-digit octal escapes, which cannot swallow a following character
-    the way hex escapes can."""
-    out = []
-    for byte in text.encode("utf-8"):
-        if byte in (0x22, 0x5C):  # '"' and '\\'
-            out.append("\\" + chr(byte))
-        elif 0x20 <= byte < 0x7F:
-            out.append(chr(byte))
-        else:
-            out.append("\\%03o" % byte)
-    return "".join(out)
-
-
-def build_search(name, keyword_list, aliases, tags):
-    tokens = []
-    for source in ([name] + keyword_list + tags):
-        tokens.extend(source.casefold().split())
-    tokens.extend(alias.casefold() for alias in aliases)
-    seen = {}
-    for token in tokens:
-        token = token.strip('",')
-        if token and token not in seen:
-            seen[token] = True
-    return " ".join(seen)
-
-
-def main():
-    if len(sys.argv) != 7:
-        sys.exit("usage: gen-emoji-data.py EMOJI_TEST ANNOTATIONS "
-                 "DERIVED_ANNOTATIONS GEMOJI VERSIONS OUTPUT")
-    (emoji_test, ann_path, derived_path, gemoji_path,
-     versions_path, output) = sys.argv[1:]
-
-    versions = parse_versions(versions_path)
-    cldr_version = versions["cldr"]
-
-    keywords = {}
-    cldr_names = {}
-    parse_annotations(ann_path, keywords, cldr_names)
-    parse_annotations(derived_path, keywords, cldr_names)
-
-    aliases = {}
-    tags = {}
-    with open(gemoji_path, encoding="utf-8") as fp:
-        for item in json.load(fp):
-            if "emoji" not in item:
-                continue
-            key = strip_vs16(item["emoji"])
-            aliases[key] = item.get("aliases", [])
-            tags[key] = item.get("tags", [])
-
-    entries = []           # base emoji, in CLDR order
-    by_name = {}           # base name -> index into entries
-    tone_sets = []         # list of [seq or None] * 5
-    skipped_mixed = 0
-
-    for group, cps, string, name in parse_emoji_test(emoji_test):
-        tones_in_seq = {cp for cp in cps if cp in TONE_MODIFIERS}
-        base_name, tone_descs = split_name(name)
-
-        if not tones_in_seq:
-            key = strip_vs16(string)
-            entry = {
-                "sequence": string,
-                "name": name,
-                "keywords": keywords.get(key, keywords.get(string, [])),
-                "aliases": aliases.get(key, []),
-                "tags": tags.get(key, []),
-                "group": GROUPS.index(group),
-                "tone_set": -1,
-            }
-            by_name[name] = len(entries)
-            entries.append(entry)
-            continue
-
-        # Tone-modified sequence: attach to its base if it uses one uniform
-        # tone; sequences mixing two tones are intentionally not bundled.
-        if len(tones_in_seq) != 1 or len(tone_descs) != 1:
-            skipped_mixed += 1
-            continue
-        if base_name not in by_name:
-            sys.exit("gen-emoji-data.py: no base emoji %r for %r"
-                     % (base_name, name))
-        entry = entries[by_name[base_name]]
-        if entry["tone_set"] == -1:
-            entry["tone_set"] = len(tone_sets)
-            tone_sets.append([None] * len(TONE_DESCRIPTORS))
-        tone_sets[entry["tone_set"]][TONE_DESCRIPTORS.index(tone_descs[0])] = string
-
-    for i, tone_set in enumerate(tone_sets):
-        if None in tone_set:
-            sys.exit("gen-emoji-data.py: incomplete tone set %d" % i)
-
-    unicode_version = parse_emoji_test.version
-    if unicode_version != versions["unicode-emoji"]:
-        sys.exit("gen-emoji-data.py: emoji-test.txt is Emoji %s but VERSIONS "
-                 "pins %s" % (unicode_version, versions["unicode-emoji"]))
-
-    with open(output, "w", encoding="utf-8", newline="\n") as out:
-        out.write("/*\n"
-                  " * Generated by tools/gen-emoji-data.py -- do not edit.\n"
-                  " *\n"
-                  " * Sources (pinned copies in data/emoji/):\n"
-                  " *   Unicode emoji-test.txt, Emoji %s\n"
-                  " *   CLDR annotations (en), release %s\n"
-                  " *   gemoji %s shortcode aliases\n"
-                  " */\n\n" % (unicode_version, cldr_version,
-                               versions["gemoji"]))
-
-        out.write("static const EmojiToneSet emoji_tone_sets_table[] =\n{\n")
-        for tone_set in tone_sets:
-            out.write("\t{ { %s } },\n"
-                      % ", ".join('"%s"' % c_escape(seq) for seq in tone_set))
-        out.write("};\n\n")
-
-        out.write("static const EmojiEntry emoji_entries_table[] =\n{\n")
-        for entry in entries:
-            search = build_search(entry["name"], entry["keywords"],
-                                  entry["aliases"], entry["tags"])
-            out.write('\t{ "%s", "%s", "%s", "%s", %d, %d },\n' % (
-                c_escape(entry["sequence"]),
-                c_escape(entry["name"]),
-                c_escape(search),
-                c_escape(" ".join(entry["aliases"])),
-                entry["group"],
-                entry["tone_set"],
-            ))
-        out.write("};\n\n")
-
-        out.write('static const char emoji_data_unicode_version_str[] = "%s";\n'
-                  % c_escape(unicode_version))
-        out.write('static const char emoji_data_cldr_version_str[] = "%s";\n'
-                  % c_escape(cldr_version))
-
-    sys.stderr.write("gen-emoji-data.py: %d emoji, %d tone sets, "
-                     "%d mixed-tone sequences skipped (Emoji %s, CLDR %s)\n"
-                     % (len(entries), len(tone_sets), skipped_mixed,
-                        unicode_version, cldr_version))
-
-
-if __name__ == "__main__":
-    main()
@@ -37,7 +37,6 @@
      <None Include="$(DepsRoot)\bin\*fribidi*.dll" />
      <None Include="$(DepsRoot)\bin\*fontconfig*.dll" />
      <None Include="$(DepsRoot)\bin\*gdk_pixbuf*.dll" />
-      <None Include="$(DepsRoot)\bin\rsvg-2-2.dll" />
      <None Include="$(DepsRoot)\bin\*gdk-3*.dll" />
      <None Include="$(DepsRoot)\bin\*epoxy*.dll" />
      <None Include="$(DepsRoot)\bin\*gio-2*.dll" />
@@ -79,12 +78,10 @@
      <Gtk3Immodules Include="$(DepsRoot)\lib\gtk-3.0\3.0.0\immodules\**\*" />
      <Gtk3PrintBackends Include="$(DepsRoot)\lib\gtk-3.0\3.0.0\printbackends\**\*" />
      <GSettingsSchemas Include="$(DepsRoot)\share\glib-2.0\schemas\*" />
-      <!-- Preserve the version/loaders directories used by the relative cache. -->
-      <GdkPixbufRuntime Include="$(DepsRoot)\lib\gdk-pixbuf-2.0\**\*" />
+      <GdkPixbufLoaders Include="$(DepsRoot)\lib\gdk-pixbuf-2.0\**\loaders\**\*" />
+      <GdkPixbufLoaderCache Include="$(DepsRoot)\lib\gdk-pixbuf-2.0\**\loaders.cache" />

-      <FontConfig Include="$(DepsRoot)\etc\fonts\**\*" />
-      <EmojiFont Include="..\..\data\fonts\NotoColorEmoji.ttf" />
-      <EmojiFontLicense Include="..\..\data\fonts\OFL.txt;..\..\data\fonts\README.md" />
+      <FontConfig Include="$(DepsRoot)\etc\fonts\*" />
      <Share Include="share\**\*" />
      <Locale Include="$(ZoiteChatBin)locale\**\*;$(DepsRoot)\share\locale\**\*" />
      <MSWindowsTheme Include="$(DepsRoot)\share\themes\MS-Windows\**\*" />
@@ -93,13 +90,11 @@
    </ItemGroup>

    <Copy SourceFiles="@(None)" DestinationFolder="$(ZoiteChatRel)" />
-    <Copy SourceFiles="@(FontConfig)" DestinationFiles="@(FontConfig->'$(ZoiteChatRel)\etc\fonts\%(RecursiveDir)%(Filename)%(Extension)')" />
-    <Copy SourceFiles="@(EmojiFont)" DestinationFolder="$(ZoiteChatRel)\share\fonts\zoitechat" />
-    <Copy SourceFiles="@(EmojiFontLicense)" DestinationFolder="$(ZoiteChatRel)\share\doc\zoitechat\fonts" />
+    <Copy SourceFiles="@(FontConfig)" DestinationFolder="$(ZoiteChatRel)\etc\fonts" />
    <Copy SourceFiles="@(Gtk3Immodules)" DestinationFiles="@(Gtk3Immodules->'$(ZoiteChatRel)\lib\gtk-3.0\3.0.0\immodules\%(RecursiveDir)%(Filename)%(Extension)')" />
    <Copy SourceFiles="@(Gtk3PrintBackends)" DestinationFiles="@(Gtk3PrintBackends->'$(ZoiteChatRel)\lib\gtk-3.0\3.0.0\printbackends\%(RecursiveDir)%(Filename)%(Extension)')" />
-    <Copy SourceFiles="@(GdkPixbufRuntime)" DestinationFiles="@(GdkPixbufRuntime->'$(ZoiteChatRel)\lib\gdk-pixbuf-2.0\%(RecursiveDir)%(Filename)%(Extension)')" />
-    <Copy SourceFiles="$(DepsRoot)\share\doc\librsvg\COPYING.LIB" DestinationFolder="$(ZoiteChatRel)\share\doc\librsvg" />
+    <Copy SourceFiles="@(GdkPixbufLoaders)" DestinationFiles="@(GdkPixbufLoaders->'$(ZoiteChatRel)\lib\gdk-pixbuf-2.0\%(RecursiveDir)%(Filename)%(Extension)')" />
+    <Copy SourceFiles="@(GdkPixbufLoaderCache)" DestinationFiles="@(GdkPixbufLoaderCache->'$(ZoiteChatRel)\lib\gdk-pixbuf-2.0\%(RecursiveDir)%(Filename)%(Extension)')" />
    <Copy SourceFiles="@(GSettingsSchemas)" DestinationFiles="@(GSettingsSchemas->'$(ZoiteChatRel)\share\glib-2.0\schemas\%(Filename)%(Extension)')" />
    <Copy SourceFiles="@(Share)" DestinationFiles="@(Share->'$(ZoiteChatRel)\share\%(RecursiveDir)%(Filename)%(Extension)')" />
    <Copy SourceFiles="..\..\COPYING" DestinationFolder="$(ZoiteChatRel)\share\doc\zoitechat" />
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{BF0C17A9-2562-4BDC-A6A2-34381C5C5173}</ProjectGuid>
-    <SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
-    <EmojiTestKind Condition="'$(EmojiTestKind)'==''">ui</EmojiTestKind>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v142</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="zoitechat.props" />
-  <PropertyGroup>
-    <TargetName>emoji-$(EmojiTestKind)-tests</TargetName>
-    <OutDir>$(ZoiteChatBuild)\$(ZoiteChatPlatform)\tests\</OutDir>
-    <IntDir>$(ZoiteChatObj)emoji-tests-$(EmojiTestKind)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_WIN64;_CONSOLE;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ZoiteChatLib);$(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <AdditionalLibraryDirectories>$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(Gtk3Lib);$(Gdk3Lib);atk-1.0.lib;gio-2.0.lib;gdk_pixbuf-2.0.lib;pangocairo-1.0.lib;pango-1.0.lib;pangoft2-1.0.lib;fontconfig.lib;cairo.lib;gobject-2.0.lib;glib-2.0.lib;$(IntlLib);%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\common\emoji-data.c" />
-    <ClCompile Include="..\src\fe-gtk\tests\test-emoji-font.c" Condition="'$(EmojiTestKind)'=='font'" />
-    <ClCompile Include="..\src\common\tests\test-emoji-data.c" Condition="'$(EmojiTestKind)'=='data'" />
-    <ClCompile Include="..\src\fe-gtk\emoji-font.c" Condition="'$(EmojiTestKind)'!='data'" />
-    <ClCompile Include="..\src\fe-gtk\emoji-picker.c" Condition="'$(EmojiTestKind)'=='ui'" />
-    <ClCompile Include="..\src\fe-gtk\tests\test-emoji-ui.c" Condition="'$(EmojiTestKind)'=='ui'" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
@@ -104,10 +104,7 @@ Source: "readme.url"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "cert.pem"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "share\xml\*"; DestDir: "{app}\share\xml"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs
 Source: "share\doc\zoitechat\*"; DestDir: "{app}\share\doc\zoitechat"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs
-Source: "share\fonts\zoitechat\*"; DestDir: "{app}\share\fonts\zoitechat"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs
 Source: "share\doc\WinSparkle\*"; DestDir: "{app}\share\doc\WinSparkle"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs
-Source: "share\doc\librsvg\*"; DestDir: "{app}\share\doc\librsvg"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs
-Source: "lib\gdk-pixbuf-2.0\*"; DestDir: "{app}\lib\gdk-pixbuf-2.0"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs
 Source: "share\themes\MS-Windows\*"; DestDir: "{app}\share\themes\MS-Windows"; Flags: ignoreversion createallsubdirs recursesubdirs skipifsourcedoesntexist; Components: libs
 Source: "share\glib-2.0\schemas\*"; DestDir: "{app}\share\glib-2.0\schemas"; Flags: ignoreversion createallsubdirs recursesubdirs skipifsourcedoesntexist; Components: libs
 Source: "share\icons\hicolor\*"; DestDir: "{app}\share\icons\hicolor"; Flags: ignoreversion createallsubdirs recursesubdirs skipifsourcedoesntexist; Components: libs
@@ -120,7 +117,6 @@ Source: "freetype-6.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: li
 Source: "fribidi-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "fontconfig-1.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "gdk_pixbuf-2.0-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
-Source: "rsvg-2-2.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "gdk-3-vs17.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "epoxy-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "gio-2.0-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
@@ -75,7 +75,7 @@

 		<UsingGtk3 Condition="Exists('$(DepsRoot)\\include\\gtk-3.0\\gtk\\gtk.h')">true</UsingGtk3>
 		<Gtk3>$(DepsRoot)\include\gtk-3.0;$(DepsRoot)\lib\gtk-3.0\include</Gtk3>
-		<GtkCommon>$(DepsRoot)\include\atk-1.0;$(DepsRoot)\include\cairo;$(DepsRoot)\include\pango-1.0;$(DepsRoot)\include\gdk-pixbuf-2.0;$(DepsRoot)\include\harfbuzz;$(DepsRoot)\include\freetype2</GtkCommon>
+		<GtkCommon>$(DepsRoot)\include\atk-1.0;$(DepsRoot)\include\cairo;$(DepsRoot)\include\pango-1.0;$(DepsRoot)\include\gdk-pixbuf-2.0;$(DepsRoot)\include\harfbuzz</GtkCommon>
 		<Gtk>$(Gtk3);$(GtkCommon)</Gtk>

 		<SslLegacyLib Condition="Exists('$(DepsRoot)\\lib\\ssleay32.lib')">ssleay32.lib</SslLegacyLib>