Fix Windows Python plugin DLL selection

.github/workflows/manjaro-package-build.yml

@@ -0,0 +1,79 @@
+name: Manjaro Package Build
+
+on:
+  push:
+    branches: [master, main]
+  pull_request:
+    branches: [master, main]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  manjaro-package:
+    runs-on: ubuntu-latest
+    container:
+      image: manjarolinux/base:latest
+
+    steps:
+      - name: Install packaging toolchain
+        run: |
+          set -euxo pipefail
+          pacman -Syu --noconfirm
+          pacman -S --noconfirm --needed \
+            base-devel \
+            git \
+            namcap \
+            meson \
+            ninja \
+            pkgconf \
+            glib2 \
+            glib2-devel \
+            gtk3 \
+            openssl \
+            libcanberra \
+            libayatana-appindicator \
+            iso-codes \
+            lua \
+            perl \
+            python \
+            python-cffi \
+            pciutils
+
+      - name: Checkout repository
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+          submodules: true
+
+      - name: Build package and generate .SRCINFO (non-root)
+        run: |
+          set -euxo pipefail
+          id -u builder >/dev/null 2>&1 || useradd -m builder
+          chown -R builder:builder "$GITHUB_WORKSPACE"
+          su builder -c "cd '$GITHUB_WORKSPACE/packaging/manjaro' && makepkg --noconfirm --syncdeps --cleanbuild"
+          su builder -c "cd '$GITHUB_WORKSPACE/packaging/manjaro' && makepkg --printsrcinfo > .SRCINFO"
+
+      - name: Lint PKGBUILD and package with namcap
+        run: |
+          set -euxo pipefail
+          cd "$GITHUB_WORKSPACE/packaging/manjaro"
+          namcap PKGBUILD
+          pkg_file="$(find . -maxdepth 1 -type f -name '*.pkg.tar.*' | head -n1)"
+          namcap "$pkg_file"
+
+      - name: Collect artifacts
+        run: |
+          set -euxo pipefail
+          mkdir -p artifacts
+          cp -v "$GITHUB_WORKSPACE"/packaging/manjaro/*.pkg.tar.* artifacts/
+          cp -v "$GITHUB_WORKSPACE"/packaging/manjaro/PKGBUILD artifacts/
+          cp -v "$GITHUB_WORKSPACE"/packaging/manjaro/.SRCINFO artifacts/
+
+      - name: Upload package artifacts
+        uses: actions/upload-artifact@v6
+        with:
+          name: zoitechat-manjaro-package
+          path: artifacts/*
+          if-no-files-found: error

.github/workflows/windows-build.yml

@@ -126,12 +126,11 @@ jobs:
           $pyRoot = $env:pythonLocation
           if (-not $pyRoot) { $pyRoot = & python -c "import sys; print(sys.prefix)" }
 
-          foreach ($pyDir in @("C:\gtk-build\python-3.8.10", "C:\gtk-build\python-3.8")) {
+          $pyDir = "C:\gtk-build\python-3.8"
-            New-Item -Path $pyDir -ItemType Directory -Force | Out-Null
+          New-Item -Path $pyDir -ItemType Directory -Force | Out-Null
-            $target = Join-Path $pyDir "${{ matrix.platform }}"
+          $target = Join-Path $pyDir "${{ matrix.platform }}"
-            if (Test-Path $target) { Remove-Item $target -Recurse -Force }
+          if (Test-Path $target) { Remove-Item $target -Recurse -Force }
-            New-Item -Path $pyDir -Name "${{ matrix.platform }}" -ItemType Junction -Value $pyRoot | Out-Null
+          New-Item -Path $pyDir -Name "${{ matrix.platform }}" -ItemType Junction -Value $pyRoot | Out-Null
-          }
 
       - name: Build
         run: |
@@ -144,33 +143,23 @@ jobs:
             exit /b 1
           )
 
-          set "PYTHON38_DIR=C:\gtk-build\python-3.8\${{ matrix.platform }}"
-          if not exist "%PYTHON38_DIR%\libs\python38.lib" (
-            echo Missing %PYTHON38_DIR%\libs\python38.lib
-            dir "%PYTHON38_DIR%\libs"
-            exit /b 1
-          )
-          if not exist "%PYTHON38_DIR%\Lib\site-packages\_cffi_backend.cp38*.pyd" (
-            echo Missing %PYTHON38_DIR%\Lib\site-packages\_cffi_backend.cp38*.pyd
-            exit /b 1
-          )
-
           set "LIB=%PYTHON_DIR%\libs;%LIB%"
           set "INCLUDE=%PYTHON_DIR%\include;%INCLUDE%"
 
           powershell -NoProfile -ExecutionPolicy Bypass -Command "$archiveLib='C:\gtk-build\gtk\x64\release\lib\libarchive.lib'; if (-not (Test-Path $archiveLib)) { $archiveDll = Get-ChildItem 'C:\gtk-build\gtk\x64\release\bin\libarchive*.dll' | Select-Object -First 1; if ($archiveDll) { Push-Location 'C:\gtk-build\gtk\x64\release\lib'; & 'C:\gtk-build\gendef\gendef.exe' $archiveDll.FullName | Out-Null; $archiveDef = Get-ChildItem 'libarchive*.def' | Select-Object -First 1; if ($archiveDef) { & lib /def:$archiveDef.Name /machine:${{ matrix.platform }} /out:libarchive.lib | Out-Null }; Pop-Location } }"
 
           msbuild win32\zoitechat.sln /m /verbosity:minimal /p:Configuration=Release /p:Platform=${{ matrix.platform }}
-          if errorlevel 1 exit /b 1
 
-          if not exist "..\zoitechat-build\${{ matrix.platform }}\rel\plugins\hcpython38.dll" (
+          set "PYTHON38_DIR=C:\gtk-build\python-3.8\${{ matrix.platform }}"
-            echo hcpython38.dll was not built
+          if not exist "%PYTHON38_DIR%\libs\python38.lib" (
-            exit /b 1
+            echo Missing %PYTHON38_DIR%\libs\python38.lib
-          )
+            dir "%PYTHON38_DIR%\libs"
-          if not exist "..\zoitechat-build\${{ matrix.platform }}\rel\_cffi_backend.cp38*.pyd" (
-            echo _cffi_backend for Python 3.8 was not staged for the installer
             exit /b 1
           )
+
+          msbuild plugins\python\python3.vcxproj /m /verbosity:minimal /p:Configuration=Release /p:Platform=${{ matrix.platform }} /p:SolutionDir=%CD%\win32\ /p:YourPython3Path=C:\gtk-build\python-3.8 /p:Python3Lib=python38 /p:Python3Output=hcpython38
+          copy /Y "%PYTHON38_DIR%\Lib\site-packages\_cffi_backend.cp38*.pyd" "..\zoitechat-build\${{ matrix.platform }}\bin\"
+          msbuild win32\installer\installer.vcxproj /m /verbosity:minimal /p:Configuration=Release /p:Platform=${{ matrix.platform }} /p:SolutionDir=%CD%\win32\
         shell: cmd
 
       - name: Preparing Artifacts

packaging/manjaro/PKGBUILD

@@ -0,0 +1,69 @@
+# Maintainer: ZoiteChat Maintainers <zoitechat@users.noreply.github.com>
+
+pkgname=zoitechat-git
+pkgver=0
+pkgrel=1
+pkgdesc='IRC client for GNOME (ZoiteChat development snapshot)'
+arch=('x86_64')
+url='https://github.com/zoitechat/zoitechat'
+license=('GPL-2.0-or-later')
+depends=(
+  'glib2'
+  'gtk3'
+  'iso-codes'
+  'libayatana-appindicator'
+  'libcanberra'
+  'lua'
+  'openssl'
+  'perl'
+  'python-cffi'
+)
+makedepends=(
+  'git'
+  'meson'
+  'ninja'
+  'pkgconf'
+  'python'
+)
+optdepends=(
+  'pciutils: sysinfo plugin hardware detection details'
+)
+provides=('zoitechat')
+conflicts=('zoitechat')
+
+_repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
+source=("zoitechat::git+file://${_repo_root}")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd "$srcdir/zoitechat"
+
+  if git describe --long --tags --abbrev=7 >/dev/null 2>&1; then
+    git describe --long --tags --abbrev=7 \
+      | sed 's/^v//' \
+      | sed -E 's/([^-]+)-([0-9]+)-g/\1.r\2.g/' \
+      | sed 's/-/./g'
+  else
+    printf '0.r%s.%s\n' \
+      "$(git rev-list --count HEAD)" \
+      "$(git rev-parse --short=7 HEAD)"
+  fi
+}
+
+build() {
+  arch-meson zoitechat build \
+    -Dtext-frontend=false \
+    -Dwith-checksum=true \
+    -Dwith-fishlim=true \
+    -Dwith-lua=lua \
+    -Dwith-perl=perl \
+    -Dwith-python=python3 \
+    -Dwith-sysinfo=true \
+    -Dinstall-plugin-metainfo=true
+
+  meson compile -C build
+}
+
+package() {
+  meson install -C build --destdir "$pkgdir"
+}

plugins/python/generate_plugin.py

@@ -53,16 +53,6 @@ builder.set_source('_zoitechat_embedded', '''
 #include "config.h"
 #include "zoitechat-plugin.h"
 
-#ifdef _WIN32
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#include <windows.h>
-#endif
-
 static zoitechat_plugin *ph;
 CFFI_DLLEXPORT int _on_plugin_init(char **, char **, char **, char *, char *);
 CFFI_DLLEXPORT int _on_plugin_deinit(void);
@@ -71,20 +61,6 @@ int zoitechat_plugin_init(zoitechat_plugin *plugin_handle,
                         char **name_out, char **description_out,
                         char **version_out, char *arg)
 {
-#ifdef _WIN32
-    /* CPython cannot be removed from a process once Py_Initialize has run.
-       If the embedded interpreter fails to start (e.g. _cffi_backend is
-       missing), the host responds to our 0 return by g_module_close()ing
-       this plugin, which would also drop the last reference to pythonXY.dll
-       and unload it mid-flight; the leftover process-global state then
-       crashes the process later, e.g. when a server connection spawns the
-       next thread.  Pin this module so FreeLibrary can never unload it. */
-    HMODULE self_handle;
-    GetModuleHandleExW (GET_MODULE_HANDLE_EX_FLAG_PIN |
-                        GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS,
-                        (LPCWSTR)&zoitechat_plugin_init, &self_handle);
-#endif
-
     if (ph != NULL)
     {
         puts ("Python plugin already loaded\\n");

plugins/python/python38.vcxproj

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v142</PlatformToolset>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{D58924D2-1492-4AC3-B058-7A214424EEDC}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>python38</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  <Import Project="..\..\win32\zoitechat.props" />
-  <PropertyGroup>
-    <TargetName>$(Python38Output)</TargetName>
-    <OutDir>$(ZoiteChatRel)plugins\</OutDir>
-  </PropertyGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;Py_NO_LINK_LIB;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <UndefinePreprocessorDefinitions>_DEBUG;Py_DEBUG;Py_REF_DEBUG;Py_TRACE_REFS;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
-      <AdditionalOptions>/U_DEBUG /UPy_DEBUG /UPy_REF_DEBUG /UPy_TRACE_REFS %(AdditionalOptions)</AdditionalOptions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <AdditionalIncludeDirectories>$(Glib);$(Python38Path)\include;..\..\src\common;$(ZoiteChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <ModuleDefinitionFile>python.def</ModuleDefinitionFile>
-      <AdditionalDependencies>"$(Python38Lib).lib";$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(DepsRoot)\lib;$(Python38Path)\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-    <PreBuildEvent>
-      <Command>"$(Python38Path)\python.exe" generate_plugin.py ..\..\src\common\zoitechat-plugin.h python.py "$(IntDir)python.c"</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="generate_plugin.py" />
-    <None Include="zoitechat.py" />
-    <None Include="python.def" />
-    <None Include="python.py" />
-    <None Include="xchat.py" />
-    <None Include="hexchat.py" />
-    <None Include="_zoitechat.py" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="$(IntDir)python.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
-
-
-
-

src/common/plugin.c

@@ -59,32 +59,18 @@ typedef struct session zoitechat_context;
 #define DEBUG(x) {x;}
 #ifdef WIN32
 
-/* Python >= 3.9 dropped support for Windows versions before 10, so those
- * systems get a Python 3.8 build of the plugin instead.  RtlGetVersion is
- * used because GetVersionEx reports a version capped by the compatibility
- * manifest rather than the real one. */
 static gboolean
-plugin_windows_needs_python38 (void)
+plugin_windows_is_windows7 (void)
 {
-	typedef LONG (WINAPI *rtl_get_version_func) (PRTL_OSVERSIONINFOW);
+	OSVERSIONINFOEXA version;
-	rtl_get_version_func rtl_get_version;
-	RTL_OSVERSIONINFOW version;
-	HMODULE ntdll;
-
-	ntdll = GetModuleHandleW (L"ntdll.dll");
-	if (ntdll == NULL)
-		return FALSE;
-
-	rtl_get_version = (rtl_get_version_func) GetProcAddress (ntdll, "RtlGetVersion");
-	if (rtl_get_version == NULL)
-		return FALSE;
 
 	memset (&version, 0, sizeof (version));
 	version.dwOSVersionInfoSize = sizeof (version);
-	if (rtl_get_version (&version) != 0)
+	if (!GetVersionExA ((OSVERSIONINFOA *)&version))
 		return FALSE;
 
-	return version.dwMajorVersion < 10;
+	return version.dwPlatformId == VER_PLATFORM_WIN32_NT &&
+		version.dwMajorVersion == 6 && version.dwMinorVersion == 1;
 }
 #endif
 
@@ -522,7 +508,7 @@ plugin_auto_load (session *sess)
 	for_files (lib_dir, "hcfishlim.dll", plugin_auto_load_cb);
 	for_files(lib_dir, "hclua.dll", plugin_auto_load_cb);
 	for_files (lib_dir, "hcperl.dll", plugin_auto_load_cb);
-	if (plugin_windows_needs_python38 ())
+	if (plugin_windows_is_windows7 ())
 		for_files (lib_dir, "hcpython38.dll", plugin_auto_load_cb);
 	else
 		for_files (lib_dir, "hcpython3.dll", plugin_auto_load_cb);

src/common/text.c

@@ -1695,97 +1695,6 @@ pevent_load (char *filename)
 	return 0;
 }
 
-
-static gboolean
-text_event_uses_color (const char *text, int color)
-{
-	const char *p;
-
-	if (!text || color < 0 || color > 31)
-		return FALSE;
-
-	for (p = text; *p; p++)
-	{
-		int value;
-		int digits;
-
-		if ((unsigned char) *p == 3)
-			p++;
-		else if (*p == '%' && p[1] == 'C')
-			p += 2;
-		else
-			continue;
-
-		if (!g_ascii_isdigit (*p))
-		{
-			p--;
-			continue;
-		}
-
-		value = *p - '0';
-		digits = 1;
-		if (g_ascii_isdigit (p[1]))
-		{
-			value = value * 10 + p[1] - '0';
-			digits = 2;
-		}
-
-		if (value == color)
-			return TRUE;
-
-		p += digits - 1;
-		if (*p == ',' && g_ascii_isdigit (p[1]))
-		{
-			p++;
-			value = *p - '0';
-			if (g_ascii_isdigit (p[1]))
-			{
-				value = value * 10 + p[1] - '0';
-				p++;
-			}
-			if (value == color)
-				return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-char **
-text_color_event_names (int color, int *count)
-{
-	GPtrArray *names;
-	int found = 0;
-	int i;
-
-	if (count)
-		*count = 0;
-
-	names = g_ptr_array_new ();
-
-	for (i = 0; i < NUM_XP; i++)
-	{
-		const char *text = pntevts_text[i] ? pntevts_text[i] : te[i].def;
-
-		if (!text_event_uses_color (text, color))
-			continue;
-
-		g_ptr_array_add (names, g_strdup (_(te[i].name)));
-		found++;
-	}
-
-	if (!found)
-	{
-		g_ptr_array_free (names, TRUE);
-		return NULL;
-	}
-
-	g_ptr_array_add (names, NULL);
-	if (count)
-		*count = found;
-	return (char **) g_ptr_array_free (names, FALSE);
-}
-
 static void
 pevent_check_all_loaded (void)
 {

src/common/text.h

@@ -53,7 +53,6 @@ int pevt_build_string (const char *input, char **output, int *max_arg);
 int pevent_load (char *filename);
 void pevent_make_pntevts (void);
 int text_color_of (char *name);
-char **text_color_event_names (int color, int *count);
 void text_emit (int index, session *sess, char *a, char *b, char *c, char *d,
 		time_t timestamp);
 int text_emit_by_name (char *name, session *sess, time_t timestamp,

src/fe-gtk/maingui.c

@@ -67,34 +67,6 @@
 #include <shellapi.h>
 #include <gdk/gdkwin32.h>
 
-/* The shell only minimizes a window from its taskbar button when the
- * window style carries WS_MINIMIZEBOX; without it the click merely
- * deactivates the window (issue #65).  GTK3 older than 3.24.50 can drop
- * the bit from top-level windows (https://gitlab.gnome.org/GNOME/gtk/-/issues/7494),
- * so guarantee it ourselves for session windows. */
-static void
-mg_win32_ensure_minimizable (GdkWindow *gdk_window)
-{
-	HWND hwnd;
-	LONG_PTR window_style;
-
-	if (!gdk_window)
-		return;
-
-	hwnd = gdk_win32_window_get_handle (gdk_window);
-	if (!hwnd)
-		return;
-
-	window_style = GetWindowLongPtr (hwnd, GWL_STYLE);
-	if (!window_style || (window_style & WS_MINIMIZEBOX))
-		return;
-
-	SetWindowLongPtr (hwnd, GWL_STYLE, window_style | WS_MINIMIZEBOX);
-	SetWindowPos (hwnd, NULL, 0, 0, 0, 0,
-	              SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE |
-	              SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOOWNERZORDER);
-}
-
 static void
 mg_win32_allow_autohide_taskbar (GtkWindow *window, GdkEventWindowState *event)
 {
@@ -3416,19 +3388,10 @@ mg_topicbar_update_height (GtkWidget *topic)
 
 		if (parent && GTK_IS_SCROLLED_WINDOW (parent))
 		{
-			GtkScrolledWindow *scrolled = GTK_SCROLLED_WINDOW (parent);
+			gtk_scrolled_window_set_max_content_height (GTK_SCROLLED_WINDOW (parent), -1);
-			int max_height = gtk_scrolled_window_get_max_content_height (scrolled);
+			gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (parent), -1);
-
+			gtk_scrolled_window_set_max_content_height (GTK_SCROLLED_WINDOW (parent), target_height);
-			if (max_height != -1 && target_height > max_height)
+			gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (parent), target_height);
-			{
-				gtk_scrolled_window_set_max_content_height (scrolled, target_height);
-				gtk_scrolled_window_set_min_content_height (scrolled, target_height);
-			}
-			else
-			{
-				gtk_scrolled_window_set_min_content_height (scrolled, target_height);
-				gtk_scrolled_window_set_max_content_height (scrolled, target_height);
-			}
 			gtk_widget_set_size_request (parent, -1, target_height);
 		}
 	}
@@ -5013,7 +4976,6 @@ mg_create_topwindow (session *sess)
 #ifdef G_OS_WIN32
 	parent_win = gtk_widget_get_window (win);
 	gdk_window_add_filter (parent_win, mg_win32_filter, NULL);
-	mg_win32_ensure_minimizable (parent_win);
 #endif
 }
 
@@ -5050,18 +5012,6 @@ mg_win32_filter (GdkXEvent *xevent, GdkEvent *event, gpointer data)
 	if (!msg)
 		return GDK_FILTER_CONTINUE;
 
-	if (msg->message == WM_STYLECHANGING && msg->wParam == (WPARAM)GWL_STYLE)
-	{
-		STYLESTRUCT *style = (STYLESTRUCT *)msg->lParam;
-
-		/* Keep the window minimizable from its taskbar button; see
-		 * mg_win32_ensure_minimizable (). */
-		if (style)
-			style->styleNew |= WS_MINIMIZEBOX;
-
-		return GDK_FILTER_CONTINUE;
-	}
-
 	if (msg->message == WM_TIMECHANGE)
 	{
 		_tzset();
@@ -5211,7 +5161,6 @@ mg_create_tabwindow (session *sess)
 #ifdef G_OS_WIN32
 	parent_win = gtk_widget_get_window (win);
 	gdk_window_add_filter (parent_win, mg_win32_filter, NULL);
-	mg_win32_ensure_minimizable (parent_win);
 #endif
 }
 

src/fe-gtk/meson.build

@@ -50,7 +50,7 @@ zoitechat_gtk_deps = [
 
 gtk_dep = dependency('gtk+-3.0', version: '>= 3.22')
 
-zoitechat_theme_deps = [gtk_dep, zoitechat_common_dep]
+zoitechat_theme_deps = [gtk_dep]
 
 if host_machine.system() != 'windows'
   appindicator_opt = get_option('appindicator')

src/fe-gtk/plugin-tray.c

@@ -71,7 +71,7 @@ typedef enum
 	WS_HIDDEN
 } WinStatus;
 
-#if !defined(WIN32) && (defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_APPINDICATOR)) && !defined(GDK_WINDOWING_X11)
+#if !defined(WIN32) && (defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_APPINDICATOR))
 #define HAVE_APPINDICATOR_BACKEND 1
 #else
 #define HAVE_APPINDICATOR_BACKEND 0

src/fe-gtk/theme/tests/test-theme-preferences-gtk3-populate.c

@@ -70,15 +70,6 @@ load_text_events (void)
 {
 }
 
-char **
-text_color_event_names (int color, int *count)
-{
-        (void)color;
-        if (count)
-                *count = 0;
-        return NULL;
-}
-
 gboolean
 theme_get_color (ThemeSemanticToken token, GdkRGBA *color)
 {

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

@@ -52,13 +52,14 @@ static const guint8 theme_default_99_mirc_colors[THEME_XTEXT_MIRC_COLS][3] = {
 };
 
 static void
-theme_access_apply_default_99_palette (XTextColor *palette, size_t palette_len)
+theme_access_apply_default_99_palette (XTextColor *palette, size_t palette_len, gboolean apply_base)
 {
 	size_t i;
+	size_t start = apply_base ? 0 : 32;
 
 	if (palette_len == 0)
 		return;
-	for (i = 32; i < THEME_XTEXT_MIRC_COLS && i < palette_len; i++)
+	for (i = start; i < THEME_XTEXT_MIRC_COLS && i < palette_len; i++)
 	{
 		palette[i].red = theme_default_99_mirc_colors[i][0] / 255.0;
 		palette[i].green = theme_default_99_mirc_colors[i][1] / 255.0;
@@ -147,10 +148,11 @@ gboolean
 theme_get_mirc_color (unsigned int mirc_index, GdkRGBA *out_rgba)
 {
 	ThemeSemanticToken token = (ThemeSemanticToken) (THEME_TOKEN_MIRC_0 + (int) mirc_index);
+	gboolean has_user_colors = theme_runtime_mode_has_user_colors (theme_runtime_is_dark_active ());
 
 	if (mirc_index >= THEME_XTEXT_MIRC_COLS)
 		return FALSE;
-	if (mirc_index >= 32)
+	if (!has_user_colors || mirc_index >= 32)
 	{
 		out_rgba->red = theme_default_99_mirc_colors[mirc_index][0] / 255.0;
 		out_rgba->green = theme_default_99_mirc_colors[mirc_index][1] / 255.0;
@@ -171,10 +173,11 @@ gboolean
 theme_get_mirc_color_rgb16 (unsigned int mirc_index, guint16 *red, guint16 *green, guint16 *blue)
 {
 	ThemeSemanticToken token = (ThemeSemanticToken) (THEME_TOKEN_MIRC_0 + (int) mirc_index);
+	gboolean has_user_colors = theme_runtime_mode_has_user_colors (theme_runtime_is_dark_active ());
 
 	if (mirc_index >= THEME_XTEXT_MIRC_COLS)
 		return FALSE;
-	if (mirc_index >= 32)
+	if (!has_user_colors || mirc_index >= 32)
 	{
 		*red = (guint16) (theme_default_99_mirc_colors[mirc_index][0] * 257);
 		*green = (guint16) (theme_default_99_mirc_colors[mirc_index][1] * 257);
@@ -224,6 +227,7 @@ void
 theme_get_xtext_colors_for_widget (GtkWidget *widget, XTextColor *palette, size_t palette_len)
 {
 	ThemeWidgetStyleValues style_values;
+	gboolean has_user_colors;
 	GdkRGBA marker_color;
 
 	if (!palette)
@@ -231,8 +235,9 @@ theme_get_xtext_colors_for_widget (GtkWidget *widget, XTextColor *palette, size_
 
 	theme_get_widget_style_values_for_widget (widget, &style_values);
 	theme_runtime_get_xtext_colors (palette, palette_len);
+	has_user_colors = theme_runtime_mode_has_user_colors (theme_runtime_is_dark_active ());
 	if (palette_len >= THEME_XTEXT_MIRC_COLS)
-		theme_access_apply_default_99_palette (palette, palette_len);
+		theme_access_apply_default_99_palette (palette, palette_len, !has_user_colors);
 	if (palette_len > THEME_XTEXT_MARK_FG_INDEX)
 	{
 		palette[THEME_XTEXT_MARK_FG_INDEX].red = style_values.selection_foreground.red;

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

@@ -38,7 +38,6 @@
 #include "theme-runtime.h"
 
 extern void load_text_events (void);
-extern char **text_color_event_names (int color, int *count);
 
 typedef struct
 {
@@ -244,9 +243,6 @@ theme_preferences_stage_discard (void)
 static void
 theme_preferences_show_import_error (GtkWidget *button, const char *message);
 
-static void
-theme_preferences_color_set_tooltip (GtkWidget *widget, ThemeSemanticToken token);
-
 static void
 theme_preferences_manager_row_free (gpointer data)
 {
@@ -485,7 +481,6 @@ theme_preferences_color_response_cb (GtkDialog *dialog, gint response_id, gpoint
                                                     data->color_change_flag,
                                                     TRUE);
                 theme_preferences_color_button_apply (data->button, &rgba);
-                theme_preferences_color_set_tooltip (data->button, data->token);
                 theme_preferences_manager_update_preview ((theme_color_manager_ui *) data->manager_ui);
         }
 
@@ -564,113 +559,6 @@ theme_preferences_token_display_name (ThemeSemanticToken token)
         }
 }
 
-static char *
-theme_preferences_color_tooltip_markup (ThemeSemanticToken token)
-{
-        GString *tip;
-        GdkRGBA rgba;
-        char *display;
-        char *hex;
-        char *escaped;
-        char **names;
-        int count = 0;
-
-        if (token < THEME_TOKEN_MIRC_0 || token > THEME_TOKEN_MIRC_31)
-                return NULL;
-
-        if (!theme_preferences_staged_get_color (token, &rgba))
-                return NULL;
-
-        tip = g_string_new (NULL);
-
-        display = theme_preferences_token_display_name (token);
-        hex = theme_preferences_format_hex (&rgba);
-        escaped = g_markup_escape_text (display, -1);
-        g_string_append_printf (tip,
-                                "<span background='%s'>\xe2\x80\x83\xe2\x80\x83</span> <b>%s</b>  <tt><small>%s</small></tt>",
-                                hex, escaped, hex);
-        g_free (escaped);
-        g_free (display);
-
-        names = text_color_event_names (token - THEME_TOKEN_MIRC_0, &count);
-        if (names)
-        {
-                int line_target;
-                int line_len = 0;
-                int i;
-
-                display = g_strdup_printf (ngettext ("Used by %d text event",
-                                                     "Used by %d text events", count), count);
-                escaped = g_markup_escape_text (display, -1);
-                g_string_append_printf (tip,
-                                        "\n<small><span alpha='60%%'>%s</span></small>\n\n<small>",
-                                        escaped);
-                g_free (escaped);
-                g_free (display);
-
-                /* Explicit line breaks keep the tooltip geometry stable;
-                 * heavily-used colors get wider lines so the full list
-                 * stays on screen. */
-                if (count <= 12)
-                        line_target = 44;
-                else if (count <= 40)
-                        line_target = 60;
-                else
-                        line_target = 76;
-
-                for (i = 0; i < count; i++)
-                {
-                        int name_len = (int) g_utf8_strlen (names[i], -1);
-
-                        if (i)
-                        {
-                                if (line_len + name_len + 5 > line_target)
-                                {
-                                        g_string_append_c (tip, '\n');
-                                        line_len = 0;
-                                }
-                                else
-                                {
-                                        g_string_append (tip, "  \xc2\xb7  ");
-                                        line_len += 5;
-                                }
-                        }
-                        escaped = g_markup_escape_text (names[i], -1);
-                        g_string_append (tip, escaped);
-                        line_len += name_len;
-                        g_free (escaped);
-                }
-                g_string_append (tip, "</small>");
-                g_strfreev (names);
-        }
-        else
-        {
-                escaped = g_markup_escape_text (_("Not used by any text events"), -1);
-                g_string_append_printf (tip,
-                                        "\n<small><span alpha='60%%'><i>%s</i></span></small>",
-                                        escaped);
-                g_free (escaped);
-        }
-
-        g_free (hex);
-        return g_string_free (tip, FALSE);
-}
-
-/* Static markup tooltips only: building tooltip widgets from a
- * query-tooltip handler makes GtkTooltip flicker on some setups, so the
- * markup is set once and refreshed whenever the color changes. */
-static void
-theme_preferences_color_set_tooltip (GtkWidget *widget, ThemeSemanticToken token)
-{
-        char *markup = theme_preferences_color_tooltip_markup (token);
-
-        if (!markup)
-                return;
-
-        gtk_widget_set_tooltip_markup (widget, markup);
-        g_free (markup);
-}
-
 static void
 theme_preferences_manager_row_apply (theme_color_manager_row *row, const GdkRGBA *rgba)
 {
@@ -681,7 +569,6 @@ theme_preferences_manager_row_apply (theme_color_manager_row *row, const GdkRGBA
         hex = theme_preferences_format_hex (rgba);
         gtk_entry_set_text (GTK_ENTRY (row->entry), hex);
         g_free (hex);
-        theme_preferences_color_set_tooltip (row->row, row->token);
 }
 
 static void
@@ -997,8 +884,6 @@ theme_preferences_create_color_manager_dialog (GtkWindow *parent, gboolean *colo
                 if (theme_preferences_staged_get_color (token, &rgba))
                         theme_preferences_manager_row_apply (row, &rgba);
 
-                theme_preferences_color_set_tooltip (list_row, token);
-
                 g_signal_connect (G_OBJECT (button), "clicked",
                                   G_CALLBACK (theme_preferences_manager_pick_cb), row);
                 g_object_set_data (G_OBJECT (button), "zoitechat-theme-color-manager-ui", ui);
@@ -1313,7 +1198,6 @@ theme_preferences_create_color_button (GtkWidget *table,
         g_object_set_data (G_OBJECT (but), "zoitechat-color-box", box);
         g_object_set_data (G_OBJECT (but), "zoitechat-theme-token", GINT_TO_POINTER (token));
         g_object_set_data (G_OBJECT (but), "zoitechat-theme-color-change", color_change_flag);
-        theme_preferences_color_set_tooltip (but, token);
         gtk_grid_attach (GTK_GRID (table), but, col, row, 1, 1);
         g_signal_connect (G_OBJECT (but), "clicked", G_CALLBACK (theme_preferences_color_cb), parent);
         if (theme_preferences_staged_get_color (token, &color))

win32/copy/copy.vcxproj

@@ -66,7 +66,6 @@
       <None Include="$(DepsRoot)\bin\*zlib*.dll" />
       <None Include="$(DepsRoot)\bin\*girepository*.dll" Condition="'$(LuaEnabled)'=='true' and '$(LuaLibDir)'!=''" />
       <None Include="$(Python3Path)\Lib\site-packages\_cffi_backend.*.pyd" Condition="'$(Python3Enabled)'=='true'" />
-      <None Include="$(Python38Path)\Lib\site-packages\_cffi_backend.*.pyd" Condition="'$(Python38Enabled)'=='true'" />
 
       <LuaLib Include="$(LuaLibDir)\**\*.dll" Condition="'$(LuaEnabled)'=='true' and '$(LuaLibDir)'!=''" />
       <LuaShare Include="$(LuaShareDir)\*.lua" Condition="'$(LuaEnabled)'=='true' and '$(LuaShareDir)'!=''" />
@@ -106,10 +105,10 @@
     <Copy SourceFiles="@(LuaShare)" DestinationFiles="@(LuaShare->'$(ZoiteChatRel)\share\lua\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy SourceFiles="@(LuaLib)" DestinationFiles="@(LuaLib->'$(ZoiteChatRel)\lib\lua\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy SourceFiles="@(Typelib)" DestinationFiles="@(Typelib->'$(ZoiteChatRel)\lib\girepository-1.0\%(Filename)%(Extension)')" />
-    <Copy SourceFiles="..\..\plugins\python\xchat.py" DestinationFolder="$(ZoiteChatRel)\python" Condition="'$(Python3Enabled)'=='true' or '$(Python38Enabled)'=='true'" />
+    <Copy SourceFiles="..\..\plugins\python\xchat.py" DestinationFolder="$(ZoiteChatRel)\python" Condition="'$(Python3Enabled)'=='true'" />
-    <Copy SourceFiles="..\..\plugins\python\hexchat.py" DestinationFolder="$(ZoiteChatRel)\python" Condition="'$(Python3Enabled)'=='true' or '$(Python38Enabled)'=='true'" />
+    <Copy SourceFiles="..\..\plugins\python\hexchat.py" DestinationFolder="$(ZoiteChatRel)\python" Condition="'$(Python3Enabled)'=='true'" />
-    <Copy SourceFiles="..\..\plugins\python\zoitechat.py" DestinationFolder="$(ZoiteChatRel)\python" Condition="'$(Python3Enabled)'=='true' or '$(Python38Enabled)'=='true'" />
+    <Copy SourceFiles="..\..\plugins\python\zoitechat.py" DestinationFolder="$(ZoiteChatRel)\python" Condition="'$(Python3Enabled)'=='true'" />
-    <Copy SourceFiles="..\..\plugins\python\_zoitechat.py" DestinationFolder="$(ZoiteChatRel)\python" Condition="'$(Python3Enabled)'=='true' or '$(Python38Enabled)'=='true'" />
+    <Copy SourceFiles="..\..\plugins\python\_zoitechat.py" DestinationFolder="$(ZoiteChatRel)\python" Condition="'$(Python3Enabled)'=='true'" />
 
     <WriteLinesToFile File="$(ZoiteChatRel)portable-mode" Lines="2" Overwrite="true" />
 

win32/installer/zoitechat.iss.tt

@@ -59,7 +59,7 @@ Name: "plugins\upd"; Description: "Update Checker"; Types: normal custom; Flags:
 Name: "langs"; Description: "Language Interfaces"; Types: custom; Flags: disablenouninstallwarning
 Name: "langs\lua"; Description: "Lua (LuaJIT 2.1)"; Types: normal custom; Flags: disablenouninstallwarning
 Name: "langs\perl"; Description: "Perl (Strawberry Perl 5.42.0.1)"; Types: custom; Flags: disablenouninstallwarning
-Name: "langs\python"; Description: "Python (Python 3.14.3, or 3.8.10 before Windows 10)"; Types: custom; Flags: disablenouninstallwarning
+Name: "langs\python"; Description: "Python (Python 3.14.3, or 3.8.10 on Windows 7)"; Types: custom; Flags: disablenouninstallwarning
 Name: "themes"; Description: "GTK3 Themes"; Types: normal minimal custom; Flags: disablenouninstallwarning
 Name: "themes\windows10"; Description: "Windows 10"; Types: normal minimal custom; Flags: disablenouninstallwarning
 Name: "themes\windows10dark"; Description: "Windows 10 Dark"; Types: normal minimal custom; Flags: disablenouninstallwarning
@@ -181,8 +181,8 @@ Source: "plugins\hcperl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Co
 
 Source: "python\*.py"; DestDir: "{app}\python"; Flags: ignoreversion; Components: langs\python
 
-Source: "plugins\hcpython3.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\python; Check: not NeedsLegacyPython
+Source: "plugins\hcpython3.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\python; Check: not IsWindows7
-Source: "plugins\hcpython38.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion skipifsourcedoesntexist; Components: langs\python; Check: NeedsLegacyPython
+Source: "plugins\hcpython38.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion skipifsourcedoesntexist; Components: langs\python; Check: IsWindows7
 Source: "_cffi_backend.cp3*.pyd"; DestDir: "{app}"; Flags: ignoreversion; Components: langs\python
 
 Source: "zoitechat.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
@@ -329,19 +329,17 @@ begin
 		Result := DirExists(ExpandConstant('{localappdata}') + '\enchant\myspell');
 end;
 
-// Python >= 3.9 dropped support for Windows versions before 10;
+function IsWindows7(): Boolean;
-// those systems get Python 3.8 and the matching plugin instead.
-function NeedsLegacyPython(): Boolean;
 var
 	Version: TWindowsVersion;
 begin
 	GetWindowsVersionEx(Version);
-	Result := Version.NTPlatform and (Version.Major < 10);
+	Result := Version.NTPlatform and (Version.Major = 6) and (Version.Minor = 1);
 end;
 
 function PythonURL(): String;
 begin
-	if NeedsLegacyPython() then
+	if IsWindows7() then
 		Result := 'https://www.python.org/ftp/python/3.8.10/python-3.8.10-amd64.exe'
 	else
 		Result := 'https://www.python.org/ftp/python/3.14.3/python-3.14.3-amd64.exe';
@@ -349,7 +347,7 @@ end;
 
 function PythonDLL(): String;
 begin
-	if NeedsLegacyPython() then
+	if IsWindows7() then
 		Result := 'python38.dll'
 	else
 		Result := 'python314.dll';

win32/zoitechat.props

@@ -8,7 +8,6 @@
 		<YourGendefPath>c:\gtk-build\gendef</YourGendefPath>
 		<YourPerlPath>c:\gtk-build\perl-5.42.0.1</YourPerlPath>
 		<YourPython3Path>c:\gtk-build\python-3.14</YourPython3Path>
-		<YourPython38Path>c:\gtk-build\python-3.8</YourPython38Path>
 		<YourWinSparklePath>c:\gtk-build\WinSparkle</YourWinSparklePath>
 
 		<!-- YOU SHOULDN'T TOUCH ANYTHING BELOW -->
@@ -33,12 +32,6 @@
 		<Python3Enabled Condition="Exists('$(Python3Path)\\python.exe') and Exists('$(Python3Path)\\libs\\$(Python3Lib).lib') and Exists('$(Python3Path)\\Lib\\site-packages\\cffi')">true</Python3Enabled>
 		<Python3Enabled Condition="'$(Python3Enabled)'==''">false</Python3Enabled>
 
-		<Python38Path>$(YourPython38Path)\$(ZoiteChatPlatform)</Python38Path>
-		<Python38Lib>python38</Python38Lib>
-		<Python38Output>hcpython38</Python38Output>
-		<Python38Enabled Condition="Exists('$(Python38Path)\\python.exe') and Exists('$(Python38Path)\\libs\\$(Python38Lib).lib') and Exists('$(Python38Path)\\Lib\\site-packages\\cffi')">true</Python38Enabled>
-		<Python38Enabled Condition="'$(Python38Enabled)'==''">false</Python38Enabled>
-
 		<PerlEnabled Condition="Exists('$(PerlPath)\\bin\\perl.exe') and Exists('$(PerlPath)\\bin\\$(PerlLib).dll') and Exists('$(GendefPath)\\gendef.exe')">true</PerlEnabled>
 		<PerlEnabled Condition="'$(PerlEnabled)'==''">false</PerlEnabled>
 

win32/zoitechat.sln

@@ -60,7 +60,6 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "installer", "installer\installer.vcxproj", "{5A0F4962-E670-4DA2-9E45-52CC47F26E2F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{C2321A03-0BA7-45B3-8740-ABD82B36B0BF} = {C2321A03-0BA7-45B3-8740-ABD82B36B0BF}
-		{D58924D2-1492-4AC3-B058-7A214424EEDC} = {D58924D2-1492-4AC3-B058-7A214424EEDC}
 		{BF0EBC16-68AD-4CD1-864C-5B56836EBE2A} = {BF0EBC16-68AD-4CD1-864C-5B56836EBE2A}
 		{17E4BE39-76F7-4A06-AD21-EFD0C5091F76} = {17E4BE39-76F7-4A06-AD21-EFD0C5091F76}
 		{4C0F3940-2EEE-4646-82F7-6CE75B9A72F4} = {4C0F3940-2EEE-4646-82F7-6CE75B9A72F4}
@@ -81,11 +80,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "perl", "..\plugins\perl\per
 		{87554B59-006C-4D94-9714-897B27067BA3} = {87554B59-006C-4D94-9714-897B27067BA3}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python38", "..\plugins\python\python38.vcxproj", "{D58924D2-1492-4AC3-B058-7A214424EEDC}"
-	ProjectSection(ProjectDependencies) = postProject
-		{87554B59-006C-4D94-9714-897B27067BA3} = {87554B59-006C-4D94-9714-897B27067BA3}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python3", "..\plugins\python\python3.vcxproj", "{C2321A03-0BA7-45B3-8740-ABD82B36B0BF}"
 	ProjectSection(ProjectDependencies) = postProject
 		{87554B59-006C-4D94-9714-897B27067BA3} = {87554B59-006C-4D94-9714-897B27067BA3}
@@ -133,8 +127,6 @@ Global
 		{D90BC3E3-1341-4849-9354-5F40489D39D1}.Release|x64.Build.0 = Release|x64
 		{C2321A03-0BA7-45B3-8740-ABD82B36B0BF}.Release|x64.ActiveCfg = Release|x64
 		{C2321A03-0BA7-45B3-8740-ABD82B36B0BF}.Release|x64.Build.0 = Release|x64
-		{D58924D2-1492-4AC3-B058-7A214424EEDC}.Release|x64.ActiveCfg = Release|x64
-		{D58924D2-1492-4AC3-B058-7A214424EEDC}.Release|x64.Build.0 = Release|x64
 		{C53145CC-D021-40C9-B97C-0249AB9A43C9}.Release|x64.ActiveCfg = Release|x64
 		{C53145CC-D021-40C9-B97C-0249AB9A43C9}.Release|x64.Build.0 = Release|x64
 		{BF0EBC16-68AD-4CD1-864C-5B56836EBE2A}.Release|x64.ActiveCfg = Release|x64
@@ -159,7 +151,6 @@ Global
 		{5A0F4962-E670-4DA2-9E45-52CC47F26E2F} = {0FD996A7-464F-4981-8380-3DCA3A244A13}
 		{D90BC3E3-1341-4849-9354-5F40489D39D1} = {D237DA6B-BD5F-46C0-8BEA-50E9A1340240}
 		{C2321A03-0BA7-45B3-8740-ABD82B36B0BF} = {D237DA6B-BD5F-46C0-8BEA-50E9A1340240}
-		{D58924D2-1492-4AC3-B058-7A214424EEDC} = {D237DA6B-BD5F-46C0-8BEA-50E9A1340240}
 		{C53145CC-D021-40C9-B97C-0249AB9A43C9} = {561126F4-FA18-45FC-A2BF-8F858F161D6D}
 		{BF0EBC16-68AD-4CD1-864C-5B56836EBE2A} = {021EC1D0-FF67-4700-9AB2-EAABF1159C09}
 		{4C0F3940-2EEE-4646-82F7-6CE75B9A72F4} = {D237DA6B-BD5F-46C0-8BEA-50E9A1340240}