;;
(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.")
(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-notice-prefix "-!-")
-(defvar lurk-error-prefix
- (propertize "!!!" 'face 'lurk-error))
+(defvar lurk-error-prefix "!!!")
(defvar lurk-prompt-string
(propertize "> " 'face 'lurk-prompt))
(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)))
(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))
(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.")))
(lurk-render-prompt)))
-;;; Output formatting
+;;; Output formatting and highlighting
;;
;; Partially-implemented idea: the face text property can be
;; 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.")
(puthash context facelist lurk-context-facelists))
facelist))
-(defun lurk-display-string (&rest strings)
+(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))
+ (fill-column 80)
+ (context-atom (if context (intern context) nil)))
(insert-before-markers
(propertize (concat (format-time-string "%H:%M") " ")
- 'face 'lurk-text
- 'read-only t)
+ '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")
- 'read-only t))
+ '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)
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-get-context-facelist context)
- 'help-echo (concat "Context: " context)
- 'context context))))
+ context
+ (pcase (lurk-get-context-type to)
+ ('channel (concat to " <" from "> " text))
+ ('nick (concat "[" from " -> " to "] " text))
+ (_
+ (error "Unsupported context type"))))))
(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*"
- (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)))
+ (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*"
+ (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
(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"
+ (lurk-display-notice nil "Detected 332: "string)
+ (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)) " ")))
(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)))
(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"
(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-notice nil (lurk-msg->string msg))))))
"Started LURK.")
-
;;; lurk.el ends here