X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=lurk.el;h=10437757190a140557fa52f0ece450b749c52cff;hb=90276bec42fe4733cca2b20c48225a16ec9f4022;hp=fb1c25841efe43b44525ee490cc1b568b150cef9;hpb=28a02ce6c1e937ad829a844a007ed10d1e177aed;p=lurk.git diff --git a/lurk.el b/lurk.el index fb1c258..1043775 100644 --- a/lurk.el +++ b/lurk.el @@ -58,6 +58,9 @@ (defcustom lurk-show-joins nil "Set to non-nil to be notified of joins, parts and quits.") +(defcustom lurk-display-header t + "If non-nil, use buffer header to display information on current host and channel.") + ;;; Faces ;; @@ -364,6 +367,24 @@ portion of the source component of the message, as LURK doesn't use this.") (defvar lurk-input-marker nil "Marker for prompt position in LURK buffer.") +(defun lurk-setup-header () + (setq-local header-line-format + '(:eval + (let ((proc (get-process "lurk"))) + (if proc + (concat + "Host: " (car (process-contact proc)) + ", Context: " + (if lurk-current-context + (concat + lurk-current-context + " (" + (number-to-string + (length (lurk-get-context-users lurk-current-context))) + " users)") + "Server")) + "No connection"))))) + (defun lurk-setup-buffer () (with-current-buffer (get-buffer-create "*lurk*") (setq-local scroll-conservatively 1) @@ -375,7 +396,9 @@ portion of the source component of the message, as LURK doesn't use this.") (set-marker lurk-input-marker (point-max)) (setq lurk-input-marker (point-max-marker))) (goto-char (point-max)) - (lurk-render-prompt))) + (lurk-render-prompt) + (if lurk-display-header + (lurk-setup-header)))) ;;; Output formatting and highlighting @@ -405,6 +428,15 @@ portion of the source component of the message, as LURK doesn't use this.") (puthash context facelist lurk-context-facelists)) facelist)) +(defun lurk--fill-strings (col indent &rest strings) + (with-temp-buffer + (setq buffer-invisibility-spec nil) + (let ((fill-column col) + (adaptive-fill-regexp (rx-to-string `(= ,indent anychar)))) + (apply #'insert strings) + (fill-region (point-min) (point-max) nil t) + (buffer-string)))) + (defun lurk-display-string (context prefix &rest strings) (with-current-buffer (get-buffer-create "*lurk*") (save-excursion @@ -413,28 +445,26 @@ portion of the source component of the message, as LURK doesn't use this.") (old-pos (marker-position lurk-prompt-marker)) (padded-timestamp (concat (format-time-string "%H:%M "))) (padded-prefix (if prefix (concat prefix " ") "")) - (adaptive-fill-regexp (rx-to-string - `(= ,(+ (length padded-timestamp) - (length padded-prefix)) - anychar))) - (fill-column 80) (context-atom (if context (intern context) nil))) (insert-before-markers - (propertize padded-timestamp - 'face 'lurk-timestamp - 'read-only t - 'context context - 'invisible context-atom) - (propertize padded-prefix - 'read-only t - 'context context - 'invisible context-atom) - (propertize (concat (lurk-buttonify-urls (apply #'concat strings)) "\n") - 'face (lurk-get-context-facelist context) - 'read-only t - 'context context - 'invisible context-atom)) - (fill-region old-pos lurk-prompt-marker nil t))))) + (lurk--fill-strings + 80 + (+ (length padded-timestamp) + (length padded-prefix)) + (propertize padded-timestamp + 'face 'lurk-timestamp + 'read-only t + 'context context + 'invisible context-atom) + (propertize padded-prefix + 'read-only t + 'context context + 'invisible context-atom) + (propertize (concat (lurk-buttonify-urls (apply #'concat strings)) "\n") + 'face (lurk-get-context-facelist context) + 'read-only t + 'context context + 'invisible context-atom))))))) (defun lurk-display-message (from to text) (let ((context (if (eq 'channel (lurk-get-context-type to)) @@ -442,11 +472,13 @@ portion of the source component of the message, as LURK doesn't use this.") (if (equal to lurk-nick) from to)))) (lurk-display-string context - (pcase (lurk-get-context-type to) - ('channel (concat to " <" from ">")) - ('nick (concat "[" from " -> " to "]")) - (_ - (error "Unsupported context type"))) + (propertize + (pcase (lurk-get-context-type to) + ('channel (concat to " <" from ">")) + ('nick (concat "[" from " -> " to "]")) + (_ + (error "Unsupported context type"))) + 'face (lurk-get-context-facelist context)) text))) (defun lurk-display-action (from to action-text) @@ -455,7 +487,9 @@ portion of the source component of the message, as LURK doesn't use this.") (if (equal to lurk-nick) from to)))) (lurk-display-string context - (concat "* " from) + (propertize + (concat context " * " from) + 'face (lurk-get-context-facelist context)) action-text))) (defun lurk-display-notice (context &rest notices) @@ -544,10 +578,8 @@ portion of the source component of the message, as LURK doesn't use this.") ("PING" (lurk-send-msg (lurk-msg nil nil "PONG" (lurk-msg-params msg)))) - ;; (lurk-display-notice nil "ping-pong (server initiated)")) ("PONG") - ;; (lurk-display-notice nil "ping-pong (client initiated)")) ("001" (let* ((params (lurk-msg-params msg)) @@ -619,6 +651,21 @@ portion of the source component of the message, as LURK doesn't use this.") (if lurk-show-joins (lurk-display-notice channel nick " left channel " channel)))) + ((and "KICK") + (let ((kicker-nick (lurk-msg-src msg)) + (channel (car (lurk-msg-params msg))) + (nick (cadr (lurk-msg-params msg))) + (reason (caddr (lurk-msg-params msg)))) + (if (equal nick lurk-nick) + (progn + (lurk-display-notice channel kicker-nick " kicked you from " channel ": " reason) + (lurk-del-context channel) + (if (equal channel lurk-current-context) + (lurk-set-current-context (lurk-get-next-context))) + (lurk-render-prompt)) + (lurk-del-context-user channel nick) + (lurk-display-notice channel kicker-nick " kicked " nick " from " channel ": " reason)))) + ("QUIT" (let ((nick (lurk-msg-src msg)) (reason (mapconcat 'identity (lurk-msg-params msg) " "))) @@ -689,6 +736,14 @@ portion of the source component of the message, as LURK doesn't use this.") (setq lurk-debug (not lurk-debug)) (lurk-display-notice nil "Debug mode now " (if lurk-debug "on" "off") ".")) + ((rx "HEADER") + (if header-line-format + (progn + (setq-local header-line-format nil) + (lurk-display-notice nil "Header disabled.")) + (lurk-setup-header) + (lurk-display-notice nil "Header enabled."))) + ((rx (: "CONNECT " (let network (* not-newline)))) (lurk-display-notice nil "Attempting to connect to " network "...") (lurk-connect network)) @@ -727,10 +782,10 @@ portion of the source component of the message, as LURK doesn't use this.") (setq lurk-nick nick) (lurk-display-notice nil "Set default nick to '" nick "'"))) - ((rx "LIST") + ((rx (: "LIST" (* whitespace) string-end)) (lurk-display-notice nil "This command can generate lots of output. Use `LIST -yes' if you're sure.")) - ((rx (: "LIST" (+ whitespace) "-YES")) + ((rx (: "LIST" (+ whitespace) "-YES" (* whitespace) string-end)) (lurk-send-msg (lurk-msg nil nil "LIST"))) ((rx "MSG " @@ -820,7 +875,8 @@ portion of the source component of the message, as LURK doesn't use this.") (let* ((end (max lurk-input-marker (point))) (space-idx (save-excursion (re-search-backward " " lurk-input-marker t))) - (start (if space-idx (+ 1 space-idx) lurk-input-marker))) + (start (if space-idx (+ 1 space-idx) lurk-input-marker)) + (completion-ignore-case t)) (unless (string-prefix-p "/" (buffer-substring start end)) (completion-in-region start end (lurk-get-context-users lurk-current-context))))))