(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"
"i - RET/mouse-1: open directory entry\tfake\tfake\t1"
"i - u: return to parent directory entry\tfake\tfake\t1"
"i - g: go to a particular site\tfake\tfake\t1"
+ "i - r: reload current page\tfake\tfake\t1"
"i\tfake\tfake\t1"
"iPlaces to start exploring Gopherspace:\tfake\tfake\t1"
"1Floodgap Systems Gopher Server\t\tgopher.floodgap.com\t70"
;; Node
-(defun elopher-make-node (parent address getter &optional content)
- (list parent address getter content))
+(defun elopher-make-node (parent address getter &optional content pos)
+ (list parent address getter content pos))
(defun elopher-node-parent (node)
- (car node))
+ (elt node 0))
(defun elopher-node-address (node)
- (cadr node))
+ (elt node 1))
(defun elopher-node-getter (node)
- (caddr node))
+ (elt node 2))
(defun elopher-node-content (node)
- (cadddr node))
+ (elt node 3))
-(defvar elopher-start-node (elopher-make-node nil nil #'elopher-get-index-node))
-(defvar elopher-current-node)
+(defun elopher-node-pos (node)
+ (elt node 4))
(defun elopher-set-node-content (node content)
- (setcar (elopher-node-content node)
- content))
+ (setcar (nthcdr 3 node) content))
+
+(defun elopher-set-node-pos (node pos)
+ (setcar (nthcdr 4 node) pos))
+
+(defun elopher-save-pos ()
+ (when elopher-current-node
+ (elopher-set-node-pos elopher-current-node (point))))
+
+(defun elopher-restore-pos ()
+ (let ((pos (elopher-node-pos elopher-current-node)))
+ (if pos
+ (goto-char pos)
+ (goto-char (point-min)))))
+
+;; Node graph traversal
+
+(defvar elopher-current-node)
(defun elopher-visit-node (node)
+ (elopher-save-pos)
(elopher-prepare-buffer)
(setq elopher-current-node node)
(funcall (elopher-node-getter node)))
+(defun elopher-visit-parent-node ()
+ (let ((parent-node (elopher-node-parent elopher-current-node)))
+ (when parent-node
+ (elopher-visit-node parent-node))))
+
(defun elopher-reload-current-node ()
- (elopher-prepare-buffer)
(elopher-set-node-content elopher-current-node nil)
- (funcall (elopher-node-getter elopher-current-node)))
+ (elopher-visit-node elopher-current-node))
;;; Buffer preparation
(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")
(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
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
address
#'elopher-get-index-node)
'action #'elopher-click-link
- 'follow-link t))
+ '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
(let ((content (elopher-node-content elopher-current-node))
(address (elopher-node-address elopher-current-node)))
(if content
- (insert content)
+ (progn
+ (let ((inhibit-read-only t))
+ (insert content))
+ (elopher-restore-pos))
(if address
(elopher-get-selector address
(lambda (proc event)
(let ((inhibit-read-only t))
- (erase-buffer)
(elopher-insert-index elopher-selector-string))
+ (elopher-restore-pos)
(elopher-set-node-content elopher-current-node
(buffer-string))))
- (let ((inhibit-read-only t))
- (erase-buffer)
- (elopher-insert-index elopher-start-page))))))
+ (progn
+ (let ((inhibit-read-only t))
+ (elopher-insert-index elopher-start-index))
+ (elopher-restore-pos)
+ (elopher-set-node-content elopher-current-node
+ (buffer-string)))))))
;; Text retrieval
+(defun elopher-strip-CRs (string)
+ (replace-regexp-in-string "\r" "" string))
+
(defun elopher-get-text-node ()
(let ((content (elopher-node-content elopher-current-node))
(address (elopher-node-address elopher-current-node)))
(if content
- (let ((inhibit-read-only t))
- (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)
- (insert elopher-selector-string))
+ (insert (elopher-strip-CRs elopher-selector-string)))
+ (elopher-restore-pos)
(elopher-set-node-content elopher-current-node
- elopher-selector-string))))))
+ (buffer-string)))))))
;;; Navigation methods
;;
(interactive)
(elopher-reload-current-node))
+(defun elopher-back ()
+ "Go to previous site."
+ (interactive)
+ (if (elopher-node-parent elopher-current-node)
+ (elopher-visit-parent-node)
+ (message "No previous site.")))
;;; Main start procedure
;;
(defun elopher ()
"Start elopher with default landing page."
(interactive)
- (elopher-visit-node elopher-start-node))
+ (setq elopher-current-node nil)
+ (let ((start-node (elopher-make-node nil nil #'elopher-get-index-node)))
+ (elopher-visit-node start-node)))
;;; Mode and keymap
;;
-(setq elopher-mode-map
+(defvar elopher-mode-map
(let ((map (make-sparse-keymap)))
(define-key map (kbd "<tab>") 'elopher-next-link)
(define-key map (kbd "<S-tab>") 'elopher-prev-link)
- (define-key map (kbd "u") 'elopher-pop-history)
+ (define-key map (kbd "u") 'elopher-back)
(define-key map (kbd "g") 'elopher-go)
(define-key map (kbd "r") 'elopher-reload)
(when (require 'evil nil t)
(evil-define-key 'normal map
(kbd "C-]") 'elopher-follow-closest-link
- (kbd "C-t") 'elopher-pop-history
- (kbd "u") 'elopher-pop-history
+ (kbd "C-t") 'elopher-back
+ (kbd "u") 'elopher-back
(kbd "g") 'elopher-go
(kbd "r") 'elopher-reload))
- map))
- ;; "Keymap for gopher client.")
+ map)
+ "Keymap for gopher client.")
(define-derived-mode elopher-mode special-mode "elopher"
"Major mode for elopher, an elisp gopher client.")