Merge pull request #417 from botovq/push-kwovwrnwwuzn

Minor simplification of _SSL_get_cert_info ()

plugins/fishlim/plugin_zoitechat.c

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

plugins/sysinfo/meson.build

@@ -6,66 +6,50 @@ 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
       sysinfo_cargs += '-DHAVE_LIBPCI'
       sysinfo_sources += 'unix/pci.c'
 
-    picidsdir = libpci.get_variable(pkgconfig: 'idsdir')
+      picidsdir = libpci.get_variable(pkgconfig : 'idsdir') 
       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
 
-elif system == 'darwin'
+    sysinfo_includes += 'unix'
-  sysinfo_includes += 'shared'
+    sysinfo_sources += [
-  sysinfo_sources += 'shared/df.c'
+      'unix/backend.c',
+      'unix/match.c',
+      'unix/parse.c',
+    ]
+  elif system == 'darwin'
     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));
-	memory.dwLength = sizeof (memory);
-	if (!GlobalMemoryStatusEx (&memory))
-	{
-		return NULL;
-	}
-
-	return format_usage ((guint64) memory.ullTotalPhys, (guint64) memory.ullAvailPhys);
 }
 
-char *
+static char *get_memory_info (void)
-sysinfo_backend_get_disk (void)
 {
-	WCHAR windows_dir[MAX_PATH];
+	MEMORYSTATUSEX meminfo = { 0 };
-	WCHAR volume_path[MAX_PATH];
+	meminfo.dwLength = sizeof (meminfo);
-	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 (!GlobalMemoryStatusEx (&meminfo))
-	{
-		return NULL;
-	}
-	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);
+	return sysinfo_format_memory (meminfo.ullTotalPhys, meminfo.ullAvailPhys);
-	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 *
+static const char *sysinfo_detect_toolkit(void)
-sysinfo_backend_get_uptime (void)
 {
-	return sysinfo_format_uptime ((gint64) (GetTickCount64 () / 1000ULL));
+#if defined(USE_GTK_FRONTEND)
-}
+	return "GTK3";
-
+#else
-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;
-	}
+#endif
-
-	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. */
+	if (toolkit)
+	{
+		return g_strdup_printf ("Windows / %s", toolkit);
+	}
+
 	return g_strdup ("Windows");
-#endif
 }

src/common/common.vcxproj

@@ -43,6 +43,7 @@
     <ClInclude Include="typedef.h" />
     <ClInclude Include="url.h" />
     <ClInclude Include="userlist.h" />
+    <ClInclude Include="hexcolor.h" />
     <ClInclude Include="util.h" />
     <ClInclude Include="zoitechat-plugin.h" />
     <ClInclude Include="zoitechat.h" />
@@ -79,6 +80,7 @@
     <ClCompile Include="tree.c" />
     <ClCompile Include="url.c" />
     <ClCompile Include="userlist.c" />
+    <ClCompile Include="hexcolor.c" />
     <ClCompile Include="util.c" />
     <ClCompile Include="zoitechat.c" />
     <ClCompile Include="theme-service.c" />

src/common/common.vcxproj.filters

@@ -98,6 +98,9 @@
     <ClInclude Include="userlist.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="hexcolor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="util.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -202,6 +205,9 @@
     <ClCompile Include="userlist.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="hexcolor.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="util.c">
       <Filter>Source Files</Filter>
     </ClCompile>

src/common/hexcolor.c

@@ -0,0 +1,42 @@
+/* ZoiteChat
+ * Parsing of \004 (hex color) formatting codes: RRGGBB[,RRGGBB].
+ * Kept free of other application dependencies so the xtext widget tests can
+ * compile it on its own.
+ * Distributed under GPL-2.0-or-later; see COPYING. */
+
+#include "hexcolor.h"
+
+static int
+hexcolor_component (const char *s, int avail, guint32 *rgb)
+{
+	int i;
+	guint32 value = 0;
+
+	if (avail < 6)
+		return FALSE;
+	for (i = 0; i < 6; i++)
+	{
+		if (!g_ascii_isxdigit (s[i]))
+			return FALSE;
+		value = (value << 4) | g_ascii_xdigit_value (s[i]);
+	}
+	if (rgb)
+		*rgb = value;
+	return TRUE;
+}
+
+int
+hexcolor_parse (const char *s, int avail, guint32 *fg, guint32 *bg, int *has_bg)
+{
+	if (has_bg)
+		*has_bg = FALSE;
+	if (!hexcolor_component (s, avail, fg))
+		return 0;
+	if (avail >= 7 && s[6] == ',' && hexcolor_component (s + 7, avail - 7, bg))
+	{
+		if (has_bg)
+			*has_bg = TRUE;
+		return 13;
+	}
+	return 6;
+}

src/common/hexcolor.h

@@ -0,0 +1,16 @@
+/* ZoiteChat
+ * Parsing of \004 (hex color) formatting codes: RRGGBB[,RRGGBB].
+ * See https://modern.ircdocs.horse/formatting
+ * Distributed under GPL-2.0-or-later; see COPYING. */
+
+#ifndef ZOITECHAT_HEXCOLOR_H
+#define ZOITECHAT_HEXCOLOR_H
+
+#include <glib.h>
+
+/* Parses the parameters following a \004 byte. Returns the number of bytes
+ * consumed (6 or 13), or 0 if no valid RRGGBB follows. fg, bg and has_bg
+ * may be NULL. */
+int hexcolor_parse (const char *s, int avail, guint32 *fg, guint32 *bg, int *has_bg);
+
+#endif

src/common/inbound.c

@@ -1880,38 +1880,51 @@ inbound_toggle_caps (server *serv, const char *extensions_str, gboolean enable)
 	char **extensions;
 	gsize i;
 
+	if (!extensions_str)
+		return;
+
 	extensions = g_strsplit (extensions_str, " ", 0);
 
 	for (i = 0; extensions[i]; i++)
 	{
 		const char *extension = extensions[i];
+		gboolean cap_enable = enable;
+
+		/* ACK prefixes disabled capabilities with '-', unlike CAP DEL. */
+		if (*extension == '-')
+		{
+			cap_enable = FALSE;
+			extension++;
+		}
 
 		if (!strcmp (extension, "solanum.chat/identify-msg"))
-			serv->have_idmsg = enable;
+			serv->have_idmsg = cap_enable;
 		else if (!strcmp (extension, "multi-prefix"))
-			serv->have_namesx = enable;
+			serv->have_namesx = cap_enable;
 		else if (!strcmp (extension, "account-notify"))
-			serv->have_accnotify = enable;
+			serv->have_accnotify = cap_enable;
 		else if (!strcmp (extension, "extended-join"))
-			serv->have_extjoin = enable;
+			serv->have_extjoin = cap_enable;
 		else if (!strcmp (extension, "userhost-in-names"))
-			serv->have_uhnames = enable;
+			serv->have_uhnames = cap_enable;
 		else if (!strcmp (extension, "server-time")
 				|| !strcmp (extension, "znc.in/server-time")
 				|| !strcmp (extension, "znc.in/server-time-iso"))
-			serv->have_server_time = enable;
+			serv->have_server_time = cap_enable;
 		else if (!strcmp (extension, "away-notify"))
-			serv->have_awaynotify = enable;
+			serv->have_awaynotify = cap_enable;
 		else if (!strcmp (extension, "account-tag"))
-			serv->have_account_tag = enable;
+			serv->have_account_tag = cap_enable;
 		else if (!strcmp (extension, "message-tags"))
-			serv->have_message_tags = enable;
+			serv->have_message_tags = cap_enable;
 		else if (!strcmp (extension, "echo-message"))
-			serv->have_echo_message = enable;
+			serv->have_echo_message = cap_enable;
 		else if (!strcmp (extension, "sasl"))
 		{
-			serv->have_sasl = enable;
+			gboolean start_auth = cap_enable && !serv->have_sasl;
-			if (enable)
+
+			serv->have_sasl = cap_enable;
+			if (start_auth)
 			{
 #ifdef USE_OPENSSL
 				if (serv->loginmethod == LOGIN_SASLEXTERNAL)
@@ -1962,10 +1975,15 @@ inbound_cap_ack (server *serv, char *nick, char *extensions,
 	inbound_toggle_caps (serv, extensions, TRUE);
 }
 
+static void inbound_request_new_caps (server *serv, const char *extensions_str,
+									 const message_tags_data *tags_data);
+
 void
 inbound_cap_new (server *serv, char *nick, char *extensions,
 					 const message_tags_data *tags_data)
 {
+	gboolean sts_upgrade_triggered = FALSE;
+
 	if (extensions)
 	{
 		char **tokens = g_strsplit (extensions, " ", 0);
@@ -1977,7 +1995,7 @@ inbound_cap_new (server *serv, char *nick, char *extensions,
 
 			if (!g_strcmp0 (parts[0], "sts") && parts[1] && parts[1][0])
 			{
-				sts_handle_capability (serv, parts[1]);
+				sts_upgrade_triggered |= sts_handle_capability (serv, parts[1]);
 			}
 
 			g_strfreev (parts);
@@ -1986,38 +2004,22 @@ inbound_cap_new (server *serv, char *nick, char *extensions,
 		g_strfreev (tokens);
 	}
 
-	EMIT_SIGNAL_TIMESTAMP (XP_TE_CAPACK, serv->server_session, nick, extensions,
+	EMIT_SIGNAL_TIMESTAMP (XP_TE_CAPLIST, serv->server_session, nick, extensions,
 								  NULL, NULL, 0, tags_data->timestamp);
 
-	inbound_toggle_caps (serv, extensions, TRUE);
+	/* NEW advertises availability; only ACK confirms an enabled capability. */
+	if (!sts_upgrade_triggered)
+		inbound_request_new_caps (serv, extensions, tags_data);
 }
 
 void
 inbound_cap_del (server *serv, char *nick, char *extensions,
 					 const message_tags_data *tags_data)
 {
-	if (extensions)
-	{
-		char **tokens = g_strsplit (extensions, " ", 0);
-		int i;
-
-		for (i = 0; tokens[i]; i++)
-		{
-			if (!g_strcmp0 (tokens[i], "sts") ||
-				g_str_has_prefix (tokens[i], "sts="))
-			{
-				/* STS cannot be disabled via CAP DEL. */
-				g_strfreev (tokens);
-				return;
-			}
-		}
-
-		g_strfreev (tokens);
-	}
-
 	EMIT_SIGNAL_TIMESTAMP (XP_TE_CAPDEL, serv->server_session, nick, extensions,
 								  NULL, NULL, 0, tags_data->timestamp);
 
+	/* STS has no toggle, but must not prevent other capabilities being removed. */
 	inbound_toggle_caps (serv, extensions, FALSE);
 }
 
@@ -2053,6 +2055,44 @@ static const char * const supported_caps[] = {
 	"solanum.chat/identify-msg",
 };
 
+static void
+inbound_request_new_caps (server *serv, const char *extensions_str,
+							 const message_tags_data *tags_data)
+{
+	char **extensions;
+	gsize i, x;
+
+	if (!extensions_str)
+		return;
+
+	extensions = g_strsplit (extensions_str, " ", 0);
+	for (i = 0; extensions[i]; i++)
+	{
+		char *value = strchr (extensions[i], '=');
+
+		if (value)
+			*value = '\0';
+	}
+
+	/* Request each supported capability once, keeping every IRC line bounded.
+	 * SASL is negotiated during login and is not in supported_caps. */
+	for (x = 0; x < G_N_ELEMENTS (supported_caps); x++)
+	{
+		for (i = 0; extensions[i]; i++)
+		{
+			if (!strcmp (extensions[i], supported_caps[x]))
+			{
+				EMIT_SIGNAL_TIMESTAMP (XP_TE_CAPREQ, serv->server_session,
+										  extensions[i], NULL, NULL, NULL, 0,
+										  tags_data->timestamp);
+				tcp_sendf (serv, "CAP REQ :%s\r\n", extensions[i]);
+				break;
+			}
+		}
+	}
+	g_strfreev (extensions);
+}
+
 static int
 get_supported_mech (server *serv, const char *list)
 {

src/common/meson.build

@@ -25,6 +25,7 @@ common_sources = [
   'tree.c',
   'url.c',
   'userlist.c',
+  'hexcolor.c',
   'util.c'
 ]
 
@@ -197,3 +198,18 @@ test('Emoji Data Tests', emoji_data_tests,
   protocol: 'tap',
   timeout: 120,
 )
+
+hexcolor_tests = executable('hexcolor_tests',
+  [
+    'tests/test-hexcolor.c',
+    'hexcolor.c',
+    'util.c',
+  ],
+  include_directories: [config_h_include, include_directories('.')],
+  dependencies: [libgio_dep] + (libssl_dep.found() ? [libssl_dep] : []),
+)
+
+test('Hex Color Tests', hexcolor_tests,
+  protocol: 'tap',
+  timeout: 120,
+)

src/common/ssl.c

@@ -155,7 +155,7 @@ _SSL_get_cert_info (struct cert_info *cert_info, SSL * ssl)
 {
 	X509 *peer_cert;
 	const X509_PUBKEY *key;
-	X509_ALGOR *algor = NULL;
+	ASN1_OBJECT *obj = NULL;
 	EVP_PKEY *peer_pkey;
 	char notBefore[64];
 	char notAfter[64];
@@ -174,10 +174,10 @@ _SSL_get_cert_info (struct cert_info *cert_info, SSL * ssl)
 	broke_oneline (cert_info->issuer, cert_info->issuer_word);
 
 	key = X509_get_X509_PUBKEY(peer_cert);
-	if (!X509_PUBKEY_get0_param(NULL, NULL, 0, &algor, key))
+	if (!X509_PUBKEY_get0_param(&obj, NULL, NULL, NULL, key))
 		return 1;
 
-	alg = OBJ_obj2nid (algor->algorithm);
+	alg = OBJ_obj2nid (obj);
 #ifndef HAVE_X509_GET_SIGNATURE_NID
 	sign_alg = OBJ_obj2nid (peer_cert->sig_alg->algorithm);
 #else

src/common/tests/test-hexcolor.c

@@ -0,0 +1,117 @@
+/* ZoiteChat
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <string.h>
+
+#include <glib.h>
+
+#include "../hexcolor.h"
+#include "../util.h"
+
+static void
+test_parse_foreground (void)
+{
+	guint32 fg = 0, bg = 0xDEAD;
+	int has_bg = TRUE;
+
+	g_assert_cmpint (hexcolor_parse ("FF8800text", 10, &fg, &bg, &has_bg), ==, 6);
+	g_assert_cmphex (fg, ==, 0xFF8800);
+	g_assert_false (has_bg);
+	g_assert_cmphex (bg, ==, 0xDEAD);
+}
+
+static void
+test_parse_foreground_and_background (void)
+{
+	guint32 fg = 0, bg = 0;
+	int has_bg = FALSE;
+
+	g_assert_cmpint (hexcolor_parse ("112233,a0b0c0x", 14, &fg, &bg, &has_bg), ==, 13);
+	g_assert_cmphex (fg, ==, 0x112233);
+	g_assert_cmphex (bg, ==, 0xA0B0C0);
+	g_assert_true (has_bg);
+}
+
+static void
+test_parse_bad_background_keeps_foreground (void)
+{
+	guint32 fg = 0;
+	int has_bg = TRUE;
+
+	/* ",12" is plain text after a valid foreground, not a background */
+	g_assert_cmpint (hexcolor_parse ("112233,12 hi", 12, &fg, NULL, &has_bg), ==, 6);
+	g_assert_cmphex (fg, ==, 0x112233);
+	g_assert_false (has_bg);
+}
+
+static void
+test_parse_bare (void)
+{
+	/* a bare \004 resets colors, like a bare \003 */
+	g_assert_cmpint (hexcolor_parse (" text", 5, NULL, NULL, NULL), ==, 0);
+	g_assert_cmpint (hexcolor_parse ("12345G", 6, NULL, NULL, NULL), ==, 0);
+	g_assert_cmpint (hexcolor_parse ("", 0, NULL, NULL, NULL), ==, 0);
+}
+
+static void
+test_parse_respects_length (void)
+{
+	g_assert_cmpint (hexcolor_parse ("FF8800", 5, NULL, NULL, NULL), ==, 0);
+	g_assert_cmpint (hexcolor_parse ("FF8800,112233", 12, NULL, NULL, NULL), ==, 6);
+}
+
+static void
+assert_stripped (const char *in, int flags, const char *expected)
+{
+	char out[128];
+
+	strip_color2 (in, -1, out, flags);
+	g_assert_cmpstr (out, ==, expected);
+}
+
+static void
+test_strip (void)
+{
+	assert_stripped ("\004FF8800alice\017: hi", STRIP_ALL, "alice: hi");
+	assert_stripped ("\004112233,445566bg", STRIP_ALL, "bg");
+	assert_stripped ("a\004 b", STRIP_ALL, "a b");
+	assert_stripped ("\004FF8800\00312x", STRIP_ALL, "x");
+	/* a trailing code with too few digits leaves the rest as text */
+	assert_stripped ("x\004FF88", STRIP_ALL, "xFF88");
+}
+
+static void
+test_strip_keeps_hex_without_strip_color (void)
+{
+	assert_stripped ("\004FF8800red\002", STRIP_ATTRIB, "\004FF8800red");
+}
+
+int
+main (int argc, char *argv[])
+{
+	g_test_init (&argc, &argv, NULL);
+
+	g_test_add_func ("/hexcolor/parse/foreground", test_parse_foreground);
+	g_test_add_func ("/hexcolor/parse/foreground-and-background", test_parse_foreground_and_background);
+	g_test_add_func ("/hexcolor/parse/bad-background", test_parse_bad_background_keeps_foreground);
+	g_test_add_func ("/hexcolor/parse/bare", test_parse_bare);
+	g_test_add_func ("/hexcolor/parse/length", test_parse_respects_length);
+	g_test_add_func ("/hexcolor/strip/all", test_strip);
+	g_test_add_func ("/hexcolor/strip/attrib-only", test_strip_keeps_hex_without_strip_color);
+
+	return g_test_run ();
+}

src/common/util.c

@@ -47,6 +47,7 @@
 #include "zoitechatc.h"
 #include <ctype.h>
 #include "util.h"
+#include "hexcolor.h"
 
 #if defined (__FreeBSD__) || defined (__APPLE__)
 #include <sys/sysctl.h>
@@ -330,6 +331,14 @@ strip_color2 (const char *src, int len, char *dst, int flags)
 				if (!(flags & STRIP_COLOR)) goto pass_char;
 				rcol = 2;
 				break;
+			case '\004':			  /*ATTR_HEXCOLOR: */
+				if (!(flags & STRIP_COLOR)) goto pass_char;
+				{
+					int skip = hexcolor_parse (src + 1, len, NULL, NULL, NULL);
+					src += skip;
+					len -= skip;
+				}
+				break;
 			case HIDDEN_CHAR:	/* CL: invisible text (for event formats only) */	/* this takes care of the topic */
 				if (!(flags & STRIP_HIDDEN)) goto pass_char;
 				break;

src/fe-gtk/ascii.c

@@ -138,7 +138,7 @@ ascii_open (void)
 		{
 			table_pos++;
 			hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-			gtk_container_add (GTK_CONTAINER (vbox), hbox);
+			gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
 			gtk_widget_show (hbox);
 			i++;
 			continue;
@@ -155,14 +155,14 @@ ascii_open (void)
 								G_CALLBACK (ascii_click), NULL);
 		g_signal_connect (G_OBJECT (but), "enter-notify-event",
 								G_CALLBACK (ascii_enter), label);
-		gtk_box_pack_start (GTK_BOX (hbox), but, 0, 0, 0);
+		gtk_box_pack_start (GTK_BOX (hbox), but, TRUE, TRUE, 0);
 		gtk_widget_show (but);
 
 		table_pos += len;
 	}
 
 	frame = gtk_frame_new ("");
-	gtk_container_add (GTK_CONTAINER (hbox), frame);
+	gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
 	gtk_container_add (GTK_CONTAINER (frame), label);
 	gtk_widget_show (label);
 	gtk_widget_show (frame);

src/fe-gtk/fkeys.c

@@ -1221,7 +1221,7 @@ key_dialog_load (GtkListStore *store)
 void
 key_dialog_show ()
 {
-	GtkWidget *vbox, *box;
+	GtkWidget *vbox, *box, *pane, *scroll;
 	GtkWidget *view, *xtext, *delete_button;
 	GtkListStore *store;
 	XTextColor xtext_palette[XTEXT_COLS];
@@ -1237,10 +1237,20 @@ key_dialog_show ()
 	key_dialog = mg_create_generic_tab ("editkeys", buf, TRUE, FALSE, key_dialog_close,
 									NULL, 600, 360, &vbox, 0);
 
-	view = key_dialog_treeview_new (vbox);
+	pane = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
+	gtk_box_pack_start (GTK_BOX (vbox), pane, TRUE, TRUE, 0);
+	box = gtkutil_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
+	gtk_paned_pack1 (GTK_PANED (pane), box, TRUE, FALSE);
+	view = key_dialog_treeview_new (box);
+	scroll = gtk_scrolled_window_new (NULL, NULL);
+	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll),
+	                                GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+	gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (scroll), 80);
+	gtk_paned_pack2 (GTK_PANED (pane), scroll, TRUE, FALSE);
+	gtk_paned_set_position (GTK_PANED (pane), 220);
 	theme_get_xtext_colors (xtext_palette, XTEXT_COLS);
 	xtext = gtk_xtext_new (xtext_palette, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), xtext, FALSE, TRUE, 2);
+	gtk_container_add (GTK_CONTAINER (scroll), xtext);
 	gtk_xtext_set_font (GTK_XTEXT (xtext), prefs.hex_text_font);
 
 	g_object_set_data (G_OBJECT (key_dialog), "view", view);

src/fe-gtk/gtkutil.c

@@ -641,9 +641,8 @@ gtkutil_get_str (char *msg, char *def, void *callback, void *userdata, gboolean
 	if (parent_window && GTK_IS_WINDOW (parent_window))
 		gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent_window));
 	gtkutil_place_dialog (dialog);
-	gtk_box_set_homogeneous (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), TRUE);
 
-	hbox = gtkutil_box_new (GTK_ORIENTATION_HORIZONTAL, TRUE, 0);
+	hbox = gtkutil_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 6);
 
 	g_object_set_data (G_OBJECT (dialog), "cb", callback);
 	g_object_set_data (G_OBJECT (dialog), "ud", userdata);
@@ -653,7 +652,8 @@ gtkutil_get_str (char *msg, char *def, void *callback, void *userdata, gboolean
 						 	G_CALLBACK (gtkutil_str_enter), dialog);
 	gtk_entry_set_text (GTK_ENTRY (entry), def ? def : "");
 	gtk_entry_set_visibility (GTK_ENTRY (entry), visible);
-	gtk_box_pack_end (GTK_BOX (hbox), entry, 0, 0, 0);
+	gtk_widget_set_valign (entry, GTK_ALIGN_CENTER);
+	gtk_box_pack_end (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
 
 	label = gtk_label_new (msg);
 	gtk_box_pack_end (GTK_BOX (hbox), label, 0, 0, 0);
@@ -661,7 +661,8 @@ gtkutil_get_str (char *msg, char *def, void *callback, void *userdata, gboolean
 	g_signal_connect (G_OBJECT (dialog), "response",
 						   G_CALLBACK (gtkutil_get_str_response), entry);
 
-	gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox);
+	gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+	                    hbox, TRUE, TRUE, 0);
 
 	gtk_widget_show_all (dialog);
 }
@@ -742,9 +743,8 @@ fe_get_int (char *msg, int def, void *callback, void *userdata)
 	if (parent_window && GTK_IS_WINDOW (parent_window))
 		gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent_window));
 	gtkutil_place_dialog (dialog);
-	gtk_box_set_homogeneous (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), TRUE);
 
-	hbox = gtkutil_box_new (GTK_ORIENTATION_HORIZONTAL, TRUE, 0);
+	hbox = gtkutil_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 6);
 
 	g_object_set_data (G_OBJECT (dialog), "cb", callback);
 	g_object_set_data (G_OBJECT (dialog), "ud", userdata);
@@ -755,7 +755,8 @@ fe_get_int (char *msg, int def, void *callback, void *userdata)
 	gtk_adjustment_set_upper (adj, 1024);
 	gtk_adjustment_set_step_increment (adj, 1);
 	gtk_spin_button_set_value ((GtkSpinButton*)spin, def);
-	gtk_box_pack_end (GTK_BOX (hbox), spin, 0, 0, 0);
+	gtk_widget_set_valign (spin, GTK_ALIGN_CENTER);
+	gtk_box_pack_end (GTK_BOX (hbox), spin, TRUE, TRUE, 0);
 
 	label = gtk_label_new (msg);
 	gtk_box_pack_end (GTK_BOX (hbox), label, 0, 0, 0);
@@ -763,7 +764,8 @@ fe_get_int (char *msg, int def, void *callback, void *userdata)
 	g_signal_connect (G_OBJECT (dialog), "response",
 						   G_CALLBACK (gtkutil_get_number_response), spin);
 
-	gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox);
+	gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+	                    hbox, TRUE, TRUE, 0);
 
 	gtk_widget_show_all (dialog);
 }
@@ -783,17 +785,18 @@ fe_get_bool (char *title, char *prompt, void *callback, void *userdata)
 	if (parent_window && GTK_IS_WINDOW (parent_window))
 		gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent_window));
 	gtkutil_place_dialog (dialog);
-	gtk_box_set_homogeneous (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), TRUE);
 
 	g_object_set_data (G_OBJECT (dialog), "cb", callback);
 	g_object_set_data (G_OBJECT (dialog), "ud", userdata);
 
 	prompt_label = gtk_label_new (prompt);
+	gtk_label_set_line_wrap (GTK_LABEL (prompt_label), TRUE);
 
 	g_signal_connect (G_OBJECT (dialog), "response",
 		G_CALLBACK (gtkutil_get_bool_response), NULL);
 
-	gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), prompt_label);
+	gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+	                    prompt_label, TRUE, TRUE, 0);
 
 	gtk_widget_show_all (dialog);
 }
@@ -885,7 +888,10 @@ gtkutil_window_new (char *title, char *role, int width, int height, int flags)
 	gtk_window_set_wmclass (GTK_WINDOW (win), "ZoiteChat", "zoitechat");
 #endif
 	gtk_window_set_title (GTK_WINDOW (win), title);
-	gtk_window_set_default_size (GTK_WINDOW (win), width, height);
+	/* Zero means content-sized to callers; GTK requires -1 for that. */
+	gtk_window_set_default_size (GTK_WINDOW (win),
+	                             width > 0 ? width : -1,
+	                             height > 0 ? height : -1);
 	gtk_window_set_role (GTK_WINDOW (win), role);
 	if (flags & 1)
 		gtk_window_set_position (GTK_WINDOW (win), GTK_WIN_POS_MOUSE);

src/fe-gtk/inline-image.c

@@ -1848,10 +1848,33 @@ image_viewer_button_press (GtkWidget *widget, GdkEventButton *event,
 	return TRUE;
 }
 
+static gboolean
+image_viewer_draw (GtkWidget *widget, cairo_t *cr, gpointer data)
+{
+	GdkPixbuf *pixbuf = data;
+	int width = gdk_pixbuf_get_width (pixbuf);
+	int height = gdk_pixbuf_get_height (pixbuf);
+	int available_width = gtk_widget_get_allocated_width (widget);
+	int available_height = gtk_widget_get_allocated_height (widget);
+	double scale = MIN ((double) available_width / width,
+	                    (double) available_height / height);
+
+	/* Draw from the original so repeated resizing never degrades the image. */
+	cairo_save (cr);
+	cairo_translate (cr, (available_width - width * scale) / 2,
+	                 (available_height - height * scale) / 2);
+	cairo_scale (cr, scale, scale);
+	gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
+	cairo_pattern_set_filter (cairo_get_source (cr), CAIRO_FILTER_BILINEAR);
+	cairo_paint (cr);
+	cairo_restore (cr);
+	return FALSE;
+}
+
 void
 inline_image_show_viewer (GtkXText *xtext, textentry *ent)
 {
-	GdkPixbuf *pixbuf, *scaled = NULL;
+	GdkPixbuf *pixbuf;
 	GtkWidget *window, *eventbox, *image, *toplevel;
 	const char *url;
 	int width, height, max_width = 1280, max_height = 960;
@@ -1885,18 +1908,15 @@ inline_image_show_viewer (GtkXText *xtext, textentry *ent)
 		double scale = MIN ((double) max_width / width,
 								  (double) max_height / height);
 
-		scaled = gdk_pixbuf_scale_simple (pixbuf,
+		width = MAX (1, (int) (width * scale));
-			MAX (1, (int) (width * scale)), MAX (1, (int) (height * scale)),
+		height = MAX (1, (int) (height * scale));
-			GDK_INTERP_BILINEAR);
-		if (scaled)
-			pixbuf = scaled;
 	}
 
 	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 	url = gtk_xtext_entry_get_image_url (xtext, ent);
 	gtk_window_set_title (GTK_WINDOW (window), url ? url : _("Image"));
 	gtk_window_set_type_hint (GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_DIALOG);
-	gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+	gtk_window_set_default_size (GTK_WINDOW (window), width, height);
 
 	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (xtext));
 	if (GTK_IS_WINDOW (toplevel))
@@ -1908,7 +1928,10 @@ inline_image_show_viewer (GtkXText *xtext, textentry *ent)
 	}
 
 	eventbox = gtk_event_box_new ();
-	image = gtk_image_new_from_pixbuf (pixbuf);
+	image = gtk_drawing_area_new ();
+	g_object_set_data_full (G_OBJECT (image), "zoitechat-viewer-image",
+	                        g_object_ref (pixbuf), g_object_unref);
+	g_signal_connect (G_OBJECT (image), "draw", G_CALLBACK (image_viewer_draw), pixbuf);
 	gtk_container_add (GTK_CONTAINER (eventbox), image);
 	gtk_container_add (GTK_CONTAINER (window), eventbox);
 
@@ -1918,7 +1941,4 @@ inline_image_show_viewer (GtkXText *xtext, textentry *ent)
 							G_CALLBACK (image_viewer_button_press), window);
 
 	gtk_widget_show_all (window);
-
-	if (scaled)
-		g_object_unref (scaled);
 }

src/fe-gtk/joind.c

@@ -137,7 +137,6 @@ joind_show_dialog (server *serv)
 	gtk_window_set_position (GTK_WINDOW (dialog1), GTK_WIN_POS_CENTER_ON_PARENT);
 	gtk_window_set_transient_for (GTK_WINDOW(dialog1), GTK_WINDOW(serv->front_session->gui->window));
 	gtk_window_set_modal (GTK_WINDOW (dialog1), TRUE);
-	gtk_window_set_resizable (GTK_WINDOW (dialog1), FALSE);
 
 	dialog_vbox1 = gtk_dialog_get_content_area (GTK_DIALOG (dialog1));
 	gtk_widget_show (dialog_vbox1);

src/fe-gtk/maingui.c

@@ -2330,7 +2330,6 @@ mg_open_quit_dialog (gboolean minimize_button)
         gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
         gtk_window_set_title (GTK_WINDOW (dialog), _("Quit ZoiteChat?"));
         gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent_window));
-        gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
 
         dialog_vbox1 = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
         gtk_widget_show (dialog_vbox1);

src/fe-gtk/menu.c

@@ -1595,16 +1595,16 @@ menu_join (GtkWidget * wid, gpointer none)
 									NULL);
 	theme_manager_attach_window (dialog);
 	content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-	gtk_box_set_homogeneous (GTK_BOX (content_area), TRUE);
 	gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
-	hbox = gtkutil_box_new (GTK_ORIENTATION_HORIZONTAL, TRUE, 0);
+	hbox = gtkutil_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 6);
 
 	entry = gtk_entry_new ();
 	gtk_editable_set_editable (GTK_EDITABLE (entry), FALSE);	/* avoid auto-selection */
 	gtk_entry_set_text (GTK_ENTRY (entry), "#");
 	g_signal_connect (G_OBJECT (entry), "activate",
 						 	G_CALLBACK (menu_join_entry_cb), dialog);
-	gtk_box_pack_end (GTK_BOX (hbox), entry, 0, 0, 0);
+	gtk_widget_set_valign (entry, GTK_ALIGN_CENTER);
+	gtk_box_pack_end (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
 
 	label = gtk_label_new (_("Enter Channel to Join:"));
 	gtk_box_pack_end (GTK_BOX (hbox), label, 0, 0, 0);
@@ -1612,7 +1612,7 @@ menu_join (GtkWidget * wid, gpointer none)
 	g_signal_connect (G_OBJECT (dialog), "response",
 						   G_CALLBACK (menu_join_cb), entry);
 
-	gtk_container_add (GTK_CONTAINER (content_area), hbox);
+	gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0);
 
 	gtk_widget_show_all (dialog);
 

src/fe-gtk/meson.build

@@ -278,3 +278,10 @@ test('Emoji Font Tests', emoji_font_tests,
   protocol: 'tap',
   timeout: 120,
 )
+
+xtext_tests = executable('xtext_tests',
+  ['tests/test-xtext.c', '../common/hexcolor.c'],
+  include_directories: [config_h_include],
+  dependencies: [gtk_dep],
+)
+test('XText Tests', xtext_tests, protocol: 'tap', timeout: 120)

src/fe-gtk/notifygui.c

@@ -391,34 +391,39 @@ fe_notify_ask (char *nick, char *networks)
 	gtk_container_set_border_width (GTK_CONTAINER (table), 12);
 	gtk_grid_set_row_spacing (GTK_GRID (table), 3);
 	gtk_grid_set_column_spacing (GTK_GRID (table), 8);
-	gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), table);
+	gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+	                    table, TRUE, TRUE, 0);
 
 	label = gtk_label_new (msg);
-	gtkutil_grid_attach_defaults (table, label, 0, 1, 0, 1);
+	gtk_label_set_xalign (GTK_LABEL (label), 0.0f);
+	gtkutil_grid_attach (table, label, 0, 1, 0, 1, GTKUTIL_ATTACH_FILL, 0, 0, 0);
 
 	entry = gtk_entry_new ();
 	gtk_entry_set_text (GTK_ENTRY (entry), nick);
 	g_signal_connect (G_OBJECT (entry), "activate",
 						 	G_CALLBACK (notifygui_add_enter), dialog);
-	gtkutil_grid_attach_defaults (table, entry, 1, 2, 0, 1);
+	gtkutil_grid_attach (table, entry, 1, 2, 0, 1,
+	                     GTKUTIL_ATTACH_EXPAND | GTKUTIL_ATTACH_FILL, 0, 0, 0);
 
 	g_signal_connect (G_OBJECT (dialog), "response",
 						   G_CALLBACK (notifygui_add_cb), entry);
 
 	label = gtk_label_new (_("Notify on these networks:"));
-	gtkutil_grid_attach_defaults (table, label, 0, 1, 2, 3);
+	gtk_label_set_xalign (GTK_LABEL (label), 0.0f);
+	gtkutil_grid_attach (table, label, 0, 1, 2, 3, GTKUTIL_ATTACH_FILL, 0, 0, 0);
 
 	wid = gtk_entry_new ();
 	g_object_set_data (G_OBJECT (entry), "net", wid);
 	g_signal_connect (G_OBJECT (wid), "activate",
 						 	G_CALLBACK (notifygui_add_enter), dialog);
 	gtk_entry_set_text (GTK_ENTRY (wid), networks ? networks : "ALL");
-	gtkutil_grid_attach_defaults (table, wid, 1, 2, 2, 3);
+	gtkutil_grid_attach (table, wid, 1, 2, 2, 3,
+	                     GTKUTIL_ATTACH_EXPAND | GTKUTIL_ATTACH_FILL, 0, 0, 0);
 
 	label = gtk_label_new (NULL);
 	g_snprintf (buf, sizeof (buf), "<i><span size=\"smaller\">%s</span></i>", _("Comma separated list of networks is accepted."));
 	gtk_label_set_markup (GTK_LABEL (label), buf);
-	gtkutil_grid_attach_defaults (table, label, 1, 2, 3, 4);
+	gtkutil_grid_attach (table, label, 1, 2, 3, 4, GTKUTIL_ATTACH_FILL, 0, 0, 0);
 
 	gtk_widget_show_all (dialog);
 }

src/fe-gtk/servlistgui.c

@@ -2423,6 +2423,8 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)
 	GtkWidget *comboboxentry_charset;
 	GtkWidget *combobox_logintypes;
 	GtkWidget *hbox1;
+	GtkWidget *content_scroll;
+	GtkWidget *content_box;
 	GtkWidget *scrolledwindow2;
 	GtkWidget *scrolledwindow4;
 	GtkWidget *scrolledwindow5;
@@ -2449,7 +2451,9 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)
 	gtk_container_set_border_width (GTK_CONTAINER (editwindow), 4);
 	g_snprintf (buf, sizeof (buf), _("Edit %s - %s"), net->name, _(DISPLAY_NAME));
 	gtk_window_set_title (GTK_WINDOW (editwindow), buf);
-	gtk_window_set_default_size (GTK_WINDOW (editwindow), netedit_win_width, netedit_win_height);
+	gtk_window_set_default_size (GTK_WINDOW (editwindow),
+	                             netedit_win_width > 0 ? netedit_win_width : -1,
+	                             netedit_win_height > 0 ? netedit_win_height : -1);
 	gtk_window_set_transient_for (GTK_WINDOW (editwindow), GTK_WINDOW (parent));
 	gtk_window_set_modal (GTK_WINDOW (editwindow), TRUE);
 	gtk_window_set_type_hint (GTK_WINDOW (editwindow), GDK_WINDOW_TYPE_HINT_DIALOG);
@@ -2458,10 +2462,20 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)
 	vbox5 = gtkutil_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
 	gtk_container_add (GTK_CONTAINER (editwindow), vbox5);
 
+	/* Keep Close accessible on small screens, while the lists still receive
+	   all spare space when the complete form fits in the window. */
+	content_scroll = gtk_scrolled_window_new (NULL, NULL);
+	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (content_scroll),
+	                                GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+	gtk_scrolled_window_set_propagate_natural_width (GTK_SCROLLED_WINDOW (content_scroll), TRUE);
+	gtk_scrolled_window_set_propagate_natural_height (GTK_SCROLLED_WINDOW (content_scroll), TRUE);
+	gtk_box_pack_start (GTK_BOX (vbox5), content_scroll, TRUE, TRUE, 0);
+	content_box = gtkutil_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
+	gtk_container_add (GTK_CONTAINER (content_scroll), content_box);
 
 	/* Tabs and buttons */
 	hbox1 = gtkutil_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox5), hbox1, TRUE, TRUE, 4);
+	gtk_box_pack_start (GTK_BOX (content_box), hbox1, TRUE, TRUE, 4);
 
 	scrolledwindow2 = gtk_scrolled_window_new (NULL, NULL);
 	scrolledwindow4 = gtk_scrolled_window_new (NULL, NULL);
@@ -2599,7 +2613,7 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)
 
 	/* Checkboxes and entries */
 	table3 = gtkutil_grid_new (19, 2, FALSE);
-	gtk_box_pack_start (GTK_BOX (vbox5), table3, FALSE, FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (content_box), table3, FALSE, FALSE, 0);
 	gtk_grid_set_row_spacing (GTK_GRID (table3), 2);
 	gtk_grid_set_column_spacing (GTK_GRID (table3), 8);
 
@@ -2828,7 +2842,9 @@ servlist_open_networks (void)
 	gtk_container_set_border_width (GTK_CONTAINER (servlist), 4);
 	g_snprintf(buf, sizeof(buf), _("Network List - %s"), _(DISPLAY_NAME));
 	gtk_window_set_title (GTK_WINDOW (servlist), buf);
-	gtk_window_set_default_size (GTK_WINDOW (servlist), netlist_win_width, netlist_win_height);
+	gtk_window_set_default_size (GTK_WINDOW (servlist),
+	                             netlist_win_width > 0 ? netlist_win_width : -1,
+	                             netlist_win_height > 0 ? netlist_win_height : -1);
 	gtk_window_set_role (GTK_WINDOW (servlist), "servlist");
 	gtk_window_set_type_hint (GTK_WINDOW (servlist), GDK_WINDOW_TYPE_HINT_DIALOG);
 	if (current_sess)

src/fe-gtk/setup.c

@@ -1256,7 +1256,7 @@ setup_create_id_menu (GtkWidget *table, char *label, int row, char *dest)
 static void
 setup_create_menu (GtkWidget *table, int row, const setting *set)
 {
-        GtkWidget *wid, *cbox, *box;
+        GtkWidget *wid, *cbox;
         const char **text = (const char **)set->list;
         int i;
 
@@ -1277,9 +1277,7 @@ setup_create_menu (GtkWidget *table, int row, const setting *set)
         g_signal_connect (G_OBJECT (cbox), "changed",
                                                         G_CALLBACK (setup_menu_cb), (gpointer)set);
 
-        box = gtkutil_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
+        setup_table_attach (table, cbox, 3, 6, row, row + 1, TRUE, FALSE,
-        gtk_box_pack_start (GTK_BOX (box), cbox, 0, 0, 0);
-        setup_table_attach (table, box, 3, 4, row, row + 1, TRUE, FALSE,
                             SETUP_ALIGN_FILL, SETUP_ALIGN_FILL, 0, 0);
 }
 
@@ -1963,7 +1961,8 @@ setup_add_page (const char *title, GtkWidget *book, GtkWidget *tab)
 
         sw = GTK_SCROLLED_WINDOW(gtk_scrolled_window_new (NULL, NULL));
         gtk_scrolled_window_set_shadow_type (sw, GTK_SHADOW_IN);
-        gtk_scrolled_window_set_policy (sw, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+        gtk_scrolled_window_set_policy (sw, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+        gtk_scrolled_window_set_propagate_natural_width (sw, TRUE);
         gtk_container_add (GTK_CONTAINER (sw), vvbox);
 
         viewport = gtk_bin_get_child (GTK_BIN(sw));
@@ -2007,7 +2006,9 @@ setup_ensure_page_created (int page)
         }
 
         page_widget = setup_page_factories[page] (setup_page_settings[page]);
-        gtk_container_add (GTK_CONTAINER (container), page_widget);
+        /* Lazy pages must pass the notebook's spare space to their content,
+           particularly the independently scrolling Sounds list. */
+        gtk_box_pack_start (GTK_BOX (container), page_widget, TRUE, TRUE, 0);
         gtk_widget_show_all (container);
 }
 
@@ -2185,9 +2186,14 @@ setup_create_tree (GtkWidget *box, GtkWidget *book)
                                                             -1, _("Categories"), renderer, "text", 0, NULL);
         gtk_tree_view_expand_all (GTK_TREE_VIEW (tree));
 
-        frame = gtk_frame_new (NULL);
+        frame = gtk_scrolled_window_new (NULL, NULL);
+        gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (frame),
+                                       GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+        gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (frame), GTK_SHADOW_IN);
+        gtk_scrolled_window_set_propagate_natural_width (GTK_SCROLLED_WINDOW (frame), TRUE);
+        gtk_widget_set_vexpand (frame, TRUE);
         gtk_container_add (GTK_CONTAINER (frame), tree);
-        gtk_box_pack_start (GTK_BOX (box), frame, 0, 0, 0);
+        gtk_box_pack_start (GTK_BOX (box), frame, FALSE, TRUE, 0);
         gtk_box_reorder_child (GTK_BOX (box), frame, 0);
 
         if (sel_iter)

src/fe-gtk/tests/test-xtext.c

@@ -0,0 +1,597 @@
+/* XText regression tests. Distributed under GPL-2.0-or-later; see COPYING.
+ * Include the implementation to check layout/selection invariants without
+ * adding test-only symbols to the widget's public API. Application services
+ * are stubbed; GTK, Pango, Cairo and the widget itself are exercised normally. */
+#include "../xtext.c"
+#include <glib/gstdio.h>
+
+struct zoitechatprefs prefs;
+
+void emoji_font_apply (GtkWidget *widget) { }
+int url_last (int *start, int *end) { return 0; }
+gsize strftime_utf8 (char *dest, gsize size, const char *format, time_t stamp)
+{
+	return strftime (dest, size, format, localtime (&stamp));
+}
+int xtext_get_stamp_str (time_t stamp, char **out)
+{
+	*out = g_strdup ("[12:34] ");
+	return strlen (*out);
+}
+void theme_get_xtext_colors_for_widget (GtkWidget *widget, XTextColor *colors, size_t len)
+{
+	size_t i;
+	for (i = 0; i < len; i++)
+	{
+		colors[i].red = colors[i].green = colors[i].blue = 0.0;
+		colors[i].alpha = 1.0;
+	}
+	colors[XTEXT_FG].red = colors[XTEXT_FG].green = colors[XTEXT_FG].blue = 1.0;
+	colors[XTEXT_MARK_BG].blue = 1.0;
+	colors[XTEXT_MARK_FG] = colors[XTEXT_FG];
+	colors[XTEXT_MARKER].red = 1.0;
+}
+
+typedef struct { GtkWidget *window; GtkXText *xtext; } Fixture;
+
+static void drain_events (void)
+{
+	while (g_main_context_iteration (NULL, FALSE)) { }
+}
+
+static void fixture_setup (Fixture *f, gconstpointer data)
+{
+	XTextColor colors[XTEXT_COLS];
+	GtkWidget *scrolled = gtk_scrolled_window_new (NULL, NULL);
+	theme_get_xtext_colors_for_widget (NULL, colors, G_N_ELEMENTS (colors));
+	f->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+	gtk_window_set_default_size (GTK_WINDOW (f->window), 640, 360);
+	f->xtext = GTK_XTEXT (gtk_xtext_new (colors, TRUE));
+	g_object_ref (f->xtext);
+	gtk_container_add (GTK_CONTAINER (scrolled), GTK_WIDGET (f->xtext));
+	gtk_container_add (GTK_CONTAINER (f->window), scrolled);
+	g_assert_true (gtk_xtext_set_font (f->xtext, "monospace 12"));
+	gtk_widget_show_all (f->window);
+	drain_events ();
+}
+
+static void fixture_teardown (Fixture *f, gconstpointer data)
+{
+	gtk_widget_destroy (f->window);
+	g_object_unref (f->xtext);
+	drain_events ();
+	g_assert_null (image_pending_list);
+}
+
+static void append (Fixture *f, const char *text)
+{
+	gtk_xtext_append (f->xtext->buffer, (guchar *)text, -1, 1234);
+}
+
+static cairo_surface_t *snapshot (Fixture *f, gboolean partial)
+{
+	GtkWidget *widget = GTK_WIDGET (f->xtext);
+	int width = gtk_widget_get_allocated_width (widget);
+	int height = gtk_widget_get_allocated_height (widget);
+	cairo_surface_t *surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height);
+	cairo_t *cr = cairo_create (surface);
+	if (partial)
+	{
+		cairo_rectangle (cr, 0, f->xtext->fontsize, width, height - f->xtext->fontsize);
+		cairo_clip (cr);
+	}
+	gtk_widget_draw (widget, cr);
+	g_assert_cmpint (cairo_status (cr), ==, CAIRO_STATUS_SUCCESS);
+	cairo_destroy (cr);
+	cairo_surface_flush (surface);
+	return surface;
+}
+
+static void test_empty_and_bounded_append (Fixture *f, gconstpointer data)
+{
+	const guchar bytes[] = {'a', 'b', 'c'}; /* deliberately no terminating NUL */
+	append (f, "");
+	g_assert_cmpstr ((char *)f->xtext->buffer->text_last->str, ==, "");
+	g_assert_cmpint (f->xtext->buffer->text_last->subline_count, ==, 1);
+	append (f, "\n");
+	g_assert_cmpint (f->xtext->buffer->text_last->str_len, ==, 0);
+	gtk_xtext_append (f->xtext->buffer, (guchar *)bytes, sizeof (bytes), 1234);
+	g_assert_cmpstr ((char *)f->xtext->buffer->text_last->str, ==, "abc");
+	gtk_xtext_append_indent (f->xtext->buffer, (guchar *)"", 0, (guchar *)"", 0, 1234);
+	g_assert_cmpstr ((char *)f->xtext->buffer->text_last->str, ==, " ");
+}
+
+static void test_utf8_limits (Fixture *f, gconstpointer data)
+{
+	GString *text = g_string_new (NULL);
+	int i;
+	for (i = 0; i < 1500; i++) g_string_append (text, "猫");
+	gtk_xtext_append (f->xtext->buffer, (guchar *)text->str, text->len, 1234);
+	g_assert_cmpint (f->xtext->buffer->text_last->str_len, ==, 4095);
+	g_assert_true (g_utf8_validate ((char *)f->xtext->buffer->text_last->str, -1, NULL));
+	gtk_xtext_append_indent (f->xtext->buffer, (guchar *)text->str, text->len,
+		(guchar *)"猫", -1, 1234);
+	g_assert_cmpint (f->xtext->buffer->text_last->str_len, <=, 4095);
+	g_assert_true (g_utf8_validate ((char *)f->xtext->buffer->text_last->str, -1, NULL));
+	gtk_xtext_append (f->xtext->buffer, (guchar *)"hello 猫", 8, 1234);
+	g_assert_cmpstr ((char *)f->xtext->buffer->text_last->str, ==, "hello ");
+	gtk_xtext_append (f->xtext->buffer, (guchar *)"ok\xff" "bad", 6, 1234);
+	g_assert_cmpstr ((char *)f->xtext->buffer->text_last->str, ==, "ok");
+	g_string_free (text, TRUE);
+}
+
+static void test_null_empty_prefix (Fixture *f, gconstpointer data)
+{
+	xtext_buffer *buf = f->xtext->buffer;
+	/* PrintTextLine passes NULL/0 for indented server text without a tab. */
+	gtk_xtext_append_indent (buf, NULL, 0, (guchar *)"server notice", -1, 1234);
+	g_assert_cmpstr ((char *)buf->text_last->str, ==, " server notice");
+	g_assert_cmpint (buf->text_last->left_len, ==, 0);
+	g_assert_cmpint (buf->text_last->stamp, ==, 1234);
+	gtk_xtext_append_indent (buf, (guchar *)"nick", -1, NULL, 0, 1234);
+	g_assert_cmpstr ((char *)buf->text_last->str, ==, "nick ");
+	gtk_xtext_append_indent (buf, NULL, 0, NULL, 0, 1234);
+	g_assert_cmpstr ((char *)buf->text_last->str, ==, " ");
+	g_assert_cmpint (buf->num_lines, ==, 3);
+	cairo_surface_destroy (snapshot (f, FALSE));
+}
+
+static void test_wrapping (Fixture *f, gconstpointer data)
+{
+	xtext_buffer *buf = f->xtext->buffer;
+	textentry *ent;
+	int start = 0, i;
+	append (f, "猫猫猫猫猫猫猫猫猫猫");
+	ent = buf->text_last;
+	/* A character wider than the row must still be kept whole. */
+	buf->window_width = 3;
+	gtk_xtext_lines_taken (buf, ent);
+	g_assert_cmpint (ent->subline_count, ==, 10);
+	for (i = 0; i < ent->subline_count; i++)
+	{
+		int end = gtk_xtext_subline_end (ent, i);
+		g_assert_cmpint (end, >, start);
+		g_assert_true (g_utf8_validate ((char *)ent->str + start, end - start, NULL));
+		start = end;
+	}
+	buf->window_width = 120;
+	gtk_xtext_lines_taken (buf, ent);
+	g_assert_cmpint (ent->subline_count, >, 1);
+	buf->window_width = 640;
+	gtk_xtext_lines_taken (buf, ent);
+	g_assert_cmpint (ent->subline_count, ==, 1);
+}
+
+static void test_font_isolation (Fixture *f, gconstpointer data)
+{
+	Fixture second;
+	int original = gtk_xtext_text_width (f->xtext, (guchar *)"WWii hello", 10);
+	fixture_setup (&second, NULL);
+	g_assert_true (gtk_xtext_set_font (second.xtext, "sans 30"));
+	g_assert_cmpint (gtk_xtext_text_width (second.xtext, (guchar *)"WWii hello", 10), >, original);
+	g_assert_cmpint (gtk_xtext_text_width (f->xtext, (guchar *)"WWii hello", 10), ==, original);
+	fixture_teardown (&second, NULL);
+	g_assert_cmpint (gtk_xtext_text_width (f->xtext, (guchar *)"WWii hello", 10), ==, original);
+}
+
+static void test_wide_metrics (Fixture *f, gconstpointer data)
+{
+	char *text = g_strnfill (4000, 'W');
+	g_assert_true (gtk_xtext_set_font (f->xtext, "sans 40"));
+	append (f, text);
+	g_assert_cmpint (f->xtext->buffer->text_last->str_width, >, 65535);
+	g_assert_cmpint (f->xtext->buffer->text_last->subline_count, >, 1);
+	g_free (text);
+}
+
+static void test_formatting (Fixture *f, gconstpointer data)
+{
+	const char *formatted = "a\002bold\002 \035italic\035 \00304,02red\017 \037u\037 \036s\036 \026r\026";
+	char *plain;
+	GSList *runs = NULL;
+	int len;
+	plain = (char *)gtk_xtext_strip_color ((guchar *)formatted, strlen (formatted), NULL, &len, &runs, FALSE);
+	g_assert_cmpstr (plain, ==, "abold italic red u s r");
+	g_assert_cmpint (len, ==, strlen (plain));
+	g_assert_cmpint (((offlen_t *)runs->data)->off, ==, 0);
+	g_slist_free_full (runs, g_free);
+	g_free (plain);
+	plain = (char *)gtk_xtext_strip_color ((guchar *)"a\010secret\010b", 10, NULL, &len, NULL, TRUE);
+	g_assert_cmpstr (plain, ==, "ab");
+	g_free (plain);
+	append (f, formatted);
+	gtk_xtext_append_indent (f->xtext->buffer, (guchar *)"nick", -1, (guchar *)formatted, -1, 1234);
+	f->xtext->auto_indent = TRUE;
+	f->xtext->buffer->time_stamp = TRUE;
+	f->xtext->buffer->indent = 130;
+	gtk_xtext_recalc_widths (f->xtext->buffer, FALSE);
+	cairo_surface_destroy (snapshot (f, FALSE));
+	g_assert_cmpstr ((char *)f->xtext->buffer->text_last->str, ==,
+		"nick a\002bold\002 \035italic\035 \00304,02red\017 \037u\037 \036s\036 \026r\026");
+}
+
+static void select_entries (Fixture *f, textentry *start, textentry *end)
+{
+	textentry *ent;
+	for (ent = start; ent; ent = ent->next)
+	{
+		ent->mark_start = 0;
+		ent->mark_end = ent->str_len;
+		if (ent == end) break;
+	}
+	gtk_xtext_selection_render (f->xtext, start, end);
+	f->xtext->selection_buffer = f->xtext->buffer;
+}
+
+static void test_selection_and_clipboard (Fixture *f, gconstpointer data)
+{
+	char *selected;
+	int len;
+	append (f, "");
+	append (f, "\002bold\002 猫");
+	append (f, "last");
+	select_entries (f, f->xtext->buffer->text_first, f->xtext->buffer->text_last);
+	selected = gtk_xtext_selection_get_text (f->xtext, &len);
+	g_assert_cmpstr (selected, ==, "\nbold 猫\nlast");
+	g_assert_cmpint (len, ==, strlen (selected));
+	g_free (selected);
+	f->xtext->color_paste = TRUE;
+	f->xtext->mark_stamp = TRUE;
+	selected = gtk_xtext_selection_get_text (f->xtext, &len);
+	g_assert_cmpstr (selected, ==, "\n[12:34] \002bold\002 猫\n[12:34] last");
+	g_free (selected);
+	f->xtext->color_paste = f->xtext->mark_stamp = FALSE;
+	gtk_xtext_copy_selection (f->xtext);
+	selected = gtk_clipboard_wait_for_text (gtk_widget_get_clipboard (GTK_WIDGET (f->xtext), GDK_SELECTION_CLIPBOARD));
+	g_assert_cmpstr (selected, ==, "\nbold 猫\nlast");
+	g_free (selected);
+	selected = gtk_clipboard_wait_for_text (gtk_widget_get_clipboard (GTK_WIDGET (f->xtext), GDK_SELECTION_PRIMARY));
+	g_assert_cmpstr (selected, ==, "\nbold 猫\nlast");
+	g_free (selected);
+	gtk_xtext_unselect (f->xtext);
+	g_assert_false (gtk_xtext_is_selecting (f->xtext));
+}
+
+static void test_search (Fixture *f, gconstpointer data)
+{
+	GError *error = NULL;
+	textentry *first;
+	xtext_buffer *buf = f->xtext->buffer;
+	append (f, "one \002needle\002 then NEEDLE");
+	first = buf->text_last;
+	append (f, "second needle");
+	g_assert_true (gtk_xtext_search (f->xtext, "needle", highlight, &error) == first);
+	g_assert_no_error (error);
+	g_assert_cmpint (g_list_length (first->marks), ==, 2);
+	g_assert_true (gtk_xtext_search (f->xtext, "needle", highlight, &error) == first);
+	g_assert_true (gtk_xtext_search (f->xtext, "needle", highlight, &error) == buf->text_last);
+	gtk_xtext_search (f->xtext, "", 0, &error);
+	g_assert_null (buf->search_found);
+	g_assert_true (gtk_xtext_search (f->xtext, "needle", backward | case_match, &error) == buf->text_last);
+	gtk_xtext_search (f->xtext, "n[a-z]+", regexp | case_match, &error);
+	g_assert_no_error (error);
+	g_assert_nonnull (buf->search_re);
+	gtk_xtext_search (f->xtext, "[", regexp, &error);
+	g_assert_error (error, G_REGEX_ERROR, G_REGEX_ERROR_UNTERMINATED_CHARACTER_CLASS);
+	g_clear_error (&error);
+	/* A no-match search must also release its regex/text on clear. */
+	gtk_xtext_search (f->xtext, "nomatch", regexp, &error);
+	g_assert_null (buf->search_found);
+	gtk_xtext_clear (buf, 0);
+	g_assert_null (buf->search_re);
+	g_assert_null (buf->search_text);
+}
+
+static void test_follow_search (Fixture *f, gconstpointer data)
+{
+	xtext_buffer *buf = f->xtext->buffer;
+	append (f, "match first");
+	gtk_xtext_search (f->xtext, "match", 0, NULL);
+	append (f, "match second");
+	gtk_xtext_search (f->xtext, NULL, follow, NULL);
+	g_assert_cmpint (g_list_length (buf->search_found), ==, 2);
+	GList *current = buf->curmark;
+	gtk_xtext_search (f->xtext, NULL, 0, NULL);
+	gtk_xtext_search (f->xtext, NULL, follow, NULL);
+	g_assert_cmpint (g_list_length (buf->search_found), ==, 2);
+	g_assert_true (buf->curmark == current);
+	append (f, "match third");
+	g_assert_cmpint (g_list_length (buf->search_found), ==, 3);
+}
+
+static void test_search_unicode_offsets (Fixture *f, gconstpointer data)
+{
+	xtext_buffer *buf = f->xtext->buffer;
+	offsets_t mark;
+	append (f, "İ \002NEEDLE\002 Straße");
+	gtk_xtext_search (f->xtext, "needle", 0, NULL);
+	mark.u = GPOINTER_TO_UINT (buf->text_first->marks->data);
+	g_assert_cmpint (mark.o.start, ==, 4);
+	/* The established color-offset mapping includes the closing control. */
+	g_assert_cmpint (mark.o.end, ==, 11);
+	gtk_xtext_search (f->xtext, "ss", 0, NULL);
+	mark.u = GPOINTER_TO_UINT (buf->text_first->marks->data);
+	g_assert_cmpint (mark.o.start, ==, 16);
+	g_assert_cmpint (mark.o.end, ==, 18);
+	gtk_xtext_clear (buf, 0);
+	append (f, "ſ needle");
+	gtk_xtext_search (f->xtext, "needle", 0, NULL);
+	mark.u = GPOINTER_TO_UINT (buf->text_first->marks->data);
+	g_assert_cmpint (mark.o.start, ==, 3);
+	g_assert_cmpint (mark.o.end, ==, 9);
+}
+
+static void test_rawlog_hidden_text (Fixture *f, gconstpointer data)
+{
+	int hidden, visible;
+	append (f, "a\010secret\010b");
+	hidden = f->xtext->buffer->text_last->str_width;
+	f->xtext->ignore_hidden = TRUE;
+	gtk_xtext_recalc_widths (f->xtext->buffer, TRUE);
+	visible = f->xtext->buffer->text_last->str_width;
+	g_assert_cmpint (visible, >, hidden);
+	g_assert_cmpint (visible, ==, gtk_xtext_text_width (f->xtext, (guchar *)"asecretb", 8));
+}
+
+static void test_save (Fixture *f, gconstpointer data)
+{
+	char *path, *saved;
+	GError *error = NULL;
+	int fd = g_file_open_tmp ("zoitechat-xtext-XXXXXX", &path, &error);
+	g_assert_no_error (error);
+	append (f, "\002bold\002 猫");
+	append (f, "");
+	append (f, "last");
+	gtk_xtext_save (f->xtext, fd);
+	close (fd);
+	g_assert_true (g_file_get_contents (path, &saved, NULL, &error));
+	g_assert_no_error (error);
+	g_assert_cmpstr (saved, ==, "bold 猫\n\nlast\n");
+	g_free (saved);
+	g_unlink (path);
+	g_free (path);
+}
+
+static void test_scrollable_ownership (Fixture *f, gconstpointer data)
+{
+	GtkAdjustment *horizontal = GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, 1, 1, 1, 1));
+	GtkAdjustment *vertical = GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, 100, 1, 10, 10));
+	GtkAdjustment *old = g_object_ref (f->xtext->adj);
+	g_object_set (f->xtext, "hadjustment", horizontal, "vadjustment", vertical, NULL);
+	g_assert_false (g_object_is_floating (horizontal));
+	g_assert_false (g_object_is_floating (vertical));
+	g_assert_true (f->xtext->hadj == horizontal);
+	g_assert_true (f->xtext->adj == vertical);
+	/* A replaced adjustment must no longer call into the widget. */
+	g_assert_cmpuint (g_signal_handler_find (old, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, f->xtext), ==, 0);
+	g_signal_emit_by_name (f->xtext, "set-scroll-adjustments", horizontal, vertical);
+	g_assert_true (f->xtext->adj == vertical);
+	g_object_set (f->xtext, "hadjustment", NULL, "vadjustment", NULL, NULL);
+	g_assert_true (GTK_IS_ADJUSTMENT (f->xtext->hadj));
+	g_assert_true (GTK_IS_ADJUSTMENT (f->xtext->adj));
+	g_object_unref (old);
+}
+
+static void test_clear_and_marker (Fixture *f, gconstpointer data)
+{
+	xtext_buffer *buf = f->xtext->buffer;
+	append (f, "first"); append (f, "second"); append (f, "third");
+	buf->marker_pos = buf->text_first;
+	buf->marker_state = MARKER_IS_SET;
+	gtk_xtext_clear (buf, 1);
+	g_assert_cmpstr ((char *)buf->text_first->str, ==, "second");
+	g_assert_cmpint (buf->marker_state, ==, MARKER_RESET_BY_CLEAR);
+	gtk_xtext_clear (buf, -1);
+	g_assert_cmpstr ((char *)buf->text_last->str, ==, "second");
+	select_entries (f, buf->text_first, buf->text_last);
+	f->xtext->hilight_ent = buf->text_first;
+	gtk_xtext_clear (buf, 0);
+	g_assert_null (f->xtext->hilight_ent);
+	g_assert_null (buf->pagetop_ent);
+	g_assert_null (buf->last_ent_start);
+	g_assert_cmpint (buf->num_lines, ==, 0);
+	g_assert_true (gtk_xtext_is_empty (buf));
+	append (f, "after clear");
+	g_assert_cmpint (buf->num_lines, ==, 1);
+}
+
+static void test_scrollback_limit (Fixture *f, gconstpointer data)
+{
+	int i;
+	xtext_buffer *buf = f->xtext->buffer;
+	gtk_xtext_set_max_lines (f->xtext, 10);
+	for (i = 0; i < 100; i++) append (f, "line");
+	g_assert_cmpint (buf->num_lines, ==, 10);
+	g_assert_null (buf->text_first->prev);
+	g_assert_null (buf->text_last->next);
+	g_assert_cmpfloat (gtk_adjustment_get_value (f->xtext->adj), >=, 0);
+}
+
+static void test_follow_trim_oversized_entry (Fixture *f, gconstpointer data)
+{
+	char *long_text = g_strnfill (4000, 'W');
+	gtk_xtext_set_max_lines (f->xtext, 3);
+	append (f, "needle");
+	gtk_xtext_search (f->xtext, "W", follow, NULL);
+	gtk_xtext_clear (f->xtext->buffer, 1);
+	append (f, long_text);
+	g_assert_true (gtk_xtext_is_empty (f->xtext->buffer));
+	g_assert_null (f->xtext->buffer->search_found);
+	g_free (long_text);
+	append (f, "after oversized");
+	gtk_xtext_clear (f->xtext->buffer, G_MININT);
+	g_assert_true (gtk_xtext_is_empty (f->xtext->buffer));
+}
+
+static void test_stress (Fixture *f, gconstpointer data)
+{
+	static const char *tokens[] = {"text ", "猫", "😀", "\002bold\002", "\00304,02red\017", "\010hidden\010", "\037u\037", "\036s\036"};
+	GRand *random = g_rand_new_with_seed (0x78746578);
+	xtext_buffer *buf = f->xtext->buffer;
+	int i;
+	gtk_xtext_set_max_lines (f->xtext, 80);
+	for (i = 0; i < 2000; i++)
+	{
+		GString *text = g_string_new (NULL);
+		textentry *ent;
+		int j, lines = 0;
+		for (j = 0; j < 30; j++)
+			g_string_append (text, tokens[g_rand_int_range (random, 0, G_N_ELEMENTS (tokens))]);
+		if (i % 2)
+			gtk_xtext_append_indent (buf, (guchar *)"nick", -1, (guchar *)text->str, text->len, 1234);
+		else
+			gtk_xtext_append (buf, (guchar *)text->str, text->len, 1234);
+		g_string_free (text, TRUE);
+		if (i % 29 == 0) gtk_xtext_search (f->xtext, "text", follow | highlight, NULL);
+		if (i % 31 == 0) gtk_xtext_clear (buf, 1);
+		if (i % 37 == 0) gtk_xtext_clear (buf, -1);
+		if (i % 101 == 0) gtk_xtext_clear (buf, 0);
+		for (ent = buf->text_first; ent; ent = ent->next)
+		{
+			g_assert_true (g_utf8_validate ((char *)ent->str, ent->str_len, NULL));
+			g_assert_cmpint (ent->subline_count, >, 0);
+			lines += ent->subline_count;
+		}
+		g_assert_cmpint (buf->num_lines, ==, lines);
+		if (i % 43 == 0) cairo_surface_destroy (snapshot (f, FALSE));
+	}
+	g_rand_free (random);
+}
+
+static void test_buffers (Fixture *f, gconstpointer data)
+{
+	xtext_buffer *original = f->xtext->buffer;
+	xtext_buffer *second = gtk_xtext_buffer_new (f->xtext);
+	append (f, "original");
+	gtk_xtext_append (second, (guchar *)"alternate", -1, 1234);
+	gtk_xtext_buffer_show (f->xtext, second, TRUE);
+	g_assert_true (f->xtext->buffer == second);
+	cairo_surface_destroy (snapshot (f, FALSE));
+	gtk_xtext_buffer_show (f->xtext, original, TRUE);
+	g_assert_cmpstr ((char *)f->xtext->buffer->text_first->str, ==, "original");
+	gtk_xtext_buffer_free (second);
+}
+
+static void test_partial_draw_after_scroll (Fixture *f, gconstpointer data)
+{
+	cairo_surface_t *partial, *full;
+	int i, stride, height, y;
+	for (i = 0; i < 80; i++)
+	{
+		char *line = g_strdup_printf ("line %d — 猫 \002bold\002", i);
+		append (f, line);
+		g_free (line);
+	}
+	cairo_surface_destroy (snapshot (f, FALSE));
+	gtk_adjustment_set_value (f->xtext->adj, 12.5);
+	partial = snapshot (f, TRUE);
+	full = snapshot (f, FALSE);
+	stride = cairo_image_surface_get_stride (full);
+	height = cairo_image_surface_get_height (full);
+	for (y = f->xtext->fontsize; y < height; y++)
+		g_assert_cmpmem (cairo_image_surface_get_data (partial) + y * stride, stride,
+			cairo_image_surface_get_data (full) + y * stride, stride);
+	cairo_surface_destroy (partial);
+	cairo_surface_destroy (full);
+}
+
+static void test_image_lifecycle (Fixture *f, gconstpointer data)
+{
+	GdkPixbuf *image = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, 800, 600);
+	xtext_buffer *buf = f->xtext->buffer;
+	textentry *ent;
+	guint handle;
+	int before;
+	gdk_pixbuf_fill (image, 0xff0000ff);
+	append (f, "image");
+	ent = buf->text_last;
+	before = buf->num_lines;
+	handle = gtk_xtext_image_load_begin (f->xtext, ent, "https://example.invalid/image.png");
+	g_assert_cmpuint (handle, !=, 0);
+	g_assert_cmpuint (gtk_xtext_image_load_begin (f->xtext, ent, "duplicate"), ==, 0);
+	g_assert_true (gtk_xtext_image_load_finish (handle, image));
+	g_assert_cmpint (buf->num_lines, >, before);
+	g_assert_true (gtk_xtext_entry_has_image (f->xtext, ent));
+	g_assert_cmpint (gdk_pixbuf_get_width (ent->image), <=, XTEXT_IMAGE_MAX_WIDTH);
+	g_assert_true (gtk_xtext_entry_get_full_image (f->xtext, ent) == image);
+	cairo_surface_destroy (snapshot (f, FALSE));
+	g_assert_true (gtk_xtext_image_remove (f->xtext, ent));
+	g_assert_cmpint (buf->num_lines, ==, before);
+	handle = gtk_xtext_image_load_begin (f->xtext, ent, "late");
+	gtk_xtext_clear (buf, 0);
+	g_assert_false (gtk_xtext_image_load_finish (handle, image));
+	g_assert_false (gtk_xtext_entry_has_image (f->xtext, ent));
+	g_assert_null (gtk_xtext_entry_get_full_image (f->xtext, ent));
+	g_object_unref (image);
+}
+
+static void test_background (Fixture *f, gconstpointer data)
+{
+	cairo_surface_t *background = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 32, 32);
+	cairo_t *cr = cairo_create (background);
+	cairo_set_source_rgb (cr, 0.2, 0.3, 0.4);
+	cairo_paint (cr);
+	cairo_destroy (cr);
+	gtk_xtext_set_background (f->xtext, background);
+	cairo_surface_destroy (background);
+	gtk_xtext_set_background (f->xtext, f->xtext->background_surface);
+	append (f, "background text");
+	cairo_surface_destroy (snapshot (f, FALSE));
+	gtk_xtext_set_background (f->xtext, NULL);
+	cairo_surface_destroy (snapshot (f, FALSE));
+}
+
+static void test_destroy_pending_sources (Fixture *f, gconstpointer data)
+{
+	guint image;
+	append (f, "pending");
+	image = gtk_xtext_image_load_begin (f->xtext, f->xtext->buffer->text_last, "late");
+	f->xtext->io_tag = g_timeout_add (10000, gtk_xtext_adjustment_timeout, f->xtext);
+	f->xtext->add_io_tag = g_timeout_add (10000, gtk_xtext_render_page_timeout, f->xtext);
+	f->xtext->scroll_tag = g_timeout_add (10000, gtk_xtext_scrollup_timeout, f->xtext);
+	gtk_widget_destroy (f->window);
+	g_assert_cmpint (f->xtext->io_tag, ==, 0);
+	g_assert_cmpint (f->xtext->add_io_tag, ==, 0);
+	g_assert_cmpint (f->xtext->scroll_tag, ==, 0);
+	g_assert_false (gtk_xtext_image_load_finish (image, NULL));
+	/* GtkWidget destruction must be safe if GObject dispose runs again. */
+	g_object_run_dispose (G_OBJECT (f->xtext));
+	f->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+}
+
+int main (int argc, char **argv)
+{
+	g_test_init (&argc, &argv, NULL);
+	if (!gtk_init_check (&argc, &argv))
+	{
+		g_test_message ("GTK display unavailable; run under Xvfb for widget coverage");
+		return 77;
+	}
+	prefs.hex_gui_mouse_scroll_speed = 10;
+#define ADD(name, function) g_test_add ("/xtext/" name, Fixture, NULL, fixture_setup, function, fixture_teardown)
+	ADD ("append/empty-bounded", test_empty_and_bounded_append);
+	ADD ("append/utf8-limits", test_utf8_limits);
+	ADD ("append/null-empty-prefix", test_null_empty_prefix);
+	ADD ("layout/wrapping", test_wrapping);
+	ADD ("layout/font-isolation", test_font_isolation);
+	ADD ("layout/wide-metrics", test_wide_metrics);
+	ADD ("render/formatting-timestamps", test_formatting);
+	ADD ("selection/clipboard", test_selection_and_clipboard);
+	ADD ("search/navigation-regex-clear", test_search);
+	ADD ("search/follow", test_follow_search);
+	ADD ("search/unicode-offsets", test_search_unicode_offsets);
+	ADD ("render/rawlog-hidden", test_rawlog_hidden_text);
+	ADD ("buffer/save", test_save);
+	ADD ("lifecycle/scrollable-ownership", test_scrollable_ownership);
+	ADD ("buffer/clear-marker", test_clear_and_marker);
+	ADD ("buffer/scrollback-limit", test_scrollback_limit);
+	ADD ("buffer/follow-trim-oversized", test_follow_trim_oversized_entry);
+	ADD ("buffer/stress", test_stress);
+	ADD ("buffer/switch", test_buffers);
+	ADD ("render/partial-scroll", test_partial_draw_after_scroll);
+	ADD ("images/lifecycle", test_image_lifecycle);
+	ADD ("render/background", test_background);
+	ADD ("lifecycle/pending-sources", test_destroy_pending_sources);
+#undef ADD
+	return g_test_run ();
+}

src/fe-gtk/textgui.c

@@ -400,7 +400,6 @@ pevent_treeview_new (GtkWidget *box)
 	scroll = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scroll), GTK_SHADOW_IN);
-	gtk_widget_set_size_request (GTK_WIDGET (scroll), -1, 250);
 
 	store = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT);
 	g_return_val_if_fail (store != NULL, NULL);
@@ -437,7 +436,7 @@ pevent_treeview_new (GtkWidget *box)
 	gtk_tree_view_column_set_min_width (col, 100);
 
 	gtk_container_add (GTK_CONTAINER (scroll), view);
-	gtk_container_add (GTK_CONTAINER (box), scroll);
+	gtk_paned_pack1 (GTK_PANED (box), scroll, TRUE, FALSE);
 
 	return view;
 }
@@ -481,7 +480,7 @@ pevent_hlist_treeview_new (GtkWidget *box)
 	gtk_tree_view_column_set_sizing (col, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
 
 	gtk_container_add (GTK_CONTAINER (scroll), view);
-	gtk_container_add (GTK_CONTAINER (box), scroll);
+	gtk_paned_pack2 (GTK_PANED (box), scroll, TRUE, FALSE);
 
 	return view;
 }
@@ -489,7 +488,7 @@ pevent_hlist_treeview_new (GtkWidget *box)
 void
 pevent_dialog_show ()
 {
-	GtkWidget *vbox, *hbox, *wid, *pane;
+	GtkWidget *vbox, *hbox, *wid, *pane, *preview_pane;
 	XTextColor xtext_palette[XTEXT_COLS];
 
 	if (pevent_dialog)
@@ -503,8 +502,12 @@ pevent_dialog_show ()
 											 TRUE, FALSE, pevent_dialog_close, NULL,
 											 600, 455, &vbox, 0);
 
+	preview_pane = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
+	gtk_box_pack_start (GTK_BOX (vbox), preview_pane, TRUE, TRUE, 0);
 	pane = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
-	gtk_box_pack_start (GTK_BOX (vbox), pane, TRUE, TRUE, 0);
+	gtk_paned_pack1 (GTK_PANED (preview_pane), pane, TRUE, FALSE);
+	gtk_paned_set_position (GTK_PANED (pane), 220);
+	gtk_paned_set_position (GTK_PANED (preview_pane), 330);
 	
 	pevent_dialog_list = pevent_treeview_new (pane);
 	pevent_dialog_fill (pevent_dialog_list);
@@ -513,12 +516,12 @@ pevent_dialog_show ()
 
 	wid = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (wid), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
-	gtk_box_pack_start (GTK_BOX (vbox), wid, FALSE, TRUE, 0);
+	gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (wid), 75);
+	gtk_paned_pack2 (GTK_PANED (preview_pane), wid, TRUE, FALSE);
 
 	theme_get_xtext_colors_for_widget (wid, xtext_palette, XTEXT_COLS);
 	pevent_dialog_twid = gtk_xtext_new (xtext_palette, 0);
 	gtk_widget_set_sensitive (pevent_dialog_twid, FALSE);
-	gtk_widget_set_size_request (pevent_dialog_twid, -1, 75);
 	gtk_container_add (GTK_CONTAINER (wid), pevent_dialog_twid);
 	gtk_xtext_set_font (GTK_XTEXT (pevent_dialog_twid), prefs.hex_text_font);
 	g_object_set_data (G_OBJECT (pevent_dialog), "xtext", pevent_dialog_twid);

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

@@ -1911,6 +1911,7 @@ theme_preferences_create_page (GtkWindow *parent,
                                          G_TYPE_STRING,
                                          G_TYPE_INT);
         ui->gtk3_combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (gtk3_store));
+        gtk_widget_set_hexpand (ui->gtk3_combo, TRUE);
         g_object_unref (gtk3_store);
         renderer = gtk_cell_renderer_text_new ();
         gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (ui->gtk3_combo), renderer, TRUE);

src/fe-gtk/xtext.h

@@ -38,6 +38,7 @@ GType gtk_xtext_get_type (void);
 
 #define ATTR_BOLD				'\002'
 #define ATTR_COLOR			'\003'
+#define ATTR_HEXCOLOR		'\004'
 #define ATTR_BLINK			'\006'
 #define ATTR_BEEP				'\007'
 #define ATTR_HIDDEN			'\010'
@@ -57,6 +58,8 @@ GType gtk_xtext_get_type (void);
 #define XTEXT_BG 102
 #define XTEXT_MARKER 103	/* for marker line */
 #define XTEXT_MAX_COLOR 98
+#define XTEXT_HEX_FG 200	/* not palette slots: colors from \004RRGGBB */
+#define XTEXT_HEX_BG 201
 typedef struct textentry textentry;
 
 /*
@@ -181,6 +184,8 @@ struct _GtkXText
 
 	int col_fore;
 	int col_back;
+	XTextColor hex_fg;
+	XTextColor hex_bg;
 
 	int depth;						  /* gdk window depth */