Read-only behaviour is now correct.

[lurk.git] / lirc.el

diff --git a/lirc.el b/lirc.el
index c9dc91b..ee6bdd4 100644 (file)
--- a/lirc.el
+++ b/lirc.el
@@ -48,15 +48,32 @@
 (defcustom lirc-port 6667
   "Default port.")
 
-(defcustom lirc-prompt "> "
+(defcustom lirc-prompt-string "prompt> "
   "Prompt.")
 
+;;; Faces
+;;
+
+(defface lirc-prompt
+  '((t :inherit font-lock-string-face))
+  "Face used for the prompt.")
+
+;;; Global variables
+;;
+
+(defvar lirc-current-channel nil)
+(defvar lirc-channel-list nil)
+
 (defvar lirc-response "")
 
+
+;;; Network process
+;;
+
 (defun lirc-filter (proc string)
   (dolist (line (split-string (concat lirc-response string) "\n"))
     (if (string-suffix-p "\r" line)
-        (lirc-process-msg-string (string-trim line))
+        (lirc-eval-msg-string (string-trim line))
       (setq lirc-response line))))
 
 (defun lirc-get-process ()
@@ -70,6 +87,9 @@
                             :nowait t
                             :buffer "*lirc*"))))
 
+;;; Messages
+;;
+
 (defun lirc-as-string (obj)
   (if obj
       (with-output-to-string (princ obj))
@@ -79,12 +99,19 @@
   (list (lirc-as-string tags)
         (lirc-as-string src)
         (upcase (lirc-as-string cmd))
-        (mapcar #'lirc-as-string params)))
+        (mapcar #'lirc-as-string
+                (if (and params (listp (elt params 0)))
+                    (elt params 0)
+                  params))))
 
 (defun lirc-msg-tags (msg) (elt msg 0))
 (defun lirc-msg-src (msg) (elt msg 1))
 (defun lirc-msg-cmd (msg) (elt msg 2))
 (defun lirc-msg-params (msg) (elt msg 3))
+(defun lirc-msg-trail (msg)
+  (let ((params (lirc-msg-params msg)))
+    (if params
+        (elt params (- (length params) 1)))))
 
 (defvar lirc-msg-regex
   (rx
@@ -112,56 +139,118 @@
         (apply #'lirc-msg (append (list tags src cmd) params)))
     (error "Failed to parse string " string)))
 
+(defun lirc--filtered-join (&rest args)
+  (string-join (seq-filter (lambda (el) el) args) " "))
+
 (defun lirc-msg->string (msg)
   (let ((tags (lirc-msg-tags msg))
         (src (lirc-msg-src msg))
         (cmd (lirc-msg-cmd msg))
         (params (lirc-msg-params msg)))
-    (concat
-     (if tags (concat "@" tags " ") "")
-     (if src (concat ":" src " ") "")
-     cmd " "
+    (lirc--filtered-join
+     (if tags (concat "@" tags) nil)
+     (if src (concat ":" src) nil)
+     cmd
      (if (> (length params) 1)
          (string-join (seq-take params (- (length params) 1)) " ")
-       "")
+       nil)
      (if (> (length params) 0)
-         (concat " :" (elt params (- (length params) 1)))))))
+         (concat ":" (elt params (- (length params) 1)))
+       nil))))
+
+
+;;; Buffer
+;;
 
 (defun lirc-display-string (string)
+  (with-current-buffer (get-buffer-create "*lirc*")
+    (save-excursion
+      (goto-char lirc-prompt-marker)
+      (let ((inhibit-read-only t))
+        (insert-before-markers (propertize (concat string "\n") 'read-only t))))))
+
+(defun lirc-connect ()
+  (lirc-send-msg (lirc-msg nil nil "USER" lirc-user-name 0 "*" lirc-full-name))
+  (lirc-send-msg (lirc-msg nil nil "NICK" lirc-nick)))
+
+(defun lirc-send-msg (msg)
+  (let ((proc (lirc-get-process)))
+    (process-send-string proc (concat (lirc-msg->string msg) "\r\n"))))
+
+(defun lirc-render-prompt ()
   (with-current-buffer "*lirc*"
+    (set-marker-insertion-type lirc-prompt-marker nil)
+    (set-marker-insertion-type lirc-input-marker t)
     (let ((inhibit-read-only t))
-      (save-excursion
-        (goto-char (point-max))
-        (insert string "\n")))))
+      (delete-region lirc-prompt-marker lirc-input-marker))
+    (save-excursion
+      (goto-char lirc-prompt-marker)
+      (let ((inhibit-read-only t))
+        (insert (propertize lirc-prompt-string
+                            'face 'lirc-prompt
+                            'read-only t
+                            'rear-nonsticky t))))))
+  
+(defvar lirc-prompt-marker nil
+  "Marker for prompt position in LIRC buffer.")
+
+(defvar lirc-input-marker nil
+  "Marker for prompt position in LIRC buffer.")
+
+(defun lirc-setup-buffer ()
+  (with-current-buffer (get-buffer-create "*lirc*")
+    (if (markerp lirc-prompt-marker)
+        (set-marker lirc-prompt-marker (point-max))
+      (setq lirc-prompt-marker (point-max-marker)))
+    (if (markerp lirc-input-marker)
+        (set-marker lirc-input-marker (point-max))
+      (setq lirc-input-marker (point-max-marker)))
+    (lirc-render-prompt)
+    (goto-char (point-max))
+    (recenter -1)))
+
+;;; Message evaluation
+;;
 
-(defun lirc-process-msg-string (string)
-  (let ((msg (lirc-string->msg string)))
+(defun lirc-eval-msg-string (string)
+  (let* ((msg (lirc-string->msg string)))
     (cond
      ((equal (lirc-msg-cmd msg) "PING")
       (lirc-send-msg
        (lirc-msg nil nil "PONG" (lirc-msg-params msg))))
+     ((string-match (rx (= 3 digit)) (lirc-msg-cmd msg))
+      (lirc-display-string (string-join (cdr (lirc-msg-params msg)) " ")))
      (t
       (lirc-display-string (lirc-msg->string msg))))))
 
-(defun lirc-connect ()
-  (lirc-send-msg (lirc-msg nil nil "USER" lirc-user-name 0 "*" lirc-full-name))
-  (lirc-send-msg (lirc-msg nil nil "NICK" lirc-nick)))
 
-(defun lirc-send-msg (msg)
-  (let ((proc (lirc-get-process)))
-    (process-send-string proc (concat (lirc-msg->string msg) "\r\n"))))
-  
+;;; Mode
+;;
+
+(defvar lirc-mode-map
+  (let ((map (make-sparse-keymap)))
+    map))
+
+(define-derived-mode lirc-mode text-mode "lirc"
+  "Major mode for LIRC.")
+
+(when (fboundp 'evil-set-initial-state)
+  (evil-set-initial-state 'lirc-mode 'insert))
+
+;;; Main start procedure
+;;
 
 (defun lirc ()
   "Switch to *lirc* buffer."
   (interactive)
-  (pop-to-buffer-same-window "*lirc*")
+  (if (get-buffer "*lirc*")
+      (switch-to-buffer "*lirc*")
+    (switch-to-buffer "*lirc*"))
   (lirc-mode)
-  (lirc-connect))
+  (lirc-setup-buffer)
+  (lirc-connect)
+  "Started LIRC.")
 
-(define-derived-mode lirc-mode text-mode "lirc"
-  "Major mode for LIRC.")
 
 
 ;;; lirc.el ends here
-:bs-mbpr348.d.ethz.ch