"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"
(defun elopher-node-content (node)
(cadddr node))
+(defun elopher-set-node-content (node content)
+ (setcar (cdddr node) content))
+
+;; Node graph traversal
+
(defvar elopher-start-node (elopher-make-node nil nil #'elopher-get-index-node))
(defvar elopher-current-node)
-(defun elopher-set-node-content (node content)
- (setcar (elopher-node-content node)
- content))
-
(defun elopher-visit-node (node)
(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
+ (setq elopher-current-node parent-node)
+ (elopher-visit-node elopher-current-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
(let ((content (elopher-node-content elopher-current-node))
(address (elopher-node-address elopher-current-node)))
(if content
- (insert content)
+ (let ((inhibit-read-only t))
+ (save-excursion
+ (insert content)))
(if address
(elopher-get-selector address
(lambda (proc event)
(let ((inhibit-read-only t))
(erase-buffer)
- (elopher-insert-index elopher-selector-string))
+ (save-excursion
+ (elopher-insert-index elopher-selector-string)))
(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))
+ (erase-buffer)
+ (save-excursion
+ (elopher-insert-index elopher-start-page)))
+ (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))
+ (save-excursion
+ (insert content)))
(elopher-get-selector address
(lambda (proc event)
(let ((inhibit-read-only t))
(erase-buffer)
- (insert elopher-selector-string))
+ (save-excursion
+ (insert
+ (elopher-strip-CRs elopher-selector-string))))
(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)
+ (elopher-visit-parent-node))
;;; Main start procedure
;;
;;; 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.")