xC: move TEXT_* constants where they belong

Now it's a realistically useful frontend.

.clang-format

@@ -0,0 +1,32 @@
+# clang-format is fairly limited, and these rules are approximate:
+#  - array initializers can get terribly mangled with clang-format 12.0,
+#  - sometimes it still aligns with space characters,
+#  - struct name NL { NL ... NL } NL name; is unachievable.
+BasedOnStyle: GNU
+ColumnLimit: 80
+IndentWidth: 4
+TabWidth: 4
+UseTab: ForContinuationAndIndentation
+BreakBeforeBraces: Allman
+SpaceAfterCStyleCast: true
+AlignAfterOpenBracket: DontAlign
+AlignOperands: DontAlign
+AlignConsecutiveMacros: Consecutive
+AllowAllArgumentsOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: false
+IndentGotoLabels: false
+
+# IncludeCategories has some potential, but it may also break the build.
+# Note that the documentation says the value should be "Never".
+SortIncludes: false
+
+# This is a compromise, it generally works out aesthetically better.
+BinPackArguments: false
+
+# Unfortunately, this can't be told to align to column 40 or so.
+SpacesBeforeTrailingComments: 2
+
+# liberty-specific macro body wrappers.
+MacroBlockBegin: "BLOCK_START"
+MacroBlockEnd: "BLOCK_END"
+ForEachMacros: ["LIST_FOR_EACH"]

.gitignore

@@ -3,7 +3,9 @@
 
 # Qt Creator files
 /CMakeLists.txt.user*
-/uirc3.config
-/uirc3.files
-/uirc3.creator*
-/uirc3.includes
+/xK.config
+/xK.files
+/xK.creator*
+/xK.includes
+/xK.cflags
+/xK.cxxflags

CMakeLists.txt

@@ -1,15 +1,19 @@
-cmake_minimum_required (VERSION 3.0)
-project (uirc3 VERSION 1.2.0 LANGUAGES C)
+# Ubuntu 18.04 LTS and OpenBSD 6.4
+cmake_minimum_required (VERSION 3.10)
+project (xK VERSION 1.5.0 DESCRIPTION "IRC client, daemon and bot" LANGUAGES C)
 
 # Options
 option (WANT_READLINE "Use GNU Readline for the UI (better)" ON)
 option (WANT_LIBEDIT "Use BSD libedit for the UI" OFF)
 
 # Moar warnings
+set (CMAKE_C_STANDARD 99)
+set (CMAKE_C_STANDARD_REQUIRED ON)
+set (CMAKE_C_EXTENSIONS OFF)
+
 if ("${CMAKE_C_COMPILER_ID}" MATCHES "GNU" OR CMAKE_COMPILER_IS_GNUCC)
 	# -Wunused-function is pretty annoying here, as everything is static
-	set (wdisabled "-Wno-unused-function")
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra ${wdisabled}")
+	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-function")
 endif ()
 
 # Version
@@ -57,6 +61,8 @@ if ("${CMAKE_SYSTEM_NAME}" MATCHES "BSD")
 	# Need this for SIGWINCH in FreeBSD and OpenBSD respectively;
 	# our POSIX version macros make it undefined
 	add_definitions (-D__BSD_VISIBLE=1 -D_BSD_SOURCE=1)
+elseif (APPLE)
+	add_definitions (-D_DARWIN_C_SOURCE)
 endif ()
 
 # -lrt is only for glibc < 2.17
@@ -77,9 +83,9 @@ CHECK_C_SOURCE_RUNS ("#include <iconv.h>
 	int main () { return iconv_open (\"UTF-8//TRANSLIT\", \"ISO-8859-1\")
 		== (iconv_t) -1; }" ICONV_ACCEPTS_TRANSLIT)
 
-# Dependencies for degesch
+# Dependencies for xC
 pkg_check_modules (libffi REQUIRED libffi)
-list (APPEND degesch_libraries ${libffi_LIBRARIES})
+list (APPEND xC_libraries ${libffi_LIBRARIES})
 include_directories (${libffi_INCLUDE_DIRS})
 link_directories (${libffi_LIBRARY_DIRS})
 
@@ -92,7 +98,7 @@ if (WITH_LUA)
 		message (FATAL_ERROR "Lua library not found")
 	endif ()
 
-	list (APPEND degesch_libraries ${lua_LIBRARIES})
+	list (APPEND xC_libraries ${lua_LIBRARIES})
 	include_directories (${lua_INCLUDE_DIRS})
 	link_directories (${lua_LIBRARY_DIRS})
 endif ()
@@ -100,10 +106,10 @@ endif ()
 find_package (Curses)
 pkg_check_modules (ncursesw ncursesw)
 if (ncursesw_FOUND)
-	list (APPEND degesch_libraries ${ncursesw_LIBRARIES})
+	list (APPEND xC_libraries ${ncursesw_LIBRARIES})
 	include_directories (${ncursesw_INCLUDE_DIRS})
 elseif (CURSES_FOUND)
-	list (APPEND degesch_libraries ${CURSES_LIBRARY})
+	list (APPEND xC_libraries ${CURSES_LIBRARY})
 	include_directories (${CURSES_INCLUDE_DIR})
 else ()
 	message (SEND_ERROR "Curses not found")
@@ -112,16 +118,22 @@ endif ()
 if ((WANT_READLINE AND WANT_LIBEDIT) OR (NOT WANT_READLINE AND NOT WANT_LIBEDIT))
 	message (SEND_ERROR "You have to choose either GNU Readline or libedit")
 elseif (WANT_READLINE)
+	pkg_check_modules (readline readline)
+
 	# OpenBSD's default readline is too old
 	if ("${CMAKE_SYSTEM_NAME}" MATCHES "OpenBSD")
 		include_directories (${OPENBSD_LOCALBASE}/include/ereadline)
-		list (APPEND degesch_libraries ereadline)
+		list (APPEND xC_libraries ereadline)
+	elseif (readline_FOUND)
+		list (APPEND xC_libraries ${readline_LIBRARIES})
+		include_directories (${readline_INCLUDE_DIRS})
+		link_directories (${readline_LIBRARY_DIRS})
 	else ()
-		list (APPEND degesch_libraries readline)
+		list (APPEND xC_libraries readline)
 	endif ()
 elseif (WANT_LIBEDIT)
 	pkg_check_modules (libedit REQUIRED libedit)
-	list (APPEND degesch_libraries ${libedit_LIBRARIES})
+	list (APPEND xC_libraries ${libedit_LIBRARIES})
 	include_directories (${libedit_INCLUDE_DIRS})
 endif ()
 
@@ -135,34 +147,34 @@ configure_file (${PROJECT_SOURCE_DIR}/config.h.in ${PROJECT_BINARY_DIR}/config.h
 include_directories (${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR})
 
 # Generate IRC replies--we need a custom target because of the multiple outputs
-add_custom_command (OUTPUT kike-replies.c kike.msg
-	COMMAND ${PROJECT_SOURCE_DIR}/kike-gen-replies.sh
-		> kike-replies.c < ${PROJECT_SOURCE_DIR}/kike-replies
-	DEPENDS ${PROJECT_SOURCE_DIR}/kike-replies
+add_custom_command (OUTPUT xD-replies.c xD.msg
+	COMMAND ${PROJECT_SOURCE_DIR}/xD-gen-replies.sh
+		> xD-replies.c < ${PROJECT_SOURCE_DIR}/xD-replies
+	DEPENDS ${PROJECT_SOURCE_DIR}/xD-replies
 	COMMENT "Generating files from the list of server numerics")
-add_custom_target (replies DEPENDS ${PROJECT_BINARY_DIR}/kike-replies.c)
+add_custom_target (replies DEPENDS ${PROJECT_BINARY_DIR}/xD-replies.c)
 
 # Build
-foreach (name zyklonb degesch kike)
+foreach (name xB xC xD)
 	add_executable (${name} ${name}.c ${PROJECT_BINARY_DIR}/config.h)
 	target_link_libraries (${name} ${project_libraries})
 	add_threads (${name})
 endforeach ()
 
-add_dependencies (kike replies)
-add_dependencies (degesch replies)
-target_link_libraries (degesch ${degesch_libraries})
+add_dependencies (xD replies)
+add_dependencies (xC replies)
+target_link_libraries (xC ${xC_libraries})
 
 # Tests
 include (CTest)
 if (BUILD_TESTING)
-	add_executable (test-degesch $<TARGET_PROPERTY:degesch,SOURCES>)
-	set_target_properties (test-degesch PROPERTIES COMPILE_DEFINITIONS TESTING)
-	target_link_libraries (test-degesch $<TARGET_PROPERTY:degesch,LINK_LIBRARIES>)
-	add_threads (test-degesch)
-	add_dependencies (test-degesch replies)
+	add_executable (test-xC $<TARGET_PROPERTY:xC,SOURCES>)
+	set_target_properties (test-xC PROPERTIES COMPILE_DEFINITIONS TESTING)
+	target_link_libraries (test-xC $<TARGET_PROPERTY:xC,LINK_LIBRARIES>)
+	add_threads (test-xC)
+	add_dependencies (test-xC replies)
 
-	add_test (NAME test-degesch COMMAND test-degesch)
+	add_test (NAME test-xC COMMAND test-xC)
 	add_test (NAME custom-static-analysis
 		COMMAND ${PROJECT_SOURCE_DIR}/test-static)
 endif ()
@@ -182,30 +194,41 @@ add_custom_target (clang-tidy
 	WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
 
 # Installation
-install (TARGETS zyklonb degesch kike DESTINATION ${CMAKE_INSTALL_BINDIR})
+install (TARGETS xB xC xD DESTINATION ${CMAKE_INSTALL_BINDIR})
 install (FILES LICENSE DESTINATION ${CMAKE_INSTALL_DOCDIR})
-# XXX: our defaults for XDG_DATA_DIRS expect /usr/local/shore or /usr/share
-install (DIRECTORY plugins/zyklonb/
-	DESTINATION ${CMAKE_INSTALL_DATADIR}/zyklonb/plugins USE_SOURCE_PERMISSIONS)
-install (DIRECTORY plugins/degesch/
-	DESTINATION ${CMAKE_INSTALL_DATADIR}/degesch/plugins)
+# XXX: our defaults for XDG_DATA_DIRS expect /usr/local/share or /usr/share
+install (DIRECTORY plugins/xB/
+	DESTINATION ${CMAKE_INSTALL_DATADIR}/xB/plugins USE_SOURCE_PERMISSIONS)
+install (DIRECTORY plugins/xC/
+	DESTINATION ${CMAKE_INSTALL_DATADIR}/xC/plugins)
 
 # Generate documentation from text markup
 find_program (ASCIIDOCTOR_EXECUTABLE asciidoctor)
-if (NOT ASCIIDOCTOR_EXECUTABLE)
-	message (FATAL_ERROR "asciidoctor not found")
+find_program (A2X_EXECUTABLE a2x)
+if (NOT ASCIIDOCTOR_EXECUTABLE AND NOT A2X_EXECUTABLE)
+	message (FATAL_ERROR "Neither asciidoctor nor a2x were found")
 endif ()
 
-foreach (page zyklonb degesch kike)
+foreach (page xB xC xD)
 	set (page_output "${PROJECT_BINARY_DIR}/${page}.1")
 	list (APPEND project_MAN_PAGES "${page_output}")
-	add_custom_command (OUTPUT ${page_output}
-		COMMAND ${ASCIIDOCTOR_EXECUTABLE} -b manpage
-			-a release-version=${project_version}
-			"${PROJECT_SOURCE_DIR}/${page}.adoc"
-			-o "${page_output}"
-		DEPENDS ${page}.adoc
-		COMMENT "Generating man page for ${page}" VERBATIM)
+	if (ASCIIDOCTOR_EXECUTABLE)
+		add_custom_command (OUTPUT ${page_output}
+			COMMAND ${ASCIIDOCTOR_EXECUTABLE} -b manpage
+				-a release-version=${project_version}
+				-o "${page_output}"
+				"${PROJECT_SOURCE_DIR}/${page}.adoc"
+			DEPENDS ${page}.adoc
+			COMMENT "Generating man page for ${page}" VERBATIM)
+	elseif (A2X_EXECUTABLE)
+		add_custom_command (OUTPUT ${page_output}
+			COMMAND ${A2X_EXECUTABLE} --doctype manpage --format manpage
+				-a release-version=${project_version}
+				-D "${PROJECT_BINARY_DIR}"
+				"${PROJECT_SOURCE_DIR}/${page}.adoc"
+			DEPENDS ${page}.adoc
+			COMMENT "Generating man page for ${page}" VERBATIM)
+	endif ()
 endforeach ()
 
 add_custom_target (docs ALL DEPENDS ${project_MAN_PAGES})
@@ -217,7 +240,6 @@ foreach (page ${project_MAN_PAGES})
 endforeach ()
 
 # CPack
-set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Unethical IRC client, daemon and bot")
 set (CPACK_PACKAGE_VERSION "${project_version_safe}")
 set (CPACK_PACKAGE_VENDOR "Premysl Eric Janouch")
 set (CPACK_PACKAGE_CONTACT "Přemysl Eric Janouch <p@janouch.name>")

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014 - 2021, Přemysl Eric Janouch <p@janouch.name>
+Copyright (c) 2014 - 2022, 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,24 +1,78 @@
+Unreleased
+
+ * xC: all behaviour.* configuration options have been renamed to general.*,
+   with the exception of editor_command/editor, backlog_helper/pager,
+   and backlog_helper_strip_formatting/pager_strip_formatting
+
+ * xC: replaced behaviour.save_on_quit with general.autosave
+
+ * xC: improved pager integration capabilities
+
+ * xC: normalized editline's history behaviour, making it a viable frontend
+
+ * xC: made it show WALLOPS messages, as PRIVMSG for the server buffer
+
+ * xD: implemented WALLOPS, choosing to make it target even non-operators
+
+
+1.5.0 (2021-12-21) "The Show Must Go On"
+
+ * xC: made it possible to pass the cursor position to external editors,
+   in particular VIM and Emacs
+
+ * xC: started quoting text coming from bracketed pastes,
+   to minimize the risk of trying to execute filesystem paths as commands
+
+ * xC: fixed to work with post-2021-08-29 editline
+
+ * xC: extended editline's autocomplete to show all options
+
+ * utm-filter.lua: added Facebook's tracking parameter to the filter
+
+
+1.4.0 (2021-10-06) "Call Me Scruffy Scruffington"
+
+ * xC: made message autosplitting respect text formatting
+
+ * xC: fixed displaying IRC colours above 16
+
+ * xC: offer IRCnet as an IRC network to connect to,
+   rather than the lunatic new Freenode
+
+ * xD: started bumping the soft limit on file descriptors to the hard one
+
+
+1.3.0 (2021-08-07) "New World Order"
+
+ * xC: made nick autocompletion offer recent speakers first
+
+ * All binaries have been renamed to something even sillier,
+   and all references in the source tree have been redacted;
+   this represents a major incompatible change for all plugins;
+   configuration and program data have to be adjusted manually
+
+
 1.2.0 (2021-07-08) "There Are Other Countries As Well"
 
- * degesch: added a /squery command for IRCnet
+ * xC: added a /squery command for IRCnet
 
- * degesch: added trivial support for SASL EXTERNAL, enabled by adding "sasl"
+ * xC: added trivial support for SASL EXTERNAL, enabled by adding "sasl"
    to the respective server's "capabilities" list
 
- * degesch: now supporting IRCv3.2 capability negotiation, including CAP DEL
+ * xC: now supporting IRCv3.2 capability negotiation, including CAP DEL
 
- * degesch: added support for IRCv3 chghost
+ * xC: added support for IRCv3 chghost
 
- * degesch: /deop and /devoice without arguments will use the client's user
+ * xC: /deop and /devoice without arguments will use the client's user
 
- * degesch: /set +=/-= now treats its argument as a string array
+ * xC: /set +=/-= now treats its argument as a string array
 
- * degesch: made "/help /command" work the same way as "/help command" does
+ * xC: made "/help /command" work the same way as "/help command" does
 
- * degesch: /ban and /unban don't mangle extended bans anymore
+ * xC: /ban and /unban don't mangle extended bans anymore
 
- * degesch: joining new channels no longer switches to their buffer
-   automatically open them if the input buffer isn't empty
+ * xC: joining new channels no longer switches to their buffer automatically
+   if the current input line isn't empty
 
  * censor.lua: now stripping colours from censored messages;
    their attributes are also configurable rather than always black on black
@@ -26,9 +80,9 @@
 
 1.1.0 (2020-10-31) "What Do You Mean By 'This Isn't Germany'?"
 
- * degesch: made fancy-prompt.lua work with libedit
+ * xC: made fancy-prompt.lua work with libedit
 
- * kike: fixed a regression with an unspecified "bind_host"
+ * xD: fixed a regression with an unspecified "bind_host"
 
  * Miscellaneous minor improvements
 
@@ -37,55 +91,55 @@
 
  * Coming with real manual pages instead of help2man-generated stubs
 
- * degesch: added support for more IRC colours and strike-through text (M-m x)
+ * xC: added support for more IRC colours and strike-through text (M-m x)
 
- * degesch: now tolerating all UTF-8 messages cut off by the server
+ * xC: now tolerating all UTF-8 messages cut off by the server
 
- * degesch: disabled "behaviour.backlog_helper_strip_formatting" by default
+ * xC: disabled "behaviour.backlog_helper_strip_formatting" by default
    since the relevant issue with ACS terminfo entries has been resolved
 
- * degesch: enabled word wrapping in the backlog by default
+ * xC: enabled word wrapping in the backlog by default
 
- * degesch: made the unread marker span the whole line, with a configurable
+ * xC: made the unread marker span the whole line, with a configurable
    character; the previous behaviour can be obtained by setting it empty
 
- * degesch: fixed the prompt not showing back up after exiting a backlog helper
+ * xC: fixed the prompt not showing back up after exiting a backlog helper
    when an external event has provoked an attempt to change it
 
- * degesch: now watching fellow channel users' away status when the server
+ * xC: now watching fellow channel users' away status when the server
    supports the away-notify capability; indicated by italicised nicknames
 
- * degesch: added a plugin to highlight prime numbers in incoming messages
+ * xC: added a plugin to highlight prime numbers in incoming messages
 
- * kike: make sure an unspecified "bind_host" binds to both IPv4 and IPv6
+ * xD: make sure an unspecified "bind_host" binds to both IPv4 and IPv6
 
- * ZyklonB: install plugins to /usr/share and look for them in XDG data dirs
+ * xB: install plugins to /usr/share and look for them in XDG data dirs
 
  * Miscellaneous little fixes
 
 
 0.9.8 (2020-09-02) "Yep, Still Using It"
 
- * degesch: fixed a crash and prompt attribute output in libedit 20191231-3.1,
+ * xC: fixed a crash and prompt attribute output in libedit 20191231-3.1,
    though users are officially discouraged from using this library
 
- * degesch: fixed Lua 5.4 build, so far the support is experimental
+ * xC: fixed Lua 5.4 build, so far the support is experimental
 
  * Miscellaneous little fixes
 
 
 0.9.7 (2018-10-21) "Business as Usual"
 
- * kike: fix wildcard handling in WHOIS
+ * xD: fix wildcard handling in WHOIS
 
- * kike: properly handle STATS without parametetrs
+ * xD: properly handle STATS without parametetrs
 
- * kike: abort earlier when an invalid mode character is detected while
+ * xD: abort earlier when an invalid mode character is detected while
    processing channel MODE messages
 
- * kike: do not send NICK notifications when the nickname doesn't really change
+ * xD: do not send NICK notifications when the nickname doesn't really change
 
- * kike: fix hostname string verification (only used for "server_name")
+ * xD: fix hostname string verification (only used for "server_name")
 
 
 0.9.6 (2018-06-22) "I've Been Sitting Here All This Time"
@@ -94,108 +148,108 @@
 
  * Fix LibreSSL compatibility
 
- * degesch: a second /disconnect cuts the connection by force
+ * xC: a second /disconnect cuts the connection by force
 
- * degesch: send a QUIT message to the IRC server on Ctrl-C
+ * xC: send a QUIT message to the IRC server on Ctrl-C
 
- * degesch: add a Slack plugin (even though the gateway's now defunct)
+ * xC: add a Slack plugin (even though the gateway's now defunct)
 
- * degesch: show an error message on log write failure
+ * xC: show an error message on log write failure
 
- * degesch: fix parsing of literal IPv6 addresses with port numbers
+ * xC: fix parsing of literal IPv6 addresses with port numbers
 
- * degesch: fix some error messages
+ * xC: fix some error messages
 
- * degesch: workaround a Readline bug in the fancy-prompt.lua plugin
+ * xC: workaround a Readline bug in the fancy-prompt.lua plugin
 
- * kike: fix two memory leaks
+ * xD: fix two memory leaks
 
- * kike: improve error handling for incoming connections
+ * xD: improve error handling for incoming connections
 
- * kike: disable TLS session reuse
+ * xD: disable TLS session reuse
 
 
 0.9.5 (2016-12-30) "It's Time"
 
  * Better support for the KILL command
 
- * degesch: export many more fields to the Lua API, add a prompt hook
+ * xC: export many more fields to the Lua API, add a prompt hook
 
- * degesch: show channel user count in the prompt
+ * xC: show channel user count in the prompt
 
- * degesch: allow hiding join/part messages and other noise (Meta-Shift-H)
+ * xC: allow hiding join/part messages and other noise (Meta-Shift-H)
 
- * degesch: allow autojoining channels with keys
+ * xC: allow autojoining channels with keys
 
- * degesch: rejoin channels with keys on reconnect
+ * xC: rejoin channels with keys on reconnect
 
- * degesch: make /query without arguments just open the buffer
+ * xC: make /query without arguments just open the buffer
 
- * degesch: add a censor plugin
+ * xC: add a censor plugin
 
- * degesch: die on configuration parse errors
+ * xC: die on configuration parse errors
 
- * degesch: request channel modes also on rejoin
+ * xC: request channel modes also on rejoin
 
- * degesch: don't show remembered channel modes on parted channels
+ * xC: don't show remembered channel modes on parted channels
 
- * degesch: fix highlight detection in colored text
+ * xC: fix highlight detection in colored text
 
- * degesch: fix CTCP handling for the real world and don't decode X-QUOTEs
+ * xC: fix CTCP handling for the real world and don't decode X-QUOTEs
 
- * degesch: add support for OpenSSL 1.1.0
+ * xC: add support for OpenSSL 1.1.0
 
 
 0.9.4 (2016-04-28) "Oops"
 
- * degesch: fix crash on characters invalid in Windows-1252
+ * xC: fix crash on characters invalid in Windows-1252
 
- * degesch: add an auto-rejoin plugin
+ * xC: add an auto-rejoin plugin
 
- * degesch: better date change messages with customizable formatting;
+ * xC: better date change messages with customizable formatting;
    now also used in the backlog, so it looks closer to regular output
 
- * ZyklonB: add a calc plugin providing a basic Scheme REPL
+ * xB: add a calc plugin providing a basic Scheme REPL
 
- * ZyklonB: add a seen plugin
+ * xB: add a seen plugin
 
- * kike, ZyklonB: use pledge(2) on OpenBSD
+ * xD, xB: use pledge(2) on OpenBSD
 
 
 0.9.3 (2016-03-27) "Doesn't Even Suck"
 
  * Use TLS Server Name Indication when connecting to servers
 
- * degesch: now we erase the screen before displaying buffers
+ * xC: now we erase the screen before displaying buffers
 
- * degesch: implemented word wrapping in buffers
+ * xC: implemented word wrapping in buffers
 
- * degesch: added autocomplete for /topic
+ * xC: added autocomplete for /topic
 
- * degesch: Lua API was improved and extended
+ * xC: Lua API was improved and extended
 
- * degesch: added a basic last.fm "now playing" plugin
+ * xC: added a basic last.fm "now playing" plugin
 
- * degesch: backlog limit was made configurable
+ * xC: backlog limit was made configurable
 
- * degesch: allow changing the list of IRC capabilities to use if available
+ * xC: allow changing the list of IRC capabilities to use if available
 
- * degesch: optimize buffer memory usage
+ * xC: optimize buffer memory usage
 
- * degesch: added logging of messages sent from /quote and plugins
+ * xC: added logging of messages sent from /quote and plugins
 
- * degesch: M-! and M-a to go to the next buffer in order with
-   a highlight or new activity respectively
+ * xC: M-! and M-a to go to the next buffer in order with a highlight
+   or new activity respectively
 
- * degesch: added --format for previewing things like MOTD files
+ * xC: added --format for previewing things like MOTD files
 
- * degesch: added /buffer goto supporting case insensitive partial matches
+ * xC: added /buffer goto supporting case insensitive partial matches
 
- * kike: add support for IRCv3.2 server-time
+ * xD: add support for IRCv3.2 server-time
 
- * ZyklonB: plugins now run in a dedicated data directory
+ * xB: plugins now run in a dedicated data directory
 
- * ZyklonB: added a factoids plugin
+ * xB: added a factoids plugin
 
  * Remote addresses are now resolved asynchronously
 
@@ -204,28 +258,28 @@
 
 0.9.2 (2015-12-31)
 
- * degesch: added rudimentary support for Lua scripting
+ * xC: added rudimentary support for Lua scripting
 
- * degesch: added detection of pasting, so that it doesn't trigger other
+ * xC: added detection of pasting, so that it doesn't trigger other
    keyboard shortcuts, such as for autocomplete
 
- * degesch: added auto-away capability
+ * xC: added auto-away capability
 
- * degesch: added an /oper command
+ * xC: added an /oper command
 
- * degesch: libedit backend works again
+ * xC: libedit backend works again
  
- * degesch: added capability to edit the input line using VISUAL/EDITOR
+ * xC: added capability to edit the input line using VISUAL/EDITOR
 
- * degesch: added Meta-Tab to switch to the last used buffer
+ * xC: added Meta-Tab to switch to the last used buffer
 
- * degesch: correctly respond to stopping and resuming (SIGTSTP)
+ * xC: correctly respond to stopping and resuming (SIGTSTP)
 
- * degesch: fixed decoding of text formatting
+ * xC: fixed decoding of text formatting
 
- * degesch: unseen PMs now show up as highlights
+ * xC: unseen PMs now show up as highlights
 
- * degesch: various bugfixes
+ * xC: various bugfixes
 
 
 0.9.1 (2015-09-25)
@@ -236,23 +290,23 @@
 
  * Pulled in kqueue support
 
- * degesch: added backlog/scrollback functionality using less(1)
+ * xC: added backlog/scrollback functionality using less(1)
 
- * degesch: made showing the entire set of channel mode user prefixes optional
+ * xC: made showing the entire set of channel mode user prefixes optional
 
- * degesch: nicknames in /names are now ordered
+ * xC: nicknames in /names are now ordered
 
- * degesch: nicknames now use the 256-color terminal palette if available
+ * xC: nicknames now use the 256-color terminal palette if available
 
- * degesch: now we skip entries in the "addresses" list that can't be resolved
+ * xC: now we skip entries in the "addresses" list that can't be resolved
    to an address, along with displaying a more helpful message
 
- * degesch: joins, parts, nick changes and quits don't count as new buffer
+ * xC: joins, parts, nick changes and quits don't count as new buffer
    activity anymore
 
- * degesch: added Meta-H to open the full log file
+ * xC: added Meta-H to open the full log file
 
- * degesch: various bugfixes and little improvements
+ * xC: various bugfixes and little improvements
 
 
 0.9.0 (2015-07-23)

README.adoc

@@ -1,35 +1,34 @@
-uirc3
-=====
-:compact-option:
+xK
+==
 
-The [line-through]#unethical# edgy IRC trinity.  This project consists of an
-IRC client, daemon, and bot.  It's all you're ever going to need for chatting,
-as long as you can make do with minimalist software.
+'xK' (chat kit) is an IRC software suite consisting of a terminal client,
+daemon, and bot.  It's all you're ever going to need for chatting,
+so long as you can make do with slightly minimalist software.
 
-All of them have these potentially interesting properties:
+They come with these potentially interesting properties:
 
- - IPv6 support
- - TLS support, including client certificates
- - lean on dependencies (with the exception of 'degesch')
+ - supporting IRCv3, SOCKS, IPv6, TLS (including client certificates)
+ - lean on dependencies
  - compact and arguably easy to hack on
- - very permissive license
+ - maximally permissive license
 
-degesch
--------
-The IRC client.  It is largely defined by being built on top of GNU Readline
-that has been hacked to death.  Its interface should feel somewhat familiar for
-weechat or irssi users.
+xC
+--
+The IRC client, and the core of 'xK'.  It is largely defined by being built
+on top of GNU Readline that has been hacked to death.  Its interface should feel
+somewhat familiar for weechat or irssi users.
 
-image::degesch.png[align="center"]
+image::xC.png[align="center"]
 
-This is the largest application within the project.  It has most of the stuff
-you'd expect of an IRC client, such as being able to set up multiple servers,
-a powerful configuration system, integrated help, text formatting, CTCP queries,
-automatic splitting of overlong messages, autocomplete, logging to file,
-auto-away, command aliases and basic support for Lua scripting.
+It has most of the stuff you'd expect of an IRC client, such as being
+multiserver, a powerful configuration system, integrated help, text formatting,
+automatic splitting of overlong messages, multiline editing, bracketed paste
+support, decent word wrapping, autocomplete, logging, CTCP queries, auto-away,
+command aliases, and basic support for Lua scripting.  As a unique bonus,
+you can launch a full text editor from within.
 
-kike
-----
+xD
+--
 The IRC daemon.  It is designed to be used as a regular user application rather
 than a system-wide daemon.  If all you want is a decent, minimal IRCd for
 testing purposes or a small network of respectful users (or bots), this one will
@@ -37,10 +36,8 @@ do it just fine.
 
 Notable features:
 
- - TLS autodetection (why doesn't everyone have this?), using secure defaults
+ - TLS autodetection (I'm still wondering why everyone doesn't have this)
  - IRCop authentication via TLS client certificates
- - epoll/kqueue support; this means that it should be able to handle quite
-   a number of concurrent user connections
  - partial IRCv3 support
 
 Not supported:
@@ -48,7 +45,7 @@ Not supported:
  - server linking (which also means no services); I consider existing protocols
    for this purpose ugly and tricky to implement correctly; I've also found no
    use for this feature yet
- - online changes to configuration; the configuration system from degesch could
+ - online changes to configuration; the configuration system from 'xC' could
    be used to implement this feature if needed
  - limits of almost any kind, just connections and mode `+l`
 
@@ -56,18 +53,16 @@ This program has been
 https://git.janouch.name/p/haven/src/branch/master/hid[ported to Go],
 and development continues over there.
 
-ZyklonB
--------
-The IRC bot.  It builds upon the concept of my other VitaminA IRC bot.  The main
-characteristic of these two bots is that they run plugins as coprocesses, which
-allows for enhanced reliability and programming language freedom.
+xB
+--
+The IRC bot.  While originally intended to be a simple rewrite of my old GNU AWK
+bot in C, it fairly quickly became a playground, and it eventually got me into
+writing the rest of this package.
 
-While originally intended to be a simple rewrite of the original AWK bot in C,
-it fairly quickly became a playground, and it eventually got me into writing
-the rest of the package.
-
-It survives crashes, server disconnects and timeouts, and also has native SOCKS
-support (even though socksify can add that easily to any program).
+Its main characteristic is that it runs plugins as coprocesses, allowing for
+enhanced reliability and programming language freedom.  Moreover, it recovers
+from any crashes, and offers native SOCKS support (even though socksify can add
+that easily to any program).
 
 Packages
 --------
@@ -76,18 +71,16 @@ a package with the latest development version from Archlinux's AUR.
 
 Building
 --------
-Build dependencies: CMake, pkg-config, asciidoctor, awk, liberty (included) +
+Build dependencies: CMake, pkg-config, asciidoctor or asciidoc, awk,
+                    liberty (included) +
 Runtime dependencies: openssl +
-Additionally for degesch: curses, libffi, lua >= 5.3 (optional),
-                          readline >= 6.0 or libedit >= 2013-07-12
+Additionally for 'xC': curses, libffi, lua >= 5.3 (optional),
+                       readline >= 6.0 or libedit >= 2013-07-12
 
-Avoid libedit if you can, in general it works but at the moment history is
-acting up and I have no clue about fixing it.
-
- $ git clone --recursive https://git.janouch.name/p/uirc3.git
- $ mkdir uirc3/build
- $ cd uirc3/build
- $ cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Debug \
+ $ git clone --recursive https://git.janouch.name/p/xK.git
+ $ mkdir xK/build
+ $ cd xK/build
+ $ cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RelWithDebInfo \
             -DWANT_READLINE=ON -DWANT_LIBEDIT=OFF -DWANT_LUA=ON
  $ make
 
@@ -95,56 +88,56 @@ To install the application, you can do either the usual:
 
  # make install
 
-Or you can try telling CMake to make a package for you.  For Debian it is:
+Or you can try telling CMake to make a package for you:
 
- $ cpack -G DEB
- # dpkg -i uirc3-*.deb
+ $ cpack -G DEB  # also supported: RPM, FreeBSD
+ # dpkg -i xK-*.deb
 
 Usage
 -----
-'degesch' has in-program configuration.  Just run it and read the instructions.
-Consult its link:degesch.adoc[man page] for details about the interface.
+'xC' has in-program configuration.  Just run it and read the instructions.
+Consult its link:xC.adoc[man page] for details about the interface.
 
 For the rest you might want to generate a configuration file:
 
- $ zyklonb --write-default-config
- $ kike --write-default-config
+ $ xB --write-default-config
+ $ xD --write-default-config
 
 After making any necessary edits to the file (there are comments to aid you in
 doing that), simply run the appropriate program with no arguments:
 
- $ zyklonb
- $ kike
+ $ xB
+ $ xD
 
-'ZyklonB' stays running in the foreground, therefore I recommend launching it
-inside a Screen or tmux session.
+'xB' stays running in the foreground, therefore I recommend launching it inside
+a Screen or tmux session.
 
-'kike', on the other hand, immediately forks into the background.  Use the PID
+'xD', on the other hand, immediately forks into the background.  Use the PID
 file or something like `killall` if you want to terminate it.  You can run it
 as a `forking` type systemd user service.
 
 Client Certificates
 -------------------
-'degesch' will use the SASL EXTERNAL method to authenticate using the TLS
-client certificate specified by the respective server's `tls_cert` option
-if you add `sasl` to the `capabilities` option and the server supports this.
+'xC' will use the SASL EXTERNAL method to authenticate using the TLS client
+certificate specified by the respective server's `tls_cert` option if you add
+`sasl` to the `capabilities` option and the server supports this.
 
-'kike' uses SHA-1 fingerprints of TLS client certificates to authenticate users.
+'xD' uses SHA-1 fingerprints of TLS client certificates to authenticate users.
 To get the fingerprint from a certificate file in the required form, use:
 
  $ openssl x509 -in public.pem -outform DER | sha1sum
 
-Custom Key Bindings in degesch
-------------------------------
-The default and preferred frontend used in 'degesch' is GNU Readline.  This
-means that you can change your bindings by editing '~/.inputrc'.  For example:
+Custom Key Bindings in xC
+-------------------------
+The default and preferred frontend used in 'xC' is GNU Readline.  This means
+that you can change your bindings by editing '~/.inputrc'.  For example:
 
 ....
 # Preload with system-wide settings
 $include /etc/inputrc
 
 # Make M-left and M-right reorder buffers
-$if degesch
+$if xC
 "\e\e[C": move-buffer-right
 "\e\e[D": move-buffer-left
 $endif
@@ -154,16 +147,20 @@ Consult the source code and the GNU Readline manual for a list of available
 functions.  Also refer to the latter for the exact syntax of this file.
 Beware that you can easily break the program if you're not careful.
 
-How do I make degesch look like the screenshot?
------------------------------------------------
-First of all, you must build it with Lua support.  With the defaults, degesch
-doesn't look too fancy because I don't want to depend on Lua or 256-colour
-terminals.  In addition to that, I appear to be one of the few people who use
-black on white terminals.
+How do I make xC look like the screenshot?
+------------------------------------------
+With the defaults, 'xC' doesn't look too fancy because I don't want to have
+a hard dependency on either Lua for the bundled script that provides an easily
+adjustable enhanced prompt, or on 256-colour terminals.  Moreover, it's nearly
+impossible to come up with a colour theme that would work well with both
+black-on-white and white-on-black terminals, or anything wild in between.
 
- /set behaviour.date_change_line = "%a %e %b %Y"
- /set behaviour.plugin_autoload += "fancy-prompt.lua"
- /set behaviour.backlog_helper = "LESSSECURE=1 less -R +Gb1d -Ps'Backlog ?ltlines %lt-%lb?L/%L. .?e(END):?pB%pB\\%..'"
+Assuming that your build supports Lua plugins, and that you have a decent,
+properly set-up terminal emulator, it suffices to run:
+
+ /set general.pager = Press Tab here and change +Gb to +Gb1d
+ /set general.date_change_line = "%a %e %b %Y"
+ /set general.plugin_autoload += "fancy-prompt.lua"
  /set attributes.userhost = "\x1b[38;5;109m"
  /set attributes.join = "\x1b[38;5;108m"
  /set attributes.part = "\x1b[38;5;138m"
@@ -184,7 +181,7 @@ configurations accordingly, but I consider it rather messy and unnecessary.
 
 Contributing and Support
 ------------------------
-Use https://git.janouch.name/p/uirc3 to report any bugs, request features,
+Use https://git.janouch.name/p/xK to report any bugs, request features,
 or submit pull requests.  `git send-email` is tolerated.  If you want to discuss
 the project, feel free to join me at ircs://irc.janouch.name, channel #dev.
 
@@ -195,5 +192,5 @@ License
 This software is released under the terms of the 0BSD license, the text of which
 is included within the package along with the list of authors.
 
-Note that 'degesch' becomes GPL-licensed when you link it against GNU Readline
+Note that 'xC' becomes GPL-licensed when you link it against GNU Readline,
 but that is not a concern of this source package.  The licenses are compatible.

common.c

@@ -22,11 +22,11 @@
 #define LIBERTY_WANT_PROTO_IRC
 
 #ifdef WANT_SYSLOG_LOGGING
-	#define print_fatal_data    ((void *) LOG_ERR)
-	#define print_error_data    ((void *) LOG_ERR)
-	#define print_warning_data  ((void *) LOG_WARNING)
-	#define print_status_data   ((void *) LOG_INFO)
-	#define print_debug_data    ((void *) LOG_DEBUG)
+#define print_fatal_data    ((void *) LOG_ERR)
+#define print_error_data    ((void *) LOG_ERR)
+#define print_warning_data  ((void *) LOG_WARNING)
+#define print_status_data   ((void *) LOG_INFO)
+#define print_debug_data    ((void *) LOG_DEBUG)
 #endif // WANT_SYSLOG_LOGGING
 
 #include "liberty/liberty.c"
@@ -87,15 +87,15 @@ static time_t
 unixtime_msec (long *msec)
 {
 #ifdef _POSIX_TIMERS
-        struct timespec tp;
-        hard_assert (clock_gettime (CLOCK_REALTIME, &tp) != -1);
-        *msec = tp.tv_nsec / 1000000;
+	struct timespec tp;
+	hard_assert (clock_gettime (CLOCK_REALTIME, &tp) != -1);
+	*msec = tp.tv_nsec / 1000000;
 #else // ! _POSIX_TIMERS
-        struct timeval tp;
-        hard_assert (gettimeofday (&tp, NULL) != -1);
-        *msec = tp.tv_usec / 1000;
+	struct timeval tp;
+	hard_assert (gettimeofday (&tp, NULL) != -1);
+	*msec = tp.tv_usec / 1000;
 #endif // ! _POSIX_TIMERS
-        return tp.tv_sec;
+	return tp.tv_sec;
 }
 
 // --- Logging -----------------------------------------------------------------

plugins/xB/calc

@@ -1,6 +1,6 @@
 #!/usr/bin/env guile
 
-  ZyklonB calc plugin, basic Scheme evaluator
+  xB calc plugin, basic Scheme evaluator
 
   Copyright 2016 Přemysl Eric Janouch
   See the file LICENSE for licensing information.
@@ -77,7 +77,7 @@
         (substring line 0 (- len 1)) line))))
 
 (define (get-config name)
-  (send "ZYKLONB get_config :" name)
+  (send "XB get_config :" name)
   (car (message-params (parse-message (get-line-crlf irc-input-port)))))
 
 (define (extract-nick prefix)
@@ -216,7 +216,7 @@
 ; --- Main loop ----------------------------------------------------------------
 
 (define prefix (get-config "prefix"))
-(send "ZYKLONB register")
+(send "XB register")
 
 (define (process msg)
   (when (string-ci=? (message-command msg) "PRIVMSG")

plugins/xB/coin

@@ -1,6 +1,6 @@
 #!/usr/bin/env tclsh
 #
-# ZyklonB coin plugin, random number-based utilities
+# xB coin plugin, random number-based utilities
 #
 # Copyright 2012, 2014 Přemysl Eric Janouch
 # See the file LICENSE for licensing information.
@@ -37,7 +37,7 @@ proc parse {line} {
 
 proc get_config {key} {
 	global msg
-	puts "ZYKLONB get_config :$key"
+	puts "XB get_config :$key"
 	gets stdin line
 	parse $line
 	return [lindex $msg(param) 0]
@@ -53,7 +53,7 @@ fconfigure stdin -translation crlf -encoding iso8859-1
 fconfigure stdout -translation crlf -encoding iso8859-1
 
 set prefix [get_config prefix]
-puts "ZYKLONB register"
+puts "XB register"
 
 set eightball [list \
 	"It is certain" \

plugins/xB/eval

@@ -1,6 +1,6 @@
 #!/usr/bin/awk -f
 #
-# ZyklonB eval plugin, LISP-like expression evaluator
+# xB eval plugin, LISP-like expression evaluator
 #
 # Copyright 2013, 2014 Přemysl Eric Janouch
 # See the file LICENSE for licensing information.
@@ -15,7 +15,7 @@ BEGIN \
 
 	prefix = get_config("prefix")
 
-	print "ZYKLONB register"
+	print "XB register"
 	fflush("")
 
 	# All functions have to be in this particular array
@@ -258,7 +258,7 @@ function process_end ()
 
 function get_config (key)
 {
-	print "ZYKLONB get_config :" key
+	print "XB get_config :" key
 	fflush("")
 
 	getline

plugins/xB/factoids

@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# ZyklonB factoids plugin
+# xB factoids plugin
 #
 # Copyright 2016 Přemysl Eric Janouch <p@janouch.name>
 # See the file LICENSE for licensing information.
@@ -24,18 +24,18 @@ sub parse ($) {
 }
 
 sub bot_print {
-	print "ZYKLONB print :${\shift}";
+	print "XB print :${\shift}";
 }
 
 # --- Initialization -----------------------------------------------------------
 
 my %config;
 for my $name (qw(prefix)) {
-	print "ZYKLONB get_config :$name";
+	print "XB get_config :$name";
 	$config{$name} = (parse <STDIN>)->{args}->[0];
 }
 
-print "ZYKLONB register";
+print "XB register";
 
 # --- Database -----------------------------------------------------------------
 # Simple map of (factoid_name => [definitions]); all factoids are separated

plugins/xB/pomodoro

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # coding: utf-8
 #
-# ZyklonB pomodoro plugin
+# xB pomodoro plugin
 #
 # Copyright 2015 Přemysl Eric Janouch
 # See the file LICENSE for licensing information.
@@ -206,7 +206,7 @@ def parse (line)
 end
 
 def bot_print (what)
-	print "ZYKLONB print :#{what}"
+	print "XB print :#{what}"
 end
 
 # --- Initialization -----------------------------------------------------------
@@ -215,12 +215,12 @@ end
 # To read it from anywhere else, it has to be done asynchronously
 $config = {}
 [:prefix].each do |name|
-	print "ZYKLONB get_config :#{name}"
+	print "XB get_config :#{name}"
 	_, _, _, _, args = *parse($stdin.gets.chomp)
 	$config[name] = args[0]
 end
 
-print "ZYKLONB register"
+print "XB register"
 
 # --- Plugin logic -------------------------------------------------------------
 

plugins/xB/script

@@ -1,6 +1,6 @@
 #!/usr/bin/tcc -run -lm
 //
-// ZyklonB scripting plugin, using a custom stack-based language
+// xB scripting plugin, using a custom stack-based language
 //
 // Copyright 2014 Přemysl Eric Janouch
 // See the file LICENSE for licensing information.
@@ -1964,12 +1964,12 @@ read_message (void)
 
 // --- Interfacing with the bot ------------------------------------------------
 
-#define BOT_PRINT "ZYKLONB print :script: "
+#define BOT_PRINT "XB print :script: "
 
 static const char *
 get_config (const char *key)
 {
-	printf ("ZYKLONB get_config :%s\r\n", key);
+	printf ("XB get_config :%s\r\n", key);
 	struct message *msg = read_message ();
 	if (!msg || msg->n_params <= 0)
 		exit (EXIT_FAILURE);
@@ -2298,7 +2298,7 @@ main (int argc, char *argv[])
 		printf (BOT_PRINT "%s\r\n", "runtime library initialization failed");
 
 	g_prefix = strdup (get_config ("prefix"));
-	printf ("ZYKLONB register\r\n");
+	printf ("XB register\r\n");
 	struct message *msg;
 	while ((msg = read_message ()))
 		process_message (msg);

plugins/xB/seen

@@ -1,6 +1,6 @@
 #!/usr/bin/env lua
 --
--- ZyklonB seen plugin
+-- xB seen plugin
 --
 -- Copyright 2016 Přemysl Eric Janouch <p@janouch.name>
 -- See the file LICENSE for licensing information.
@@ -26,7 +26,7 @@ function parse (line)
 end
 
 function get_config (name)
-	io.write ("ZYKLONB get_config :", name, "\r\n")
+	io.write ("XB get_config :", name, "\r\n")
 	return parse (io.read ()).params[1]
 end
 
@@ -34,7 +34,7 @@ end
 
 io.output ():setvbuf ('line')
 local prefix = get_config ('prefix')
-io.write ("ZYKLONB register\r\n")
+io.write ("XB register\r\n")
 
 local db = {}
 local db_filename = "seen.db"

plugins/xB/seen-import-xC.pl

@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
-# Creates a database for the "seen" plugin from logs for degesch.
+# Creates a database for the "seen" plugin from logs for xC.
 # The results may not be completely accurate but are good for jumpstarting.
-# Usage: ./seen-import-degesch.pl LOG-FILE... > seen.db
+# Usage: ./seen-import-xC.pl LOG-FILE... > seen.db
 
 use strict;
 use warnings;

plugins/xB/youtube

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# ZyklonB YouTube plugin, displaying info about YouTube links
+# xB YouTube plugin, displaying info about YouTube links
 #
 # Copyright 2014 - 2015, Přemysl Eric Janouch <p@janouch.name>
 # See the file LICENSE for licensing information.
@@ -27,12 +27,12 @@ class Plugin:
 		return (nick, user, host, command, args)
 
 	def get_config (self, key):
-		print ("ZYKLONB get_config :%s" % key)
+		print ("XB get_config :%s" % key)
 		(_, _, _, _, args) = self.parse (sys.stdin.readline ())
 		return args[0]
 
 	def bot_print (self, what):
-		print ('ZYKLONB print :%s' % what)
+		print ('XB print :%s' % what)
 
 class YouTube (Plugin):
 	re_videos = [re.compile (x) for x in [
@@ -98,7 +98,7 @@ class YouTube (Plugin):
 		if self.youtube_api_key == "":
 			self.bot_print ("youtube: missing `youtube_api_key'")
 
-		print ("ZYKLONB register")
+		print ("XB register")
 
 		for line in sys.stdin:
 			self.process_line (line)

plugins/xC/auto-rejoin.lua

@@ -16,7 +16,7 @@
 --
 
 local timeout
-degesch.setup_config {
+xC.setup_config {
 	timeout = {
 		type = "integer",
 		comment = "auto rejoin timeout",
@@ -31,9 +31,9 @@ degesch.setup_config {
 	},
 }
 
-async, await = degesch.async, coroutine.yield
-degesch.hook_irc (function (hook, server, line)
-	local msg = degesch.parse (line)
+async, await = xC.async, coroutine.yield
+xC.hook_irc (function (hook, server, line)
+	local msg = xC.parse (line)
 	if msg.command ~= "KICK" then return line end
 
 	local who = msg.prefix:match ("^[^!]*")

plugins/xC/censor.lua

@@ -39,7 +39,7 @@ local read_masks = function (v)
 end
 
 local quote
-degesch.setup_config {
+xC.setup_config {
 	masks = {
 		type = "string_array",
 		default = "\"\"",
@@ -72,8 +72,8 @@ local censor = function (line)
 	return start .. text
 end
 
-degesch.hook_irc (function (hook, server, line)
-	local msg = degesch.parse (line)
+xC.hook_irc (function (hook, server, line)
+	local msg = xC.parse (line)
 	if msg.command ~= "PRIVMSG" then return line end
 
 	local channel = msg.params[1]:lower ()

plugins/xC/fancy-prompt.lua

@@ -1,7 +1,7 @@
 --
 -- fancy-prompt.lua: the fancy multiline prompt you probably want
 --
--- Copyright (c) 2016, Přemysl Eric Janouch <p@janouch.name>
+-- Copyright (c) 2016 - 2022, 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.
@@ -28,19 +28,19 @@
 -- background but to really fix that mode, we'd have to fully reimplement it
 -- since its alternative prompt very often gets overriden by accident anyway.
 
-degesch.hook_prompt (function (hook)
-	local current = degesch.current_buffer
+xC.hook_prompt (function (hook)
+	local current = xC.current_buffer
 	local chan = current.channel
 	local s = current.server
 
 	local bg_color = "255"
 	local current_n = 0
 	local active = ""
-	for i, buffer in ipairs (degesch.buffers) do
+	for i, buffer in ipairs (xC.buffers) do
 		if buffer == current then
 			current_n = i
 		elseif buffer.new_messages_count ~= buffer.new_unimportant_count then
-			if active ~= "" then active = active .. "," end
+			active = active .. ","
 			if buffer.highlighted then
 				active = active .. "!"
 				bg_color = "224"
@@ -48,7 +48,6 @@ degesch.hook_prompt (function (hook)
 			active = active .. i
 		end
 	end
-	if active ~= "" then active = "(" .. active .. ")" end
 	local x = current_n .. ":" .. current.name
 	if chan and chan.users_len ~= 0 then
 		local params = ""
@@ -56,25 +55,34 @@ degesch.hook_prompt (function (hook)
 			params = params .. " +" .. mode .. " " .. param
 		end
 		local modes = chan.no_param_modes .. params:sub (3)
-		if modes ~= "" then x = x .. "(+" .. modes .. ")" end
+		if modes ~= "" then
+			x = x .. "(+" .. modes .. ")"
+		end
 		x = x .. "{" .. chan.users_len .. "}"
 	end
-	if current.hide_unimportant then x = x .. "<H>" end
-
-	local lines, cols = degesch.get_screen_size ()
-	x = x .. " " .. active .. string.rep (" ", cols)
+	if current.hide_unimportant then
+		x = x .. "<H>"
+	end
+	if active ~= "" then
+		x = x .. " (" .. active:sub (2) .. ")"
+	end
 
 	-- Readline 7.0.003 seems to be broken and completely corrupts the prompt.
 	-- However 8.0.004 seems to be fine with these, as is libedit 20191231-3.1.
 	--x = x:gsub("[\128-\255]", "?")
 
-	-- Cut off extra characters and apply formatting, including the hack.
-	-- FIXME: this doesn't count with full-width or zero-width characters.
-	--   We might want to export wcwidth() above term_from_utf8 somehow.
-	local overflow = utf8.offset (x, cols - 1)
-	if overflow then x = x:sub (1, overflow) end
+	-- Align to the terminal's width and apply formatting, including the hack.
+	local lines, cols = xC.get_screen_size ()
+	local trailing, width = " ", xC.measure (x)
+	while cols > 0 and width >= cols do
+		x = x:sub (1, utf8.offset (x, -1) - 1)
+		trailing, width = ">", xC.measure (x)
+	end
+
 	x = "\x01\x1b[0;4;1;38;5;16m\x1b[48;5;" .. bg_color .. "m\x02" ..
-		x ..  "\x01\x1b[0;4;1;7;38;5;" .. bg_color .. "m\x02 \x01\x1b[0;1m\x02"
+		x .. string.rep (" ", cols - width - 1) ..
+		"\x01\x1b[0;4;1;7;38;5;" .. bg_color .. "m\x02" ..
+		trailing .. "\x01\x1b[0;1m\x02"
 
 	local user_prefix = function (chan, user)
 		for i, chan_user in ipairs (chan.users) do

plugins/xC/last-fm.lua

@@ -23,7 +23,7 @@ local cjson = require "cjson"
 
 -- Setup configuration to load last.fm API credentials from
 local user, api_key
-degesch.setup_config {
+xC.setup_config {
 	user    = {
 		type = "string",
 		comment = "last.fm username",
@@ -117,7 +117,7 @@ end
 local running
 
 -- Initiate a connection to last.fm servers
-async, await = degesch.async, coroutine.yield
+async, await = xC.async, coroutine.yield
 local make_request = function (buffer, action)
 	if not user or not api_key then
 		report_error (buffer, "configuration is incomplete")
@@ -159,7 +159,7 @@ local send_song = function (buffer)
 end
 
 -- Hook input to simulate new commands
-degesch.hook_input (function (hook, buffer, input)
+xC.hook_input (function (hook, buffer, input)
 	if input == "/np" then
 		make_request (buffer, function (np)
 			now_playing = np

plugins/xC/ping-timeout.lua

@@ -15,8 +15,8 @@
 -- CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 --
 
-degesch.hook_irc (function (hook, server, line)
-	local msg = degesch.parse (line)
+xC.hook_irc (function (hook, server, line)
+	local msg = xC.parse (line)
 	local start, timeout = line:match ("^(.* :Ping timeout:) (%d+) seconds$")
 	if msg.command ~= "QUIT" or not start then
 		return line

plugins/xC/prime.lua

@@ -16,7 +16,7 @@
 --
 
 local smallest, highlight = 0, "\x1f"
-degesch.setup_config {
+xC.setup_config {
 	smallest = {
 		type = "integer",
 		default = "0",
@@ -62,7 +62,7 @@ end
 
 -- XXX: sadly it won't typically highlight primes in our own messages,
 -- unless IRCv3 echo-message is on
-degesch.hook_irc (function (hook, server, line)
+xC.hook_irc (function (hook, server, line)
 	local start, message = line:match ("^(.- PRIVMSG .- :)(.*)$")
 	return message and start .. do_message (message) or line
 end)

plugins/xC/slack.lua

@@ -51,7 +51,7 @@ local load_emoji = function (extra)
 	for k, v in extra:gmatch "([^,]+) ([^,]+)" do emoji[k] = v end
 end
 
-degesch.setup_config {
+xC.setup_config {
 	servers = {
 		type = "string_array",
 		default = "\"\"",
@@ -74,8 +74,8 @@ degesch.setup_config {
 
 -- We can handle external messages about what we've supposedly sent just fine,
 -- so let's get rid of that "[username] some message sent from the web UI" crap
-degesch.hook_irc (function (hook, server, line)
-	local msg, us = degesch.parse (line), server.user
+xC.hook_irc (function (hook, server, line)
+	local msg, us = xC.parse (line), server.user
 	if not servers[server.name] or msg.command ~= "PRIVMSG" or not us
 		or msg.params[1]:lower () ~= us.nickname:lower () then return line end
 
@@ -88,7 +88,7 @@ degesch.hook_irc (function (hook, server, line)
 end)
 
 -- Unfuck emoji and :nick!nick@irc.tinyspeck.com MODE #channel +v nick : active
-degesch.hook_irc (function (hook, server, line)
+xC.hook_irc (function (hook, server, line)
 	if not servers[server.name] then return line end
 	if unemojify then
 		local start, text = line:match ("^(.- PRIVMSG .- :)(.*)$")
@@ -101,7 +101,7 @@ degesch.hook_irc (function (hook, server, line)
 end)
 
 -- The gateway simply ignores the NAMES command altogether
-degesch.hook_input (function (hook, buffer, input)
+xC.hook_input (function (hook, buffer, input)
 	if not buffer.channel or not servers[buffer.server.name]
 		or not input:match "^/names%s*$" then return input end
 
@@ -119,9 +119,9 @@ degesch.hook_input (function (hook, buffer, input)
 	buffer:log (names)
 end)
 
-degesch.hook_completion (function (hook, data, word)
-	local chan = degesch.current_buffer.channel
-	local server = degesch.current_buffer.server
+xC.hook_completion (function (hook, data, word)
+	local chan = xC.current_buffer.channel
+	local server = xC.current_buffer.server
 	if not chan or not servers[server.name] then return end
 
 	-- In /commands there is typically no desire at all to add the at sign

plugins/xC/utm-filter.lua

@@ -1,7 +1,7 @@
 --
--- utm-filter.lua: filter out Google Analytics bullshit from URLs
+-- utm-filter.lua: filter out Google Analytics bullshit etc. from URLs
 --
--- Copyright (c) 2015, Přemysl Eric Janouch <p@janouch.name>
+-- Copyright (c) 2015 - 2021, 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.
@@ -19,6 +19,10 @@
 local banned = {
 	gclid        = 1,
 
+	-- Alas, Facebook no longer uses this parameter, see:
+	-- https://news.ycombinator.com/item?id=32117489
+	fbclid       = 1,
+
 	utm_source   = 1,
 	utm_medium   = 1,
 	utm_term     = 1,
@@ -52,11 +56,11 @@ local do_text = function (text)
 	return text:gsub ('%f[%g]https?://%g+', do_single_url)
 end
 
-degesch.hook_irc (function (hook, server, line)
+xC.hook_irc (function (hook, server, line)
 	local start, message = line:match ("^(.* :)(.*)$")
 	return message and start .. do_text (message) or line
 end)
 
-degesch.hook_input (function (hook, buffer, input)
+xC.hook_input (function (hook, buffer, input)
 	return do_text (input)
 end)

test

@@ -2,13 +2,13 @@
 # Very basic end-to-end testing for CI
 
 # Run the daemon to test against
-system ./kike --write-default-cfg
-spawn ./kike -d
+system ./xD --write-default-cfg
+spawn ./xD -d
 
 # 10 seconds is a bit too much
 set timeout 5
 
-spawn ./degesch
+spawn ./xC
 
 # Fuck this Tcl shit, I want the exit code
 expect_after {

test-nick-colors

@@ -9,7 +9,7 @@ export example=$(
 	#define N_ELEMENTS(a) (sizeof (a) / sizeof ((a)[0]))
 
 	$(perl -0777 -ne 'print $& if /^.*?\nfilter_color(?s:.*?)^}$/m' \
-		"$(dirname "$0")"/degesch.c)
+		"$(dirname "$0")"/xC.c)
 
 	void main () {
 		size_t len = 0;

test-static

@@ -1,7 +1,7 @@
 #!/bin/sh
 # We don't use printf's percent notation with our custom logging mechanism,
 # so the compiler cannot check it for us like it usually does
-perl -n0777 - "$(dirname "$0")"/degesch.c <<-'END'
+perl -n0777 - "$(dirname "$0")"/xC.c <<-'END'
 	while (/\blog_[^ ]+\s*\([^"()]*"[^"]*%[^%][^"]*"/gm) {
 		my ($p, $m) = ($`, $&);
 		printf "$ARGV:%d: suspicious log format string: %s...\n",

xB.adoc

@@ -1,20 +1,20 @@
-zyklonb(1)
-==========
+xB(1)
+=====
 :doctype: manpage
-:manmanual: uirc3 Manual
-:mansource: uirc3 {release-version}
+:manmanual: xK Manual
+:mansource: xK {release-version}
 
 Name
 ----
-zyklonb - modular IRC bot
+xB - modular IRC bot
 
 Synopsis
 --------
-*zyklonb* [_OPTION_]...
+*xB* [_OPTION_]...
 
 Description
 -----------
-*zyklonb* is a modular IRC bot with a programming language-agnostic plugin
+*xB* is a modular IRC bot with a programming language-agnostic plugin
 architecture based on co-processes.
 
 Options
@@ -57,24 +57,24 @@ Plugins
 -------
 Plugins communicate with the bot over their standard input and output streams
 using the IRC protocol.  (Caveat: the standard C library doesn't automatically
-flush FILE streams for pipes on newlines.)  A special *ZYKLONB* command is
-introduced for RPC, with the following subcommands:
+flush FILE streams for pipes on newlines.)  A special *XB* command is introduced
+for RPC, with the following subcommands:
 
-*ZYKLONB get_config* _key_::
+*XB get_config* __key__::
 	Request the value of the given configuration option.  If no such option
 	exists, the value will be empty.  The response will be delivered in
 	the following format:
 +
-```
-ZYKLONB :value
-```
+....
+XB :value
+....
 +
 This is particularly useful for retrieving the *prefix* string.
 
-*ZYKLONB print* _message_::
+*XB print* _message_::
 	Make the bot print the _message_ on its standard output.
 
-*ZYKLONB register*::
+*XB register*::
 	Once a plugin issues this command, it will start receiving all of the bot's
 	incoming IRC traffic, which includes data from the initialization period.
 
@@ -82,23 +82,23 @@ All other commands will be forwarded directly to the IRC server.
 
 Files
 -----
-*zyklonb* follows the XDG Base Directory Specification.
+*xB* follows the XDG Base Directory Specification.
 
-_~/.config/zyklonb/zyklonb.conf_::
+_~/.config/xB/xB.conf_::
 	The bot's configuration file.  Use the *--write-default-cfg* option
 	to create a new one for editing.
 
-_~/.local/share/zyklonb/_::
+_~/.local/share/xB/_::
 	The initial working directory for plugins, in which they may create private
 	databases or other files as needed.
 
-_~/.local/share/zyklonb/plugins/_::
-_/usr/local/share/zyklonb/plugins/_::
-_/usr/share/zyklonb/plugins/_::
+_~/.local/share/xB/plugins/_::
+_/usr/local/share/xB/plugins/_::
+_/usr/share/xB/plugins/_::
 	Plugins are searched for in these directories, in order, unless
 	the *plugin_dir* configuration option overrides this.
 
 Reporting bugs
 --------------
-Use https://git.janouch.name/p/uirc3 to report bugs, request features,
+Use https://git.janouch.name/p/xK to report bugs, request features,
 or submit pull requests.

xB.c

@@ -1,5 +1,5 @@
 /*
- * zyklonb.c: a modular IRC bot
+ * xB.c: a modular IRC bot
  *
  * Copyright (c) 2014 - 2020, Přemysl Eric Janouch <p@janouch.name>
  *
@@ -17,7 +17,7 @@
  */
 
 #include "config.h"
-#define PROGRAM_NAME "ZyklonB"
+#define PROGRAM_NAME "xB"
 
 #include "common.c"
 
@@ -25,9 +25,9 @@
 
 static struct simple_config_item g_config_table[] =
 {
-	{ "nickname",        "ZyklonB",         "IRC nickname"                   },
+	{ "nickname",        "xB",              "IRC nickname"                   },
 	{ "username",        "bot",             "IRC user name"                  },
-	{ "realname",        "ZyklonB IRC bot", "IRC real name/e-mail"           },
+	{ "realname",        "xB IRC bot",      "IRC real name/e-mail"           },
 
 	{ "irc_host",        NULL,              "Address of the IRC server"      },
 	{ "irc_port",        "6667",            "Port of the IRC server"         },
@@ -735,7 +735,7 @@ setup_recovery_handler (struct bot_context *ctx, struct error **e)
 // --- Plugins -----------------------------------------------------------------
 
 /// The name of the special IRC command for interprocess communication
-static const char *plugin_ipc_command = "ZYKLONB";
+static const char *plugin_ipc_command = "XB";
 
 static struct plugin *
 plugin_find_by_pid (struct bot_context *ctx, pid_t pid)
@@ -1860,7 +1860,7 @@ on_plugin_death (struct plugin *plugin, int status)
 	struct bot_context *ctx = plugin->ctx;
 
 	// TODO: callbacks on children death, so that we may tell the user
-	//       "plugin `name' died like a dirty jewish pig"; use `status'
+	//       "plugin `name' died"; use `status'
 	if (!plugin->is_zombie && WIFSIGNALED (status))
 	{
 		const char *notes = "";

xC.adoc

@@ -1,22 +1,22 @@
-degesch(1)
-==========
+xC(1)
+=====
 :doctype: manpage
-:manmanual: uirc3 Manual
-:mansource: uirc3 {release-version}
+:manmanual: xK Manual
+:mansource: xK {release-version}
 
 Name
 ----
-degesch - terminal-based IRC client
+xC - terminal-based IRC client
 
 Synopsis
 --------
-*degesch* [_OPTION_]...
+*xC* [_OPTION_]...
 
 Description
 -----------
-*degesch* is a scriptable IRC client for the command line.  On the first run
-it will welcome you with an introductory message.  Should you ever get lost,
-use the */help* command to obtain more information on commands or options.
+*xC* is a scriptable IRC client for the command line.  On the first run it will
+welcome you with an introductory message.  Should you ever get lost, use the
+*/help* command to obtain more information on commands or options.
 
 Options
 -------
@@ -25,9 +25,9 @@ Options
 	other formatting marks to ANSI codes retrieved from the *terminfo*(5)
 	database:
 +
-```
-printf '\x02bold\x02\n' | degesch -f
-```
+....
+printf '\x02bold\x02\n' | xC -f
+....
 +
 This feature may be used to preview server MOTD files.
 
@@ -98,28 +98,27 @@ Environment
 
 Files
 -----
-*degesch* follows the XDG Base Directory Specification.
+*xC* follows the XDG Base Directory Specification.
 
-_~/.config/degesch/degesch.conf_::
+_~/.config/xC/xC.conf_::
 	The program's configuration file.  Preferrably use internal facilities, such
 	as the */set* command, to make changes in it.
 
-_~/.local/share/degesch/logs/_::
-	When enabled by *behaviour.logging*, log files are stored here.
+_~/.local/share/xC/logs/_::
+	When enabled by *general.logging*, log files are stored here.
 
-_~/.local/share/degesch/plugins/_::
-_/usr/local/share/degesch/plugins/_::
-_/usr/share/degesch/plugins/_::
+_~/.local/share/xC/plugins/_::
+_/usr/local/share/xC/plugins/_::
+_/usr/share/xC/plugins/_::
 	Plugins are searched for in these directories, in order.
 
 Bugs
 ----
-The editline (libedit) frontend is more of a proof of concept that mostly seems
-to work but exhibits bugs that are not our fault.
+The editline (libedit) frontend may exhibit some unexpected behaviour.
 
 Reporting bugs
 --------------
-Use https://git.janouch.name/p/uirc3 to report bugs, request features,
+Use https://git.janouch.name/p/xK to report bugs, request features,
 or submit pull requests.
 
 See also

xD-gen-replies.sh

@@ -2,7 +2,7 @@
 LC_ALL=C exec awk '
 	BEGIN {
 		# The message catalog is a by-product
-		msg = "kike.msg"
+		msg = "xD.msg"
 		print "$quote \"" > msg;
 		print "$set 1" > msg;
 	}

xD.adoc

@@ -1,20 +1,20 @@
-kike(1)
-=======
+xD(1)
+=====
 :doctype: manpage
-:manmanual: uirc3 Manual
-:mansource: uirc3 {release-version}
+:manmanual: xK Manual
+:mansource: xK {release-version}
 
 Name
 ----
-kike - IRC daemon
+xD - IRC daemon
 
 Synopsis
 --------
-*kike* [_OPTION_]...
+*xD* [_OPTION_]...
 
 Description
 -----------
-*kike* is a basic IRC daemon for single-server networks, suitable for testing
+*xD* is a basic IRC daemon for single-server networks, suitable for testing
 and private use.  When run without a configuration file, it will start listening
 on the standard port 6667 and the "any" address.
 
@@ -40,14 +40,14 @@ contrary to what you might expect from a server.
 
 Files
 -----
-*kike* follows the XDG Base Directory Specification.
+*xD* follows the XDG Base Directory Specification.
 
-_~/.config/kike/kike.conf_::
-_/etc/xdg/kike/kike.conf_::
+_~/.config/xD/xD.conf_::
+_/etc/xdg/xD/xD.conf_::
 	The daemon's configuration file.  Use the *--write-default-cfg* option
 	to create a new one for editing.
 
 Reporting bugs
 --------------
-Use https://git.janouch.name/p/uirc3 to report bugs, request features,
+Use https://git.janouch.name/p/xK to report bugs, request features,
 or submit pull requests.

xD.c

@@ -1,7 +1,7 @@
 /*
- * kike.c: an IRC daemon
+ * xD.c: an IRC daemon
  *
- * Copyright (c) 2014 - 2020, Přemysl Eric Janouch <p@janouch.name>
+ * Copyright (c) 2014 - 2022, 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.
@@ -17,12 +17,14 @@
  */
 
 #include "config.h"
-#define PROGRAM_NAME "kike"
+#define PROGRAM_NAME "xD"
 
 #define WANT_SYSLOG_LOGGING
 #include "common.c"
-#include "kike-replies.c"
+#include "xD-replies.c"
+
 #include <nl_types.h>
+#include <sys/resource.h>
 
 enum { PIPE_READ, PIPE_WRITE };
 
@@ -2930,6 +2932,29 @@ irc_handle_links (const struct irc_message *msg, struct client *c)
 	irc_send_reply (c, IRC_RPL_ENDOFLINKS, mask);
 }
 
+static void
+irc_handle_wallops (const struct irc_message *msg, struct client *c)
+{
+	if (msg->params.len < 1)
+		RETURN_WITH_REPLY (c, IRC_ERR_NEEDMOREPARAMS, msg->command);
+	if (!(c->mode & IRC_USER_MODE_OPERATOR))
+		RETURN_WITH_REPLY (c, IRC_ERR_NOPRIVILEGES);
+
+	const char *message = msg->params.vector[0];
+
+	// Our interpretation: anonymize the sender,
+	// and target all users who want to receive these messages
+	struct str_map_iter iter = str_map_iter_make (&c->ctx->users);
+	struct client *target;
+	while ((target = str_map_iter_next (&iter)))
+	{
+		if (target != c && !(target->mode & IRC_USER_MODE_RX_WALLOPS))
+			continue;
+
+		client_send (target, ":%s WALLOPS :%s", c->ctx->server_name, message);
+	}
+}
+
 static void
 irc_handle_kill (const struct irc_message *msg, struct client *c)
 {
@@ -2992,6 +3017,7 @@ irc_register_handlers (struct server_context *ctx)
 		{ "ADMIN",    true,  irc_handle_admin,    0, 0 },
 		{ "STATS",    true,  irc_handle_stats,    0, 0 },
 		{ "LINKS",    true,  irc_handle_links,    0, 0 },
+		{ "WALLOPS",  true,  irc_handle_wallops,  0, 0 },
 
 		{ "MODE",     true,  irc_handle_mode,     0, 0 },
 		{ "PRIVMSG",  true,  irc_handle_privmsg,  0, 0 },
@@ -3984,6 +4010,21 @@ daemonize (struct server_context *ctx)
 	poller_post_fork (&ctx->poller);
 }
 
+static void
+setup_limits (void)
+{
+	struct rlimit limit;
+	if (getrlimit (RLIMIT_NOFILE, &limit))
+	{
+		print_warning ("%s: %s", "getrlimit", strerror (errno));
+		return;
+	}
+
+	limit.rlim_cur = limit.rlim_max;
+	if (setrlimit (RLIMIT_NOFILE, &limit))
+		print_warning ("%s: %s", "setrlimit", strerror (errno));
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -4030,6 +4071,7 @@ main (int argc, char *argv[])
 
 	print_status (PROGRAM_NAME " " PROGRAM_VERSION " starting");
 	setup_signal_handlers ();
+	setup_limits ();
 	init_openssl ();
 
 	struct server_context ctx;