Switched to using insert-text-button.

[elpher.git] / elopher.el

diff --git a/elopher.el b/elopher.el
index 9d45428..a7e232f 100644 (file)
--- a/elopher.el
+++ b/elopher.el
@@ -26,53 +26,37 @@
                'face '(foreground-color . "yellow")))
     (insert (make-string elopher-type-margin-width ?\s))))
 
-(defun elopher-make-clickable (string link-function mouse-help)
-  (let ((map (make-sparse-keymap)))
-    (define-key map [mouse-1] link-function)
-    (define-key map (kbd "RET") link-function)
-    (propertize string
-                'mouse-face 'highlight
-                'help-echo (concat "mouse-1: " mouse-help)
-                'keymap map)))
-
-(defun elopher-format-i (display-string)
-  (elopher-type-margin)
-  (insert (propertize display-string 'face '(foreground-color . "white")))
-  (insert "\n"))
-
-(defun elopher-format-0 (display-string selector hostname port)
-  (elopher-type-margin "T")
-  (insert (propertize
-           (elopher-make-clickable display-string
-                                  `(lambda () (interactive)
-                                     (elopher-get-text ,hostname ,port ,selector))
-                                  (format "open \"%s\" on %s port %s"
-                                          selector hostname port))
-           'face '(foreground-color . "gray")))
-  (insert "\n"))
-
-(defun elopher-format-1 (display-string selector hostname port)
-  (elopher-type-margin "/")
-  (insert (propertize
-           (elopher-make-clickable display-string
-                                   `(lambda () (interactive)
-                                      (elopher-get-index ,hostname ,port ,selector))
-                                   (format "follow link to \"%s\" on %s port %s"
-                                           selector hostname port))
-           'face '(foreground-color . "cyan")))
-  (insert "\n"))
+(defun elopher-follow-index-link (button)
+  (apply #'elopher-get-index (button-get button 'link-address)))
+
+(defun elopher-follow-text-link (button)
+  (apply #'elopher-get-text (button-get button 'link-address)))
 
 (defun elopher-process-record (line)
   (let* ((type (elt line 0))
          (fields (split-string (substring line 1) "\t"))
-         (g-display-string (elt fields 0))
-         (g-selector (elt fields 1))
-         (g-hostname (elt fields 2))
-         (g-port (elt fields 3)))
+         (display-string (elt fields 0))
+         (selector (elt fields 1))
+         (hostname (elt fields 2))
+         (port (elt fields 3))
+         (address (list selector hostname port)))
     (pcase type
-      (?i (elopher-format-i g-display-string))
-      (?0 (elopher-format-0 g-display-string g-selector g-hostname g-port))
-      (?1 (elopher-format-1 g-display-string g-selector g-hostname g-port)))))
+      (?i (elopher-type-margin)
+          (insert (propertize display-string
+                              'face '(foreground-color. "white"))))
+      (?0 (elopher-type-margin "T")
+          (insert-text-button display-string
+                              'face '(foreground-color . "gray")
+                              'link-address address
+                              'action #'elopher-follow-text-link
+                              'follow-link t))
+      (?1 (elopher-type-margin "/")
+          (insert-text-button display-string
+                              'face '(foreground-color . "cyan")
+                              'link-address address
+                              'action #'elopher-follow-index-link
+                              'follow-link t)))
+    (insert "\n")))
 
 (defvar elopher-incomplete-record "")
 
@@ -94,15 +78,16 @@
         (elopher-process-complete-records string)
         (set-marker marker (point))))))
     
-(defun elopher-get-index (host &optional port path)
+(defun elopher-get-index (selector host port)
   (switch-to-buffer "*elopher*")
   (erase-buffer)
+  (setq elopher-incomplete-record "")
   (make-network-process
    :name "elopher-process"
    :host host
    :service (if port port 70)
    :filter #'elopher-index-filter)
-  (process-send-string "elopher-process" (concat path "\n")))
+  (process-send-string "elopher-process" (concat selector "\n")))
 
 (defun elopher-text-filter (proc string)
   (with-current-buffer (get-buffer "*elopher*")
@@ -111,12 +96,14 @@
           (set-marker marker 0 (current-buffer)))
       (save-excursion
         (goto-char marker)
-        (insert string)
+        (dolist (line (split-string string "\r"))
+          (insert line))
         (set-marker marker (point))))))
 
-(defun elopher-get-text (host port selector)
+(defun elopher-get-text (selector host port)
   (switch-to-buffer "*elopher*")
   (erase-buffer)
+  (setq elopher-incomplete-record "")
   (make-network-process
    :name "elopher-process"
    :host host
@@ -127,14 +114,9 @@
 (defun elopher ()
   "Start gopher client."
   (interactive)
-  (elopher-get-index (read-from-minibuffer "Gopher host: ") 70))
+  (elopher-get-index "" (read-from-minibuffer "Gopher host: ") 70))
 
-(elopher-get-index "cosmic.voyage")
-;; (elopher-get-index "gopher.floodgap.com")
-;; (elopher-get-index "maurits.id.au")
-
-(defun elopher-quit ()
-  (interactive)
-  (kill-buffer "*elopher*"))
+;; (elopher-get-index "" "cosmic.voyage" 70)
+;; (elopher-get-index "" "gopher.floodgap.com" 70)
 
 ;;; elopher.el ends here