"Multiserver Unibuffer iRc Klient"
:group 'network)
-(defcustom murk-nick "plugd"
+(defcustom murk-default-nick "plugd"
"Default nick.")
(defcustom murk-default-quit-msg "Bye"
"Default quit message when none supplied.")
(defcustom murk-networks
- '(("libera" "irc.libera.chat" 6697)
+ '(("debug" "localhost" 6667 :notls)
+ ("libera" "irc.libera.chat" 6697)
("tilde" "tilde.chat" 6697))
"IRC networks.")
(defvar murk-debug nil
"If non-nil, enable debug mode.")
+
;;; Utility procedures
;;
(with-output-to-string (princ obj))
nil))
+
;;; Network processes
;;
(defun murk-connection-process (server)
(elt (assoc server murk-connection-table) 1))
-(defun murk-connection-response (server)
+(defun murk-connection-nick (server)
(elt (assoc server murk-connection-table) 2))
+(defun murk-set-connection-nick (server nick)
+ (setf (elt (assoc server murk-connection-table) 2) nick))
+
+(defun murk-connection-response (server)
+ (elt (assoc server murk-connection-table) 3))
+
(defun murk-set-connection-response (server string)
- (setf (elt (assoc server murk-connection-table) 2) string))
+ (setf (elt (assoc server murk-connection-table) 3) string))
+
+(defun murk-connection-new (server process nick)
+ (add-to-list 'murk-connection-table
+ (list server process nick "")))
-(defun murk-connection-close (server)
+(defun murk-connection-remove (server)
(setq murk-connection-table (assoc-delete-all server murk-connection-table)))
(defun murk-make-server-filter (server)
"\n"))
(if (string-suffix-p "\r" line)
(murk-eval-msg-string server (string-trim line))
- (murk-set-connection-response line)))))
+ (murk-set-connection-response server line)))))
(defun murk-make-server-sentinel (server)
(lambda (proc string)
(unless (equal "open" (string-trim string))
(murk-display-error "Disconnected from server.")
- (murk-remove-contexts-for-server server)
- (murk-render-prompt)
- (murk-connection-close server))))
+ (murk-connection-remove server)
+ (murk-remove-server-contexts server)
+ (murk-render-prompt))))
(defun murk-start-process (server)
(let* ((row (assoc server murk-networks))
(if (not (assoc server murk-networks))
(murk-display-error "Network '" server "' is unknown.")
(let ((proc (murk-start-process server)))
- (add-to-list murk-connection-table
- (list server proc "")))
- (murk-send-msg server (murk-msg nil nil "USER" murk-nick 0 "*" murk-nick))
- (murk-send-msg server (murk-msg nil nil "NICK" murk-nick)))))
+ (murk-connection-new server proc murk-default-nick))
+ (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-render-prompt))))
(defun murk-send-msg (server msg)
(if murk-debug
(let ((proc (murk-connection-process server)))
(if (and proc (eq (process-status proc) 'open))
(process-send-string proc (concat (murk-msg->string msg) "\r\n"))
- (murk-display-error "No server connection established.")
- (error "No server connection established"))))
+ (murk-display-error "No server connection established."))))
+
;;; Server messages
;;
;; representing either a channel name or nick, and server is a symbol
;; identifying the server.
;;
-;; Each server has a special context (server) used for messages
+;; Each server has a special context (server nil) used for messages
;; to/from the server itself.
(defvar murk-contexts nil
(car murk-contexts)
nil))
+(defun murk-contexts-equal (c1 c2)
+ (if (murk-server-context-p c1)
+ (and (murk-server-context-p c2)
+ (equal (murk-context-server c1)
+ (murk-context-server c2)))
+ (and (not (murk-server-context-p c2))
+ (equal (seq-take c1 2)
+ (seq-take c2 2)))))
+
(defun murk-context-server (ctx) (elt ctx 0))
(defun murk-context-name (ctx) (elt ctx 1))
+(defun murk-context-users (ctx) (seq-drop ctx 2))
+(defun murk-server-context-p (ctx) (not (cdr ctx)))
+
+(defun murk-add-context (ctx)
+ (add-to-list 'murk-contexts ctx))
+
+(defun murk-remove-context (ctx)
+ (setq murk-contexts
+ (seq-remove
+ (lambda (this-ctx)
+ (murk-contexts-equal this-ctx ctx))
+ murk-contexts)))
+
+(defun murk-remove-server-contexts (server)
+ (setq murk-contexts
+ (assoc-delete-all server murk-contexts)))
+
+(defun murk-context->string (ctx)
+ (if (murk-server-context-p ctx)
+ (concat "[" (murk-context-server ctx) "]")
+ (concat (murk-context-name ctx) "@"
+ (murk-context-server ctx))))
+
;;; Buffer
;;
(insert
(propertize (let ((ctx (murk-current-context)))
(if ctx
- (concat (murk-context-name) "@" (murk-context-server ctx))
- ""))
+ (murk-context->string ctx)
+ ""))
'face 'murk-context
'read-only t)
(propertize murk-prompt-string
"Marker for prompt position in murk buffer.")
(defun murk-setup-header ()
- ;; To do
- )
+ (with-current-buffer "*murk*"
+ (setq-local header-line-format
+ '((:eval
+ (let* ((ctx (murk-current-context)))
+ (if ctx
+ (let ((server (murk-context-server ctx)))
+ (concat
+ "Network: " server ", "
+ (if (murk-server-context-p ctx)
+ "Server"
+ (concat
+ "Channel: "
+ (murk-context-name ctx)
+ " ("
+ (number-to-string
+ (length (murk-context-users ctx)))
+ ")"))))
+ "No connection")))))))
(defun murk-setup-buffer ()
(with-current-buffer (get-buffer-create "*murk*")
(fill-region (point-min) (point-max) nil t)
(buffer-string))))
-(defun murk-context->string (context)
- (if context
- (concat (murk-context-name) "@" (murk-context-server context))
- nil))
-
(defun murk-display-string (context prefix &rest strings)
(with-current-buffer "*murk*"
(save-excursion
("PONG")
+ ("001"
+ (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)))
+
+ ((rx (= 3 (any digit)))
+ (murk-display-notice nil (mapconcat 'identity (cdr (murk-msg-params msg)) " ")))
+
+ ((and "JOIN"
+ (guard (equal (murk-connection-nick server)
+ (murk-msg-src msg))))
+ (let ((channel (car (murk-msg-params msg))))
+ (murk-add-context (list server channel))
+ (murk-display-notice (murk-current-context)
+ "Joining channel " channel " on " server)
+ (murk-render-prompt)))
+
+ ((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-render-prompt)))
+
+ ("QUIT"
+ (let ((nick (murk-msg-src msg))
+ (reason (mapconcat 'identity (murk-msg-params msg) " ")))
+ (murk-del-user nick)
+ (if murk-show-joins
+ (murk-display-notice nil nick " quit: " reason))))
+
(_
(murk-display-notice nil (murk-msg->string msg))))))
(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)
- ("CONNECT" "Connect to an IRC network." murk-command-connect murk-network-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)
("MSG" "Send private message to user." murk-command-msg 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.")
+(defun murk-boolean-completions ()
+ '("on" "off"))
+
+(defun murk-network-completions ()
+ (mapcar (lambda (row) (car row)) murk-networks))
+
(defun murk-command-help (params)
(if params
(let* ((cmd-str (upcase (car params)))
(not murk-debug)))
(murk-display-notice nil "Debug mode now " (if murk-debug "on" "off") "."))
+(defun murk-command-header (params)
+ (if
+ (if params
+ (equal (upcase (car params)) "ON")
+ (not header-line-format))
+ (progn
+ (murk-setup-header)
+ (murk-display-notice nil "Header enabled."))
+ (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-connect (params)
+ (if params
+ (let ((network (car params)))
+ (murk-display-notice nil "Attempting to connect to " network "...")
+ (murk-connect network))
+ (murk-display-notice nil "Usage: /connect <network>")))
+
+(defun murk-command-networks (params)
+ (murk-display-notice nil "Currently-known networks:")
+ (dolist (row murk-networks)
+ (seq-let (network server port &rest others) row
+ (murk-display-notice nil "\t" network
+ " [" server
+ " " (number-to-string port) "]")))
+ (murk-display-notice nil "(Modify the `murk-networks' variable to add more.)"))
+
+(defun murk-command-quit (params)
+ (let ((ctx (murk-current-context)))
+ (if (not ctx)
+ (murk-display-error "No current context.")
+ (let ((quit-msg (if params (string-join params " ") murk-default-quit-msg)))
+ (murk-send-msg
+ (murk-context-server ctx)
+ (murk-msg nil nil "QUIT" quit-msg))))))
+
+(defun murk-command-join (params)
+ (if params
+ (let ((server (murk-context-server (murk-current-context))))
+ (dolist (channel params)
+ (murk-send-msg server (murk-msg nil nil "JOIN" channel))))
+ (murk-display-notice nil "Usage: /join channel [channel2 ...]")))
+
+(defun murk-command-part (params)
+ (let* ((server (murk-context-server (murk-current-context)))
+ (channel (if params
+ (car params)
+ (murk-context-name (murk-current-context)))))
+ (if channel
+ (murk-send-msg server (murk-msg nil nil "PART" channel))
+ (murk-display-error "No current channel to leave."))))
+
;;; Command entering
;;
nil)))
(if (and command-row (elt command-row 2))
(funcall (elt command-row 2) params)
- (murk-send-msg (murk-msg nil nil (upcase cmd-str) params)))))
+ (murk-send-msg
+ (murk-context-server (murk-current-context))
+ (murk-msg nil nil (upcase cmd-str) params)))))
(_
(murk-display-error "Badly formed command.")))
(unless (string-empty-p string)
(delete-region murk-input-marker (point-max)))
(murk-enter-string line))))
+(defun murk-history-next ()
+ (interactive)
+ (murk-history-cycle -1))
+
+(defun murk-history-prev ()
+ (interactive)
+ (murk-history-cycle +1))
+
+(defun murk-complete-input ()
+ (interactive)
+ (let ((completion-ignore-case t))
+ (when (>= (point) murk-input-marker)
+ (pcase (buffer-substring murk-input-marker (point))
+ ((rx (: "/" (let cmd-str (+ (not whitespace))) (+ " ") (* (not whitespace)) string-end))
+ (let ((space-idx (save-excursion
+ (re-search-backward " " murk-input-marker t)))
+ (table-row (assoc (upcase cmd-str) murk-command-table #'equal)))
+ (if (and table-row (elt table-row 3))
+ (let* ((completions-nospace (funcall (elt table-row 3)))
+ (completions (mapcar (lambda (el) (concat el " ")) completions-nospace)))
+ (completion-in-region (+ 1 space-idx) (point) completions)))))
+ ((rx (: "/" (* (not whitespace)) string-end))
+ (message (buffer-substring murk-input-marker (point)))
+ (completion-in-region murk-input-marker (point)
+ (mapcar (lambda (row) (concat "/" (car row) " "))
+ murk-command-table)))
+ (_
+ (let* ((end (max murk-input-marker (point)))
+ (space-idx (save-excursion
+ (re-search-backward " " murk-input-marker t)))
+ (start (if space-idx (+ 1 space-idx) murk-input-marker)))
+ (unless (string-prefix-p "/" (buffer-substring start end))
+ (let* ((users (murk-get-context-users murk-current-context))
+ (users-no@ (mapcar
+ (lambda (u) (car (split-string u "@" t)))
+ users)))
+ (completion-in-region start end users-no@)))))))))
;;; Mode
;;
(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-up>") 'murk-history-prev)
+ (define-key map (kbd "<C-down>") 'murk-history-next)
(when (fboundp 'evil-define-key*)
(evil-define-key* 'motion map
(kbd "TAB") 'murk-complete-input))