X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?p=lurk.git;a=blobdiff_plain;f=lurk.el;h=bd1e416ac95aa8610cfc4824238f53b47aa3ebac;hp=45d9424573db7e82ea9e96c32aab9541b1aa9f5b;hb=d9a9192dde02a1d7b79771bfbc6e6cfe3a7fe1a9;hpb=79e36b9edd4ee40eb4c0c428f6433c80fcf9fec2 diff --git a/lurk.el b/lurk.el index 45d9424..bd1e416 100644 --- a/lurk.el +++ b/lurk.el @@ -351,8 +351,10 @@ portion of the source component of the message, as LURK doesn't use this.") "") 'face 'lurk-context 'read-only t) - (propertize (concat lurk-prompt-string " ") + (propertize lurk-prompt-string 'face 'lurk-prompt + 'read-only t) + (propertize " " ; Need this to be separate to mark it as rear-nonsticky 'read-only t 'rear-nonsticky t))) (set-marker-insertion-type lurk-input-marker nil)) @@ -580,7 +582,8 @@ portion of the source component of the message, as LURK doesn't use this.") (underline nil) (strikethrough nil) (prev-point (point))) - (while (re-search-forward (rx (any "\x02\x1D\x1F\x1E")) nil t) + (while (re-search-forward (rx (or (any "\x02\x1D\x1F\x1E\x0F") + (: "\x03" (+ digit) (opt "," (* digit))))) nil t) (let ((beg (+ (match-beginning 0) 1))) (if bold (add-face-text-property prev-point beg '(:weight bold))) @@ -594,7 +597,13 @@ portion of the source component of the message, as LURK doesn't use this.") ("\x02" (setq bold (not bold))) ("\x1D" (setq italics (not italics))) ("\x1F" (setq underline (not underline))) - ("\x1E" (setq strikethrough (not strikethrough)))) + ("\x1E" (setq strikethrough (not strikethrough))) + ("\x0F" ; Reset + (setq bold nil) + (setq italics nil) + (setq underline nil) + (setq strikethrough nil)) + (_)) (delete-region (match-beginning 0) (match-end 0)) (setq prev-point (point))))) (buffer-string))) @@ -824,7 +833,8 @@ in which case they match anything.") ("QUIT" "Disconnect from current network." lurk-command-quit) ("NICK" "Change nick." lurk-command-nick) ("LIST" "Display details of one or more channels." lurk-command-list) - ("MSG" "Send private message to user." lurk-command-msg lurk-nick-completions)) + ("MSG" "Send private message to user." lurk-command-msg lurk-nick-completions) + ("HELP" "Display help on client commands." lurk-command-help lurk-help-completions)) "Table of commands explicitly supported by Lurk.") (defun lurk-boolean-completions () @@ -839,34 +849,22 @@ in which case they match anything.") (defun lurk-context-completions () (lurk-get-context-list)) +(defun lurk-help-completions () + (mapcar (lambda (row) (car row)) lurk-command-table)) -;;; Command entering -;; - -(defun lurk-enter-string (string) - (if (string-prefix-p "/" string) - (pcase string - ((rx (: "/" (let cmd-str (+ (not whitespace))) - (opt (+ whitespace) - (let params-str (+ anychar)) - string-end))) - (let ((command-row (assoc (upcase cmd-str) lurk-command-table #'equal)) - (params (if params-str - (split-string params-str nil t) - nil))) - (if command-row - (funcall (elt command-row 2) params) - (lurk-send-msg (lurk-msg nil nil (upcase cmd-str) params))))) - (_ - (lurk-display-error "Badly formed command."))) - (unless (string-empty-p string) - (if lurk-current-context - (progn - (lurk-send-msg (lurk-msg nil nil "PRIVMSG" - lurk-current-context - string)) - (lurk-display-message lurk-nick lurk-current-context string)) - (lurk-display-error "No current context."))))) +(defun lurk-command-help (params) + (if params + (let* ((cmd-str (upcase (car params))) + (row (assoc cmd-str lurk-command-table #'equal))) + (if row + (progn + (lurk-display-notice nil "Help for \x02" cmd-str "\x02:") + (lurk-display-notice nil " " (elt row 1))) + (lurk-display-notice nil "No such (client-interpreted) command."))) + (lurk-display-notice nil "Client-interpreted commands:") + (dolist (row lurk-command-table) + (lurk-display-notice nil " \x02" (elt row 0) "\x02: " (elt row 1))) + (lurk-display-notice nil "Use /HELP COMMAND to display information about a specific command."))) (defun lurk-command-debug (params) (setq lurk-debug @@ -952,7 +950,7 @@ in which case they match anything.") (lurk-display-notice nil "No current channel."))) (defun lurk-command-msg (params) - (if (and params (>= 2 (length params))) + (if (and params (>= (length params) 2)) (let ((to (car params)) (text (string-join (cdr params) " "))) (lurk-send-msg (lurk-msg nil nil "PRIVMSG" to text)) @@ -960,24 +958,41 @@ in which case they match anything.") (lurk-display-notice nil "Usage: /msg "))) +;;; Command entering +;; + +(defun lurk-enter-string (string) + (if (string-prefix-p "/" string) + (pcase string + ((rx (: "/" (let cmd-str (+ (not whitespace))) + (opt (+ whitespace) + (let params-str (+ anychar)) + string-end))) + (let ((command-row (assoc (upcase cmd-str) lurk-command-table #'equal)) + (params (if params-str + (split-string params-str nil t) + nil))) + (if command-row + (funcall (elt command-row 2) params) + (lurk-send-msg (lurk-msg nil nil (upcase cmd-str) params))))) + (_ + (lurk-display-error "Badly formed command."))) + (unless (string-empty-p string) + (if lurk-current-context + (progn + (lurk-send-msg (lurk-msg nil nil "PRIVMSG" + lurk-current-context + string)) + (lurk-display-message lurk-nick lurk-current-context string)) + (lurk-display-error "No current context."))))) + + ;;; Command history ;; (defvar lurk-history nil "Commands and messages sent in current session.") - -(defun lurk-enter () - "Enter current contents of line after prompt." - (interactive) - (with-current-buffer "*lurk*" - (let ((line (buffer-substring lurk-input-marker (point-max)))) - (push line lurk-history) - (setq lurk-history-index nil) - (let ((inhibit-read-only t)) - (delete-region lurk-input-marker (point-max))) - (lurk-enter-string line)))) - (defvar lurk-history-index nil) (defun lurk-history-cycle (delta) @@ -992,14 +1007,6 @@ in which case they match anything.") (delete-region lurk-input-marker (point-max)) (insert (elt lurk-history lurk-history-index))))) -(defun lurk-history-next () - (interactive) - (lurk-history-cycle -1)) - -(defun lurk-history-prev () - (interactive) - (lurk-history-cycle +1)) - ;;; Interactive functions ;; @@ -1022,6 +1029,14 @@ in which case they match anything.") (lurk-zoom-in lurk-current-context)) (setq lurk-zoomed (not lurk-zoomed))) +(defun lurk-history-next () + (interactive) + (lurk-history-cycle -1)) + +(defun lurk-history-prev () + (interactive) + (lurk-history-cycle +1)) + (defun lurk-complete-input () (interactive) (let ((completion-ignore-case t)) @@ -1032,12 +1047,13 @@ in which case they match anything.") (re-search-backward " " lurk-input-marker t))) (table-row (assoc (upcase cmd-str) lurk-command-table #'equal))) (if (and table-row (elt table-row 3)) - (let ((completions (funcall (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 lurk-input-marker (point))) (completion-in-region lurk-input-marker (point) - (mapcar (lambda (row) (string-join (list "/" (car row)))) + (mapcar (lambda (row) (concat "/" (car row) " ")) lurk-command-table))) (_ (let* ((end (max lurk-input-marker (point))) @@ -1047,6 +1063,18 @@ in which case they match anything.") (unless (string-prefix-p "/" (buffer-substring start end)) (completion-in-region start end (lurk-get-context-users lurk-current-context))))))))) +(defun lurk-enter () + "Enter current contents of line after prompt." + (interactive) + (with-current-buffer "*lurk*" + (let ((line (buffer-substring lurk-input-marker (point-max)))) + (push line lurk-history) + (setq lurk-history-index nil) + (let ((inhibit-read-only t)) + (delete-region lurk-input-marker (point-max))) + (lurk-enter-string line)))) + + ;;; Mode ;; @@ -1070,17 +1098,21 @@ in which case they match anything.") (when (fboundp 'evil-set-initial-state) (evil-set-initial-state 'lurk-mode 'insert)) + ;;; Main start procedure ;; -(defun lurk () - "Switch to *lurk* buffer." +(defun lurk (&optional network) + "Start lurk or just switch to the lurk buffer if one already exists. +Also connect to NETWORK if non-nil." (interactive) (if (get-buffer "*lurk*") (switch-to-buffer "*lurk*") (switch-to-buffer "*lurk*") (lurk-mode) - (lurk-setup-buffer)) + (lurk-setup-buffer) + (if network + (lurk-command-connect (list network)))) "Started LURK.")