Add an xC relay protocol analyzer

To that effect, bump liberty and the xC relay protocol version.
Relay events have been reordered to improve forward compatibility.

Also prevent use-after-free when serialization fails.

xP now slightly throttles activity notifications,
and indicates when there are unacknowledged commands.

CMakeLists.txt

@@ -210,6 +210,11 @@ if (BUILD_TESTING)
 	add_test (NAME custom-static-analysis
 		COMMAND ${PROJECT_SOURCE_DIR}/test-static)
 endif ()
+option (BUILD_TESTING_WDYE "Build the integration test" OFF)
+if (BUILD_TESTING_WDYE)
+	add_subdirectory (liberty/tools/wdye)
+	add_test (NAME integration COMMAND wdye "${PROJECT_SOURCE_DIR}/test.lua")
+endif ()
 
 # Various clang-based diagnostics, loads of fake positives and spam
 file (GLOB clang_tidy_sources *.c)

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014 - 2024, Přemysl Eric Janouch <p@janouch.name>
+Copyright (c) 2014 - 2025, Přemysl Eric Janouch <p@janouch.name>
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted.

NEWS

@@ -1,3 +1,30 @@
+Unreleased
+
+ * xC: added more characters as nickname delimiters,
+   so that @nick works as a highlight
+
+ * xC: prevented rare crashes in relay code
+
+ * xP: added a network lag indicator to the user interface
+
+ * Bumped relay protocol version
+
+
+2.1.0 (2024-12-19) "Bunnyrific"
+
+ * xC: fixed a crash when the channel topic had too many formatting items
+
+ * xC: fixed keyboard EOF behaviour with Readline >= 8.0
+
+ * xC: made it possible to stream commands into the binary
+
+ * xM/xW: various bugfixes
+
+ * Added a Fyne frontend for xC called xA
+
+ * Added a Qt Widgets frontend for xC called xT
+
+
 2.0.0 (2024-07-28) "Perfect Is the Enemy of Good"
 
  * xD: now using SHA-256 for client certificate fingerprints
@@ -16,7 +43,7 @@
 
  * xC: replaced behaviour.save_on_quit with general.autosave
 
- * xC: the server *.command configuration option now supports multiple lines
+ * xC: the servers.*.command configuration option now supports multiple lines
 
  * xC: improved pager integration capabilities
 

README.adoc

@@ -2,9 +2,9 @@ xK
 ==
 
 'xK' (chat kit) is an IRC software suite consisting of a daemon, bot, notifier,
-terminal client, and web/Windows/macOS frontends for the client.  It's all
-you're ever going to need for chatting, so long as you can make do with slightly
-minimalist software.
+terminal client, and web/Windows/macOS/Linux/FreeBSD/Android/iOS frontends
+for the client.  It's all you're ever going to need for chatting, so long as
+you can make do with slightly minimalist software.
 
 They're all lean on dependencies, and offer a maximally permissive licence.
 
@@ -33,6 +33,11 @@ including link:xC.adoc#_key_bindings[keyboard shortcuts].
 
 image::xP.webp[align="center"]
 
+xA, xT, xW, xM
+--------------
+Fyne, Qt Widgets, Win32, Cocoa frontends for 'xC'.
+Using them is not recommended.
+
 xD
 --
 The IRC daemon.  It is designed for use as a regular user application rather
@@ -142,6 +147,18 @@ For remote use, it's recommended to put 'xP' behind a reverse proxy, with TLS,
 and some form of HTTP authentication.  Pass the external URL of the WebSocket
 endpoint as the third command line argument in this case.
 
+xA
+~~
+The Fyne frontend supports all of Linux, FreeBSD, Windows, macOS, Android, and
+iOS natively, albeit somewhat poorly.  Only use `fyne` or `fyne-cross` after
+running `make generate` first.
+
+xT
+~~
+The Qt Widgets frontend is a separate CMake subproject.  It generally supports
+all desktop operating systems.  To avoid having to specify the relay address
+each time you run it, pass it on the command line.
+
 xW
 ~~
 The Win32 frontend is a separate CMake subproject that should be compiled

liberty

@@ -1 +1 @@
-Subproject commit f04cc2c61e1a00db4d1af1bb55ca7e20b9c3db23
+Subproject commit 31ae40085206dc365a15fd6e9d13978e392f8b35

test

@@ -1,52 +0,0 @@
-#!/usr/bin/expect -f
-# Very basic end-to-end testing for CI
-set tempdir [exec mktemp -d]
-set ::env(XDG_CONFIG_HOME) $tempdir
-
-# Run the daemon to test against
-system ./xD --write-default-cfg
-spawn ./xD -d
-
-# 10 seconds is a bit too much
-set timeout 5
-
-spawn ./xC
-
-# Fuck this Tcl shit, I want the exit code
-expect_after {
-	eof {
-		puts ""
-		puts "Child exited prematurely"
-		exit 1
-	}
-}
-
-# Connect to the daemon
-send "/server add localhost\n"
-expect "]"
-send "/set servers.localhost.addresses = \"localhost\"\n"
-expect "Option changed"
-send "/disconnect\n"
-expect "]"
-send "/connect\n"
-expect "Welcome to"
-
-# Try some chatting
-send "/join #test\n"
-expect "has joined"
-send "Hello\n"
-expect "Hello"
-
-# Attributes
-send "\x1bmbBold text! \x1bmc0,5And colors.\n"
-expect "]"
-
-# Try basic commands
-send "/set\n"
-expect "]"
-send "/help\n"
-expect "]"
-
-# Quit
-send "/quit\n"
-expect "Shutting down"

test.lua

@@ -0,0 +1,72 @@
+#!/usr/bin/env wdye
+-- Very basic end-to-end testing for CI
+function exec (...)
+	local p = wdye.spawn(...)
+	local out = wdye.expect(p:eof {function (p) return p[0] end})
+	if not out then
+		error "exec() timeout"
+	end
+
+	local status = p:wait()
+	if status ~= 0 then
+		io.write(out, "\n")
+		error("exit status " .. status)
+	end
+	return out:gsub("%s+$", "")
+end
+
+local temp = exec {"mktemp", "-d"}
+local atexit = {}
+setmetatable(atexit, {__gc = function () exec {"rm", "-rf", "--", temp} end})
+
+local env = {XDG_CONFIG_HOME=temp, TERM="xterm"}
+exec {"./xD", "--write-default-cfg", environ=env}
+
+-- Run the daemon to test against (assuming the default port 6667)
+local xD = wdye.spawn {"./xD", "-d", environ=env}
+local xC = wdye.spawn {"./xC", environ=env}
+
+function send (...) xC:send(...) end
+function expect (string)
+	wdye.expect(xC:exact {string},
+		wdye.timeout {5, function (p) error "xC timeout" end},
+		xC:eof {function (p) error "xC exited prematurely" end})
+end
+
+-- Connect to the daemon
+send "/server add localhost\n"
+expect "]"
+send "/set servers.localhost.addresses = \"localhost\"\n"
+expect "Option changed"
+send "/disconnect\n"
+expect "]"
+send "/connect\n"
+expect "Welcome to"
+
+-- Try some chatting
+send "/join #test\n"
+expect "has joined"
+send "Hello\n"
+expect "Hello"
+
+-- Attributes
+send "\x1bmbBold text! \x1bmc0,5And colors.\n"
+expect "]"
+
+-- Try basic commands
+send "/set\n"
+expect "]"
+send "/help\n"
+expect "]"
+
+-- Quit
+send "/quit\n"
+expect "Shutting down"
+
+local s1 = xC:wait()
+assert(s1 == 0, "xC exited abnormally: " .. s1)
+
+-- Send SIGINT (^C)
+xD:send "\003"
+local s2 = xD:wait()
+assert(s2 == 0, "xD exited abnormally: " .. s2)

xA/.gitignore

@@ -0,0 +1,5 @@
+/xA
+/proto.go
+/FyneApp.toml
+/*.png
+/beep.raw

xA/Makefile

@@ -0,0 +1,36 @@
+.POSIX:
+.SUFFIXES:
+.SUFFIXES: .png .svg
+AWK = env LC_ALL=C awk
+
+tools = ../liberty/tools
+generated = FyneApp.toml xA.png xA-highlighted.png beep.raw proto.go
+outputs = xA $(generated)
+all: $(outputs)
+generate: $(generated)
+
+FyneApp.toml: ../xK-version
+	printf "\
+	[Details]\n\
+	Icon = 'xA.png'\n\
+	Name = 'xA'\n\
+	ID = 'name.janouch.xA'\n\
+	Version = '$$(cat ../xK-version)'\n\
+	Build = 1\n\
+	\n\
+	[LinuxAndBSD]\n\
+	GenericName = 'IRC Client'\n\
+	Categories = ['Network', 'Chat', 'IRCClient']\n" > $@
+.svg.png:
+	rsvg-convert --output=$@ -- $<
+beep.raw:
+	sox -Dr 44100 -c 1 -e signed-integer -b 16 -L -n $@ \
+		synth 0.1 0 25 triangle 800 vol 0.5 fade t 0 -0 0.005 pad 0 0.05
+proto.go: $(tools)/lxdrgen.awk $(tools)/lxdrgen-go.awk ../xC.lxdr
+	$(AWK) -f $(tools)/lxdrgen.awk -f $(tools)/lxdrgen-go.awk \
+		-v PrefixCamel=Relay ../xC.lxdr > $@
+xA: xA.go ../xK-version $(generated)
+	go build -ldflags "-X 'main.projectVersion=$$(cat ../xK-version)'" -o $@ \
+		-gcflags=all="-N -l"
+clean:
+	rm -f $(outputs)

xA/go.mod

@@ -0,0 +1,46 @@
+module janouch.name/xK/xA
+
+go 1.23.0
+
+toolchain go1.24.0
+
+require (
+	fyne.io/fyne/v2 v2.6.0
+	github.com/ebitengine/oto/v3 v3.3.3
+)
+
+require (
+	fyne.io/systray v1.11.0 // indirect
+	github.com/BurntSushi/toml v1.5.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/ebitengine/purego v0.8.2 // indirect
+	github.com/fredbi/uri v1.1.0 // indirect
+	github.com/fsnotify/fsnotify v1.9.0 // indirect
+	github.com/fyne-io/gl-js v0.1.0 // indirect
+	github.com/fyne-io/glfw-js v0.2.0 // indirect
+	github.com/fyne-io/image v0.1.1 // indirect
+	github.com/fyne-io/oksvg v0.1.0 // indirect
+	github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 // indirect
+	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20250301202403-da16c1255728 // indirect
+	github.com/go-text/render v0.2.0 // indirect
+	github.com/go-text/typesetting v0.3.0 // indirect
+	github.com/godbus/dbus/v5 v5.1.0 // indirect
+	github.com/hack-pad/go-indexeddb v0.3.2 // indirect
+	github.com/hack-pad/safejs v0.1.1 // indirect
+	github.com/jeandeaual/go-locale v0.0.0-20250421151639-a9d6ed1b3d45 // indirect
+	github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 // indirect
+	github.com/kr/text v0.2.0 // indirect
+	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
+	github.com/nicksnyder/go-i18n/v2 v2.6.0 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/rymdport/portal v0.4.1 // indirect
+	github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c // indirect
+	github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef // indirect
+	github.com/stretchr/testify v1.10.0 // indirect
+	github.com/yuin/goldmark v1.7.10 // indirect
+	golang.org/x/image v0.26.0 // indirect
+	golang.org/x/net v0.39.0 // indirect
+	golang.org/x/sys v0.32.0 // indirect
+	golang.org/x/text v0.24.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)

xA/go.sum

@@ -0,0 +1,84 @@
+fyne.io/fyne/v2 v2.6.0 h1:Rywo9yKYN4qvNuvkRuLF+zxhJYWbIFM+m4N4KV4p1pQ=
+fyne.io/fyne/v2 v2.6.0/go.mod h1:YZt7SksjvrSNJCwbWFV32WON3mE1Sr7L41D29qMZ/lU=
+fyne.io/systray v1.11.0 h1:D9HISlxSkx+jHSniMBR6fCFOUjk1x/OOOJLa9lJYAKg=
+fyne.io/systray v1.11.0/go.mod h1:RVwqP9nYMo7h5zViCBHri2FgjXF7H2cub7MAq4NSoLs=
+github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
+github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/ebitengine/oto/v3 v3.3.3 h1:m6RV69OqoXYSWCDsHXN9rc07aDuDstGHtait7HXSM7g=
+github.com/ebitengine/oto/v3 v3.3.3/go.mod h1:MZeb/lwoC4DCOdiTIxYezrURTw7EvK/yF863+tmBI+U=
+github.com/ebitengine/purego v0.8.2 h1:jPPGWs2sZ1UgOSgD2bClL0MJIqu58nOmIcBuXr62z1I=
+github.com/ebitengine/purego v0.8.2/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
+github.com/felixge/fgprof v0.9.3 h1:VvyZxILNuCiUCSXtPtYmmtGvb65nqXh2QFWc0Wpf2/g=
+github.com/felixge/fgprof v0.9.3/go.mod h1:RdbpDgzqYVh/T9fPELJyV7EYJuHB55UTEULNun8eiPw=
+github.com/fredbi/uri v1.1.0 h1:OqLpTXtyRg9ABReqvDGdJPqZUxs8cyBDOMXBbskCaB8=
+github.com/fredbi/uri v1.1.0/go.mod h1:aYTUoAXBOq7BLfVJ8GnKmfcuURosB1xyHDIfWeC/iW4=
+github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
+github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
+github.com/fyne-io/gl-js v0.1.0 h1:8luJzNs0ntEAJo+8x8kfUOXujUlP8gB3QMOxO2mUdpM=
+github.com/fyne-io/gl-js v0.1.0/go.mod h1:ZcepK8vmOYLu96JoxbCKJy2ybr+g1pTnaBDdl7c3ajI=
+github.com/fyne-io/glfw-js v0.2.0 h1:8GUZtN2aCoTPNqgRDxK5+kn9OURINhBEBc7M4O1KrmM=
+github.com/fyne-io/glfw-js v0.2.0/go.mod h1:Ri6te7rdZtBgBpxLW19uBpp3Dl6K9K/bRaYdJ22G8Jk=
+github.com/fyne-io/image v0.1.1 h1:WH0z4H7qfvNUw5l4p3bC1q70sa5+YWVt6HCj7y4VNyA=
+github.com/fyne-io/image v0.1.1/go.mod h1:xrfYBh6yspc+KjkgdZU/ifUC9sPA5Iv7WYUBzQKK7JM=
+github.com/fyne-io/oksvg v0.1.0 h1:7EUKk3HV3Y2E+qypp3nWqMXD7mum0hCw2KEGhI1fnBw=
+github.com/fyne-io/oksvg v0.1.0/go.mod h1:dJ9oEkPiWhnTFNCmRgEze+YNprJF7YRbpjgpWS4kzoI=
+github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 h1:5BVwOaUSBTlVZowGO6VZGw2H/zl9nrd3eCZfYV+NfQA=
+github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71/go.mod h1:9YTyiznxEY1fVinfM7RvRcjRHbw2xLBJ3AAGIT0I4Nw=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20250301202403-da16c1255728 h1:RkGhqHxEVAvPM0/R+8g7XRwQnHatO0KAuVcwHo8q9W8=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20250301202403-da16c1255728/go.mod h1:SyRD8YfuKk+ZXlDqYiqe1qMSqjNgtHzBTG810KUagMc=
+github.com/go-text/render v0.2.0 h1:LBYoTmp5jYiJ4NPqDc2pz17MLmA3wHw1dZSVGcOdeAc=
+github.com/go-text/render v0.2.0/go.mod h1:CkiqfukRGKJA5vZZISkjSYrcdtgKQWRa2HIzvwNN5SU=
+github.com/go-text/typesetting v0.3.0 h1:OWCgYpp8njoxSRpwrdd1bQOxdjOXDj9Rqart9ML4iF4=
+github.com/go-text/typesetting v0.3.0/go.mod h1:qjZLkhRgOEYMhU9eHBr3AR4sfnGJvOXNLt8yRAySFuY=
+github.com/go-text/typesetting-utils v0.0.0-20241103174707-87a29e9e6066 h1:qCuYC+94v2xrb1PoS4NIDe7DGYtLnU2wWiQe9a1B1c0=
+github.com/go-text/typesetting-utils v0.0.0-20241103174707-87a29e9e6066/go.mod h1:DDxDdQEnB70R8owOx3LVpEFvpMK9eeH1o2r0yZhFI9o=
+github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
+github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/google/pprof v0.0.0-20211214055906-6f57359322fd h1:1FjCyPC+syAzJ5/2S8fqdZK1R22vvA0J7JZKcuOIQ7Y=
+github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg=
+github.com/hack-pad/go-indexeddb v0.3.2 h1:DTqeJJYc1usa45Q5r52t01KhvlSN02+Oq+tQbSBI91A=
+github.com/hack-pad/go-indexeddb v0.3.2/go.mod h1:QvfTevpDVlkfomY498LhstjwbPW6QC4VC/lxYb0Kom0=
+github.com/hack-pad/safejs v0.1.1 h1:d5qPO0iQ7h2oVtpzGnLExE+Wn9AtytxIfltcS2b9KD8=
+github.com/hack-pad/safejs v0.1.1/go.mod h1:HdS+bKF1NrE72VoXZeWzxFOVQVUSqZJAG0xNCnb+Tio=
+github.com/jeandeaual/go-locale v0.0.0-20250421151639-a9d6ed1b3d45 h1:vFdvrlsVU+p/KFBWTq0lTG4fvWvG88sawGlCzM+RUEU=
+github.com/jeandeaual/go-locale v0.0.0-20250421151639-a9d6ed1b3d45/go.mod h1:ZDXo8KHryOWSIqnsb/CiDq7hQUYryCgdVnxbj8tDG7o=
+github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 h1:YLvr1eE6cdCqjOe972w/cYF+FjW34v27+9Vo5106B4M=
+github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25/go.mod h1:kLgvv7o6UM+0QSf0QjAse3wReFDsb9qbZJdfexWlrQw=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
+github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
+github.com/nicksnyder/go-i18n/v2 v2.6.0 h1:C/m2NNWNiTB6SK4Ao8df5EWm3JETSTIGNXBpMJTxzxQ=
+github.com/nicksnyder/go-i18n/v2 v2.6.0/go.mod h1:88sRqr0C6OPyJn0/KRNaEz1uWorjxIKP7rUUcvycecE=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
+github.com/pkg/profile v1.7.0 h1:hnbDkaNWPCLMO9wGLdBFTIZvzDrDfBM2072E1S9gJkA=
+github.com/pkg/profile v1.7.0/go.mod h1:8Uer0jas47ZQMJ7VD+OHknK4YDY07LPUC6dEvqDjvNo=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rymdport/portal v0.4.1 h1:2dnZhjf5uEaeDjeF/yBIeeRo6pNI2QAKm7kq1w/kbnA=
+github.com/rymdport/portal v0.4.1/go.mod h1:kFF4jslnJ8pD5uCi17brj/ODlfIidOxlgUDTO5ncnC4=
+github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c h1:km8GpoQut05eY3GiYWEedbTT0qnSxrCjsVbb7yKY1KE=
+github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c/go.mod h1:cNQ3dwVJtS5Hmnjxy6AgTPd0Inb3pW05ftPSX7NZO7Q=
+github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef h1:Ch6Q+AZUxDBCVqdkI8FSpFyZDtCVBc2VmejdNrm5rRQ=
+github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef/go.mod h1:nXTWP6+gD5+LUJ8krVhhoeHjvHTutPxMYl5SvkcnJNE=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/yuin/goldmark v1.7.10 h1:S+LrtBjRmqMac2UdtB6yyCEJm+UILZ2fefI4p7o0QpI=
+github.com/yuin/goldmark v1.7.10/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg=
+golang.org/x/image v0.26.0 h1:4XjIFEZWQmCZi6Wv8BoxsDhRU3RVnLX04dToTDAEPlY=
+golang.org/x/image v0.26.0/go.mod h1:lcxbMFAovzpnJxzXS3nyL83K27tmqtKzIJpctK8YO5c=
+golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
+golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
+golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
+golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
+golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

xA/xA-highlighted.svg

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" width="512" height="512" viewBox="0 0 512 512"
+   xmlns="http://www.w3.org/2000/svg">
+
+  <defs>
+    <linearGradient id="background" x1="0" y1="0" x2="0" y2="1">
+      <stop stop-color="#ffaa00" offset="0" />
+      <stop stop-color="#ffffff" offset="1" />
+    </linearGradient>
+    <clipPath id="clip">
+      <rect x="0" y="0" width="1" height="1" />
+    </clipPath>
+  </defs>
+
+  <rect x="0" y="0" width="512" height="512" fill="url(#background)" />
+
+  <g transform="translate(64, 64) scale(384)" stroke-linecap="square">
+    <g clip-path="url(#clip)">
+      <path stroke="#ff0000" stroke-width="0.125"
+         d="M 0.25,1.1 0.65,-0.1 M 0.75,1.1 0.35,-0.1 M 0.225,0.75 0.775,0.75" />
+    </g>
+  </g>
+</svg>

xA/xA.svg

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" width="512" height="512" viewBox="0 0 512 512"
+   xmlns="http://www.w3.org/2000/svg">
+
+  <defs>
+    <linearGradient id="background" x1="0" y1="0" x2="0" y2="1">
+      <stop stop-color="#ffaa00" offset="0" />
+      <stop stop-color="#ff0000" offset="1" />
+    </linearGradient>
+    <clipPath id="clip">
+      <rect x="0" y="0" width="1" height="1" />
+    </clipPath>
+  </defs>
+
+  <rect x="0" y="0" width="512" height="512" fill="url(#background)" />
+
+  <g transform="translate(64, 64) scale(384)" stroke-linecap="square">
+    <g clip-path="url(#clip)">
+      <path stroke="#ffffff" stroke-width="0.125"
+         d="M 0.25,1.1 0.65,-0.1 M 0.75,1.1 0.35,-0.1 M 0.225,0.75 0.775,0.75" />
+    </g>
+  </g>
+</svg>

xC.lxdr

@@ -1,7 +1,8 @@
 // Backwards-compatible protocol version.
-const VERSION = 1;
+const VERSION = 2;
 
 // From the frontend to the relay.
+// All commands receive either an Event.RESPONSE, or an Event.ERROR.
 struct CommandMessage {
 	// The command sequence number will be repeated in responses
 	// in the respective fields.
@@ -32,13 +33,10 @@ struct CommandMessage {
 	// XXX: Perhaps this should rather be handled through a /buffer command.
 	case BUFFER_TOGGLE_UNIMPORTANT:
 		string buffer_name;
-	case PING_RESPONSE:
-		u32 event_seq;
-
-	// Only these commands may produce Event.RESPONSE, as below,
-	// but any command may produce an error.
 	case PING:
 		void;
+	case PING_RESPONSE:
+		u32 event_seq;
 	case BUFFER_COMPLETE:
 		string buffer_name;
 		string text;
@@ -52,6 +50,9 @@ struct CommandMessage {
 struct EventMessage {
 	u32 event_seq;
 	union EventData switch (enum Event {
+		ERROR,
+		RESPONSE,
+
 		PING,
 		BUFFER_LINE,
 		BUFFER_UPDATE,
@@ -64,12 +65,28 @@ struct EventMessage {
 		SERVER_UPDATE,
 		SERVER_RENAME,
 		SERVER_REMOVE,
-		ERROR,
-		RESPONSE,
 	} event) {
+	// Restriction: command_seq strictly follows the sequence received
+	// by the relay, across both of these replies.
+	case ERROR:
+		u32 command_seq;
+		string error;
+	case RESPONSE:
+		u32 command_seq;
+		union ResponseData switch (Command command) {
+		case BUFFER_COMPLETE:
+			u32 start;
+			string completions<>;
+		case BUFFER_LOG:
+			// UTF-8, but not guaranteed.
+			u8 log<>;
+		default:
+			// Reception acknowledged.
+			void;
+		} data;
+
 	case PING:
 		void;
-
 	case BUFFER_LINE:
 		string buffer_name;
 		// Whether the line should also be displayed in the active buffer.
@@ -188,23 +205,5 @@ struct EventMessage {
 		string new;
 	case SERVER_REMOVE:
 		string server_name;
-
-	// Restriction: command_seq strictly follows the sequence received
-	// by the relay, across both of these replies.
-	case ERROR:
-		u32 command_seq;
-		string error;
-	case RESPONSE:
-		u32 command_seq;
-		union ResponseData switch (Command command) {
-		case PING:
-			void;
-		case BUFFER_COMPLETE:
-			u32 start;
-			string completions<>;
-		case BUFFER_LOG:
-			// UTF-8, but not guaranteed.
-			u8 log<>;
-		} data;
 	} data;
 };

xK-version

@@ -1 +1 @@
-2.0.0
+2.1.0

xM/gen-icon.swift

@@ -3,6 +3,9 @@
 // Copyright (c) 2023, Přemysl Eric Janouch <p@janouch.name>
 // SPDX-License-Identifier: 0BSD
 //
+// As an odd regression, AppKit may be necessary for JIT linking.
+import AppKit
+
 // NSGraphicsContext mostly just weirdly wraps over Quartz,
 // so we do it all in Quartz directly.
 import CoreGraphics

xM/main.swift

@@ -173,8 +173,11 @@ class RelayRPC {
 	func send(data: RelayCommandData, callback: Callback? = nil) {
 		self.commandSeq += 1
 		let m = RelayCommandMessage(commandSeq: self.commandSeq, data: data)
-		if let callback = callback {
-			self.commandCallbacks[m.commandSeq] = callback
+		self.commandCallbacks[m.commandSeq] = callback ?? { error, data in
+			if data == nil {
+				NSSound.beep()
+				Logger().warning("\(error)")
+			}
 		}
 
 		var w = RelayWriter()
@@ -842,11 +845,11 @@ relayRPC.onEvent = { message in
 
 		b.bufferName = data.new
 
-		refreshBufferList()
 		if b.bufferName == relayBufferCurrent {
 			relayBufferCurrent = data.new
 			refreshStatus()
 		}
+		refreshBufferList()
 		if b.bufferName == relayBufferLast {
 			relayBufferLast = data.new
 		}
@@ -1203,6 +1206,7 @@ class WindowDelegate: NSObject, NSWindowDelegate {
 
 		b.highlighted = false
 		refreshIcon()
+		refreshBufferList()
 	}
 
 	// Buffer indexes rotated to start after the current buffer.

xN/xN.go

@@ -247,16 +247,16 @@ func main() {
 		flag.PrintDefaults()
 	}
 	flag.Parse()
-	if flag.NArg() < 1 {
-		flag.Usage()
-		os.Exit(2)
-	}
-
 	if *version {
 		fmt.Printf("%s %s\n", projectName, projectVersion)
 		return
 	}
 
+	if flag.NArg() < 1 {
+		flag.Usage()
+		os.Exit(2)
+	}
+
 	text, err := io.ReadAll(os.Stdin)
 	if err != nil {
 		log.Fatalln(err)

xP/go.mod

@@ -1,10 +1,7 @@
 module janouch.name/xK/xP
 
-go 1.18
+go 1.21
 
-require nhooyr.io/websocket v1.8.7
+toolchain go1.23.2
 
-require (
-	github.com/klauspost/compress v1.15.9 // indirect
-	golang.org/x/sys v0.0.0-20210423082822-04245dca01da // indirect
-)
+require nhooyr.io/websocket v1.8.17

xP/go.sum

@@ -1,62 +1,2 @@
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
-github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14=
-github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
-github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
-github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
-github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
-github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
-github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
-github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY=
-github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
-github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0=
-github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
-github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8=
-github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
-github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo=
-github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls=
-github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
-github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
-github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
-github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
-github.com/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY=
-github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
-github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
-github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
-github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
-github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
-github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
-github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da h1:b3NXsE2LusjYGGjL5bxEVZZORm/YEFFrWFjR8eFrw/c=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g=
-nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
+nhooyr.io/websocket v1.8.17 h1:KEVeLJkUywCKVsnLIDlD/5gtayKp8VoCkksHCGGfT9Y=
+nhooyr.io/websocket v1.8.17/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+c=

xP/public/xP.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 - 2023, Přemysl Eric Janouch <p@janouch.name>
+// Copyright (c) 2022 - 2025, Přemysl Eric Janouch <p@janouch.name>
 // SPDX-License-Identifier: 0BSD
 import * as Relay from './proto.js'
 
@@ -67,18 +67,19 @@ class RelayRPC extends EventTarget {
 
 	_processOne(message) {
 		let e = message.data
+		let p
 		switch (e.event) {
 		case Relay.Event.Error:
-			if (this.promised[e.commandSeq] !== undefined)
-				this.promised[e.commandSeq].reject(e.error)
-			else
+			if ((p = this.promised[e.commandSeq]) === undefined)
 				console.error(`Unawaited error: ${e.error}`)
+			else if (p !== true)
+				p.reject(e.error)
 			break
 		case Relay.Event.Response:
-			if (this.promised[e.commandSeq] !== undefined)
-				this.promised[e.commandSeq].resolve(e.data)
-			else
+			if ((p = this.promised[e.commandSeq]) === undefined)
 				console.error("Unawaited response")
+			else if (p !== true)
+				p.resolve(e.data)
 			break
 		default:
 			e.eventSeq = message.eventSeq
@@ -95,6 +96,13 @@ class RelayRPC extends EventTarget {
 			this.promised[seq].reject("No response")
 			delete this.promised[seq]
 		}
+		m.redraw()
+	}
+
+	get busy() {
+		for (const seq in this.promised)
+			return true
+		return false
 	}
 
 	send(params) {
@@ -110,6 +118,9 @@ class RelayRPC extends EventTarget {
 
 		this.ws.send(JSON.stringify({commandSeq: seq, data: params}))
 
+		this.promised[seq] = true
+		m.redraw()
+
 		// Automagically detect if we want a result.
 		let data = undefined
 		const promise = new Promise(
@@ -191,6 +202,17 @@ let bufferAutoscroll = true
 
 let servers = new Map()
 
+let lastActive = undefined
+
+function notifyActive() {
+	// Reduce unnecessary traffic.
+	const now = Date.now()
+	if (lastActive === undefined || (now - lastActive >= 5000)) {
+		lastActive = now
+		rpc.send({command: 'Active'})
+	}
+}
+
 function bufferResetStats(b) {
 	b.newMessages = 0
 	b.newUnimportantMessages = 0
@@ -695,10 +717,8 @@ let Buffer = {
 				dom.scrollTop + dom.clientHeight + 1 >= dom.scrollHeight
 
 			let b = buffers.get(bufferCurrent)
-			if (b !== undefined && b.highlighted && !bufferAutoscroll) {
+			if (b !== undefined && b.highlighted && !bufferAutoscroll)
 				b.highlighted = false
-				m.redraw()
-			}
 		}}, lines)
 	},
 }
@@ -1000,7 +1020,7 @@ let Input = {
 
 	onKeyDown: event => {
 		// TODO: And perhaps on other actions, too.
-		rpc.send({command: 'Active'})
+		notifyActive()
 
 		let b = buffers.get(bufferCurrent)
 		if (b === undefined || event.isComposing)
@@ -1105,7 +1125,13 @@ let Main = {
 
 		return m('.xP', {}, [
 			overlay,
-			m('.title', {}, [m('b', {}, `xP`), m(Topic)]),
+			m('.title', {}, [
+				m('span', [
+					rpc.busy ? '⋯ ' : undefined,
+					m('b', {}, `xP`),
+				]),
+				m(Topic),
+			]),
 			m('.middle', {}, [m(BufferList), m(BufferContainer)]),
 			m(Status),
 			m('.input', {}, [m(Prompt), m(Input)]),

xP/xP.go

@@ -75,12 +75,12 @@ func relayMakeReceiver(ctx context.Context, conn net.Conn) <-chan []byte {
 	go func() {
 		defer close(p)
 		for {
-			j := relayReadFrame(r)
-			if j == nil {
+			b := relayReadFrame(r)
+			if b == nil {
 				return
 			}
 			select {
-			case p <- j:
+			case p <- b:
 			case <-ctx.Done():
 				return
 			}
@@ -145,8 +145,7 @@ func clientWriteError(ctx context.Context, ws *websocket.Conn, err error) bool {
 	b, ok := (&RelayEventMessage{
 		EventSeq: 0,
 		Data: RelayEventData{
-			Interface: RelayEventDataError{
-				Event:      RelayEventError,
+			Variant: &RelayEventDataError{
 				CommandSeq: 0,
 				Error:      err.Error(),
 			},

xR/.gitignore

@@ -0,0 +1,2 @@
+/xR
+/proto.go

xR/Makefile

@@ -0,0 +1,17 @@
+.POSIX:
+AWK = env LC_ALL=C awk
+
+tools = ../liberty/tools
+generated = proto.go
+outputs = xR $(generated)
+all: $(outputs)
+generate: $(generated)
+
+proto.go: $(tools)/lxdrgen.awk $(tools)/lxdrgen-go.awk ../xC.lxdr
+	$(AWK) -f $(tools)/lxdrgen.awk -f $(tools)/lxdrgen-go.awk \
+		-v PrefixCamel=Relay ../xC.lxdr > $@
+xR: xR.go ../xK-version $(generated)
+	go build -ldflags "-X 'main.projectVersion=$$(cat ../xK-version)'" -o $@ \
+		-gcflags=all="-N -l"
+clean:
+	rm -f $(outputs)

xR/go.mod

@@ -0,0 +1,5 @@
+module janouch.name/xK/xR
+
+go 1.23.0
+
+toolchain go1.24.0

xR/xR.adoc

@@ -0,0 +1,41 @@
+xR(1)
+=====
+:doctype: manpage
+:manmanual: xK Manual
+:mansource: xK {release-version}
+
+Name
+----
+xR - xC relay protocol analyzer
+
+Synopsis
+--------
+*xR* [_OPTION_]... RELAY-ADDRESS...
+
+Description
+-----------
+*xR* connects to an *xC* relay and prints all incoming events one per line
+in JSON format.  The JSON objects have two additional fields:
+
+when::
+	The time of reception (or sending) as a nanosecond precision
+	RFC 3339 UTC timestamp.
+raw::
+	The incoming event (or outgoing command) in raw binary form.
+
+Options
+-------
+*-debug*::
+	Print any outgoing commands as well, which may help in debugging any issues.
+
+*-version*::
+	Output version information and exit.
+
+Reporting bugs
+--------------
+Use https://git.janouch.name/p/xK to report bugs, request features,
+or submit pull requests.
+
+See also
+--------
+*xC*(1)

xR/xR.go

@@ -0,0 +1,134 @@
+// Copyright (c) 2025, Přemysl Eric Janouch <p@janouch.name>
+// SPDX-License-Identifier: 0BSD
+
+package main
+
+import (
+	"encoding/binary"
+	"encoding/json"
+	"errors"
+	"flag"
+	"fmt"
+	"io"
+	"log"
+	"net"
+	"os"
+	"time"
+)
+
+var (
+	debug          = flag.Bool("debug", false, "enable debug output")
+	version        = flag.Bool("version", false, "show version and exit")
+	projectName    = "xR"
+	projectVersion = "?"
+)
+
+func now() string {
+	return time.Now().UTC().Format(time.RFC3339Nano)
+}
+
+func relayReadFrame(r io.Reader) bool {
+	var length uint32
+	if err := binary.Read(
+		r, binary.BigEndian, &length); errors.Is(err, io.EOF) {
+		return false
+	} else if err != nil {
+		log.Fatalln("Event receive failed: " + err.Error())
+	}
+	b := make([]byte, length)
+	if _, err := io.ReadFull(r, b); errors.Is(err, io.EOF) {
+		return false
+	} else if err != nil {
+		log.Fatalln("Event receive failed: " + err.Error())
+	}
+
+	m := struct {
+		When   string `json:"when"`
+		Binary []byte `json:"raw"`
+		RelayEventMessage
+	}{
+		When:   now(),
+		Binary: b,
+	}
+
+	if after, ok := m.RelayEventMessage.ConsumeFrom(b); !ok {
+		log.Println("Event deserialization failed")
+	} else if len(after) != 0 {
+		log.Println("Event deserialization failed: trailing data")
+		return true
+	}
+
+	j, err := json.Marshal(m)
+	if err != nil {
+		log.Fatalln("Event marshalling failed: " + err.Error())
+	}
+	fmt.Printf("%s\n", j)
+	return true
+}
+
+func run(addressConnect string) {
+	conn, err := net.Dial("tcp", addressConnect)
+	if err != nil {
+		log.Println("Connection failed: " + err.Error())
+		return
+	}
+	defer conn.Close()
+
+	// We can only support this one protocol version
+	// that proto.go has been generated for.
+	m := RelayCommandMessage{CommandSeq: 0, Data: RelayCommandData{
+		Variant: &RelayCommandDataHello{Version: RelayVersion},
+	}}
+
+	b, ok := m.AppendTo(make([]byte, 4))
+	if !ok {
+		log.Fatalln("Command serialization failed")
+	}
+	binary.BigEndian.PutUint32(b[:4], uint32(len(b)-4))
+	if _, err := conn.Write(b); err != nil {
+		log.Fatalln("Command send failed: " + err.Error())
+	}
+
+	// You can differentiate the direction by the presence
+	// of .data.command or .data.event.
+	if *debug {
+		j, err := json.Marshal(struct {
+			When   string `json:"when"`
+			Binary []byte `json:"raw"`
+			RelayCommandMessage
+		}{
+			When:                now(),
+			Binary:              b,
+			RelayCommandMessage: m,
+		})
+		if err != nil {
+			log.Fatalln("Command marshalling failed: " + err.Error())
+		}
+		fmt.Printf("%s\n", j)
+	}
+
+	for relayReadFrame(conn) {
+	}
+}
+
+func main() {
+	flag.Usage = func() {
+		fmt.Fprintf(flag.CommandLine.Output(),
+			"Usage: %s [OPTION...] CONNECT\n\n", os.Args[0])
+		flag.PrintDefaults()
+	}
+	flag.Parse()
+	if *version {
+		fmt.Printf("%s %s (relay protocol version %d)\n",
+			projectName, projectVersion, RelayVersion)
+		return
+	}
+
+	if flag.NArg() != 1 {
+		flag.Usage()
+		os.Exit(1)
+	}
+
+	// TODO(p): This program should be able to run as a filter as well.
+	run(flag.Arg(0))
+}

xS/Makefile

@@ -5,7 +5,7 @@ AWK = env LC_ALL=C awk
 outputs = xS xS-replies.go xS.1
 all: $(outputs)
 
-xS: xS.go ../xK-version xS-replies.go
+xS: xS.go xS-replies.go ../xK-version
 	go build -ldflags "-X 'main.projectVersion=$$(cat ../xK-version)'" -o $@
 xS-replies.go: xS-gen-replies.awk xS-replies
 	$(AWK) -f xS-gen-replies.awk xS-replies > $@

xT/CMakeLists.txt

@@ -0,0 +1,164 @@
+# As per Qt 6.8 documentation, at least 3.16 is necessary
+cmake_minimum_required (VERSION 3.21.1)
+
+file (READ ../xK-version project_version)
+configure_file (../xK-version xK-version.tag COPYONLY)
+string (STRIP "${project_version}" project_version)
+
+# This is an entirely separate CMake project.
+project (xT VERSION "${project_version}"
+	DESCRIPTION "Qt frontend for xC" LANGUAGES CXX)
+
+set (CMAKE_CXX_STANDARD 17)
+set (CMAKE_CXX_STANDARD_REQUIRED ON)
+
+find_package (Qt6 REQUIRED COMPONENTS Widgets Network Multimedia)
+qt_standard_project_setup ()
+
+add_compile_options ("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
+add_compile_options ("$<$<CXX_COMPILER_ID:GNU>:-Wall;-Wextra>")
+add_compile_options ("$<$<CXX_COMPILER_ID:Clang>:-Wall;-Wextra>")
+
+set (project_config "${PROJECT_BINARY_DIR}/config.h")
+configure_file ("${PROJECT_SOURCE_DIR}/config.h.in" "${project_config}")
+include_directories ("${PROJECT_SOURCE_DIR}" "${PROJECT_BINARY_DIR}")
+
+# Produce a beep sample
+find_program (sox_EXECUTABLE sox REQUIRED)
+set (beep "${PROJECT_BINARY_DIR}/beep.wav")
+add_custom_command (OUTPUT "${beep}"
+	COMMAND ${sox_EXECUTABLE} -b 16 -Dr 44100 -n "${beep}"
+		synth 0.1 0 25 triangle 800 vol 0.5 fade t 0 -0 0.005 pad 0 0.05
+	COMMENT "Generating a beep sample" VERBATIM)
+set_property (SOURCE "${beep}" APPEND PROPERTY QT_RESOURCE_ALIAS beep.wav)
+
+# Rasterize SVG icons
+set (root "${PROJECT_SOURCE_DIR}/..")
+set (CMAKE_MODULE_PATH "${root}/liberty/cmake")
+include (IconUtils)
+
+# It might generally be better to use QtSvg, though it is an extra dependency.
+# The icon_to_png macro is not intended to be used like this.
+foreach (icon xT xT-highlighted)
+	icon_to_png (${icon} "${PROJECT_SOURCE_DIR}/${icon}.svg"
+		48 "${PROJECT_BINARY_DIR}/resources" icon_png)
+	set_property (SOURCE "${icon_png}"
+		APPEND PROPERTY QT_RESOURCE_ALIAS "${icon}.png")
+	list (APPEND icon_rsrc_list "${icon_png}")
+endforeach ()
+
+if (APPLE)
+	set (MACOSX_BUNDLE_ICON_FILE xT.icns)
+	icon_to_icns ("${PROJECT_SOURCE_DIR}/xT.svg"
+		"${MACOSX_BUNDLE_ICON_FILE}" icon_icns)
+else ()
+	# The largest size is mainly for an appropriately sized Windows icon
+	set (icon_base "${PROJECT_BINARY_DIR}/icons")
+	set (icon_png_list)
+	foreach (icon_size 16 32 48 256)
+		icon_to_png (xT "${PROJECT_SOURCE_DIR}/xT.svg"
+			${icon_size} "${icon_base}" icon_png)
+		list (APPEND icon_png_list "${icon_png}")
+	endforeach ()
+	add_custom_target (icons ALL DEPENDS ${icon_png_list})
+	if (WIN32)
+		list (REMOVE_ITEM icon_png_list "${icon_png}")
+		set (icon_ico "${PROJECT_BINARY_DIR}/xT.ico")
+		icon_for_win32 ("${icon_ico}" "${icon_png_list}" "${icon_png}")
+
+		set (resource_file "${PROJECT_BINARY_DIR}/xT.rc")
+		list (APPEND project_sources "${resource_file}")
+		add_custom_command (OUTPUT "${resource_file}"
+			COMMAND ${CMAKE_COMMAND} -E echo "1 ICON \"xT.ico\""
+				> ${resource_file} VERBATIM)
+		set_property (SOURCE "${resource_file}"
+			APPEND PROPERTY OBJECT_DEPENDS ${icon_ico})
+	endif ()
+endif ()
+
+# Build the main executable and link it
+find_program (awk_EXECUTABLE awk ${find_program_REQUIRE})
+add_custom_command (OUTPUT xC-proto.cpp
+	COMMAND ${CMAKE_COMMAND} -E env LC_ALL=C ${awk_EXECUTABLE}
+		-f ${root}/liberty/tools/lxdrgen.awk
+		-f ${root}/liberty/tools/lxdrgen-cpp.awk
+		-v PrefixCamel=Relay
+		${root}/xC.lxdr > xC-proto.cpp
+	DEPENDS
+		${root}/liberty/tools/lxdrgen.awk
+		${root}/liberty/tools/lxdrgen-cpp.awk
+		${root}/xC.lxdr
+	COMMENT "Generating xC relay protocol code" VERBATIM)
+add_custom_target (xC-proto DEPENDS ${PROJECT_BINARY_DIR}/xC-proto.cpp)
+
+list (APPEND project_sources "${root}/liberty/tools/lxdrgen-cpp-qt.cpp")
+qt_add_executable (xT
+	xT.cpp ${project_config} ${project_sources} "${icon_icns}")
+add_dependencies (xT xC-proto)
+qt_add_resources (xT "rsrc" PREFIX / FILES "${beep}" ${icon_rsrc_list})
+target_link_libraries (xT PRIVATE Qt6::Widgets Qt6::Network Qt6::Multimedia)
+set_target_properties (xT PROPERTIES WIN32_EXECUTABLE ON MACOSX_BUNDLE ON
+	MACOSX_BUNDLE_GUI_IDENTIFIER name.janouch.xT)
+
+# https://stackoverflow.com/questions/79079161 and resolved in Qt Creator 16.
+set (QT_QML_GENERATE_QMLLS_INI ON)
+
+# The files to be installed
+include (GNUInstallDirs)
+
+if (ANDROID)
+	install (TARGETS xT DESTINATION .)
+elseif (APPLE OR WIN32)
+	install (TARGETS xT
+		BUNDLE DESTINATION .
+		RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
+	# XXX: QTBUG-127075, which can be circumvented by manually running
+	# macdeployqt on xT.app before the install.
+	qt_generate_deploy_app_script (TARGET xT OUTPUT_SCRIPT deploy_xT)
+	install (SCRIPT "${deploy_xT}")
+else ()
+	install (TARGETS xT DESTINATION ${CMAKE_INSTALL_BINDIR})
+	install (FILES ../LICENSE DESTINATION ${CMAKE_INSTALL_DOCDIR})
+
+	install (FILES xT.svg
+		DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps)
+	install (DIRECTORY ${icon_base}
+		DESTINATION ${CMAKE_INSTALL_DATADIR})
+	install (FILES xT.desktop
+		DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
+endif ()
+
+# Within MSYS2, windeployqt doesn't copy the compiler runtime,
+# which is always linked dynamically by the Qt binaries.
+# TODO(p): Consider whether or not to use MSYS2 to cross-compile, and how.
+if (WIN32)
+	install (CODE [=[
+	set (bindir "${CMAKE_INSTALL_PREFIX}/bin")
+	execute_process (COMMAND cygpath -m /
+		OUTPUT_VARIABLE cygroot OUTPUT_STRIP_TRAILING_WHITESPACE)
+	if (cygroot)
+		execute_process (COMMAND ldd "${bindir}/xT.exe"
+			OUTPUT_VARIABLE ldd_output OUTPUT_STRIP_TRAILING_WHITESPACE)
+		string (REGEX MATCHALL " /mingw64/bin/[^ ]+ " libs "${ldd_output}")
+		foreach (lib ${libs})
+			string (STRIP "${lib}" lib)
+			file (COPY "${cygroot}${lib}" DESTINATION "${bindir}")
+		endforeach()
+	endif ()
+	]=])
+endif ()
+
+# CPack
+set (CPACK_PACKAGE_VENDOR "Premysl Eric Janouch")
+set (CPACK_PACKAGE_CONTACT "Přemysl Eric Janouch <p@janouch.name>")
+set (CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/../LICENSE")
+set (CPACK_GENERATOR "TGZ;ZIP")
+set (CPACK_PACKAGE_FILE_NAME
+	"${PROJECT_NAME}-${PROJECT_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
+set (CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME} ${PROJECT_VERSION}")
+set (CPACK_SOURCE_GENERATOR "TGZ;ZIP")
+set (CPACK_SOURCE_IGNORE_FILES "/build;/CMakeLists.txt.user")
+set (CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION}")
+
+include (CPack)

xT/config.h.in

@@ -0,0 +1,7 @@
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#define PROJECT_NAME        "${PROJECT_NAME}"
+#define PROJECT_VERSION     "${project_version}"
+
+#endif  // ! CONFIG_H

xT/xT-highlighted.svg

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" width="48" height="48" viewBox="0 0 48 48"
+   xmlns="http://www.w3.org/2000/svg">
+
+  <defs>
+    <radialGradient id="green-x">
+      <stop stop-color="hsl(66, 100%, 80%)" offset="0" />
+      <stop stop-color="hsl(66, 100%, 50%)" offset="1" />
+    </radialGradient>
+    <radialGradient id="orange">
+      <stop stop-color="hsl(36, 100%, 60%)" offset="0" />
+      <stop stop-color="hsl(23, 100%, 60%)" offset="1" />
+    </radialGradient>
+    <filter id="shadow" x="-50%" y="-50%" width="200%" height="200%">
+      <feDropShadow dx="0" dy="0" stdDeviation="0.05"
+         flood-color="rgba(0, 0, 0, .5)" />
+    </filter>
+  </defs>
+
+  <!-- XXX: librsvg screws up shadows on rotated objects. -->
+  <g filter="url(#shadow)" transform="translate(24 3) scale(16)">
+    <path fill="url(#orange)" stroke="hsl(36, 100%, 20%)" stroke-width="0.1"
+       d="M-.8 0 H.8 V.5 H.25 V2.625 H-.25 V.5 H-.8 Z" />
+  </g>
+  <g filter="url(#shadow)" transform="translate(24 28) rotate(-45) scale(16)">
+    <path fill="url(#green-x)" stroke="hsl(66, 100%, 20%)" stroke-width="0.1"
+       d="M-.25 -1 H.25 V-.25 H1 V.25 H.25 V1 H-.25 V.25 H-1 V-.25 H-.25 Z" />
+  </g>
+</svg>

xT/xT.desktop

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=xT
+GenericName=IRC Client
+Icon=xT
+Exec=xT
+StartupNotify=false
+Categories=Network;Chat;IRCClient;

xT/xT.svg

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" width="48" height="48" viewBox="0 0 48 48"
+   xmlns="http://www.w3.org/2000/svg">
+
+  <defs>
+    <radialGradient id="grey-x">
+      <stop stop-color="hsl(66, 0%, 90%)" offset="0" />
+      <stop stop-color="hsl(66, 0%, 80%)" offset="1" />
+    </radialGradient>
+    <radialGradient id="orange">
+      <stop stop-color="hsl(36, 100%, 60%)" offset="0" />
+      <stop stop-color="hsl(23, 100%, 60%)" offset="1" />
+    </radialGradient>
+    <filter id="shadow" x="-50%" y="-50%" width="200%" height="200%">
+      <feDropShadow dx="0" dy="0" stdDeviation="0.05"
+         flood-color="rgba(0, 0, 0, .5)" />
+    </filter>
+  </defs>
+
+  <!-- XXX: librsvg screws up shadows on rotated objects. -->
+  <g filter="url(#shadow)" transform="translate(24 28) rotate(-45) scale(16)">
+    <path fill="url(#grey-x)" stroke="hsl(66, 0%, 30%)" stroke-width="0.1"
+       d="M-.25 -1 H.25 V-.25 H1 V.25 H.25 V1 H-.25 V.25 H-1 V-.25 H-.25 Z" />
+  </g>
+  <g filter="url(#shadow)" transform="translate(24 3) scale(16)">
+    <path fill="url(#orange)" stroke="hsl(36, 100%, 20%)" stroke-width="0.1"
+       d="M-.8 0 H.8 V.5 H.25 V2.625 H-.25 V.5 H-.8 Z" />
+  </g>
+</svg>

xW/xW.cpp

@@ -1,7 +1,7 @@
 /*
  * xW.cpp: Win32 frontend for xC
  *
- * Copyright (c) 2023, Přemysl Eric Janouch <p@janouch.name>
+ * Copyright (c) 2023 - 2024, Přemysl Eric Janouch <p@janouch.name>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted.
@@ -221,6 +221,14 @@ relay_try_write(std::wstring &error)
 	return true;
 }
 
+static void
+on_relay_generic_response(
+	std::wstring error, const Relay::ResponseData *response)
+{
+	if (!response)
+		show_error_message(error.c_str());
+}
+
 static void
 relay_send(Relay::CommandData *data, Callback callback = {})
 {
@@ -232,6 +240,8 @@ relay_send(Relay::CommandData *data, Callback callback = {})
 
 	if (callback)
 		g.command_callbacks[m.command_seq] = std::move(callback);
+	else
+		g.command_callbacks[m.command_seq] = on_relay_generic_response;
 
 	uint32_t len = htonl(w.data.size());
 	uint8_t *prefix = reinterpret_cast<uint8_t *>(&len);
@@ -255,73 +265,6 @@ buffer_by_name(const std::wstring &name)
 	return nullptr;
 }
 
-static void
-buffer_activate(const std::wstring &name)
-{
-	auto activate = new Relay::CommandData_BufferActivate();
-	activate->buffer_name = name;
-	relay_send(activate);
-}
-
-static void
-buffer_toggle_unimportant(const std::wstring &name)
-{
-	auto toggle = new Relay::CommandData_BufferToggleUnimportant();
-	toggle->buffer_name = name;
-	relay_send(toggle);
-}
-
-// --- Current buffer ----------------------------------------------------------
-
-static void
-buffer_toggle_log(
-	const std::wstring &error, const Relay::ResponseData_BufferLog *response)
-{
-	if (!response) {
-		show_error_message(error.c_str());
-		return;
-	}
-
-	std::wstring log;
-	if (!LibertyXDR::utf8_to_wstring(
-			response->log.data(), response->log.size(), log)) {
-		show_error_message(L"Invalid encoding.");
-		return;
-	}
-
-	std::wstring filtered;
-	for (auto wch : log) {
-		if (wch == L'\n')
-			filtered += L"\r\n";
-		else
-			filtered += wch;
-	}
-
-	SetWindowText(g.hwndBufferLog, filtered.c_str());
-	ShowWindow(g.hwndBuffer, SW_HIDE);
-	ShowWindow(g.hwndBufferLog, SW_SHOW);
-}
-
-static void
-buffer_toggle_log()
-{
-	if (IsWindowVisible(g.hwndBufferLog)) {
-		ShowWindow(g.hwndBufferLog, SW_HIDE);
-		ShowWindow(g.hwndBuffer, SW_SHOW);
-		SetWindowText(g.hwndBufferLog, L"");
-		return;
-	}
-
-	auto log = new Relay::CommandData_BufferLog();
-	log->buffer_name = g.buffer_current;
-	relay_send(log, [name = g.buffer_current](auto error, auto response) {
-		if (g.buffer_current != name)
-			return;
-		buffer_toggle_log(error,
-			dynamic_cast<const Relay::ResponseData_BufferLog *>(response));
-	});
-}
-
 static bool
 buffer_at_bottom()
 {
@@ -354,6 +297,7 @@ refresh_icon()
 		if (b.highlighted)
 			icon = g.hiconHighlighted;
 
+	// XXX: This may not change the taskbar icon.
 	SendMessage(g.hwndMain, WM_SETICON, ICON_SMALL, (LPARAM) icon);
 	SendMessage(g.hwndMain, WM_SETICON, ICON_BIG, (LPARAM) icon);
 }
@@ -430,6 +374,88 @@ refresh_status()
 		SetWindowText(g.hwndStatus, status.c_str());
 }
 
+static void
+recheck_highlighted()
+{
+	// Corresponds to the logic toggling the bool on.
+	auto b = buffer_by_name(g.buffer_current);
+	if (b && b->highlighted && buffer_at_bottom() &&
+		!IsIconic(g.hwndMain) && !IsWindowVisible(g.hwndBufferLog)) {
+		b->highlighted = false;
+		refresh_icon();
+		refresh_buffer_list();
+	}
+}
+
+// --- Buffer actions ----------------------------------------------------------
+
+static void
+buffer_activate(const std::wstring &name)
+{
+	auto activate = new Relay::CommandData_BufferActivate();
+	activate->buffer_name = name;
+	relay_send(activate);
+}
+
+static void
+buffer_toggle_unimportant(const std::wstring &name)
+{
+	auto toggle = new Relay::CommandData_BufferToggleUnimportant();
+	toggle->buffer_name = name;
+	relay_send(toggle);
+}
+
+static void
+buffer_toggle_log(
+	const std::wstring &error, const Relay::ResponseData_BufferLog *response)
+{
+	if (!response) {
+		show_error_message(error.c_str());
+		return;
+	}
+
+	std::wstring log;
+	if (!LibertyXDR::utf8_to_wstring(
+			response->log.data(), response->log.size(), log)) {
+		show_error_message(L"Invalid encoding.");
+		return;
+	}
+
+	std::wstring filtered;
+	for (auto wch : log) {
+		if (wch == L'\n')
+			filtered += L"\r\n";
+		else
+			filtered += wch;
+	}
+
+	SetWindowText(g.hwndBufferLog, filtered.c_str());
+	ShowWindow(g.hwndBuffer, SW_HIDE);
+	ShowWindow(g.hwndBufferLog, SW_SHOW);
+}
+
+static void
+buffer_toggle_log()
+{
+	if (IsWindowVisible(g.hwndBufferLog)) {
+		ShowWindow(g.hwndBufferLog, SW_HIDE);
+		ShowWindow(g.hwndBuffer, SW_SHOW);
+		SetWindowText(g.hwndBufferLog, L"");
+
+		recheck_highlighted();
+		return;
+	}
+
+	auto log = new Relay::CommandData_BufferLog();
+	log->buffer_name = g.buffer_current;
+	relay_send(log, [name = g.buffer_current](auto error, auto response) {
+		if (g.buffer_current != name)
+			return;
+		buffer_toggle_log(error,
+			dynamic_cast<const Relay::ResponseData_BufferLog *>(response));
+	});
+}
+
 // --- Rich Edit formatting ----------------------------------------------------
 
 static COLORREF
@@ -695,7 +721,7 @@ buffer_print_line(std::vector<BufferLine>::const_iterator begin,
 static void
 buffer_print_separator()
 {
-	bool sameline = !GetWindowTextLength(g.hwndBuffer);
+	bool sameline = !buffer_reset_selection();
 
 	CHARFORMAT2 format = default_charformat();
 	format.dwEffects &= ~CFE_AUTOCOLOR;
@@ -728,6 +754,7 @@ refresh_buffer(const Buffer &b)
 
 	buffer_print_and_watch_trailing_date_changes();
 	buffer_scroll_to_bottom();
+	// We will get a scroll event, so no need to recheck_highlighted() here.
 
 	SendMessage(g.hwndBuffer, WM_SETREDRAW, (WPARAM) TRUE, 0);
 	InvalidateRect(g.hwndBuffer, NULL, TRUE);
@@ -749,8 +776,9 @@ relay_process_buffer_line(Buffer &b, Relay::EventData_BufferLine &m)
 	// Retained mode is complicated.
 	bool display = (!m.is_unimportant || !bc->hide_unimportant) &&
 		(b.buffer_name == g.buffer_current || m.leak_to_active);
+	// XXX: It would be great if it didn't autoscroll when focused.
 	bool to_bottom = display &&
-		buffer_at_bottom();
+		(buffer_at_bottom() || GetFocus() == g.hwndBuffer);
 	bool visible = display &&
 		to_bottom &&
 		!IsIconic(g.hwndMain) &&
@@ -914,11 +942,11 @@ relay_process_message(const Relay::EventMessage &m)
 
 		b->buffer_name = data.new_;
 
-		refresh_buffer_list();
 		if (data.buffer_name == g.buffer_current) {
 			g.buffer_current = data.new_;
 			refresh_status();
 		}
+		refresh_buffer_list();
 		if (data.buffer_name == g.buffer_last)
 			g.buffer_last = data.new_;
 		break;
@@ -1465,6 +1493,7 @@ richedit_proc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam,
 	{
 		// Dragging the scrollbar doesn't result in EN_VSCROLL.
 		LRESULT lResult = DefSubclassProc(hWnd, uMsg, wParam, lParam);
+		recheck_highlighted();
 		refresh_status();
 		return lResult;
 	}
@@ -1522,8 +1551,12 @@ process_resize(UINT w, UINT h)
 	MoveWindow(g.hwndBufferList, 3, top, 150, h - top - bottom, FALSE);
 	MoveWindow(g.hwndBuffer, 156, top, w - 159, h - top - bottom, FALSE);
 	MoveWindow(g.hwndBufferLog, 156, top, w - 159, h - top - bottom, FALSE);
-	if (to_bottom)
+	if (to_bottom) {
 		buffer_scroll_to_bottom();
+	} else {
+		recheck_highlighted();
+		refresh_status();
+	}
 
 	InvalidateRect(g.hwndMain, NULL, TRUE);
 }
@@ -1685,8 +1718,10 @@ window_proc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 	}
 	case WM_SYSCOMMAND:
 	{
+		// We're not deiconified yet, so duplicate recheck_highlighted().
 		auto b = buffer_by_name(g.buffer_current);
-		if (b && wParam == SC_RESTORE) {
+		if (wParam == SC_RESTORE && b && b->highlighted && buffer_at_bottom() &&
+			!IsWindowVisible(g.hwndBufferLog)) {
 			b->highlighted = false;
 			refresh_icon();
 		}
@@ -1694,13 +1729,15 @@ window_proc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 		break;
 	}
 	case WM_COMMAND:
-		if (!lParam)
+		if (!lParam) {
 			process_accelerator(LOWORD(wParam));
-		else if (lParam == (LPARAM) g.hwndBufferList)
+		} else if (lParam == (LPARAM) g.hwndBufferList) {
 			process_bufferlist_notification(HIWORD(wParam));
-		else if (lParam == (LPARAM) g.hwndBuffer &&
-				HIWORD(wParam) == EN_VSCROLL)
+		} else if (lParam == (LPARAM) g.hwndBuffer &&
+				HIWORD(wParam) == EN_VSCROLL) {
+			recheck_highlighted();
 			refresh_status();
+		}
 		return 0;
 	case WM_NOTIFY:
 		switch (((LPNMHDR) lParam)->code) {