:type '(string))
(defcustom murk-networks
- '(("debug" "localhost" 6667 :notls)
+ '(("debug" "localhost" 6697)
("libera" "irc.libera.chat" 6697)
("tilde" "tilde.chat" 6697)
- ("freenode" "chat.freenode.net" 6697))
+ ("sdf" "irc.sdf.org" 6697)
+ ("freenode" "chat.freenode.net" 6697)
+ ("mbr" "mbrserver.com" 6667 :notls))
"IRC networks."
:type '(alist :key-type string))
+(defcustom murk-show-joins nil
+ "Set to non-nil to be notified of joins, parts and quits.")
+
(defcustom murk-display-header t
"If non-nil, use buffer header to display current host and channel."
:type '(boolean))
(murk-display-error "Disconnected from server.")
(murk-connection-remove server)
(murk-remove-server-contexts server)
+ (murk-highlight-current-context)
(murk-render-prompt))))
(defun murk-start-process (server)
(murk-send-msg server (murk-msg nil nil "USER" murk-default-nick 0 "*" murk-default-nick))
(murk-send-msg server (murk-msg nil nil "NICK" murk-default-nick))
(murk-add-context (list server))
+ (murk-highlight-current-context)
(murk-render-prompt))))
(defun murk-send-msg (server msg)
(equal (seq-take c1 2)
(seq-take c2 2)))))
-(defun murk-context-server (ctx) (elt ctx 0))
-(defun murk-context-channel (ctx) (elt ctx 1))
-(defun murk-context-users (ctx) (elt ctx 2))
+(defun murk-context-server (ctx)
+ (elt ctx 0))
+
+(defun murk-context-channel (ctx)
+ (elt ctx 1))
+
+(defun murk-context-users (ctx)
+ (elt ctx 2))
+
(defun murk-set-context-users (ctx users)
(setcar (cddr ctx) users))
-(defun murk-server-context-p (ctx) (not (cdr ctx)))
+
+(defun murk-server-context-p (ctx)
+ (not (cdr ctx)))
(defun murk-add-context (ctx)
(add-to-list 'murk-contexts ctx))
(concat (murk-context-channel ctx) "@"
(murk-context-server ctx))))
-(defun murk-get-context (server &optional name)
- (if name
- (let ((test-ctx (list server name)))
+(defun murk-string->context (string)
+ (if (not (string-prefix-p "#" string))
+ (murk-get-context string)
+ (let* ((parts (string-split string "@"))
+ (channel (elt parts 0))
+ (server (elt parts 1)))
+ (murk-get-context server channel))))
+
+(defun murk-get-context (server &optional channel)
+ (if (and channel (string-prefix-p "#" channel))
+ (let ((test-ctx (list server channel)))
(seq-find (lambda (ctx)
(equal (seq-take ctx 2) test-ctx))
murk-contexts))
- (assoc server murk-contexts)))
+ (car (member (list server) murk-contexts))))
(defun murk-cycle-contexts (&optional reverse)
(setq murk-contexts
(seq-take murk-contexts nminus1)))
(append (cdr murk-contexts) (list (car murk-contexts))))))
+(defun murk-switch-to-context (ctx)
+ (setq murk-contexts
+ (let* ((new-head (memq ctx murk-contexts))
+ (new-tail (take (- (length murk-contexts)
+ (length new-head)))))
+ (append new-head new-tail))))
+
(defun murk-add-context-users (ctx users)
(murk-set-context-users
ctx
(cl-union users (murk-context-users ctx))))
+(defun murk-del-context-user (ctx user)
+ (murk-set-context-users
+ ctx
+ (delete user (murk-context-users ctx))))
+
+(defun murk-del-server-user (server user)
+ (dolist (ctx murk-contexts)
+ (if (and (equal (murk-context-server ctx) server)
+ (not (murk-server-context-p ctx)))
+ (murk-del-context-user ctx user))))
+
+(defun murk-rename-server-user (server old-nick new-nick)
+ (dolist (ctx murk-contexts)
+ (when (and (equal (murk-context-server ctx) server)
+ (member old-nick (murk-context-users ctx)))
+ (murk-del-context-user ctx old-nick)
+ (murk-add-context-users ctx (list new-nick)))))
+
;;; Buffer
;;
(set-marker murk-input-marker (point-max))
(setq murk-input-marker (point-max-marker)))
(goto-char (point-max))
+ (murk-highlight-current-context)
(murk-render-prompt)
(if murk-display-header
(murk-setup-header))))
;;; Output formatting and highlighting
;;
+;; Idea: the face text property can be a list of faces, applied in
+;; order. By assigning each context a unique list and keeping track
+;; of these in a hash table, we can easily switch the face
+;; corresponding to a particular context by modifying the elements of
+;; this list.
+;;
+;; More subtly, we make only the cdrs of this list shared among
+;; all text of a given context, allowing the cars to be different
+;; and for different elements of the context-specific text to have
+;; different styling.
+
+;; Additionally, we allow selective hiding of contexts via
+;; the buffer-invisibility-spec.
+
+(defvar murk-context-facelists (make-hash-table :test 'equal)
+ "List of seen contexts and associated face lists.")
+
+(defun murk-get-context-facelist (context)
+ (let* ((short-ctx (take 2 context))
+ (facelist (gethash short-ctx murk-context-facelists)))
+ (unless facelist
+ (setq facelist (list 'murk-text))
+ (puthash short-ctx facelist murk-context-facelists))
+ facelist))
+
(defun murk--fill-strings (col indent &rest strings)
(with-temp-buffer
(setq buffer-invisibility-spec nil)
(old-pos (marker-position murk-prompt-marker))
(padded-timestamp (concat (format-time-string "%H:%M ")))
(padded-prefix (if prefix (concat prefix " ") ""))
- (context-atom (if context (intern (murk-context->string context)) nil)))
+ (short-ctx (take 2 context))
+ (context-atom (if short-ctx
+ (intern (murk-context->string short-ctx))
+ nil))
+ (context-face (murk-get-context-facelist short-ctx)))
(insert-before-markers
(murk--fill-strings
80
(propertize padded-timestamp
'face 'murk-timestamp
'read-only t
- 'context context
+ 'context short-ctx
'invisible context-atom)
(propertize padded-prefix
'read-only t
- 'context context
+ 'context short-ctx
'invisible context-atom)
(murk-add-formatting
(propertize (concat (apply #'murk-buttonify-urls strings) "\n")
+ 'face context-face
'read-only t
- 'context context
+ 'context short-ctx
'invisible context-atom)))))))
(murk-scroll-windows-to-last-line))
(murk-get-context server))))
(murk-display-string
context
- (if (murk-server-context-p context)
- (concat "[" from " -> " to "]")
- (concat (murk-context->string context) " <" from ">"))
+ (propertize
+ (if (murk-server-context-p context)
+ (concat "[" from "->" to "]")
+ (concat (murk-context->string context) " <" from ">"))
+ 'face (murk-get-context-facelist context))
text)))
+(defun murk-display-action (server from to action-text)
+ (let ((context (if (string-prefix-p "#" to)
+ (murk-get-context server to)
+ (murk-get-context server))))
+ (murk-display-string
+ context
+ (concat (murk-context->string context) " *")
+ from " " action-text)))
+
(defun murk-display-notice (context &rest notices)
(murk-display-string
context
(propertize murk-error-prefix 'face 'murk-error)
(apply #'concat messages)))
+(defun murk-highlight-current-context ()
+ (maphash
+ (lambda (this-context facelist)
+ (if (equal (take 2 this-context) (take 2 (murk-current-context)))
+ (setcar facelist 'murk-text)
+ (setcar facelist 'murk-faded)))
+ murk-context-facelists)
+ (force-window-update "*murk*"))
+
+(defun murk-zoom-in (context)
+ (with-current-buffer "*murk*"
+ (maphash
+ (lambda (this-context _)
+ (when this-context
+ (let ((this-context-atom
+ (intern (murk-context->string this-context))))
+ (if (equal this-context (take 2 context))
+ (remove-from-invisibility-spec this-context-atom)
+ (add-to-invisibility-spec this-context-atom)))))
+ murk-context-facelists)
+ (force-window-update "*murk*"))
+ (murk-scroll-windows-to-last-line))
+
+(defun murk-zoom-out ()
+ (with-current-buffer "*murk*"
+ (maphash
+ (lambda (this-context _)
+ (let ((this-context-atom
+ (if this-context
+ (intern (murk-context->string this-context))
+ nil)))
+ (remove-from-invisibility-spec this-context-atom)))
+ murk-context-facelists)
+ (force-window-update "*murk*"))
+ (murk-scroll-windows-to-last-line))
+
(defun murk--start-of-final-line ()
(with-current-buffer "*murk*"
(save-excursion
(strikethrough nil)
(prev-point (point)))
(while (re-search-forward (rx (or (any "\x02\x1D\x1F\x1E\x0F")
- (: "\x03" (+ digit) (opt "," (* digit)))))
+ (: "\x03" (* digit) (opt "," (* digit)))))
nil t)
(let ((beg (+ (match-beginning 0) 1)))
(if bold
("PONG")
- ("001"
+ ("001" ; RPL_WELCOME
(let* ((params (murk-msg-params msg))
(nick (elt params 0))
(text (string-join (seq-drop params 1) " ")))
(murk-set-connection-nick server nick)
- (murk-display-notice nil text)))
+ (murk-display-notice (murk-get-context server) text)))
("353" ; NAMEREPLY
(let* ((params (murk-msg-params msg))
" users in " channel)
(murk-display-notice nil "End of " channel " names list."))))
+ ("331" ; RPL_NOTOPIC
+ (let* ((params (murk-msg-params msg))
+ (channel (elt params 1))
+ (ctx (murk-get-context server channel)))
+ (murk-display-notice ctx "No topic set.")))
+
+ ("332" ; RPL_TOPIC
+ (let* ((params (murk-msg-params msg))
+ (channel (elt params 1))
+ (topic (elt params 2))
+ (ctx (murk-get-context server channel)))
+ (murk-display-notice ctx "Topic: " topic)))
((rx (= 3 (any digit)))
- (murk-display-notice nil (mapconcat 'identity (cdr (murk-msg-params msg)) " ")))
+ (murk-display-notice (murk-get-context server)
+ (mapconcat 'identity (cdr (murk-msg-params msg)) " ")))
((and "JOIN"
(guard (equal (murk-connection-nick server)
(murk-add-context (list server channel nil))
(murk-display-notice (murk-current-context)
"Joining channel " channel " on " server)
+ (murk-highlight-current-context)
(murk-render-prompt)))
+ ("JOIN"
+ (let* ((channel (car (murk-msg-params msg)))
+ (nick (murk-msg-src msg))
+ (ctx (murk-get-context server channel)))
+ (murk-add-context-users ctx (list nick))
+ (if murk-show-joins
+ (murk-display-notice ctx nick " joined channel " channel
+ " on " server))))
+
((and "PART"
(guard (equal (murk-connection-nick server)
(murk-msg-src msg))))
(let ((channel (car (murk-msg-params msg))))
(murk-display-notice (murk-current-context) "Left channel " channel)
(murk-remove-context (list server channel))
+ (murk-highlight-current-context)
(murk-render-prompt)))
+ ("PART"
+ (let* ((channel (car (murk-msg-params msg)))
+ (nick (murk-msg-src msg))
+ (ctx (murk-get-context server channel)))
+ (murk-del-context-user ctx nick)
+ (if murk-show-joins
+ (murk-display-notice ctx nick " left channel " channel
+ " on " server))))
+
+ ((and "NICK"
+ (guard (equal (murk-connection-nick server)
+ (murk-msg-src msg))))
+ (let ((new-nick (car (murk-msg-params msg)))
+ (old-nick (murk-connection-nick server)))
+ (murk-set-connection-nick server new-nick)
+ (murk-rename-server-user server old-nick new-nick)
+ (murk-display-notice (murk-get-context server)
+ "Nick set to " new-nick " on " server)))
+
+ ("NICK"
+ (let ((old-nick (murk-msg-src msg))
+ (new-nick (car (murk-msg-params msg))))
+ (murk-display-notice nil old-nick " is now known as " new-nick
+ " on " server)
+ (murk-rename-server-user server old-nick new-nick)))
+
+ ("TOPIC"
+ (let ((channel (car (murk-msg-params msg)))
+ (nick (murk-msg-src msg))
+ (topic (cadr (murk-msg-params msg))))
+ (murk-display-notice (murk-get-context server channel)
+ nick " set the topic: " topic)))
+
("QUIT"
(let ((nick (murk-msg-src msg))
(reason (mapconcat 'identity (murk-msg-params msg) " ")))
- (murk-del-user nick)
+ (murk-del-server-user server nick)
(if murk-show-joins
- (murk-display-notice nil nick " quit: " reason))))
+ (murk-display-notice (murk-get-context server)
+ nick " quit: " reason))))
+
+ ("NOTICE"
+ (let ((nick (murk-msg-src msg))
+ (channel (car (murk-msg-params msg)))
+ (text (cadr (murk-msg-params msg))))
+ (pcase text
+ ((rx (: "\01VERSION "
+ (let version (* (not "\01")))
+ "\01"))
+ (murk-display-notice (murk-get-context server)
+ "CTCP version reply from " nick ": " version))
+ (_
+ (murk-display-notice (murk-get-context server channel) text)))))
("PRIVMSG"
(let* ((from (murk-msg-src msg))
(list from (concat "\01VERSION "
version-string
"\01")))))
- (murk-display-notice nil "CTCP version request received from "
+ (murk-display-notice (murk-get-context server)
+ "CTCP version request received from "
from " on " server))
((rx (let ping (: "\01PING " (* (not "\01")) "\01")))
(murk-send-msg server (murk-msg nil nil "NOTICE" (list from ping)))
- (murk-display-notice nil "CTCP ping received from " from " on " server))
+ (murk-display-notice (murk-get-context server)
+ "CTCP ping received from " from " on " server))
("\01USERINFO\01"
- (murk-display-notice nil "CTCP userinfo request from " from
+ (murk-display-notice (murk-get-context server)
+ "CTCP userinfo request from " from
" on " server " (no response sent)"))
("\01CLIENTINFO\01"
- (murk-display-notice nil "CTCP clientinfo request from " from
+ (murk-display-notice (murk-get-context server)
+ "CTCP clientinfo request from " from
" on " server " (no response sent)"))
((rx (: "\01ACTION " (let action-text (* (not "\01"))) "\01"))
- (murk-display-action from to action-text))
+ (murk-display-action server from to action-text))
(_
(murk-display-message server from to text)))))
(_
- (murk-display-notice nil (murk-msg->string msg))))))
+ (murk-display-notice (murk-get-context server)
+ (murk-msg->string msg))))))
;;; Commands
;;
(defvar murk-command-table
'(("DEBUG" "Toggle debug mode on/off." murk-command-debug murk-boolean-completions)
("HEADER" "Toggle display of header." murk-command-header murk-boolean-completions)
+ ("SHOWJOINS" "Toggles display of joins/parts." murk-command-showjoins murk-boolean-completions)
("NETWORKS" "List known IRC networks." murk-command-networks)
("CONNECT" "Connect to an IRC network." murk-command-connect murk-network-completions)
("QUIT" "Disconnect from current network." murk-command-quit)
("JOIN" "Join one or more channels." murk-command-join)
("PART" "Leave channel." murk-command-part murk-context-completions)
("NICK" "Change nick." murk-command-nick)
+ ("LIST" "Display details of one or more channels." murk-command-list)
+ ("TOPIC" "Set/query topic for current channel." murk-command-topic)
+ ("USERS" "List nicks of users in current context." murk-command-users)
("MSG" "Send private message to user." murk-command-msg murk-nick-completions)
+ ("ME" "Display action." murk-command-me)
+ ("VERSION" "Request version of another user's client via CTCP." murk-command-version murk-nick-completions)
("CLEAR" "Clear buffer text." murk-command-clear murk-context-completions)
("HELP" "Display help on client commands." murk-command-help murk-help-completions))
"Table of commands explicitly supported by murk.")
(setq-local header-line-format nil)
(murk-display-notice nil "Header disabled.")))
-(defun murk-command-clear (params)
- (if (not params)
- (murk-clear-buffer)
- (dolist (context params)
- (murk-clear-context context))))
+(defun murk-command-showjoins (params)
+ (setq murk-show-joins
+ (if params
+ (if (equal (upcase (car params)) "ON")
+ t
+ nil)
+ (not murk-show-joins)))
+ (murk-display-notice nil "Joins/parts will now be "
+ (if murk-show-joins "shown" "hidden") "."))
(defun murk-command-connect (params)
(if params
(murk-send-msg server (murk-msg nil nil "PART" channel))
(murk-display-error "No current channel to leave"))))
+(defun murk-command-nick (params)
+ (if params
+ (let ((new-nick (string-join params " "))
+ (ctx (murk-current-context)))
+ (if ctx
+ (murk-send-msg (murk-context-server ctx)
+ (murk-msg nil nil "NICK" new-nick))
+ (murk-display-error "No current connection")))
+ (murk-display-notice nil "Usage: /nick <new-nick>")))
+
+(defun murk-command-list (params)
+ (let ((ctx (murk-current-context)))
+ (if ctx
+ (if (not params)
+ (murk-display-notice nil "This command can generate lots of output. Use `/LIST -yes' if you really want this, or `/LIST <channel_regexp>' to reduce the output.")
+ (let ((server (murk-context-server ctx)))
+ (if (equal (upcase (car params)) "-YES")
+ (murk-send-msg server (murk-msg nil nil "LIST"))
+ (murk-send-msg server (murk-msg nil nil "LIST"
+ (car params))))))
+ (murk-display-error "No current connection"))))
+
+(defun murk-command-topic (params)
+ (let ((ctx (murk-current-context)))
+ (if (and ctx (not (murk-server-context-p ctx)))
+ (let ((server (murk-context-server ctx))
+ (channel (murk-context-channel ctx)))
+ (if params
+ (murk-send-msg server
+ (murk-msg nil nil "TOPIC" channel
+ (string-join params " ")))
+ (murk-send-msg server
+ (murk-msg nil nil "TOPIC" channel))))
+ (murk-display-notice nil "No current channel."))))
+
(defun murk-command-msg (params)
(let ((server (murk-context-server (murk-current-context))))
(if (and params (>= (length params) 2))
to text))
(murk-display-notice nil "Usage: /msg <nick> <message>"))))
+(defun murk-command-me (params)
+ (let* ((ctx (murk-current-context))
+ (server (murk-context-server ctx)))
+ (if (and ctx (not (murk-server-context-p ctx)))
+ (if params
+ (let* ((channel (murk-context-channel ctx))
+ (my-nick (murk-connection-nick server))
+ (action (string-join params " "))
+ (ctcp-text (concat "\01ACTION " action "\01")))
+ (murk-send-msg server
+ (murk-msg nil nil "PRIVMSG"
+ (list channel ctcp-text)))
+ (murk-display-action server my-nick channel action))
+ (murk-display-notice nil "Usage: /me <action>"))
+ (murk-display-notice nil "No current channel."))))
+
+(defun murk-command-version (params)
+ (let ((ctx (murk-current-context)))
+ (if ctx
+ (if params
+ (let ((server (murk-context-server ctx))
+ (nick (car params)))
+ (murk-send-msg server
+ (lurk-msg nil nil "PRIVMSG"
+ (list nick "\01VERSION\01")))
+ (murk-display-notice ctx "CTCP version request sent to "
+ nick " on " server))
+ (murk-display-notice ctx "Usage: /version <nick>"))
+ (murk-display-notice nil "No current channel."))))
+
+(defun murk-command-users (_params)
+ (let ((ctx (murk-current-context)))
+ (if (and ctx (not (murk-server-context-p ctx)))
+ (let ((channel (murk-context-channel ctx))
+ (server (murk-context-server ctx))
+ (users (murk-context-users ctx)))
+ (murk-display-notice ctx "Users in " channel " on " server ":")
+ (murk-display-notice ctx (string-join users " ")))
+ (murk-display-notice nil "No current channel."))))
+
+
;;; Command entering
;;
(defun murk-cycle-contexts-forward ()
(interactive)
(murk-cycle-contexts)
- (murk-render-prompt))
+ (murk-highlight-current-context)
+ (murk-render-prompt)
+ (if murk-zoomed
+ (murk-zoom-in (murk-current-context))))
(defun murk-cycle-contexts-reverse ()
(interactive)
(murk-cycle-contexts t)
- (murk-render-prompt))
+ (murk-highlight-current-context)
+ (murk-render-prompt)
+ (if murk-zoomed
+ (murk-zoom-in (murk-current-context))))
+
+(defvar murk-zoomed nil
+ "Keeps track of zoom status.")
+
+(defun murk-toggle-zoom ()
+ (interactive)
+ (if murk-zoomed
+ (murk-zoom-out)
+ (murk-zoom-in (murk-current-context)))
+ (setq murk-zoomed (not murk-zoomed)))
+
(defun murk-complete-input ()
(interactive)
(let ((map (make-sparse-keymap)))
(define-key map (kbd "RET") 'murk-enter)
(define-key map (kbd "TAB") 'murk-complete-input)
+ (define-key map (kbd "C-c C-z") 'murk-toggle-zoom)
(define-key map (kbd "<C-up>") 'murk-history-prev)
(define-key map (kbd "<C-down>") 'murk-history-next)
(define-key map (kbd "<C-tab>") 'murk-cycle-contexts-forward)
The Lambda Lab / projects / lurk.git / blobdiff