Image rendering now working.

[elpher.git] / elopher.el

diff --git a/elopher.el b/elopher.el
index 79b2885..eb5160c 100644 (file)
--- a/elopher.el
+++ b/elopher.el
@@ -15,7 +15,7 @@
 (defconst elopher-margin-width 6
   "Width of left-hand margin used when rendering indicies.")
 
-(defconst elopher-start-page
+(defconst elopher-start-index
   (string-join
    (list "i\tfake\tfake\t1"
          "i--------------------------------------------\tfake\tfake\t1"
@@ -109,12 +109,11 @@
 (defun elopher-restore-pos ()
   (let ((pos (elopher-node-pos elopher-current-node)))
     (if pos
-        (goto-char (elopher-node-pos elopher-current-node))
+        (goto-char pos)
       (goto-char (point-min)))))
 
 ;; Node graph traversal
 
-(defvar elopher-start-node (elopher-make-node nil nil #'elopher-get-index-node))
 (defvar elopher-current-node)
 
 (defun elopher-visit-node (node)
@@ -126,8 +125,7 @@
 (defun elopher-visit-parent-node ()
   (let ((parent-node (elopher-node-parent elopher-current-node)))
     (when parent-node
-      (setq elopher-current-node parent-node)
-      (elopher-visit-node elopher-current-node))))
+      (elopher-visit-node parent-node))))
       
 (defun elopher-reload-current-node ()
   (elopher-set-node-content elopher-current-node nil)
@@ -154,6 +152,7 @@
       (elopher-insert-index-record line))))
 
 (defun elopher-insert-margin (&optional type-name)
+  "Insert index margin, optionally containing the TYPE-NAME, into the current buffer."
   (if type-name
       (progn
         (insert (format (concat "%" (number-to-string (- elopher-margin-width 1)) "s")
@@ -169,7 +168,11 @@
   (let* ((type (elt line 0))
          (fields (split-string (substring line 1) "\t"))
          (display-string (elt fields 0))
-         (address (elopher-make-address (elt fields 1) (elt fields 2) (elt fields 3))))
+         (address (elopher-make-address (elt fields 1) (elt fields 2) (elt fields 3)))
+         (help-string (format "mouse-1, RET: open %s on %s port %s"
+                              (elopher-address-selector address)
+                              (elopher-address-host address)
+                              (elopher-address-port address))))
     (pcase type
       (?i (elopher-insert-margin)
           (insert (propertize display-string
@@ -181,7 +184,8 @@
                                                                address
                                                                #'elopher-get-text-node)
                               'action #'elopher-click-link
-                              'follow-link t))
+                              'follow-link t
+                              'help-echo help-string))
       (?1 (elopher-insert-margin "/")
           (insert-text-button display-string
                               'face elopher-index-face
@@ -189,7 +193,17 @@
                                                                address
                                                                #'elopher-get-index-node)
                               'action #'elopher-click-link
-                              'follow-link t))
+                              'follow-link t
+                              'help-echo help-string))
+      ((or ?g ?p ?I) (elopher-insert-margin "im")
+          (insert-text-button display-string
+                              'face elopher-image-face
+                              'elopher-node (elopher-make-node elopher-current-node
+                                                               address
+                                                               #'elopher-get-image-node)
+                              'action #'elopher-click-link
+                              'follow-link t
+                              'help-echo help-string))
       (?.) ; Occurs at end of index, can safely ignore.
       (tp (elopher-insert-margin (concat (char-to-string tp) "?"))
           (insert (propertize display-string
@@ -202,7 +216,10 @@
 
 (defvar elopher-selector-string)
 
-(defun elopher-get-selector (address after)
+(defun elopher-get-selector (address after &optional binary)
+  "Retrieve selector specified by ADDRESS and store it in the
+string elopher-selector-string, then execute AFTER as the
+sentinal function."
   (setq elopher-selector-string "")
   (let ((p (get-process "elopher-process")))
     (if p (delete-process p)))
@@ -222,9 +239,10 @@
   (let ((content (elopher-node-content elopher-current-node))
         (address (elopher-node-address elopher-current-node)))
     (if content
-        (let ((inhibit-read-only t))
-          (insert content))
-        (elopher-restore-pos)
+        (progn
+          (let ((inhibit-read-only t))
+            (insert content))
+          (elopher-restore-pos))
       (if address
           (elopher-get-selector address
                                 (lambda (proc event)
@@ -235,7 +253,7 @@
                                                             (buffer-string))))
         (progn
           (let ((inhibit-read-only t))
-            (elopher-insert-index elopher-start-page))
+            (elopher-insert-index elopher-start-index))
           (elopher-restore-pos)
           (elopher-set-node-content elopher-current-node
                                     (buffer-string)))))))
@@ -249,20 +267,41 @@
   (let ((content (elopher-node-content elopher-current-node))
         (address (elopher-node-address elopher-current-node)))
     (if content
-        (let ((inhibit-read-only t))
-          (save-excursion
-            (insert content)))
+        (progn
+          (let ((inhibit-read-only t))
+            (insert content))
+          (elopher-restore-pos))
       (elopher-get-selector address
                             (lambda (proc event)
                               (let ((inhibit-read-only t))
-                                (erase-buffer)
-                                (save-excursion
-                                  (insert
-                                   (elopher-strip-CRs elopher-selector-string))))
+                                (insert (elopher-strip-CRs elopher-selector-string)))
+                              (elopher-restore-pos)
                               (elopher-set-node-content elopher-current-node
                                                         (buffer-string)))))))
 
-;;; Navigation methods
+;; Image retrieval
+
+(defun elopher-get-image-node ()
+  (let ((content (elopher-node-content elopher-current-node))
+        (address (elopher-node-address elopher-current-node)))
+    (if content
+        (progn
+          (let ((inhibit-read-only t))
+            (insert-image content))
+          (elopher-restore-pos))
+      (elopher-get-selector address
+                            (lambda (proc event)
+                              (let ((image (create-image
+                                            (string-as-unibyte elopher-selector-string)
+                                            nil t))
+                                    (inhibit-read-only t))
+                                (insert-image image)
+                                (elopher-restore-pos)
+                                (elopher-set-node-content elopher-current-node image)))))))
+        
+  
+
+;;; Navigation procedures
 ;;
 
 (defun elopher-next-link ()
@@ -301,15 +340,9 @@
 (defun elopher-back ()
   "Go to previous site."
   (interactive)
-  (elopher-visit-parent-node))
-
-;;; Main start procedure
-;;
-(defun elopher ()
-  "Start elopher with default landing page."
-  (interactive)
-  (setq elopher-current-node nil)
-  (elopher-visit-node elopher-start-node))
+  (if (elopher-node-parent elopher-current-node)
+      (elopher-visit-parent-node)
+    (message "No previous site.")))
 
 
 ;;; Mode and keymap
@@ -336,4 +369,13 @@
   "Major mode for elopher, an elisp gopher client.")
 
 
+;;; Main start procedure
+;;
+(defun elopher ()
+  "Start elopher with default landing page."
+  (interactive)
+  (setq elopher-current-node nil)
+  (let ((start-node (elopher-make-node nil nil #'elopher-get-index-node)))
+    (elopher-visit-node start-node)))
+
 ;;; elopher.el ends here