Compare commits
30 Commits
v1.2.0
...
f9848ed627
| Author | SHA1 | Date | |
|---|---|---|---|
|
f9848ed627
|
|||
|
686a39df38
|
|||
|
9cea3fca91
|
|||
|
5165f76b7c
|
|||
|
92ac13f3c6
|
|||
|
df4ca74580
|
|||
|
9e297244a4
|
|||
|
d32ba133c0
|
|||
|
ce3976e1ec
|
|||
|
e5ed89646b
|
|||
|
5e728f6d31
|
|||
|
766f68e070
|
|||
|
3dc5242d43
|
|||
|
fd9d5db1d2
|
|||
|
cb480b4c71
|
|||
|
59cc423694
|
|||
|
9323089d66
|
|||
|
de7df1f60d
|
|||
|
b082e82b62
|
|||
|
b8dbc70a9c
|
|||
|
e0ad67a921
|
|||
|
565edc15b4
|
|||
|
5d285ffb96
|
|||
|
50057d5149
|
|||
|
1f64710e79
|
|||
|
027bf8666e
|
|||
|
7c7e12d8d5
|
|||
|
3cb93d24e8
|
|||
|
acddfe2cfa
|
|||
|
051c43a072
|
32
.clang-format
Normal file
32
.clang-format
Normal file
@@ -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"]
|
||||
2
.gitignore
vendored
2
.gitignore
vendored
@@ -7,3 +7,5 @@
|
||||
/uirc3.files
|
||||
/uirc3.creator*
|
||||
/uirc3.includes
|
||||
/uirc3.cflags
|
||||
/uirc3.cxxflags
|
||||
|
||||
@@ -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 (uirc3 VERSION 1.4.0 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
|
||||
@@ -77,9 +81,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 +96,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 +104,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")
|
||||
@@ -115,13 +119,13 @@ elseif (WANT_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)
|
||||
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 +139,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,13 +186,13 @@ 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)
|
||||
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)
|
||||
@@ -196,7 +200,7 @@ if (NOT ASCIIDOCTOR_EXECUTABLE)
|
||||
message (FATAL_ERROR "asciidoctor not 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}
|
||||
@@ -217,7 +221,7 @@ foreach (page ${project_MAN_PAGES})
|
||||
endforeach ()
|
||||
|
||||
# CPack
|
||||
set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Unethical IRC client, daemon and bot")
|
||||
set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Unreasonable 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>")
|
||||
|
||||
221
NEWS
221
NEWS
@@ -1,24 +1,59 @@
|
||||
1.5.0 (20xx-xx-xx) "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 the options
|
||||
|
||||
|
||||
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 +61,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 +72,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 +129,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 +239,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 +271,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)
|
||||
|
||||
117
README.adoc
117
README.adoc
@@ -1,35 +1,34 @@
|
||||
uirc3
|
||||
=====
|
||||
:compact-option:
|
||||
|
||||
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.
|
||||
The unreasonable 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.
|
||||
|
||||
All of them have these potentially interesting properties:
|
||||
They have 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
|
||||
-------
|
||||
xC
|
||||
--
|
||||
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.
|
||||
|
||||
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.
|
||||
This is the core of the project. 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
|
||||
--------
|
||||
@@ -78,8 +73,8 @@ Building
|
||||
--------
|
||||
Build dependencies: CMake, pkg-config, asciidoctor, 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.
|
||||
@@ -87,7 +82,7 @@ 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 \
|
||||
$ cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||
-DWANT_READLINE=ON -DWANT_LIBEDIT=OFF -DWANT_LUA=ON
|
||||
$ make
|
||||
|
||||
@@ -95,56 +90,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
|
||||
$ cpack -G DEB # also supported: RPM, FreeBSD
|
||||
# dpkg -i uirc3-*.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,9 +149,9 @@ 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
|
||||
How do I make xC look like the screenshot?
|
||||
------------------------------------------
|
||||
First of all, you must build it with Lua support. With the defaults, 'xC'
|
||||
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.
|
||||
@@ -195,5 +190,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.
|
||||
|
||||
24
common.c
24
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 -----------------------------------------------------------------
|
||||
|
||||
2
liberty
2
liberty
Submodule liberty updated: 9639777814...1b9d89cab3
@@ -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")
|
||||
@@ -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" \
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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 -------------------------------------------------------------
|
||||
|
||||
@@ -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);
|
||||
@@ -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"
|
||||
@@ -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;
|
||||
@@ -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)
|
||||
@@ -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 ("^[^!]*")
|
||||
@@ -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 ()
|
||||
@@ -28,15 +28,15 @@
|
||||
-- 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
|
||||
@@ -61,7 +61,7 @@ degesch.hook_prompt (function (hook)
|
||||
end
|
||||
if current.hide_unimportant then x = x .. "<H>" end
|
||||
|
||||
local lines, cols = degesch.get_screen_size ()
|
||||
local lines, cols = xC.get_screen_size ()
|
||||
x = x .. " " .. active .. string.rep (" ", cols)
|
||||
|
||||
-- Readline 7.0.003 seems to be broken and completely corrupts the prompt.
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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)
|
||||
@@ -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
|
||||
@@ -52,11 +52,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)
|
||||
6
test
6
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 {
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
zyklonb(1)
|
||||
==========
|
||||
xB(1)
|
||||
=====
|
||||
:doctype: manpage
|
||||
:manmanual: uirc3 Manual
|
||||
:mansource: uirc3 {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,19 +82,19 @@ 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.
|
||||
|
||||
@@ -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 = "";
|
||||
@@ -1,22 +1,22 @@
|
||||
degesch(1)
|
||||
==========
|
||||
xC(1)
|
||||
=====
|
||||
:doctype: manpage
|
||||
:manmanual: uirc3 Manual
|
||||
:mansource: uirc3 {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
|
||||
-------
|
||||
@@ -26,7 +26,7 @@ Options
|
||||
database:
|
||||
+
|
||||
```
|
||||
printf '\x02bold\x02\n' | degesch -f
|
||||
printf '\x02bold\x02\n' | xC -f
|
||||
```
|
||||
+
|
||||
This feature may be used to preview server MOTD files.
|
||||
@@ -98,18 +98,18 @@ 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/_::
|
||||
_~/.local/share/xC/logs/_::
|
||||
When enabled by *behaviour.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
|
||||
538
degesch.c → xC.c
538
degesch.c → xC.c
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* degesch.c: a terminal-based IRC client
|
||||
* xC.c: a terminal-based IRC client
|
||||
*
|
||||
* Copyright (c) 2015 - 2021, Přemysl Eric Janouch <p@janouch.name>
|
||||
*
|
||||
@@ -46,10 +46,10 @@ enum
|
||||
#define print_warning_data ((void *) ATTR_WARNING)
|
||||
|
||||
#include "config.h"
|
||||
#define PROGRAM_NAME "degesch"
|
||||
#define PROGRAM_NAME "xC"
|
||||
|
||||
#include "common.c"
|
||||
#include "kike-replies.c"
|
||||
#include "xD-replies.c"
|
||||
|
||||
#include <math.h>
|
||||
#include <langinfo.h>
|
||||
@@ -238,8 +238,8 @@ struct input_vtable
|
||||
/// Bind Alt+key to the given named function
|
||||
void (*bind_meta) (void *input, char key, const char *fn);
|
||||
|
||||
/// Get the current line input
|
||||
char *(*get_line) (void *input);
|
||||
/// Get the current line input and position within
|
||||
char *(*get_line) (void *input, int *position);
|
||||
/// Clear the current line input
|
||||
void (*clear_line) (void *input);
|
||||
/// Insert text at current position
|
||||
@@ -361,9 +361,10 @@ input_rl_insert (void *input, const char *s)
|
||||
}
|
||||
|
||||
static char *
|
||||
input_rl_get_line (void *input)
|
||||
input_rl_get_line (void *input, int *position)
|
||||
{
|
||||
(void) input;
|
||||
if (position) *position = rl_point;
|
||||
return rl_copy_text (0, rl_end);
|
||||
}
|
||||
|
||||
@@ -459,6 +460,10 @@ input_rl_start (void *input, const char *program_name)
|
||||
rl_completer_word_break_characters = NULL;
|
||||
rl_attempted_completion_function = app_readline_completion;
|
||||
|
||||
// We shouldn't produce any duplicates that the library would help us
|
||||
// autofilter, and we don't generally want alphabetic ordering at all
|
||||
rl_sort_completion_matches = false;
|
||||
|
||||
hard_assert (self->prompt != NULL);
|
||||
// The inputrc is read before any callbacks are called, so we need to
|
||||
// register all functions that our user may want to map up front
|
||||
@@ -767,24 +772,13 @@ struct input_el
|
||||
|
||||
static void app_editline_init (struct input_el *self);
|
||||
|
||||
static int
|
||||
input_el__get_termios (int character, int fallback)
|
||||
{
|
||||
if (!g_terminal.initialized)
|
||||
return fallback;
|
||||
|
||||
cc_t value = g_terminal.termios.c_cc[character];
|
||||
if (value == _POSIX_VDISABLE)
|
||||
return fallback;
|
||||
return value;
|
||||
}
|
||||
|
||||
static void
|
||||
input_el__redisplay (void *input)
|
||||
{
|
||||
// See rl_redisplay()
|
||||
// See rl_redisplay(), however NetBSD editline's map.c v1.54 breaks VREPRINT
|
||||
// so we bind redisplay somewhere else in app_editline_init()
|
||||
struct input_el *self = input;
|
||||
char x[] = { input_el__get_termios (VREPRINT, 'R' - 0x40), 0 };
|
||||
char x[] = { 'q' & 31, 0 };
|
||||
el_push (self->editline, x);
|
||||
|
||||
// We have to do this or it gets stuck and nothing is done
|
||||
@@ -867,10 +861,12 @@ input_el_insert (void *input, const char *s)
|
||||
}
|
||||
|
||||
static char *
|
||||
input_el_get_line (void *input)
|
||||
input_el_get_line (void *input, int *position)
|
||||
{
|
||||
struct input_el *self = input;
|
||||
const LineInfo *info = el_line (self->editline);
|
||||
int point = info->cursor - info->buffer;
|
||||
if (position) *position = point;
|
||||
return xstrndup (info->buffer, info->lastchar - info->buffer);
|
||||
}
|
||||
|
||||
@@ -1444,7 +1440,7 @@ enum formatter_item_type
|
||||
FORMATTER_ITEM_ATTR, ///< Formatting attributes
|
||||
FORMATTER_ITEM_FG_COLOR, ///< Foreground colour
|
||||
FORMATTER_ITEM_BG_COLOR, ///< Background colour
|
||||
FORMATTER_ITEM_SIMPLE, ///< Toggle mIRC formatting
|
||||
FORMATTER_ITEM_SIMPLE, ///< Toggle IRC formatting
|
||||
FORMATTER_ITEM_IGNORE_ATTR ///< Un/set attribute ignoration
|
||||
};
|
||||
|
||||
@@ -2085,7 +2081,7 @@ struct app_context
|
||||
int *nick_palette; ///< A 256-colour palette for nicknames
|
||||
size_t nick_palette_len; ///< Number of entries in nick_palette
|
||||
|
||||
bool awaiting_mirc_escape; ///< Awaiting a mIRC attribute escape
|
||||
bool awaiting_formatting_escape; ///< Awaiting an IRC formatting escape
|
||||
bool in_bracketed_paste; ///< User is pasting some content
|
||||
struct str input_buffer; ///< Buffered pasted content
|
||||
|
||||
@@ -2446,6 +2442,13 @@ static struct config_schema g_config_behaviour[] =
|
||||
.type = CONFIG_ITEM_BOOLEAN,
|
||||
.default_ = "on",
|
||||
.on_change = on_config_word_wrapping_change },
|
||||
{ .name = "editor_command",
|
||||
.comment = "VIM: \"vim +%Bgo %F\", Emacs: \"emacs -nw +%L:%C %F\"",
|
||||
.type = CONFIG_ITEM_STRING },
|
||||
{ .name = "process_pasted_text",
|
||||
.comment = "Normalize newlines and quote the command prefix in pastes",
|
||||
.type = CONFIG_ITEM_BOOLEAN,
|
||||
.default_ = "on" },
|
||||
{ .name = "date_change_line",
|
||||
.comment = "Input to strftime(3) for the date change line",
|
||||
.type = CONFIG_ITEM_STRING,
|
||||
@@ -2793,7 +2796,8 @@ enum
|
||||
TEXT_UNDERLINE = 1 << 2,
|
||||
TEXT_INVERSE = 1 << 3,
|
||||
TEXT_BLINK = 1 << 4,
|
||||
TEXT_CROSSED_OUT = 1 << 5
|
||||
TEXT_CROSSED_OUT = 1 << 5,
|
||||
TEXT_MONOSPACE = 1 << 6
|
||||
};
|
||||
|
||||
struct attr_printer
|
||||
@@ -2956,6 +2960,7 @@ attr_printer_apply (struct attr_printer *self,
|
||||
|
||||
attr_printer_reset (self);
|
||||
|
||||
// TEXT_MONOSPACE is unimplemented, for obvious reasons
|
||||
if (text_attrs)
|
||||
attr_printer_tputs (self, tparm (set_attributes,
|
||||
0, // standout
|
||||
@@ -3117,7 +3122,7 @@ irc_to_utf8 (const char *text)
|
||||
// #l inserts a locale-encoded string
|
||||
//
|
||||
// #S inserts a string from the server with unknown encoding
|
||||
// #m inserts a mIRC-formatted string (auto-resets at boundaries)
|
||||
// #m inserts an IRC-formatted string (auto-resets at boundaries)
|
||||
// #n cuts the nickname from a string and automatically colours it
|
||||
// #N is like #n but also appends userhost, if present
|
||||
//
|
||||
@@ -3148,8 +3153,6 @@ formatter_add_item (struct formatter *self, struct formatter_item template_)
|
||||
FORMATTER_ADD_ITEM ((self), ATTR, .attribute = ATTR_RESET)
|
||||
#define FORMATTER_ADD_TEXT(self, text_) \
|
||||
FORMATTER_ADD_ITEM ((self), TEXT, .text = (text_))
|
||||
#define FORMATTER_ADD_SIMPLE(self, attribute_) \
|
||||
FORMATTER_ADD_ITEM ((self), SIMPLE, .attribute = TEXT_ ## attribute_)
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
||||
@@ -3186,7 +3189,7 @@ static const int g_mirc_to_terminal[] =
|
||||
|
||||
// https://modern.ircdocs.horse/formatting.html
|
||||
// http://anti.teamidiot.de/static/nei/*/extended_mirc_color_proposal.html
|
||||
static const char g_extra_to_256[100 - 16] =
|
||||
static const int16_t g_extra_to_256[100 - 16] =
|
||||
{
|
||||
52, 94, 100, 58, 22, 29, 23, 24, 17, 54, 53, 89,
|
||||
88, 130, 142, 64, 28, 35, 30, 25, 18, 91, 90, 125,
|
||||
@@ -3198,42 +3201,127 @@ static const char g_extra_to_256[100 - 16] =
|
||||
};
|
||||
|
||||
static const char *
|
||||
formatter_parse_mirc_color (struct formatter *self, const char *s)
|
||||
irc_parse_mirc_color (const char *s, uint8_t *fg, uint8_t *bg)
|
||||
{
|
||||
if (!isdigit_ascii (*s))
|
||||
{
|
||||
FORMATTER_ADD_ITEM (self, FG_COLOR, .color = -1);
|
||||
FORMATTER_ADD_ITEM (self, BG_COLOR, .color = -1);
|
||||
*fg = *bg = 99;
|
||||
return s;
|
||||
}
|
||||
|
||||
int fg = *s++ - '0';
|
||||
*fg = *s++ - '0';
|
||||
if (isdigit_ascii (*s))
|
||||
fg = fg * 10 + (*s++ - '0');
|
||||
if (fg < 16)
|
||||
FORMATTER_ADD_ITEM (self, FG_COLOR, .color = g_mirc_to_terminal[fg]);
|
||||
else
|
||||
FORMATTER_ADD_ITEM (self, FG_COLOR,
|
||||
.color = COLOR_256 (DEFAULT, g_extra_to_256[fg]));
|
||||
*fg = *fg * 10 + (*s++ - '0');
|
||||
|
||||
if (*s != ',' || !isdigit_ascii (s[1]))
|
||||
return s;
|
||||
s++;
|
||||
|
||||
int bg = *s++ - '0';
|
||||
*bg = *s++ - '0';
|
||||
if (isdigit_ascii (*s))
|
||||
bg = bg * 10 + (*s++ - '0');
|
||||
*bg = *bg * 10 + (*s++ - '0');
|
||||
return s;
|
||||
}
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
||||
struct irc_char_attrs
|
||||
{
|
||||
uint8_t fg, bg; ///< {Fore,back}ground colour or 99
|
||||
uint8_t attributes; ///< TEXT_* flags, except TEXT_BLINK
|
||||
uint8_t starts_at_boundary; ///< Possible to split here?
|
||||
};
|
||||
|
||||
static void
|
||||
irc_serialize_char_attrs (const struct irc_char_attrs *attrs, struct str *out)
|
||||
{
|
||||
soft_assert (attrs->fg < 100 && attrs->bg < 100);
|
||||
|
||||
if (attrs->fg != 99 || attrs->bg != 99)
|
||||
{
|
||||
str_append_printf (out, "\x03%u", attrs->fg);
|
||||
if (attrs->bg != 99)
|
||||
str_append_printf (out, ",%02u", attrs->bg);
|
||||
}
|
||||
if (attrs->attributes & TEXT_BOLD) str_append_c (out, '\x02');
|
||||
if (attrs->attributes & TEXT_ITALIC) str_append_c (out, '\x1d');
|
||||
if (attrs->attributes & TEXT_UNDERLINE) str_append_c (out, '\x1f');
|
||||
if (attrs->attributes & TEXT_INVERSE) str_append_c (out, '\x16');
|
||||
if (attrs->attributes & TEXT_CROSSED_OUT) str_append_c (out, '\x1e');
|
||||
if (attrs->attributes & TEXT_MONOSPACE) str_append_c (out, '\x11');
|
||||
}
|
||||
|
||||
static int
|
||||
irc_parse_attribute (char c)
|
||||
{
|
||||
switch (c)
|
||||
{
|
||||
case '\x02' /* ^B */: return TEXT_BOLD;
|
||||
case '\x11' /* ^Q */: return TEXT_MONOSPACE;
|
||||
case '\x16' /* ^V */: return TEXT_INVERSE;
|
||||
case '\x1d' /* ^] */: return TEXT_ITALIC;
|
||||
case '\x1e' /* ^^ */: return TEXT_CROSSED_OUT;
|
||||
case '\x1f' /* ^_ */: return TEXT_UNDERLINE;
|
||||
case '\x0f' /* ^O */: return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
// The text needs to be NUL-terminated, and a valid UTF-8 string
|
||||
static struct irc_char_attrs *
|
||||
irc_analyze_text (const char *text, size_t len)
|
||||
{
|
||||
struct irc_char_attrs *attrs = xcalloc (len, sizeof *attrs),
|
||||
blank = { .fg = 99, .bg = 99, .starts_at_boundary = true },
|
||||
next = blank, cur = next;
|
||||
|
||||
for (size_t i = 0; i != len; cur = next)
|
||||
{
|
||||
const char *start = text;
|
||||
hard_assert (utf8_decode (&text, len - i) >= 0);
|
||||
|
||||
int attribute = irc_parse_attribute (*start);
|
||||
if (*start == '\x03')
|
||||
text = irc_parse_mirc_color (text, &next.fg, &next.bg);
|
||||
else if (attribute > 0)
|
||||
next.attributes ^= attribute;
|
||||
else if (attribute < 0)
|
||||
next = blank;
|
||||
|
||||
while (start++ != text)
|
||||
{
|
||||
attrs[i++] = cur;
|
||||
cur.starts_at_boundary = false;
|
||||
}
|
||||
}
|
||||
return attrs;
|
||||
}
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
||||
static const char *
|
||||
formatter_parse_mirc_color (struct formatter *self, const char *s)
|
||||
{
|
||||
uint8_t fg = 255, bg = 255;
|
||||
s = irc_parse_mirc_color (s, &fg, &bg);
|
||||
|
||||
if (fg < 16)
|
||||
FORMATTER_ADD_ITEM (self, FG_COLOR, .color = g_mirc_to_terminal[fg]);
|
||||
else if (fg < 100)
|
||||
FORMATTER_ADD_ITEM (self, FG_COLOR,
|
||||
.color = COLOR_256 (DEFAULT, g_extra_to_256[fg - 16]));
|
||||
|
||||
if (bg < 16)
|
||||
FORMATTER_ADD_ITEM (self, BG_COLOR, .color = g_mirc_to_terminal[bg]);
|
||||
else
|
||||
else if (bg < 100)
|
||||
FORMATTER_ADD_ITEM (self, BG_COLOR,
|
||||
.color = COLOR_256 (DEFAULT, g_extra_to_256[bg]));
|
||||
.color = COLOR_256 (DEFAULT, g_extra_to_256[bg - 16]));
|
||||
|
||||
return s;
|
||||
}
|
||||
|
||||
static void
|
||||
formatter_parse_mirc (struct formatter *self, const char *s)
|
||||
formatter_parse_message (struct formatter *self, const char *s)
|
||||
{
|
||||
FORMATTER_ADD_RESET (self);
|
||||
|
||||
@@ -3247,24 +3335,15 @@ formatter_parse_mirc (struct formatter *self, const char *s)
|
||||
str_reset (&buf);
|
||||
}
|
||||
|
||||
switch (c)
|
||||
{
|
||||
case '\x02': FORMATTER_ADD_SIMPLE (self, BOLD); break;
|
||||
case '\x11': /* monospace, N/A */ break;
|
||||
case '\x1d': FORMATTER_ADD_SIMPLE (self, ITALIC); break;
|
||||
case '\x1e': FORMATTER_ADD_SIMPLE (self, CROSSED_OUT); break;
|
||||
case '\x1f': FORMATTER_ADD_SIMPLE (self, UNDERLINE); break;
|
||||
case '\x16': FORMATTER_ADD_SIMPLE (self, INVERSE); break;
|
||||
|
||||
case '\x03':
|
||||
int attribute = irc_parse_attribute (c);
|
||||
if (c == '\x03')
|
||||
s = formatter_parse_mirc_color (self, s);
|
||||
break;
|
||||
case '\x0f':
|
||||
else if (attribute > 0)
|
||||
FORMATTER_ADD_ITEM (self, SIMPLE, .attribute = attribute);
|
||||
else if (attribute < 0)
|
||||
FORMATTER_ADD_RESET (self);
|
||||
break;
|
||||
default:
|
||||
else
|
||||
str_append_c (&buf, c);
|
||||
}
|
||||
}
|
||||
|
||||
if (buf.len)
|
||||
@@ -3374,7 +3453,7 @@ restart:
|
||||
break;
|
||||
case 'm':
|
||||
tmp = irc_to_utf8 ((s = va_arg (*ap, char *)));
|
||||
formatter_parse_mirc (self, tmp);
|
||||
formatter_parse_message (self, tmp);
|
||||
free (tmp);
|
||||
break;
|
||||
case 'n':
|
||||
@@ -4082,6 +4161,9 @@ log_full (struct app_context *ctx, struct server *s, struct buffer *buffer,
|
||||
log_server_status ((s), (s)->buffer, "Notice -> #n: #m", (target), (text))
|
||||
#define log_outcoming_orphan_privmsg(s, target, text) \
|
||||
log_server_status ((s), (s)->buffer, "MSG(#n): #m", (target), (text))
|
||||
#define log_outcoming_orphan_action(s, target, text) \
|
||||
log_server_status ((s), (s)->buffer, "MSG(#n): #a*#r #m", (target), \
|
||||
ATTR_ACTION, (text))
|
||||
|
||||
#define log_ctcp_query(s, target, tag) \
|
||||
log_server_status ((s), (s)->buffer, "CTCP query to #S: #S", target, tag)
|
||||
@@ -6206,7 +6288,7 @@ irc_is_highlight (struct server *s, const char *message)
|
||||
// Strip formatting from the message so that it doesn't interfere
|
||||
// with nickname detection (colour sequences in particular)
|
||||
struct formatter f = formatter_make (s->ctx, NULL);
|
||||
formatter_parse_mirc (&f, message);
|
||||
formatter_parse_message (&f, message);
|
||||
|
||||
struct str stripped = str_make ();
|
||||
for (size_t i = 0; i < f.items_len; i++)
|
||||
@@ -6507,8 +6589,9 @@ irc_handle_sent_privmsg_text (struct server *s,
|
||||
prefixes, s->irc_user->nickname, text->str);
|
||||
free (prefixes);
|
||||
}
|
||||
else if (is_action)
|
||||
log_outcoming_orphan_action (s, target, text->str);
|
||||
else
|
||||
// TODO: also handle actions here
|
||||
log_outcoming_orphan_privmsg (s, target, text->str);
|
||||
}
|
||||
|
||||
@@ -6821,7 +6904,7 @@ irc_handle_join (struct server *s, const struct irc_message *msg)
|
||||
|
||||
buffer_add (s->ctx, buffer);
|
||||
|
||||
char *input = CALL (s->ctx->input, get_line);
|
||||
char *input = CALL_ (s->ctx->input, get_line, NULL);
|
||||
if (!*input)
|
||||
buffer_activate (s->ctx, buffer);
|
||||
else
|
||||
@@ -7266,6 +7349,18 @@ irc_handle_privmsg_text (struct server *s,
|
||||
char *prefixes = irc_get_privmsg_prefix
|
||||
(s, str_map_find (&s->irc_users, nickname), target);
|
||||
|
||||
// Make autocomplete offer recent speakers first on partial matches
|
||||
// (note that freshly joined users also move to the front)
|
||||
struct user *user;
|
||||
struct channel_user *channel_user;
|
||||
if (!irc_is_this_us (s, msg->prefix) && buffer->channel
|
||||
&& (user = str_map_find (&s->irc_users, nickname))
|
||||
&& (channel_user = irc_channel_get_user (buffer->channel, user)))
|
||||
{
|
||||
LIST_UNLINK (buffer->channel->users, channel_user);
|
||||
LIST_PREPEND (buffer->channel->users, channel_user);
|
||||
}
|
||||
|
||||
// IRCv3.2 echo-message could otherwise cause us to highlight ourselves
|
||||
if (irc_is_this_us (s, msg->prefix) || !irc_is_highlight (s, text->str))
|
||||
{
|
||||
@@ -7589,20 +7684,35 @@ channel_user_sort_entry_cmp (const void *entry_a, const void *entry_b)
|
||||
b->channel_user->user->nickname);
|
||||
}
|
||||
|
||||
static void
|
||||
irc_sort_channel_users (struct channel *channel)
|
||||
{
|
||||
size_t n_users = channel->users_len;
|
||||
struct channel_user_sort_entry entries[n_users], *p = entries;
|
||||
LIST_FOR_EACH (struct channel_user, iter, channel->users)
|
||||
{
|
||||
p->s = channel->s;
|
||||
p->channel_user = iter;
|
||||
p++;
|
||||
}
|
||||
|
||||
qsort (entries, n_users, sizeof *entries, channel_user_sort_entry_cmp);
|
||||
|
||||
channel->users = NULL;
|
||||
while (p-- != entries)
|
||||
LIST_PREPEND (channel->users, p->channel_user);
|
||||
}
|
||||
|
||||
static char *
|
||||
make_channel_users_list (struct channel *channel)
|
||||
{
|
||||
size_t n_users = 0;
|
||||
LIST_FOR_EACH (struct channel_user, iter, channel->users)
|
||||
n_users++;
|
||||
|
||||
struct channel_user_sort_entry entries[n_users];
|
||||
size_t i = 0;
|
||||
size_t n_users = channel->users_len;
|
||||
struct channel_user_sort_entry entries[n_users], *p = entries;
|
||||
LIST_FOR_EACH (struct channel_user, iter, channel->users)
|
||||
{
|
||||
entries[i].s = channel->s;
|
||||
entries[i].channel_user = iter;
|
||||
i++;
|
||||
p->s = channel->s;
|
||||
p->channel_user = iter;
|
||||
p++;
|
||||
}
|
||||
|
||||
qsort (entries, n_users, sizeof *entries, channel_user_sort_entry_cmp);
|
||||
@@ -7610,7 +7720,7 @@ make_channel_users_list (struct channel *channel)
|
||||
// Make names of users that are away italicised, constructing a formatter
|
||||
// and adding a new attribute seems like unnecessary work
|
||||
struct str list = str_make ();
|
||||
for (i = 0; i < n_users; i++)
|
||||
for (size_t i = 0; i < n_users; i++)
|
||||
{
|
||||
struct channel_user *channel_user = entries[i].channel_user;
|
||||
if (channel_user->user->away) str_append_c (&list, '\x1d');
|
||||
@@ -7663,6 +7773,9 @@ irc_process_names (struct channel *channel)
|
||||
struct str_map present = str_map_make (NULL);
|
||||
present.key_xfrm = channel->s->irc_strxfrm;
|
||||
|
||||
// Either that, or there is no other inhabitant, and sorting does nothing
|
||||
bool we_have_just_joined = channel->users_len == 1;
|
||||
|
||||
struct strv *updates = &channel->names_buf;
|
||||
for (size_t i = 0; i < updates->len; i++)
|
||||
{
|
||||
@@ -7686,6 +7799,8 @@ irc_process_names (struct channel *channel)
|
||||
str_map_free (&present);
|
||||
strv_reset (&channel->names_buf);
|
||||
|
||||
if (we_have_just_joined)
|
||||
irc_sort_channel_users (channel);
|
||||
if (!channel->show_names_after_who)
|
||||
irc_process_names_finish (channel);
|
||||
}
|
||||
@@ -8191,12 +8306,12 @@ irc_process_message (const struct irc_message *msg, struct server *s)
|
||||
|
||||
// --- Message autosplitting magic ---------------------------------------------
|
||||
|
||||
// This is the most basic acceptable algorithm; something like ICU with proper
|
||||
// This is a rather basic algorithm; something like ICU with proper
|
||||
// locale specification would be needed to make it work better.
|
||||
|
||||
static size_t
|
||||
wrap_text_for_single_line (const char *text, size_t text_len,
|
||||
size_t line_len, struct str *output)
|
||||
wrap_text_for_single_line (const char *text, struct irc_char_attrs *attrs,
|
||||
size_t text_len, size_t target_len, struct str *output)
|
||||
{
|
||||
size_t eaten = 0;
|
||||
|
||||
@@ -8204,7 +8319,7 @@ wrap_text_for_single_line (const char *text, size_t text_len,
|
||||
const char *word_start;
|
||||
const char *word_end = text + strcspn (text, " ");
|
||||
size_t word_len = word_end - text;
|
||||
while (line_len && word_len <= line_len)
|
||||
while (target_len && word_len <= target_len)
|
||||
{
|
||||
if (word_len)
|
||||
{
|
||||
@@ -8212,7 +8327,7 @@ wrap_text_for_single_line (const char *text, size_t text_len,
|
||||
|
||||
text += word_len;
|
||||
eaten += word_len;
|
||||
line_len -= word_len;
|
||||
target_len -= word_len;
|
||||
}
|
||||
|
||||
// Find the next word's end
|
||||
@@ -8226,53 +8341,60 @@ wrap_text_for_single_line (const char *text, size_t text_len,
|
||||
return eaten + (word_start - text);
|
||||
|
||||
// And if that doesn't help, cut the longest valid block of characters
|
||||
for (const char *p = text; (size_t) (p - text) <= line_len; )
|
||||
{
|
||||
eaten = p - text;
|
||||
hard_assert (utf8_decode (&p, text_len - eaten) >= 0);
|
||||
}
|
||||
for (size_t i = 1; i <= text_len && i <= target_len; i++)
|
||||
if (i == text_len || attrs[i].starts_at_boundary)
|
||||
eaten = i;
|
||||
|
||||
str_append_data (output, text, eaten);
|
||||
return eaten;
|
||||
}
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
||||
// In practice, this should never fail at all, although it's not guaranteed
|
||||
static bool
|
||||
wrap_message (const char *message,
|
||||
int line_max, struct strv *output, struct error **e)
|
||||
{
|
||||
size_t message_left = strlen (message), i = 0;
|
||||
struct irc_char_attrs *attrs = irc_analyze_text (message, message_left);
|
||||
struct str m = str_make ();
|
||||
if (line_max <= 0)
|
||||
goto error;
|
||||
|
||||
int message_left = strlen (message);
|
||||
while (message_left > line_max)
|
||||
while (m.len + message_left > (size_t) line_max)
|
||||
{
|
||||
struct str m = str_make ();
|
||||
|
||||
size_t eaten = wrap_text_for_single_line
|
||||
(message, message_left, line_max, &m);
|
||||
(message + i, attrs + i, message_left, line_max - m.len, &m);
|
||||
if (!eaten)
|
||||
{
|
||||
str_free (&m);
|
||||
goto error;
|
||||
}
|
||||
|
||||
strv_append_owned (output, str_steal (&m));
|
||||
message += eaten;
|
||||
message_left -= eaten;
|
||||
m = str_make ();
|
||||
|
||||
i += eaten;
|
||||
if (!(message_left -= eaten))
|
||||
break;
|
||||
|
||||
irc_serialize_char_attrs (attrs + i, &m);
|
||||
if (m.len >= (size_t) line_max)
|
||||
{
|
||||
print_debug ("formatting continuation too long");
|
||||
str_reset (&m);
|
||||
}
|
||||
}
|
||||
|
||||
if (message_left)
|
||||
strv_append (output, message);
|
||||
strv_append_owned (output,
|
||||
xstrdup_printf ("%s%s", m.str, message + i));
|
||||
|
||||
free (attrs);
|
||||
str_free (&m);
|
||||
return true;
|
||||
|
||||
error:
|
||||
// Well, that's just weird
|
||||
error_set (e,
|
||||
free (attrs);
|
||||
str_free (&m);
|
||||
return error_set (e,
|
||||
"Message splitting was unsuccessful as there was "
|
||||
"too little room for UTF-8 characters");
|
||||
return false;
|
||||
}
|
||||
|
||||
/// Automatically splits messages that arrive at other clients with our prefix
|
||||
@@ -10663,7 +10785,7 @@ lua_plugin_load (struct app_context *ctx, const char *filename,
|
||||
|
||||
luaL_checkversion (L);
|
||||
|
||||
// Register the degesch library as a singleton with "plugin" as an upvalue
|
||||
// Register the xC library as a singleton with "plugin" as an upvalue
|
||||
// (mostly historical, but rather convenient)
|
||||
luaL_newmetatable (L, lua_ctx_info.name);
|
||||
lua_pushlightuserdata (L, plugin);
|
||||
@@ -12506,8 +12628,6 @@ process_input (struct app_context *ctx, char *user_input)
|
||||
else
|
||||
{
|
||||
struct strv lines = strv_make ();
|
||||
|
||||
// XXX: this interprets commands in pasted text
|
||||
cstr_split (input, "\r\n", false, &lines);
|
||||
for (size_t i = 0; i < lines.len; i++)
|
||||
(void) process_input_utf8 (ctx,
|
||||
@@ -13040,7 +13160,7 @@ dump_input_to_file (struct app_context *ctx, char *template, struct error **e)
|
||||
if (fd < 0)
|
||||
return error_set (e, "%s", strerror (errno));
|
||||
|
||||
char *input = CALL (ctx->input, get_line);
|
||||
char *input = CALL_ (ctx->input, get_line, NULL);
|
||||
bool success = xwrite (fd, input, strlen (input), e);
|
||||
free (input);
|
||||
|
||||
@@ -13068,6 +13188,103 @@ try_dump_input_to_file (struct app_context *ctx)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static struct strv
|
||||
build_editor_command (struct app_context *ctx, const char *filename)
|
||||
{
|
||||
struct strv argv = strv_make ();
|
||||
const char *editor = get_config_string
|
||||
(ctx->config.root, "behaviour.editor_command");
|
||||
if (!editor)
|
||||
{
|
||||
const char *command;
|
||||
if (!(command = getenv ("VISUAL"))
|
||||
&& !(command = getenv ("EDITOR")))
|
||||
command = "vi";
|
||||
|
||||
strv_append (&argv, command);
|
||||
strv_append (&argv, filename);
|
||||
return argv;
|
||||
}
|
||||
|
||||
int cursor = 0;
|
||||
char *input = CALL_ (ctx->input, get_line, &cursor);
|
||||
hard_assert (cursor >= 0);
|
||||
|
||||
mbstate_t ps;
|
||||
memset (&ps, 0, sizeof ps);
|
||||
|
||||
wchar_t wch;
|
||||
size_t len, processed = 0, line_one_based = 1, column = 0;
|
||||
while (processed < (size_t) cursor
|
||||
&& (len = mbrtowc (&wch, input + processed, cursor - processed, &ps))
|
||||
&& len != (size_t) -2 && len != (size_t) -1)
|
||||
{
|
||||
// Both VIM and Emacs use the caret notation with columns.
|
||||
// Consciously leaving tabs broken, they're too difficult to handle.
|
||||
int width = wcwidth (wch);
|
||||
if (width < 0)
|
||||
width = 2;
|
||||
|
||||
processed += len;
|
||||
if (wch == '\n')
|
||||
{
|
||||
line_one_based++;
|
||||
column = 0;
|
||||
}
|
||||
else
|
||||
column += width;
|
||||
}
|
||||
free (input);
|
||||
|
||||
// Trivially split the command on spaces and substitute our values
|
||||
struct str argument = str_make ();
|
||||
for (; *editor; editor++)
|
||||
{
|
||||
if (*editor == ' ')
|
||||
{
|
||||
if (argument.len)
|
||||
{
|
||||
strv_append_owned (&argv, str_steal (&argument));
|
||||
argument = str_make ();
|
||||
}
|
||||
continue;
|
||||
}
|
||||
if (*editor != '%' || !editor[1])
|
||||
{
|
||||
str_append_c (&argument, *editor);
|
||||
continue;
|
||||
}
|
||||
|
||||
// None of them are zero-length, thus words don't get lost
|
||||
switch (*++editor)
|
||||
{
|
||||
case 'F':
|
||||
str_append (&argument, filename);
|
||||
break;
|
||||
case 'L':
|
||||
str_append_printf (&argument, "%zu", line_one_based);
|
||||
break;
|
||||
case 'C':
|
||||
str_append_printf (&argument, "%zu", column + 1);
|
||||
break;
|
||||
case 'B':
|
||||
str_append_printf (&argument, "%d", cursor + 1);
|
||||
break;
|
||||
case '%':
|
||||
case ' ':
|
||||
str_append_c (&argument, *editor);
|
||||
break;
|
||||
default:
|
||||
print_warning ("unknown substitution variable");
|
||||
}
|
||||
}
|
||||
if (argument.len)
|
||||
strv_append_owned (&argv, str_steal (&argument));
|
||||
else
|
||||
str_free (&argument);
|
||||
return argv;
|
||||
}
|
||||
|
||||
static bool
|
||||
on_edit_input (int count, int key, void *user_data)
|
||||
{
|
||||
@@ -13079,16 +13296,15 @@ on_edit_input (int count, int key, void *user_data)
|
||||
if (!(filename = try_dump_input_to_file (ctx)))
|
||||
return false;
|
||||
|
||||
const char *command;
|
||||
if (!(command = getenv ("VISUAL"))
|
||||
&& !(command = getenv ("EDITOR")))
|
||||
command = "vi";
|
||||
struct strv argv = build_editor_command (ctx, filename);
|
||||
if (!argv.len)
|
||||
strv_append (&argv, "true");
|
||||
|
||||
hard_assert (!ctx->running_editor);
|
||||
switch (spawn_helper_child (ctx))
|
||||
{
|
||||
case 0:
|
||||
execlp (command, command, filename, NULL);
|
||||
execvp (argv.vector[0], argv.vector);
|
||||
print_error ("%s: %s",
|
||||
"Failed to launch editor", strerror (errno));
|
||||
_exit (EXIT_FAILURE);
|
||||
@@ -13101,6 +13317,7 @@ on_edit_input (int count, int key, void *user_data)
|
||||
ctx->running_editor = true;
|
||||
ctx->editor_filename = filename;
|
||||
}
|
||||
strv_free (&argv);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -13381,7 +13598,7 @@ on_insert_attribute (int count, int key, void *user_data)
|
||||
(void) key;
|
||||
|
||||
struct app_context *ctx = user_data;
|
||||
ctx->awaiting_mirc_escape = true;
|
||||
ctx->awaiting_formatting_escape = true;
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -13415,7 +13632,7 @@ input_add_functions (void *user_data)
|
||||
XX ("toggle-unimportant", "Toggle junk msgs", on_toggle_unimportant)
|
||||
XX ("edit-input", "Edit input", on_edit_input)
|
||||
XX ("redraw-screen", "Redraw screen", on_redraw_screen)
|
||||
XX ("insert-attribute", "mIRC formatting", on_insert_attribute)
|
||||
XX ("insert-attribute", "IRC formatting", on_insert_attribute)
|
||||
XX ("start-paste-mode", "Bracketed paste", on_start_paste_mode)
|
||||
#undef XX
|
||||
}
|
||||
@@ -13586,19 +13803,33 @@ on_editline_complete (EditLine *editline, int key)
|
||||
|
||||
// Insert the best match instead
|
||||
el_insertstr (editline, completions[0]);
|
||||
|
||||
// I'm not sure if Readline's menu-complete can at all be implemented
|
||||
// with Editline--we have no way of detecting what the last executed handler
|
||||
// was. Employ the formatter's wrapping feature to spew all options.
|
||||
bool only_match = !completions[1];
|
||||
if (!only_match)
|
||||
{
|
||||
CALL (ctx->input, hide);
|
||||
redraw_screen (ctx);
|
||||
|
||||
struct formatter f = formatter_make (ctx, NULL);
|
||||
for (char **p = completions; *++p; )
|
||||
formatter_add (&f, " #l", *p);
|
||||
formatter_add (&f, "\n");
|
||||
formatter_flush (&f, stdout, 0);
|
||||
formatter_free (&f);
|
||||
|
||||
CALL (ctx->input, show);
|
||||
}
|
||||
|
||||
for (char **p = completions; *p; p++)
|
||||
free (*p);
|
||||
free (completions);
|
||||
|
||||
// I'm not sure if Readline's menu-complete can at all be implemented
|
||||
// with Editline. Spamming the terminal with possible completions
|
||||
// probably isn't what the user wants and we have no way of detecting
|
||||
// what the last executed handler was.
|
||||
if (!only_match)
|
||||
return CC_REFRESH_BEEP;
|
||||
|
||||
// But if there actually is just one match, finish the word
|
||||
// If there actually is just one match, finish the word
|
||||
el_insertstr (editline, " ");
|
||||
return CC_REFRESH;
|
||||
}
|
||||
@@ -13659,8 +13890,11 @@ app_editline_init (struct input_el *self)
|
||||
CALL_ (input, bind_control, 'w', "ed-delete-prev-word");
|
||||
// Just what are you doing?
|
||||
CALL_ (input, bind_control, 'u', "vi-kill-line-prev");
|
||||
// See input_el__redisplay(), functionally important
|
||||
CALL_ (input, bind_control, 'q', "ed-redisplay");
|
||||
|
||||
// We need to hide the prompt and input first
|
||||
CALL_ (input, bind, "\r", "send-line");
|
||||
CALL_ (input, bind, "\n", "send-line");
|
||||
|
||||
CALL_ (input, bind_control, 'i', "complete");
|
||||
@@ -13676,7 +13910,7 @@ app_editline_init (struct input_el *self)
|
||||
static const char *g_first_time_help[] =
|
||||
{
|
||||
"",
|
||||
"\x02Welcome to degesch!",
|
||||
"\x02Welcome to xC!",
|
||||
"",
|
||||
"To get a list of all commands, type \x02/help\x02. To obtain",
|
||||
"more information on a command or option, simply add it as",
|
||||
@@ -13686,9 +13920,9 @@ static const char *g_first_time_help[] =
|
||||
"F5/Ctrl-P\x02 or \x02" "F6/Ctrl-N\x02.",
|
||||
"",
|
||||
"Finally, adding a network is as simple as:",
|
||||
" - \x02/server add freenode\x02",
|
||||
" - \x02/set servers.freenode.addresses = \"chat.freenode.net\"\x02",
|
||||
" - \x02/connect freenode\x02",
|
||||
" - \x02/server add IRCnet\x02",
|
||||
" - \x02/set servers.IRCnet.addresses = \"open.ircnet.net\"\x02",
|
||||
" - \x02/connect IRCnet\x02",
|
||||
"",
|
||||
"That should be enough to get you started. Have fun!",
|
||||
""
|
||||
@@ -13945,7 +14179,7 @@ on_signal_pipe_readable (const struct pollfd *fd, struct app_context *ctx)
|
||||
}
|
||||
|
||||
static void
|
||||
process_mirc_escape (const struct pollfd *fd, struct app_context *ctx)
|
||||
process_formatting_escape (const struct pollfd *fd, struct app_context *ctx)
|
||||
{
|
||||
// There's no other way with libedit, as both el_getc() in a function
|
||||
// handler and CC_ARGHACK would block execution
|
||||
@@ -13997,11 +14231,45 @@ error:
|
||||
CALL (ctx->input, ding);
|
||||
done:
|
||||
str_reset (buf);
|
||||
ctx->awaiting_mirc_escape = false;
|
||||
ctx->awaiting_formatting_escape = false;
|
||||
}
|
||||
|
||||
#define BRACKETED_PASTE_LIMIT 102400 ///< How much text can be pasted
|
||||
|
||||
static bool
|
||||
insert_paste (struct app_context *ctx, char *paste, size_t len)
|
||||
{
|
||||
if (!get_config_boolean (ctx->config.root, "behaviour.process_pasted_text"))
|
||||
return CALL_ (ctx->input, insert, paste);
|
||||
|
||||
// Without ICRNL, which Editline keeps but Readline doesn't,
|
||||
// the terminal sends newlines as carriage returns (seen on urxvt)
|
||||
for (size_t i = 0; i < len; i++)
|
||||
if (paste[i] == '\r')
|
||||
paste[i] = '\n';
|
||||
|
||||
int position = 0;
|
||||
char *input = CALL_ (ctx->input, get_line, &position);
|
||||
bool quote_first_slash = !position || strchr ("\r\n", input[position - 1]);
|
||||
free (input);
|
||||
|
||||
// Executing commands by accident is much more common than pasting them
|
||||
// intentionally, although the latter may also have security consequences
|
||||
struct str processed = str_make ();
|
||||
str_reserve (&processed, len);
|
||||
for (size_t i = 0; i < len; i++)
|
||||
{
|
||||
if (paste[i] == '/'
|
||||
&& ((!i && quote_first_slash) || (i && paste[i - 1] == '\n')))
|
||||
str_append_c (&processed, paste[i]);
|
||||
str_append_c (&processed, paste[i]);
|
||||
}
|
||||
|
||||
bool success = CALL_ (ctx->input, insert, processed.str);
|
||||
str_free (&processed);
|
||||
return success;
|
||||
}
|
||||
|
||||
static void
|
||||
process_bracketed_paste (const struct pollfd *fd, struct app_context *ctx)
|
||||
{
|
||||
@@ -14026,7 +14294,7 @@ process_bracketed_paste (const struct pollfd *fd, struct app_context *ctx)
|
||||
(int) (text_len = BRACKETED_PASTE_LIMIT));
|
||||
|
||||
buf->str[text_len] = '\0';
|
||||
if (CALL_ (ctx->input, insert, buf->str))
|
||||
if (insert_paste (ctx, buf->str, text_len))
|
||||
goto done;
|
||||
|
||||
error:
|
||||
@@ -14093,8 +14361,8 @@ on_tty_readable (const struct pollfd *fd, struct app_context *ctx)
|
||||
if (fd->revents & ~(POLLIN | POLLHUP | POLLERR))
|
||||
print_debug ("fd %d: unexpected revents: %d", fd->fd, fd->revents);
|
||||
|
||||
if (ctx->awaiting_mirc_escape)
|
||||
process_mirc_escape (fd, ctx);
|
||||
if (ctx->awaiting_formatting_escape)
|
||||
process_formatting_escape (fd, ctx);
|
||||
else if (ctx->in_bracketed_paste)
|
||||
process_bracketed_paste (fd, ctx);
|
||||
else if (!ctx->quitting)
|
||||
@@ -14267,9 +14535,11 @@ test_aliases (void)
|
||||
static void
|
||||
test_wrapping (void)
|
||||
{
|
||||
static const char *message = " foo bar foobar fóóbárbáz";
|
||||
static const char *split[] =
|
||||
{ " foo", "bar", "foob", "ar", "fó", "ób", "árb", "áz" };
|
||||
static const char *message = " foo bar foobar fóóbárbáz\002 a\0031 b";
|
||||
// XXX: formatting continuation order is implementation-dependent here
|
||||
// (irc_serialize_char_attrs() makes a choice in serialization)
|
||||
static const char *split[] = { " foo", "bar", "foob", "ar",
|
||||
"fó", "ób", "árb", "áz\x02", "\002a\0031", "\0031\002b" };
|
||||
|
||||
struct strv v = strv_make ();
|
||||
hard_assert (wrap_message (message, 4, &v, NULL));
|
||||
@@ -14310,13 +14580,9 @@ main (int argc, char *argv[])
|
||||
|
||||
static const char *g_logo[] =
|
||||
{
|
||||
" __ __ ",
|
||||
" __/ /___________________/ / ",
|
||||
" / / , / / , / __/ __/ _ \\ ",
|
||||
"/ / / __/ / / __/_ / /_/ // / ",
|
||||
"\\__/\\__/_ /\\__/___/\\__/_//_/ " PROGRAM_VERSION,
|
||||
" /___/",
|
||||
""
|
||||
"",
|
||||
"\x02" PROGRAM_NAME "\x02 " PROGRAM_VERSION,
|
||||
"",
|
||||
};
|
||||
|
||||
static void
|
||||
@@ -14343,7 +14609,7 @@ format_input_and_die (struct app_context *ctx)
|
||||
int
|
||||
main (int argc, char *argv[])
|
||||
{
|
||||
// We include a generated file from kike including this array we don't use;
|
||||
// We include a generated file from xD including this array we don't use;
|
||||
// let's just keep it there and silence the compiler warning instead
|
||||
(void) g_default_replies;
|
||||
|
||||
|
Before Width: | Height: | Size: 8.9 KiB After Width: | Height: | Size: 8.9 KiB |
@@ -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;
|
||||
}
|
||||
@@ -1,20 +1,20 @@
|
||||
kike(1)
|
||||
=======
|
||||
xD(1)
|
||||
=====
|
||||
:doctype: manpage
|
||||
:manmanual: uirc3 Manual
|
||||
:mansource: uirc3 {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,10 +40,10 @@ 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.
|
||||
|
||||
@@ -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 - 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.
|
||||
@@ -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 };
|
||||
|
||||
@@ -3984,6 +3986,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 +4047,7 @@ main (int argc, char *argv[])
|
||||
|
||||
print_status (PROGRAM_NAME " " PROGRAM_VERSION " starting");
|
||||
setup_signal_handlers ();
|
||||
setup_limits ();
|
||||
init_openssl ();
|
||||
|
||||
struct server_context ctx;
|
||||
Reference in New Issue
Block a user