X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=lurk.el;h=8b307fe6464467844ff56de42a1ad86f6a80c234;hb=f0cb00a4471cb0c83c6fdddf1b702365c2f33f82;hp=becfff17332e281b11ffb33233da3d0bca6e9c5b;hpb=339375f4b2769d4d7efb5d14dfb0b8e8da073ef8;p=lurk.git

diff --git a/lurk.el b/lurk.el
index becfff1..8b307fe 100644
--- a/lurk.el
+++ b/lurk.el
@@ -55,33 +55,28 @@
 (defcustom lurk-allow-ipv6 nil
   "Set to non-nil to allow use of IPv6.")
 
+(defcustom lurk-show-joins nil
+  "Set to non-nil to be notified of joins, parts and quits.")
+
 ;;; Faces
 ;;
 
 (defface lurk-text
-  '((t :inherit font-lock-preprocessor-face))
+  '((t :inherit default))
   "Face used for Lurk text.")
 
-(defface lurk-your-nick
-  '((t :inherit font-lock-constant-face))
-  "Face used for highlighting your nick.")
-
 (defface lurk-prompt
-  '((t :inherit org-level-2))
+  '((t :inherit org-priority))
   "Face used for the prompt.")
 
 (defface lurk-context
-  '((t :inherit org-list-dt))
+  '((t :inherit org-tag))
   "Face used for the context name in the prompt.")
 
 (defface lurk-faded
-  '((t :inherit font-lock-preprocessor-face))
+  '((t :inherit org-agenda-dimmed-todo-face))
   "Face used for faded Lurk text.")
 
-(defface lurk-bold
-  '((t :inherit font-lock-function-name-face))
-  "Face used for bold Lurk text.")
-
 (defface lurk-error
   '((t :inherit font-lock-regexp-grouping-construct))
   "Face used for Lurk error text.")
@@ -91,18 +86,9 @@
 
 (defvar lurk-version "Lurk v0.1")
 
-(defvar lurk-notice-prefix
-  (concat
-   (propertize
-    "-" 'face 'lurk-faded)
-   (propertize
-    "!" 'face 'lurk-bold)
-   (propertize
-    "-" 'face 'lurk-faded)))
-
-(defvar lurk-error-prefix
-  (propertize "!!!" 'face 'lurk-error))
+(defvar lurk-notice-prefix "-!-")
 
+(defvar lurk-error-prefix "!!!")
 
 (defvar lurk-prompt-string
   (propertize "> " 'face 'lurk-prompt))
@@ -123,7 +109,7 @@
   (unless (equal "open" (string-trim string))
     (lurk-display-error "Disconnected from server.")
     (clrhash lurk-contexts)
-    (setq lurk-current-context nil)
+    (lurk-set-current-context nil)
     (lurk-render-prompt)
     (cancel-timer lurk-ping-timer)))
 
@@ -160,7 +146,7 @@
     (if (not (assoc network lurk-networks))
         (lurk-display-error "Network '" network "' is unknown.")
       (clrhash lurk-contexts)
-      (setq lurk-current-context nil)
+      (lurk-set-current-context nil)
       (lurk-start-process network)
       (lurk-send-msg (lurk-msg nil nil "USER" lurk-nick 0 "*" lurk-nick))
       (lurk-send-msg (lurk-msg nil nil "NICK" lurk-nick))
@@ -284,6 +270,11 @@ portion of the source component of the message, as LURK doesn't use this.")
   (dolist (context (lurk-get-context-list))
     (lurk-del-context-user context user)))
 
+(defun lurk-rename-user (old-nick new-nick)
+  (dolist (context (lurk-get-context-list))
+    (lurk-del-context-user context old-nick)
+    (lurk-add-context-users context (list new-nick))))
+
 (defun lurk-get-context-type (name)
   (cond
    ((string-prefix-p "#" name) 'channel)
@@ -308,41 +299,21 @@ portion of the source component of the message, as LURK doesn't use this.")
           (car context-list)))
     nil))
 
+(defun lurk-set-current-context (context)
+  (setq lurk-current-context context)
+  (lurk-highlight-context context))
+
 (defun lurk-cycle-contexts (&optional rev)
   (if lurk-current-context
       (progn
-        (setq lurk-current-context (lurk-get-next-context rev))
+        (lurk-set-current-context (lurk-get-next-context rev))
         (lurk-render-prompt))
     (lurk-display-error "No channels joined.")))
 
-(defun lurk-cycle-contexts-forward ()
-  (interactive)
-  (lurk-cycle-contexts))
-
-(defun lurk-cycle-contexts-reverse ()
-  (interactive)
-  (lurk-cycle-contexts t))
-
 
 ;;; Buffer
 ;;
 
-(defun lurk-display-string (&rest strings)
-  (with-current-buffer (get-buffer-create "*lurk*")
-    (save-excursion
-      (goto-char lurk-prompt-marker)
-      (let ((inhibit-read-only t)
-            (old-pos (marker-position lurk-prompt-marker))
-            (adaptive-fill-regexp (rx (= 6 anychar)))
-            (fill-column 80))
-        (insert-before-markers
-         (propertize (concat (format-time-string "%H:%M") " ")
-                     'face 'lurk-text
-                     'read-only t)
-         (propertize (concat (apply #'concat strings) "\n")
-                     'read-only t))
-        (fill-region old-pos lurk-prompt-marker nil t)))))
-
 (defun lurk-render-prompt ()
   (with-current-buffer "*lurk*"
     (let ((update-point (= lurk-input-marker (point)))
@@ -392,63 +363,120 @@ portion of the source component of the message, as LURK doesn't use this.")
     (lurk-render-prompt)))
 
 
-;;; Output formatting
+;;; Output formatting and highlighting
 ;;
 
+;; Partially-implemented 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 can allow selective hiding of contexts via
+;; the buffer-invisibility-spec.
+
+(defvar lurk-context-facelists (make-hash-table :test 'equal)
+  "List of seen contexts and associated face lists.")
+
+(defun lurk-get-context-facelist (context)
+  (let ((facelist (gethash context lurk-context-facelists)))
+    (unless facelist
+      (setq facelist (list 'lurk-text))
+      (puthash context facelist lurk-context-facelists))
+    facelist))
+
+(defun lurk-display-string (context &rest strings)
+  (with-current-buffer (get-buffer-create "*lurk*")
+    (save-excursion
+      (goto-char lurk-prompt-marker)
+      (let ((inhibit-read-only t)
+            (old-pos (marker-position lurk-prompt-marker))
+            (adaptive-fill-regexp (rx (= 6 anychar)))
+            (fill-column 80)
+            (context-atom (if context (intern context) nil)))
+        (insert-before-markers
+         (propertize (concat (format-time-string "%H:%M") " ")
+                     'face (lurk-get-context-facelist context)
+                     'read-only t
+                     'context context
+                     'invisible context-atom
+                     'help-echo (concat "Context: " (or context "none")))
+         (propertize (concat (apply #'concat strings) "\n")
+                     'face (lurk-get-context-facelist context)
+                     'read-only t
+                     'context context
+                     'invisible context-atom
+                     'help-echo (concat "Context: " (or context "none"))))
+        (fill-region old-pos lurk-prompt-marker nil t)))))
+
 (defun lurk-display-message (from to text)
   (let ((context (if (eq 'channel (lurk-get-context-type to))
                      to
                    (if (equal to lurk-nick) from to))))
-    (lurk-display-string
-     (propertize
-      (pcase (lurk-get-context-type to)
-        ('channel (concat to " <" from "> " text))
-        ('nick (concat "[" from " -> " to "] " text))
-        (_
-         (error "Unsupported context type")))
-      'face 'lurk-text
-      'help-echo (concat "Context: " context)
-      'context context))))
+    (if (string-match (rx (: "\01ACTION " (group (* (not "\01"))) "\01")) text)
+        (lurk-display-string context to " * " from " " (match-string 1 text))
+      (lurk-display-string
+       context
+       (pcase (lurk-get-context-type to)
+         ('channel (concat to " <" from "> "))
+         ('nick (concat "[" from " -> " to "] "))
+         (_
+          (error "Unsupported context type")))
+       text))))
 
 (defun lurk-display-notice (context &rest notices)
   (lurk-display-string
-   (propertize
-    (concat lurk-notice-prefix " " (apply #'concat notices))
-    'help-echo (concat "Context: " (or context "none"))
-    'context context)))
+   context
+   lurk-notice-prefix " "
+   (apply #'concat notices)))
 
 (defun lurk-display-error (&rest messages)
   (lurk-display-string
-   (concat lurk-error-prefix " "
-           (propertize (apply #'concat messages)
-                       'face 'lurk-error))))
+   nil
+   lurk-error-prefix " "
+   (apply #'concat messages)))
 
 (defun lurk-highlight-context (context)
+  (maphash
+   (lambda (this-context facelist)
+     (if (equal this-context context)
+         (setcar facelist 'lurk-text)
+       (setcar facelist 'lurk-faded)))
+   lurk-context-facelists)
+  (force-window-update "*lurk*"))
+
+(defun lurk-zoom-in (context)
+  (with-current-buffer "*lurk*"
+    (maphash
+     (lambda (this-context _)
+       (when this-context
+         (let ((this-context-atom (intern this-context)))
+           (if (equal this-context context)
+               (remove-from-invisibility-spec this-context-atom)
+             (add-to-invisibility-spec this-context-atom)))))
+     lurk-context-facelists)
+    (force-window-update "*lurk*")))
+
+(defun lurk-zoom-out ()
   (with-current-buffer "*lurk*"
-    (let* ((pos lurk-prompt-marker)
-           (nextpos (previous-single-property-change pos 'context))
-           (inhibit-read-only t))
-      (while (> pos nextpos)
-        (let ((thiscontext (get-text-property nextpos 'context)))
-          (if thiscontext
-              (if (equal context thiscontext)
-                  (add-text-properties nextpos pos
-                                       '(face (foreground-color . "green")))
-                (add-text-properties nextpos pos
-                                     '(face (foreground-color . "blue"))))
-            (add-text-properties nextpos pos
-                                 '(face lurk-text)))
-          thiscontext
-          (setq pos nextpos)
-          (setq nextpos (previous-single-property-change pos 'context nil 1)))))))
+    (maphash
+     (lambda (this-context _)
+       (let ((this-context-atom (if this-context (intern this-context) nil)))
+         (remove-from-invisibility-spec this-context-atom)))
+     lurk-context-facelists)
+    (force-window-update "*lurk*")))
 
 ;;; Message evaluation
 ;;
 
 (defun lurk-eval-msg-string (string)
-  ;; (lurk-display-string string)
+  ;; (lurk-display-string nil string)
   (let* ((msg (lurk-string->msg string)))
-    ;; (message (pp msg))
     (pcase (lurk-msg-cmd msg)
       ("PING"
        (lurk-send-msg
@@ -479,6 +507,19 @@ portion of the source component of the message, as LURK doesn't use this.")
           (lurk--as-string (length (lurk-get-context-users channel)))
           " users in " channel)))
 
+      ("331"
+       (let* ((params (lurk-msg-params msg))
+              (channel (elt params 1)))
+         (lurk-display-notice
+          channel
+          "No topic set.")))
+
+      ("332"
+       (let* ((params (lurk-msg-params msg))
+              (channel (elt params 1))
+              (topic (elt params 2)))
+         (lurk-display-notice channel "Topic: " topic)))
+
       ((rx (= 3 (any digit)))
        (lurk-display-notice nil (mapconcat 'identity (cdr (lurk-msg-params msg)) " ")))
 
@@ -486,7 +527,7 @@ portion of the source component of the message, as LURK doesn't use this.")
             (guard (equal lurk-nick (lurk-msg-src msg))))
        (let ((channel (car (lurk-msg-params msg))))
          (lurk-add-context channel)
-         (setq lurk-current-context channel)
+         (lurk-set-current-context channel)
          (lurk-display-notice channel "Joining channel " channel)
          (lurk-render-prompt)))
 
@@ -494,7 +535,8 @@ portion of the source component of the message, as LURK doesn't use this.")
        (let ((channel (car (lurk-msg-params msg)))
              (nick (lurk-msg-src msg)))
          (lurk-add-context-users channel (list nick))
-         (lurk-display-notice channel nick " joined channel " channel)))
+         (if lurk-show-joins
+             (lurk-display-notice channel nick " joined channel " channel))))
 
       ((and "PART"
             (guard (equal lurk-nick (lurk-msg-src msg))))
@@ -502,20 +544,22 @@ portion of the source component of the message, as LURK doesn't use this.")
          (lurk-display-notice channel "Left channel " channel)
          (lurk-del-context channel)
          (if (equal channel lurk-current-context)
-             (setq lurk-current-context (lurk-get-next-context)))
+             (lurk-set-current-context (lurk-get-next-context)))
          (lurk-render-prompt)))
 
       ("PART"
        (let ((channel (car (lurk-msg-params msg)))
              (nick (lurk-msg-src msg)))
          (lurk-del-context-user channel nick)
-         (lurk-display-notice channel nick " left channel " channel)))
+         (if lurk-show-joins
+             (lurk-display-notice channel nick " left channel " channel))))
 
       ("QUIT"
        (let ((nick (lurk-msg-src msg))
              (reason (mapconcat 'identity (lurk-msg-params msg) " ")))
          (lurk-del-user nick)
-         (lurk-display-notice nil nick " quit: " reason)))
+         (if lurk-show-joins
+             (lurk-display-notice nil nick " quit: " reason))))
 
       ((and "NICK"
             (guard (equal lurk-nick (lurk-msg-src msg))))
@@ -562,9 +606,13 @@ portion of the source component of the message, as LURK doesn't use this.")
             (lurk-display-notice "CTCP userinfo request from " from " (no response sent)"))
 
            (_
+            (if (and (equal from "BitBot")
+                     (equal to "##moshpit")
+                     (cl-search "\\_o< QUACK!" text))
+              (lurk-send-msg (lurk-msg nil nil "PRIVMSG" to ",bef")))
             (lurk-display-message from to text)))))
       (_
-       (lurk-display-string (lurk-msg->string msg))))))
+       (lurk-display-notice nil (lurk-msg->string msg))))))
 
 
 ;;; Command entering
@@ -581,10 +629,10 @@ portion of the source component of the message, as LURK doesn't use this.")
          (lurk-send-msg (lurk-msg nil nil "TOPIC" lurk-current-context new-topic)))
 
         ((rx (: "ME " (let action (* not-newline))))
-         (lurk-send-msg (lurk-msg nil nil "PRIVMSG"
-                                  (list lurk-current-context
-                                        (concat "\01ACTION " action "\01"))))
-         (lurk-display-action lurk-nick action))
+         (let ((ctcp-text (concat "\01ACTION " action "\01")))
+           (lurk-send-msg (lurk-msg nil nil "PRIVMSG"
+                                    (list lurk-current-context ctcp-text)))
+           (lurk-display-message lurk-nick lurk-current-context ctcp-text)))
 
         ((rx (: "VERSION" " " (let nick (+ (not whitespace)))))
          (lurk-send-msg (lurk-msg nil nil "PRIVMSG"
@@ -644,12 +692,38 @@ portion of the source component of the message, as LURK doesn't use this.")
       (lurk-enter-string line))))
 
 
+;;; Command completion
+;;
+
+;;; Interactive functions
+;;
+
+(defun lurk-cycle-contexts-forward ()
+  (interactive)
+  (lurk-cycle-contexts))
+
+(defun lurk-cycle-contexts-reverse ()
+  (interactive)
+  (lurk-cycle-contexts t))
+
+(defvar lurk-zoomed nil
+  "Keeps track of zoom status.")
+
+(defun lurk-toggle-zoom ()
+  (interactive)
+  (if lurk-zoomed
+      (lurk-zoom-out)
+    (lurk-zoom-in lurk-current-context))
+  (setq lurk-zoomed (not lurk-zoomed)))
+
 ;;; Mode
 ;;
 
 (defvar lurk-mode-map
   (let ((map (make-sparse-keymap)))
     (define-key map (kbd "RET") 'lurk-enter)
+    (define-key map (kbd "<tab>") 'lurk-complete)
+    (define-key map (kbd "C-c C-z") 'lurk-toggle-zoom)
     (define-key map (kbd "<C-tab>") 'lurk-cycle-contexts-forward)
     (define-key map (kbd "<C-S-tab>") 'lurk-cycle-contexts-reverse)
     map))
@@ -674,5 +748,4 @@ portion of the source component of the message, as LURK doesn't use this.")
   "Started LURK.")
 
 
-
 ;;; lurk.el ends here