add sphinx to appimage build

Block root unless --run-as-root

.github/workflows/appimage-build.yml

@@ -35,7 +35,7 @@ jobs:
             libxkbcommon0 \
             libgtk-3-bin libglib2.0-bin glib-networking 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 \
+            perl python3 python3-minimal python3-dev python3-cffi python3-sphinx mono-devel desktop-file-utils \
             breeze-gtk-theme \
             patchelf file curl
 

.github/workflows/windows-build.yml

@@ -40,6 +40,7 @@ jobs:
           python -m pip install --upgrade pip
           python -m pip install cffi
           python -m pip install zstandard
+          python -m pip install sphinx
 
           $ProgressPreference = 'SilentlyContinue'
           function Download-WithRetry {

docs/_static/css/zoitechat-docs.css

@@ -78,6 +78,11 @@ a {
     text-decoration: none;
 }
 
+::selection {
+    background: var(--accent);
+    color: #fff8ea;
+}
+
 button,
 input,
 textarea,
@@ -139,6 +144,7 @@ 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);
 }
 
@@ -231,6 +237,17 @@ 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);
@@ -511,6 +528,7 @@ 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;
 }
 
@@ -527,6 +545,11 @@ select {
     outline: none;
 }
 
+.button:active {
+    transform: translate(3px, 3px);
+    box-shadow: none;
+}
+
 .button-primary {
     background: var(--accent);
     color: #fff8ea;
@@ -1176,6 +1199,11 @@ 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: "↳ ";
@@ -1184,6 +1212,7 @@ select {
 .footer-links a:hover,
 .footer-links a:focus-visible {
     color: #fff8ea;
+    border-bottom-color: currentColor;
     outline: none;
 }
 
@@ -1346,6 +1375,70 @@ 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;
@@ -1485,6 +1578,17 @@ 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,
@@ -1671,6 +1775,7 @@ footer.site-footer-lite {
 }
 
 .document .body p {
+    max-width: 78ch;
     margin: 0 0 1rem !important;
 }
 
@@ -1716,6 +1821,7 @@ 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;
 }
@@ -1865,6 +1971,11 @@ 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,
@@ -2004,6 +2115,7 @@ 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,
@@ -2019,6 +2131,13 @@ 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;
@@ -2275,3 +2394,37 @@ 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;
+    }
+}

docs/_theme/basicstrap/layout.html

@@ -135,7 +135,9 @@
     {{ js_tag(scriptfile) }}
   {%- endif -%}
 {%- endfor %}
+{%- if theme_theme_preview|tobool %}
 <script type="text/javascript" src="{{ pathto('_static/js/jquery.cookie.min.js', 1) }}"></script>
+{%- endif %}
 <script type="text/javascript" src="{{ pathto('_static/js/basicstrap.js', 1) }}"></script>
 <script type="text/javascript">
   DOCUMENTATION_OPTIONS.FILE_SUFFIX = DOCUMENTATION_OPTIONS.FILE_SUFFIX || '.html';
@@ -209,6 +211,8 @@
     {%- 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 %}
@@ -260,8 +264,9 @@
         <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) }}">Docs</a>
+          <a href="{{ pathto(master_doc) }}" aria-current="page">Docs</a>
           <a href="https://github.com/ZoiteChat/zoitechat" target="_blank" rel="noopener">GitHub</a>
           <details class="nav-menu">
             <summary>IRC Support</summary>
@@ -336,6 +341,7 @@
           <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>

docs/build-docs.py

@@ -0,0 +1,73 @@
+#!/usr/bin/env python3
+
+import os
+import shutil
+import subprocess
+import sys
+
+
+def prune_unused_local_assets(output_dir):
+    index_path = os.path.join(output_dir, "index.html")
+
+    try:
+        with open(index_path, "r", encoding="utf-8") as index_file:
+            index_html = index_file.read()
+    except OSError:
+        return
+
+    if "bootswatch-" not in index_html:
+        for bootstrap_version in ("bootstrap2", "bootstrap3"):
+            css_dir = os.path.join(
+                output_dir, "_static", "css", bootstrap_version
+            )
+            if not os.path.isdir(css_dir):
+                continue
+
+            for filename in os.listdir(css_dir):
+                if filename.startswith("bootswatch-") and filename.endswith(".css"):
+                    os.remove(os.path.join(css_dir, filename))
+
+    if "jquery.cookie.min.js" not in index_html:
+        js_dir = os.path.join(output_dir, "_static", "js")
+        for filename in ("jquery.cookie.min.js", "jquery.cookie-1.4.1.min.js"):
+            path = os.path.join(js_dir, filename)
+            if os.path.isfile(path):
+                os.remove(path)
+
+
+def main():
+    if len(sys.argv) != 4:
+        raise SystemExit("usage: build-docs.py SOURCE_DIR OUTPUT_DIR STAMP_FILE")
+
+    source_dir = os.path.abspath(sys.argv[1])
+    output_dir = os.path.abspath(sys.argv[2])
+    stamp_file = os.path.abspath(sys.argv[3])
+    doctree_dir = output_dir + ".doctrees"
+
+    shutil.rmtree(output_dir, ignore_errors=True)
+    shutil.rmtree(doctree_dir, ignore_errors=True)
+    os.makedirs(output_dir, exist_ok=True)
+
+    subprocess.run(
+        [
+            sys.executable,
+            "-m",
+            "sphinx",
+            "-b",
+            "html",
+            "-d",
+            doctree_dir,
+            source_dir,
+            output_dir,
+        ],
+        check=True,
+    )
+
+    prune_unused_local_assets(output_dir)
+
+    with open(stamp_file, "w", encoding="utf-8") as stamp:
+        stamp.write("built\n")
+
+
+if __name__ == "__main__":
+    main()

docs/install-docs.py

@@ -0,0 +1,36 @@
+#!/usr/bin/env python3
+
+import os
+import shutil
+import sys
+
+
+def main():
+    if len(sys.argv) != 4:
+        raise SystemExit("usage: install-docs.py STAMP_FILE SOURCE_DIR DATADIR")
+
+    _, source_dir, datadir = sys.argv[1:]
+    source_dir = os.path.abspath(source_dir)
+
+    if not os.path.isfile(sys.argv[1]):
+        raise SystemExit("documentation build did not produce its stamp file")
+    if not os.path.isfile(os.path.join(source_dir, "index.html")):
+        raise SystemExit("documentation build did not produce index.html")
+
+    if os.path.isabs(datadir):
+        destdir = os.environ.get("DESTDIR", "")
+        if destdir:
+            data_root = os.path.join(destdir, datadir.lstrip("/\\"))
+        else:
+            data_root = datadir
+    else:
+        data_root = os.path.join(os.environ["MESON_INSTALL_DESTDIR_PREFIX"], datadir)
+
+    destination = os.path.join(data_root, "doc", "zoitechat", "html")
+    shutil.rmtree(destination, ignore_errors=True)
+    os.makedirs(os.path.dirname(destination), exist_ok=True)
+    shutil.copytree(source_dir, destination)
+
+
+if __name__ == "__main__":
+    main()

flatpak/net.zoite.Zoitechat.json

@@ -59,6 +59,7 @@
       ],
       "config-opts": [
         "-Ddbus-service-use-appid=true",
+        "-Dinstall-docs=false",
         "-Dwith-perl=perl",
         "-Dwith-python=python3",
         "-Dwith-lua=lua"

meson.build

@@ -35,6 +35,9 @@ config_h.set_quoted('PACKAGE_NAME', meson.project_name())
 config_h.set_quoted('GETTEXT_PACKAGE', 'zoitechat')
 config_h.set_quoted('LOCALEDIR', join_paths(get_option('prefix'),
                                  get_option('datadir'), 'locale'))
+config_h.set_quoted('ZOITECHAT_DOCDIR',
+  join_paths(get_option('prefix'), get_option('datadir'), 'doc', 'zoitechat', 'html')
+)
 config_h.set10('ENABLE_NLS', true)
 config_h.set_quoted('ZOITECHAT_DATADIR', join_paths(get_option('prefix'), get_option('datadir')))
 
@@ -161,6 +164,41 @@ foreach ldflag : test_ldflags
 endforeach
 add_project_link_arguments(global_ldflags, language: 'c')
 
+if get_option('install-docs')
+  docs_python = find_program('python3', 'python')
+  docs_sphinx = run_command(docs_python, '-c', 'import sphinx', check: false)
+  if docs_sphinx.returncode() != 0
+    error('Sphinx is required to build the local HTML documentation. Install Sphinx or configure with -Dinstall-docs=false.')
+  endif
+
+  docs_source_dir = join_paths(meson.source_root(), 'docs')
+  docs_output_dir = join_paths(meson.build_root(), 'docs-html')
+  docs_build_script = join_paths(docs_source_dir, 'build-docs.py')
+  docs_install_script = join_paths(docs_source_dir, 'install-docs.py')
+
+  docs_target = custom_target(
+    'html-documentation',
+    output: 'html-documentation.stamp',
+    command: [
+      docs_python,
+      docs_build_script,
+      docs_source_dir,
+      docs_output_dir,
+      '@OUTPUT@',
+    ],
+    build_by_default: true,
+    build_always_stale: true,
+  )
+
+  meson.add_install_script(
+    docs_python,
+    docs_install_script,
+    docs_target,
+    docs_output_dir,
+    get_option('datadir'),
+  )
+endif
+
 subdir('src')
 if get_option('plugin')
   subdir('plugins')

meson_options.txt

@@ -33,6 +33,9 @@ option('install-appdata', type: 'boolean',
 option('install-plugin-metainfo', type: 'boolean', value: false,
   description: 'Installs metainfo files for enabled plugins, useful when distros create split packages'
 )
+option('install-docs', type: 'boolean', value: true,
+  description: 'Build and install the local HTML documentation'
+)
 
 # Plugins
 option('with-checksum', type: 'boolean',

packaging/fedora/zoitechat.spec

@@ -15,6 +15,7 @@ BuildRequires:  perl
 BuildRequires:  perl-devel
 BuildRequires:  python3
 BuildRequires:  python3-cffi
+BuildRequires:  python3-sphinx
 BuildRequires:  publicsuffix-list
 BuildRequires:  xwayland-run
 BuildRequires:  weston
@@ -94,6 +95,7 @@ xwfb-run -- /usr/bin/meson test -C %{_vpath_builddir} --num-processes %{_smp_bui
 %{_datadir}/icons/hicolor/scalable/apps/net.zoite.Zoitechat.svg
 %{_datadir}/metainfo/net.zoite.Zoitechat.appdata.xml
 %{_datadir}/metainfo/net.zoite.Zoitechat*.metainfo.xml
+%{_datadir}/doc/zoitechat/html/
 %dir %{_libdir}/zoitechat
 %dir %{_libdir}/zoitechat/plugins
 %dir %{_libdir}/zoitechat/python

plugins/sysinfo/meson.build

@@ -6,35 +6,20 @@ sysinfo_sources = [
 sysinfo_deps = [
   libgio_dep,
   zoitechat_plugin_dep,
+  common_sysinfo_deps,
 ]
 
 sysinfo_includes = []
 sysinfo_cargs = ['-DHAVE_CONFIG_H']
 
 system = host_machine.system()
-if system == 'linux'
+if system == 'linux' or system == 'gnu' or system.startswith('gnu/') or system == 'darwin' or system == 'freebsd'
-  if get_option('gtk-frontend')
+  sysinfo_includes += 'shared'
-    sysinfo_deps += dependency('gtk+-3.0', version: '>= 3.22')
-  endif
-
-  libpci = dependency('libpci', required: false, method: 'pkg-config')
-  if libpci.found()
-    sysinfo_deps += libpci
-    sysinfo_cargs += '-DHAVE_LIBPCI'
-  endif
-
-  sysinfo_includes += 'unix'
-  sysinfo_sources += 'unix/modern-backend.c'
-
-elif system == 'freebsd' or system == 'gnu' or system.startswith('gnu/')
-  sysinfo_includes += ['shared', 'unix']
   sysinfo_sources += [
-    'shared/df.c',
+    'shared/df.c'
-    'unix/backend.c',
-    'unix/match.c',
-    'unix/parse.c',
   ]
 
+  if system == 'linux' or system == 'gnu' or system.startswith('gnu/') or system == 'freebsd'
     libpci = dependency('libpci', required: false, method: 'pkg-config')
     if libpci.found()
       sysinfo_deps += libpci
@@ -45,27 +30,26 @@ elif system == 'freebsd' or system == 'gnu' or system.startswith('gnu/')
       pciids = join_paths(picidsdir, 'pci.ids')
       sysinfo_cargs += '-DPCIIDS_FILE="@0@"'.format(pciids)
     endif
-
     if get_option('gtk-frontend')
       sysinfo_deps += dependency('gtk+-3.0', version: '>= 3.22')
     endif
 
+    sysinfo_includes += 'unix'
+    sysinfo_sources += [
+      'unix/backend.c',
+      'unix/match.c',
+      'unix/parse.c',
+    ]
   elif system == 'darwin'
-  sysinfo_includes += 'shared'
-  sysinfo_sources += 'shared/df.c'
     add_languages('objc')
     sysinfo_sources += 'osx/backend.m'
+  endif
 
 elif system == 'windows'
-  cc = meson.get_compiler('c')
+  sysinfo_sources += [
-  sysinfo_deps += [
+    'win32/backend.c',
-    cc.find_library('advapi32', required: true),
+    '../../src/common/sysinfo/win32/backend.c'
-    cc.find_library('dxgi', required: true),
-    cc.find_library('dxguid', required: true),
-    cc.find_library('iphlpapi', required: true),
-    cc.find_library('winmm', required: true),
   ]
-  sysinfo_sources += 'win32/backend.c'
 else
   error('sysinfo: Unknown system?')
 endif

plugins/sysinfo/sysinfo.c

@@ -40,8 +40,8 @@ static zoitechat_plugin *ph;
 
 static char name[] = "Sysinfo";
 static char desc[] = "Display info about your hardware and OS";
-static char version[] = "2.0";
+static char version[] = "1.0";
-static char sysinfo_help[] = "SysInfo Usage:\n  /SYSINFO [-e|-o] [CLIENT|UI|OS|CPU|RAM|MEMORY|STORAGE|DISK|GPU|VGA|CHIPSET|SOUND|NETWORK|ETHERNET|UPTIME], print various details about your system or print a summary without arguments\n  /SYSINFO SET <variable>\n";
+static char sysinfo_help[] = "SysInfo Usage:\n  /SYSINFO [-e|-o] [CLIENT|UI|OS|CPU|RAM|STORAGE|GPU|CHIPSET|SOUND|ETHERNET|UPTIME], print various details about your system or print a summary without arguments\n  /SYSINFO SET <variable>\n";
 
 typedef struct
 {
@@ -68,11 +68,11 @@ static hwinfo hwinfos[] = {
 	{"os", "OS", sysinfo_backend_get_os},
 	{"cpu", "CPU", sysinfo_backend_get_cpu},
 	{"memory", "Memory", sysinfo_backend_get_memory},
-        {"storage", "Storage", sysinfo_backend_get_disk},
+	{"storage", "Storage", sysinfo_backend_get_disk, TRUE},
 	{"gpu", "GPU", sysinfo_backend_get_gpu},
-	{"chipset", "Chipset", sysinfo_backend_get_chipset, TRUE},
+	{"chipset", "CHIPSET", sysinfo_backend_get_chipset, TRUE},
 	{"sound", "Sound", sysinfo_backend_get_sound, TRUE},
-	{"ethernet", "Network", sysinfo_backend_get_network, TRUE},
+	{"ethernet", "Ethernet", sysinfo_backend_get_network, TRUE},
 	{"uptime", "Uptime", sysinfo_backend_get_uptime},
 	{NULL, NULL},
 };
@@ -115,30 +115,14 @@ print_summary (gboolean announce)
 	g_free (output);
 }
 
-static const char *
-normalize_info_name (const char *info)
-{
-	if (!g_ascii_strcasecmp (info, "ram"))
-		return "memory";
-	if (!g_ascii_strcasecmp (info, "disk"))
-		return "storage";
-	if (!g_ascii_strcasecmp (info, "vga"))
-		return "gpu";
-	if (!g_ascii_strcasecmp (info, "network"))
-		return "ethernet";
-
-	return info;
-}
-
 static void
 print_info (char *info, gboolean announce)
 {
-	const char *normalized = normalize_info_name (info);
 	int i;
 
 	for (i = 0; hwinfos[i].name != NULL; i++)
 	{
-		if (!g_ascii_strcasecmp (normalized, hwinfos[i].name))
+		if (!g_ascii_strcasecmp (info, hwinfos[i].name))
 		{
 			char *str = hwinfos[i].callback();
 			if (str)
@@ -199,17 +183,12 @@ sysinfo_set_pref (char *key, char *value)
 	}
 	else if (g_str_has_prefix (key, "hide_"))
 	{
-		const char *normalized = normalize_info_name (key + 5);
 		int i;
-
 		for (i = 0; hwinfos[i].name != NULL; i++)
 		{
-			if (!strcmp (normalized, hwinfos[i].name))
+			if (!strcmp (key + 5, hwinfos[i].name))
 			{
-				char canonical[32];
+				sysinfo_set_pref_real (key, value, hwinfos[i].def);
-
-				g_snprintf (canonical, sizeof (canonical), "hide_%s", hwinfos[i].name);
-				sysinfo_set_pref_real (canonical, value, hwinfos[i].def);
 				return;
 			}
 		}

plugins/sysinfo/win32/backend.c

@@ -1,34 +1,28 @@
-/*
+/* ZoiteChat
- * Modern Windows SysInfo backend for ZoiteChat.
+ * Copyright (c) 2011-2012 Berke Viktor.
  *
- * Avoids WMI in the plugin hot path and uses native Win32/DXGI APIs.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS 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. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0601
-#elif _WIN32_WINNT < 0x0601
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0601
-#endif
-
-#include <winsock2.h>
-#include <windows.h>
-#include <winternl.h>
-#include <dxgi.h>
-#include <iphlpapi.h>
-#include <ipifcons.h>
-#include <mmsystem.h>
-
-#ifdef _MSC_VER
-#pragma comment(lib, "advapi32.lib")
-#pragma comment(lib, "dxgi.lib")
-#pragma comment(lib, "dxguid.lib")
-#pragma comment(lib, "iphlpapi.lib")
-#pragma comment(lib, "winmm.lib")
-#endif
-#include <stdint.h>
 #include <stdio.h>
-#include <string.h>
+#include <windows.h>
+#include <wbemidl.h>
 
 #include <glib.h>
 
@@ -36,548 +30,63 @@
 #include "config.h"
 #endif
 
+#include "../../../src/common/sysinfo/sysinfo.h"
+
 #include "../format.h"
-#include "../sysinfo-backend.h"
 
-#define SYSINFO_SEP " \xC2\xB7 "
+static char *get_memory_info (void);
 
-typedef struct
+char *
-{
+sysinfo_backend_get_sound (void)
-	char *os;
-	char *cpu;
-	char *gpu;
-	char *sound;
-} WinStaticSnapshot;
-
-static WinStaticSnapshot snapshot;
-static gsize os_initialized = 0;
-static gsize cpu_initialized = 0;
-static gsize gpu_initialized = 0;
-static gsize sound_initialized = 0;
-
-static char *wide_to_utf8 (const WCHAR *value);
-static char *read_registry_string (HKEY root, const WCHAR *subkey, const WCHAR *value_name);
-static gboolean read_registry_dword (HKEY root, const WCHAR *subkey, const WCHAR *value_name, DWORD *value);
-static const char *get_native_arch (void);
-static DWORD get_windows_build_number (void);
-static char *build_os_string (void);
-static DWORD count_physical_cores (void);
-static char *build_cpu_string (void);
-static char *build_gpu_string (void);
-static char *build_sound_string (void);
-static void ensure_os_snapshot (void);
-static void ensure_cpu_snapshot (void);
-static void ensure_gpu_snapshot (void);
-static void ensure_sound_snapshot (void);
-static char *format_usage (guint64 total, guint64 available);
-static char *join_ptr_array (GPtrArray *items, const char *separator);
-static void ptr_array_add_unique (GPtrArray *items, const char *value);
-static gboolean adapter_looks_virtual (const char *name);
-
-static char *
-wide_to_utf8 (const WCHAR *value)
-{
-	if (!value || value[0] == L'\0')
 {
 	return NULL;
 }
 
-	return g_utf16_to_utf8 ((const gunichar2 *) value, -1, NULL, NULL, NULL);
-}
-
-static char *
-read_registry_string (HKEY root, const WCHAR *subkey, const WCHAR *value_name)
-{
-	HKEY key;
-	DWORD type = 0;
-	DWORD size = 0;
-	WCHAR *buffer;
-	char *result = NULL;
-	LONG status;
-
-	status = RegOpenKeyExW (root, subkey, 0, KEY_READ | KEY_WOW64_64KEY, &key);
-	if (status != ERROR_SUCCESS)
-	{
-		return NULL;
-	}
-
-	status = RegQueryValueExW (key, value_name, NULL, &type, NULL, &size);
-	if (status != ERROR_SUCCESS || (type != REG_SZ && type != REG_EXPAND_SZ) || size < sizeof (WCHAR))
-	{
-		RegCloseKey (key);
-		return NULL;
-	}
-
-	buffer = g_malloc0 ((gsize) size + sizeof (WCHAR));
-	status = RegQueryValueExW (key, value_name, NULL, &type, (LPBYTE) buffer, &size);
-	if (status == ERROR_SUCCESS)
-	{
-		result = wide_to_utf8 (buffer);
-		if (result)
-		{
-			g_strstrip (result);
-		}
-	}
-
-	g_free (buffer);
-	RegCloseKey (key);
-	return result;
-}
-
-static gboolean
-read_registry_dword (HKEY root, const WCHAR *subkey, const WCHAR *value_name, DWORD *value)
-{
-	HKEY key;
-	DWORD type = 0;
-	DWORD size = sizeof (*value);
-	LONG status;
-
-	status = RegOpenKeyExW (root, subkey, 0, KEY_READ | KEY_WOW64_64KEY, &key);
-	if (status != ERROR_SUCCESS)
-	{
-		return FALSE;
-	}
-
-	status = RegQueryValueExW (key, value_name, NULL, &type, (LPBYTE) value, &size);
-	RegCloseKey (key);
-	return status == ERROR_SUCCESS && type == REG_DWORD;
-}
-
-static const char *
-get_native_arch (void)
-{
-	SYSTEM_INFO info;
-
-	GetNativeSystemInfo (&info);
-	switch (info.wProcessorArchitecture)
-	{
-	case PROCESSOR_ARCHITECTURE_AMD64:
-		return "x64";
-	case PROCESSOR_ARCHITECTURE_ARM64:
-		return "ARM64";
-	case PROCESSOR_ARCHITECTURE_INTEL:
-		return "x86";
-	default:
-		return "unknown-arch";
-	}
-}
-
-static DWORD
-get_windows_build_number (void)
-{
-	typedef LONG (WINAPI *RtlGetVersionFn) (PRTL_OSVERSIONINFOW);
-	HMODULE ntdll;
-	RtlGetVersionFn rtl_get_version;
-	RTL_OSVERSIONINFOW version;
-	DWORD build = 0;
-
-	ntdll = GetModuleHandleW (L"ntdll.dll");
-	if (ntdll)
-	{
-		rtl_get_version = (RtlGetVersionFn) GetProcAddress (ntdll, "RtlGetVersion");
-		if (rtl_get_version)
-		{
-			ZeroMemory (&version, sizeof (version));
-			version.dwOSVersionInfoSize = sizeof (version);
-			if (rtl_get_version (&version) == 0)
-			{
-				build = version.dwBuildNumber;
-			}
-		}
-	}
-
-	return build;
-}
-
-static char *
-build_os_string (void)
-{
-	static const WCHAR current_version_key[] = L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion";
-	char *product;
-	char *display_version;
-	char *registry_build;
-	char *fixed_product = NULL;
-	char *result;
-	DWORD ubr = 0;
-	DWORD build;
-	guint64 parsed_build = 0;
-
-	product = read_registry_string (HKEY_LOCAL_MACHINE, current_version_key, L"ProductName");
-	display_version = read_registry_string (HKEY_LOCAL_MACHINE, current_version_key, L"DisplayVersion");
-	registry_build = read_registry_string (HKEY_LOCAL_MACHINE, current_version_key, L"CurrentBuildNumber");
-	read_registry_dword (HKEY_LOCAL_MACHINE, current_version_key, L"UBR", &ubr);
-
-	build = get_windows_build_number ();
-	if (registry_build)
-	{
-		parsed_build = g_ascii_strtoull (registry_build, NULL, 10);
-		if (parsed_build != 0)
-		{
-			build = (DWORD) parsed_build;
-		}
-	}
-
-	if (!product)
-	{
-		product = g_strdup (build >= 22000 ? "Windows 11" : "Windows");
-	}
-	else if (build >= 22000 && g_str_has_prefix (product, "Windows 10"))
-	{
-		fixed_product = g_strdup_printf ("Windows 11%s", product + strlen ("Windows 10"));
-		g_free (product);
-		product = fixed_product;
-	}
-
-	if (display_version && build != 0)
-	{
-		result = g_strdup_printf ("%s %s" SYSINFO_SEP "build %lu.%lu" SYSINFO_SEP "%s",
-			product, display_version, (unsigned long) build, (unsigned long) ubr, get_native_arch ());
-	}
-	else if (build != 0)
-	{
-		result = g_strdup_printf ("%s" SYSINFO_SEP "build %lu.%lu" SYSINFO_SEP "%s",
-			product, (unsigned long) build, (unsigned long) ubr, get_native_arch ());
-	}
-	else
-	{
-		result = g_strdup_printf ("%s" SYSINFO_SEP "%s", product, get_native_arch ());
-	}
-
-	g_free (product);
-	g_free (display_version);
-	g_free (registry_build);
-	return result;
-}
-
-static DWORD
-count_physical_cores (void)
-{
-	DWORD length = 0;
-	PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX buffer;
-	BYTE *cursor;
-	BYTE *end;
-	DWORD cores = 0;
-
-	GetLogicalProcessorInformationEx (RelationProcessorCore, NULL, &length);
-	if (GetLastError () != ERROR_INSUFFICIENT_BUFFER || length == 0)
-	{
-		return 0;
-	}
-
-	buffer = g_malloc0 (length);
-	if (!GetLogicalProcessorInformationEx (RelationProcessorCore, buffer, &length))
-	{
-		g_free (buffer);
-		return 0;
-	}
-
-	cursor = (BYTE *) buffer;
-	end = cursor + length;
-	while (cursor < end)
-	{
-		PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX info = (PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX) cursor;
-
-		if (info->Size == 0)
-		{
-			break;
-		}
-		if (info->Relationship == RelationProcessorCore)
-		{
-			cores++;
-		}
-		cursor += info->Size;
-	}
-
-	g_free (buffer);
-	return cores;
-}
-
-static char *
-build_cpu_string (void)
-{
-	static const WCHAR cpu_key[] = L"HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0";
-	char *name;
-	DWORD cores;
-	DWORD threads;
-	SYSTEM_INFO info;
-	char *result;
-
-	name = read_registry_string (HKEY_LOCAL_MACHINE, cpu_key, L"ProcessorNameString");
-	if (!name)
-	{
-		name = g_strdup ("Unknown CPU");
-	}
-
-	cores = count_physical_cores ();
-	threads = GetActiveProcessorCount (ALL_PROCESSOR_GROUPS);
-	if (threads == 0)
-	{
-		GetNativeSystemInfo (&info);
-		threads = info.dwNumberOfProcessors;
-	}
-	if (cores != 0)
-	{
-		result = g_strdup_printf ("%s" SYSINFO_SEP "%luC/%luT",
-			name, (unsigned long) cores, (unsigned long) threads);
-	}
-	else
-	{
-		/* Logical processor count cannot establish the physical core count. */
-		result = g_strdup_printf ("%s" SYSINFO_SEP "%luT", name, (unsigned long) threads);
-	}
-	g_free (name);
-	return result;
-}
-
-static char *
-join_ptr_array (GPtrArray *items, const char *separator)
-{
-	GString *joined;
-	guint i;
-
-	if (!items || items->len == 0)
-	{
-		return NULL;
-	}
-
-	joined = g_string_new (NULL);
-	for (i = 0; i < items->len; i++)
-	{
-		if (i != 0)
-		{
-			g_string_append (joined, separator);
-		}
-		g_string_append (joined, g_ptr_array_index (items, i));
-	}
-	return g_string_free (joined, FALSE);
-}
-
-static void
-ptr_array_add_unique (GPtrArray *items, const char *value)
-{
-	guint i;
-
-	if (!value || value[0] == '\0')
-	{
-		return;
-	}
-
-	for (i = 0; i < items->len; i++)
-	{
-		if (g_ascii_strcasecmp (g_ptr_array_index (items, i), value) == 0)
-		{
-			return;
-		}
-	}
-	g_ptr_array_add (items, g_strdup (value));
-}
-
-static char *
-build_gpu_string (void)
-{
-	IDXGIFactory1 *factory = NULL;
-	GPtrArray *adapters;
-	UINT index;
-	HRESULT hr;
-	char *result;
-
-	hr = CreateDXGIFactory1 (&IID_IDXGIFactory1, (void **) &factory);
-	if (FAILED (hr) || !factory)
-	{
-		return NULL;
-	}
-
-	adapters = g_ptr_array_new_with_free_func (g_free);
-	for (index = 0; ; index++)
-	{
-		IDXGIAdapter1 *adapter = NULL;
-		DXGI_ADAPTER_DESC1 desc;
-		char *name;
-		char *label;
-
-		hr = factory->lpVtbl->EnumAdapters1 (factory, index, &adapter);
-		if (hr == DXGI_ERROR_NOT_FOUND)
-		{
-			break;
-		}
-		if (FAILED (hr) || !adapter)
-		{
-			/* A failed enumeration is not another adapter. Retrying every
-			 * index can freeze the client indefinitely after a device error. */
-			break;
-		}
-
-		ZeroMemory (&desc, sizeof (desc));
-		hr = adapter->lpVtbl->GetDesc1 (adapter, &desc);
-		adapter->lpVtbl->Release (adapter);
-		if (FAILED (hr) || (desc.Flags & DXGI_ADAPTER_FLAG_SOFTWARE))
-		{
-			continue;
-		}
-
-		name = wide_to_utf8 (desc.Description);
-		if (!name)
-		{
-			continue;
-		}
-		g_strstrip (name);
-
-		if ((guint64) desc.DedicatedVideoMemory >= (512ULL * 1024ULL * 1024ULL))
-		{
-			char *vram = g_format_size_full ((guint64) desc.DedicatedVideoMemory, G_FORMAT_SIZE_IEC_UNITS);
-			label = g_strdup_printf ("%s (%s VRAM)", name, vram);
-			g_free (vram);
-		}
-		else
-		{
-			label = g_strdup (name);
-		}
-
-		ptr_array_add_unique (adapters, label);
-		g_free (label);
-		g_free (name);
-	}
-
-	factory->lpVtbl->Release (factory);
-	result = join_ptr_array (adapters, ", ");
-	g_ptr_array_free (adapters, TRUE);
-	return result;
-}
-
-static char *
-build_sound_string (void)
-{
-	UINT count;
-	UINT i;
-	GPtrArray *devices;
-	char *result;
-
-	count = waveOutGetNumDevs ();
-	if (count == 0)
-	{
-		return NULL;
-	}
-
-	devices = g_ptr_array_new_with_free_func (g_free);
-	for (i = 0; i < count; i++)
-	{
-		WAVEOUTCAPSW caps;
-		char *name;
-
-		ZeroMemory (&caps, sizeof (caps));
-		if (waveOutGetDevCapsW ((UINT_PTR) i, &caps, sizeof (caps)) != MMSYSERR_NOERROR)
-		{
-			continue;
-		}
-
-		name = wide_to_utf8 (caps.szPname);
-		if (name)
-		{
-			g_strstrip (name);
-			ptr_array_add_unique (devices, name);
-			g_free (name);
-		}
-	}
-
-	result = join_ptr_array (devices, ", ");
-	g_ptr_array_free (devices, TRUE);
-	return result;
-}
-
-static void
-ensure_os_snapshot (void)
-{
-	if (g_once_init_enter (&os_initialized))
-	{
-		snapshot.os = build_os_string ();
-		g_once_init_leave (&os_initialized, 1);
-	}
-}
-
-static void
-ensure_cpu_snapshot (void)
-{
-	if (g_once_init_enter (&cpu_initialized))
-	{
-		snapshot.cpu = build_cpu_string ();
-		g_once_init_leave (&cpu_initialized, 1);
-	}
-}
-
-static void
-ensure_gpu_snapshot (void)
-{
-	if (g_once_init_enter (&gpu_initialized))
-	{
-		snapshot.gpu = build_gpu_string ();
-		g_once_init_leave (&gpu_initialized, 1);
-	}
-}
-
-static void
-ensure_sound_snapshot (void)
-{
-	if (g_once_init_enter (&sound_initialized))
-	{
-		snapshot.sound = build_sound_string ();
-		g_once_init_leave (&sound_initialized, 1);
-	}
-}
-
-static char *
-format_usage (guint64 total, guint64 available)
-{
-	guint64 used;
-	char *used_fmt;
-	char *total_fmt;
-	char *result;
-	double percent;
-
-	if (total == 0)
-	{
-		return NULL;
-	}
-
-	if (available > total)
-	{
-		available = total;
-	}
-	used = total - available;
-	percent = ((double) used / (double) total) * 100.0;
-	used_fmt = g_format_size_full (used, G_FORMAT_SIZE_IEC_UNITS);
-	total_fmt = g_format_size_full (total, G_FORMAT_SIZE_IEC_UNITS);
-	result = g_strdup_printf ("%s / %s used (%.0f%%)", used_fmt, total_fmt, percent);
-	g_free (used_fmt);
-	g_free (total_fmt);
-	return result;
-}
-
 char *
-sysinfo_backend_get_os (void)
+sysinfo_backend_get_network (void)
 {
-	ensure_os_snapshot ();
+	return NULL;
-	return g_strdup (snapshot.os);
+}
+
+char *
+sysinfo_backend_get_uptime (void)
+{
+	return sysinfo_format_uptime (GetTickCount64 () / 1000);
+}
+
+char *
+sysinfo_backend_get_disk (void)
+{
+	guint64 hdd_capacity;
+	guint64 hdd_free_space;
+
+	sysinfo_get_hdd_info (&hdd_capacity, &hdd_free_space);
+
+	if (hdd_capacity != 0)
+	{
+		return sysinfo_format_disk(hdd_capacity, hdd_free_space);
+	}
+
+	return NULL;
 }
 
 char *
 sysinfo_backend_get_cpu (void)
 {
-	ensure_cpu_snapshot ();
+	return sysinfo_get_cpu ();
-	return g_strdup (snapshot.cpu);
+}
+
+char *
+sysinfo_backend_get_memory (void)
+{
+	/* Memory information is always loaded dynamically since it includes the current amount of free memory */
+	return get_memory_info ();
 }
 
 char *
 sysinfo_backend_get_gpu (void)
 {
-	ensure_gpu_snapshot ();
+	return sysinfo_get_gpu ();
-	return g_strdup (snapshot.gpu);
-}
-
-char *
-sysinfo_backend_get_sound (void)
-{
-	ensure_sound_snapshot ();
-	return g_strdup (snapshot.sound);
 }
 
 char *
@@ -587,178 +96,43 @@ sysinfo_backend_get_chipset (void)
 }
 
 char *
-sysinfo_backend_get_memory (void)
+sysinfo_backend_get_os (void)
 {
-	MEMORYSTATUSEX memory;
+	return sysinfo_get_os ();
+}
 
-	ZeroMemory (&memory, sizeof (memory));
+static char *get_memory_info (void)
-	memory.dwLength = sizeof (memory);
+{
-	if (!GlobalMemoryStatusEx (&memory))
+	MEMORYSTATUSEX meminfo = { 0 };
+	meminfo.dwLength = sizeof (meminfo);
+
+	if (!GlobalMemoryStatusEx (&meminfo))
 	{
 		return NULL;
 	}
 
-	return format_usage ((guint64) memory.ullTotalPhys, (guint64) memory.ullAvailPhys);
+	return sysinfo_format_memory (meminfo.ullTotalPhys, meminfo.ullAvailPhys);
 }
 
-char *
+static const char *sysinfo_detect_toolkit(void)
-sysinfo_backend_get_disk (void)
-{
-	WCHAR windows_dir[MAX_PATH];
-	WCHAR volume_path[MAX_PATH];
-	ULARGE_INTEGER available;
-	ULARGE_INTEGER total;
-	ULARGE_INTEGER total_free;
-	char *usage;
-	char *volume_utf8;
-	char *result;
-
-	if (GetWindowsDirectoryW (windows_dir, G_N_ELEMENTS (windows_dir)) == 0)
 {
+#if defined(USE_GTK_FRONTEND)
+	return "GTK3";
+#else
 	return NULL;
-	}
+#endif
-	if (!GetVolumePathNameW (windows_dir, volume_path, G_N_ELEMENTS (volume_path)))
-	{
-		return NULL;
-	}
-	if (!GetDiskFreeSpaceExW (volume_path, &available, &total, &total_free))
-	{
-		return NULL;
-	}
-
-	usage = format_usage ((guint64) total.QuadPart, (guint64) available.QuadPart);
-	if (!usage)
-	{
-		return NULL;
-	}
-
-	volume_utf8 = wide_to_utf8 (volume_path);
-	if (!volume_utf8)
-	{
-		return usage;
-	}
-	g_strchomp (volume_utf8);
-	result = g_strdup_printf ("%s" SYSINFO_SEP "%s", usage, volume_utf8);
-	g_free (volume_utf8);
-	g_free (usage);
-	return result;
-}
-
-char *
-sysinfo_backend_get_uptime (void)
-{
-	return sysinfo_format_uptime ((gint64) (GetTickCount64 () / 1000ULL));
-}
-
-static gboolean
-adapter_looks_virtual (const char *name)
-{
-	char *lower;
-	gboolean result;
-
-	if (!name)
-	{
-		return FALSE;
-	}
-
-	lower = g_ascii_strdown (name, -1);
-	result = strstr (lower, "virtual") != NULL ||
-		strstr (lower, "hyper-v") != NULL ||
-		strstr (lower, "vmware") != NULL ||
-		strstr (lower, "virtualbox") != NULL ||
-		strstr (lower, "tap-windows") != NULL ||
-		strstr (lower, "wireguard") != NULL ||
-		strstr (lower, "vpn") != NULL;
-	g_free (lower);
-	return result;
-}
-
-char *
-sysinfo_backend_get_network (void)
-{
-	ULONG size = 16 * 1024;
-	ULONG status;
-	IP_ADAPTER_ADDRESSES *addresses;
-	IP_ADAPTER_ADDRESSES *adapter;
-	GPtrArray *physical;
-	GPtrArray *fallback;
-	GPtrArray *selected;
-	char *result;
-
-	addresses = g_malloc0 (size);
-	status = GetAdaptersAddresses (AF_UNSPEC,
-		GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST | GAA_FLAG_SKIP_DNS_SERVER,
-		NULL, addresses, &size);
-	if (status == ERROR_BUFFER_OVERFLOW)
-	{
-		g_free (addresses);
-		addresses = g_malloc0 (size);
-		status = GetAdaptersAddresses (AF_UNSPEC,
-			GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST | GAA_FLAG_SKIP_DNS_SERVER,
-			NULL, addresses, &size);
-	}
-	if (status != NO_ERROR)
-	{
-		g_free (addresses);
-		return NULL;
-	}
-
-	physical = g_ptr_array_new_with_free_func (g_free);
-	fallback = g_ptr_array_new_with_free_func (g_free);
-	for (adapter = addresses; adapter != NULL; adapter = adapter->Next)
-	{
-		char *description;
-		char *friendly;
-		const char *name;
-		const char *type;
-		char *label;
-
-		if (adapter->OperStatus != IfOperStatusUp || adapter->PhysicalAddressLength == 0)
-		{
-			continue;
-		}
-		if (adapter->IfType != IF_TYPE_ETHERNET_CSMACD && adapter->IfType != IF_TYPE_IEEE80211)
-		{
-			continue;
-		}
-
-		description = wide_to_utf8 (adapter->Description);
-		friendly = wide_to_utf8 (adapter->FriendlyName);
-		name = description && description[0] ? description : friendly;
-		if (!name)
-		{
-			g_free (description);
-			g_free (friendly);
-			continue;
-		}
-
-		type = adapter->IfType == IF_TYPE_IEEE80211 ? "Wi-Fi" : "Ethernet";
-		label = g_strdup_printf ("%s: %s", type, name);
-		ptr_array_add_unique (fallback, label);
-		if (!adapter_looks_virtual (name))
-		{
-			ptr_array_add_unique (physical, label);
-		}
-
-		g_free (label);
-		g_free (description);
-		g_free (friendly);
-	}
-	g_free (addresses);
-
-	selected = physical->len != 0 ? physical : fallback;
-	result = join_ptr_array (selected, ", ");
-	g_ptr_array_free (physical, TRUE);
-	g_ptr_array_free (fallback, TRUE);
-	return result;
 }
 
 char *
 sysinfo_backend_get_ui (void)
 {
-#if defined(USE_GTK_FRONTEND)
+	const char *toolkit = sysinfo_detect_toolkit();
-	return g_strdup ("Windows / GTK3");
+
-#else
+	/* On Windows we don't have X11/Wayland. Keep it simple. */
-	return g_strdup ("Windows");
+	if (toolkit)
-#endif
+	{
+		return g_strdup_printf ("Windows / %s", toolkit);
+	}
+
+	return g_strdup ("Windows");
 }

src/common/fe.h

@@ -70,6 +70,9 @@ 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

src/common/outbound.c

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

src/common/zoitechat.c

@@ -95,6 +95,7 @@ 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;
@@ -1175,6 +1176,25 @@ 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.
@@ -1263,7 +1283,7 @@ main (int argc, char *argv[])
 #ifndef WIN32
 #ifndef __EMX__
 	/* OS/2 uses UID 0 all the time */
-	if (getuid () == 0)
+	if (getuid () == 0 && !arg_run_as_root)
 		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

src/common/zoitechat.h

@@ -450,6 +450,7 @@ 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;
 

src/common/zoitechatc.h

@@ -25,6 +25,7 @@ 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;

src/fe-gtk/fe-gtk.c

@@ -90,6 +90,9 @@ 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"},
@@ -103,6 +106,33 @@ 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)

src/fe-gtk/maingui.c

@@ -778,10 +778,13 @@ 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)
@@ -793,30 +796,42 @@ 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], "*") || !strcmp (deny[i], tag) || (deny[i][0] == '+' && !strcmp (deny[i] + 1, tag)))
+                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;
+        }
+
+        g_strfreev (deny);
+        return !blocked;
+}
+
+static gboolean
+mg_typing_can_send (session *sess)
 {
-                        g_strfreev (deny);
+        gint64 now = g_get_monotonic_time ();
-                        return FALSE;
+
-                }
+        return sess->typing_last_sent == 0 ||
+               now - sess->typing_last_sent >= TYPING_THROTTLE_USEC;
 }
 
-        g_strfreev (deny);
+static gboolean
-        return TRUE;
-}
-
-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;
+                return FALSE;
 
         if (sess->type != SESS_CHANNEL && sess->type != SESS_DIALOG)
-                return;
+                return FALSE;
 
         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
@@ -845,17 +860,15 @@ mg_typing_update (session *sess, const char *text)
 
         if (!text || !*text || text[0] == prefs.hex_input_command_char[0])
         {
-                if (sess->typing_status)
+                if (sess->typing_status && mg_typing_can_send (sess))
                         mg_send_typing (sess, "done");
                 sess->typing_status = 0;
                 return;
         }
 
-        if (sess->typing_status != 1)
+        if (mg_typing_can_send (sess))
-        {
                 mg_send_typing (sess, "active");
         sess->typing_status = 1;
-        }
         sess->typing_timeout_tag = fe_timeout_add_seconds (6, mg_typing_pause_cb, sess);
 }
 

src/fe-gtk/menu.c

@@ -1796,9 +1796,50 @@ menu_ctcpguiopen (void)
 	editlist_gui_open (NULL, NULL, ctcp_list, buf, "ctcpreply", "ctcpreply.conf", ctcp_help);
 }
 
+static char *
+menu_find_local_docs (void)
+{
+	char *path;
+
+#ifdef WIN32
+	char *base_path;
+
+	base_path = g_win32_get_package_installation_directory_of_module (NULL);
+	if (!base_path)
+		return NULL;
+
+	path = g_build_filename (base_path, "share", "doc", "zoitechat", "html", "index.html", NULL);
+	g_free (base_path);
+#else
+	const char *appdir;
+
+	appdir = g_getenv ("APPDIR");
+	if (appdir && *appdir)
+		path = g_build_filename (appdir, "usr", "share", "doc", "zoitechat", "html", "index.html", NULL);
+	else
+		path = g_build_filename (ZOITECHAT_DOCDIR, "index.html", NULL);
+#endif
+
+	if (g_file_test (path, G_FILE_TEST_IS_REGULAR))
+		return path;
+
+	g_free (path);
+	return NULL;
+}
+
 static void
 menu_docs (GtkWidget *wid, gpointer none)
 {
+	char *path;
+
+	path = menu_find_local_docs ();
+	if (path)
+	{
+		fe_open_url (path);
+		g_free (path);
+		return;
+	}
+
 	fe_open_url ("https://docs.zoitechat.org/en/latest/");
 }
 

src/fe-gtk/sexy-spell-entry.c

@@ -1266,8 +1266,6 @@ 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;
@@ -1299,15 +1297,8 @@ 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);
 
-	if (gtk_widget_get_realized (GTK_WIDGET(entry)))
+	/* GtkEntry shares its parent's GdkWindow in GTK3; redraw the widget area. */
-	{
+	gtk_widget_queue_draw (widget);
-		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

src/fe-gtk/theme/theme-manager.c

@@ -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 || prefs.hex_text_color_nicks) ? FALSE : TRUE;
+	behavior.apply_foreground = prefs.hex_gui_ulist_color ? FALSE : TRUE;
 
 	return behavior;
 }

src/fe-gtk/userlistgui.c

@@ -594,7 +594,7 @@ fe_userlist_rehash (session *sess, struct User *user)
 		nick_token = THEME_TOKEN_TAB_AWAY;
 		have_nick_token = TRUE;
 	}
-	else if (prefs.hex_gui_ulist_color || prefs.hex_text_color_nicks)
+	else if (prefs.hex_gui_ulist_color)
 	{
 		int mirc_index = text_color_of (user->nick);
 
@@ -635,7 +635,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 || prefs.hex_text_color_nicks)
+	else if (prefs.hex_gui_ulist_color)
 	{
 		int mirc_index = text_color_of (newuser->nick);
 

src/fe-gtk/xtext.c

@@ -273,6 +273,8 @@ static void gtk_xtext_render_page (GtkXText * xtext);
 static void gtk_xtext_calc_lines (xtext_buffer *buf, int);
 static gboolean gtk_xtext_is_selecting (GtkXText *xtext);
 static char *gtk_xtext_selection_get_text (GtkXText *xtext, int *len_ret);
+static void gtk_xtext_clipboard_get (GtkClipboard *, GtkSelectionData *, guint, gpointer);
+static void gtk_xtext_clipboard_clear (GtkClipboard *, gpointer);
 static textentry *gtk_xtext_nth (GtkXText *xtext, int line, int *subline);
 static void gtk_xtext_adjustment_changed (GtkAdjustment * adj,
 												GtkXText * xtext);
@@ -1082,9 +1084,29 @@ gtk_xtext_new (const XTextColor *palette, int separator)
 	return GTK_WIDGET (xtext);
 }
 
+static void
+gtk_xtext_release_selections (GtkXText *xtext)
+{
+	GdkAtom selections[] = { GDK_SELECTION_PRIMARY, GDK_SELECTION_SECONDARY };
+	guint i;
+
+	if (!gtk_widget_has_screen (GTK_WIDGET (xtext)))
+		return;
+
+	for (i = 0; i < G_N_ELEMENTS (selections); i++)
+	{
+		GtkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (xtext), selections[i]);
+
+		if (gtk_clipboard_get_owner (clipboard) == G_OBJECT (xtext))
+			gtk_clipboard_clear (clipboard);
+	}
+}
+
 static void
 gtk_xtext_cleanup (GtkXText *xtext)
 {
+	gtk_xtext_release_selections (xtext);
+
 	if (xtext->add_io_tag)
 	{
 		g_source_remove (xtext->add_io_tag);
@@ -1179,6 +1201,7 @@ gtk_xtext_finalize (GObject *object)
 static void
 gtk_xtext_unrealize (GtkWidget * widget)
 {
+	gtk_xtext_release_selections (GTK_XTEXT (widget));
 	backend_deinit (GTK_XTEXT (widget));
 
 	/*
@@ -2743,8 +2766,16 @@ gtk_xtext_set_clip_owner (GtkWidget * xtext, GdkEventButton * event)
 		{
 			gtk_clipboard_set_text (gtk_widget_get_clipboard (xtext, GDK_SELECTION_CLIPBOARD), str, len);
 			
-			gtk_selection_owner_set (xtext, GDK_SELECTION_PRIMARY, event ? event->time : GDK_CURRENT_TIME);
+			/* Let GtkClipboard own the X11 selection window. Making xtext
-			gtk_selection_owner_set (xtext, GDK_SELECTION_SECONDARY, event ? event->time : GDK_CURRENT_TIME);
+			 * the selection owner forces its window native and bypasses
+			 * GTK's toplevel backing buffer on subsequent redraws.
+			 */
+			gtk_clipboard_set_with_owner (gtk_widget_get_clipboard (xtext, GDK_SELECTION_PRIMARY),
+				gtk_xtext_selection_targets, G_N_ELEMENTS (gtk_xtext_selection_targets),
+				gtk_xtext_clipboard_get, gtk_xtext_clipboard_clear, G_OBJECT (xtext));
+			gtk_clipboard_set_with_owner (gtk_widget_get_clipboard (xtext, GDK_SELECTION_SECONDARY),
+				gtk_xtext_selection_targets, G_N_ELEMENTS (gtk_xtext_selection_targets),
+				gtk_xtext_clipboard_get, gtk_xtext_clipboard_clear, G_OBJECT (xtext));
 		}
 
 		g_free (str);
@@ -3172,7 +3203,7 @@ gtk_xtext_selection_get (GtkWidget * widget,
 			if (!window || !GDK_IS_WINDOW (window))
 				break;
 			display = gdk_window_get_display (window);
-			if (!display)
+			if (!display || !GDK_IS_X11_DISPLAY (display))
 				break;
 			GdkAtom encoding;
 			gint format;
@@ -3197,6 +3228,29 @@ gtk_xtext_selection_get (GtkWidget * widget,
 	g_free (stripped);
 }
 
+static void
+gtk_xtext_clipboard_get (GtkClipboard *clipboard, GtkSelectionData *selection_data,
+						 guint info, gpointer owner)
+{
+	int len;
+	char *text = gtk_xtext_selection_get_text (GTK_XTEXT (owner), &len);
+
+	if (text)
+	{
+		gtk_selection_data_set_text (selection_data, text, len);
+		g_free (text);
+	}
+}
+
+static void
+gtk_xtext_clipboard_clear (GtkClipboard *clipboard, gpointer owner)
+{
+	GtkXText *xtext = GTK_XTEXT (owner);
+
+	if (xtext->orig_buffer)
+		gtk_xtext_selection_kill (xtext, NULL);
+}
+
 static gboolean
 gtk_xtext_scroll (GtkWidget *widget, GdkEventScroll *event)
 {

src/fe-text/fe-text.c

@@ -467,6 +467,9 @@ 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"},
@@ -475,6 +478,16 @@ 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[])
 {