"Width of left-hand margin used when rendering indicies.")
(defconst elopher-start-page
- (concat "i\tfake\tfake\t1\r\n"
- "i--------------------------------------------\tfake\tfake\t1\r\n"
- "i Elopher Gopher Client \tfake\tfake\t1\r\n"
- (format "i version %s\tfake\tfake\t1\r\n" elopher-version)
- "i--------------------------------------------\tfake\tfake\t1\r\n"
- "i\tfake\tfake\t1\r\n"
- "iBasic usage:\tfake\tfake\t1\r\n"
- "i - tab/shift-tab: next/prev directory entry\tfake\tfake\t1\r\n"
- "i - RET/mouse-1: open directory entry\tfake\tfake\t1\r\n"
- "i - u: return to parent directory entry\tfake\tfake\t1\r\n"
- "i - g: go to a particular site\tfake\tfake\t1\r\n"
- "i\tfake\tfake\t1\r\n"
- "iPlaces to start exploring Gopherspace:\tfake\tfake\t1\r\n"
- "1Floodgap Systems Gopher Server\t\tgopher.floodgap.com\t70\r\n"
- "1Super-Dimensional Fortress\t\tsdf.org\t70\r\n"
- "i\tfake\tfake\t1\r\n"
- "iTest entries:\tfake\tfake\t1\r\n"
- "pXKCD comic image\t/fun/xkcd/comics/2130/2137/text_entry.png\tgopher.floodgap.com\t70\r\n"))
+ (string-join
+ (list "i\tfake\tfake\t1"
+ "i--------------------------------------------\tfake\tfake\t1"
+ "i Elopher Gopher Client \tfake\tfake\t1"
+ (format "i version %s\tfake\tfake\t1" elopher-version)
+ "i--------------------------------------------\tfake\tfake\t1"
+ "i\tfake\tfake\t1"
+ "iBasic usage:\tfake\tfake\t1"
+ "i - tab/shift-tab: next/prev directory entry\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\tfake\tfake\t1"
+ "iPlaces to start exploring Gopherspace:\tfake\tfake\t1"
+ "1Floodgap Systems Gopher Server\t\tgopher.floodgap.com\t70"
+ "1Super-Dimensional Fortress\t\tsdf.org\t70"
+ "i\tfake\tfake\t1"
+ "iTest entries:\tfake\tfake\t1"
+ "pXKCD comic image\t/fun/xkcd/comics/2130/2137/text_entry.png\tgopher.floodgap.com\t70"
+ "1Test server\t\tlocalhost\t70"
+ ".")
+ "\r\n"))
;;; Customization group
;; Node
(defun elopher-make-node (parent address getter &optional content)
- (list parent address content))
+ (list parent address getter content))
(defun elopher-node-parent (node)
(car node))
(defun elopher-node-content (node)
(cadddr node))
-(defvar elopher-start-node (elopher-make-node nil nil #'elopher-index-getter))
-(defvar elopher-current-node elopher-start-node)
+(defun elopher-set-node-content (node content)
+ (setcar (cdddr node) content))
-(defun elopher-set-current-node-content (content)
- (setcar (elopher-node-content elopher-current-node)
- content))
+(defvar elopher-start-node (elopher-make-node nil nil #'elopher-get-index-node))
+(defvar elopher-current-node)
(defun elopher-visit-node (node)
(elopher-prepare-buffer)
(setq elopher-current-node node)
- (funcall (elopher-node-getter)))
-
+ (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-current-node-content nil)
- (funcall (elopher-node-getter)))
+ (elopher-set-node-content elopher-current-node nil)
+ (elopher-visit-node elopher-current-node))
;;; Buffer preparation
(defun elopher-prepare-buffer ()
(switch-to-buffer "*elopher*")
- (elopher-mode))
+ (elopher-mode)
+ (let ((inhibit-read-only t))
+ (erase-buffer)))
;;; Index rendering
(defun elopher-insert-index (string)
"Inserts the index corresponding to STRING into the current buffer."
(dolist (line (split-string string "\r\n"))
- (elopher-insert-index-record line)))
+ (unless (string-empty-p line)
+ (elopher-insert-index-record line))))
(defun elopher-insert-margin (&optional type-name)
(if type-name
- (insert (format (concat "%" (number-to-string elopher-margin-width) "s"
- (concat
- (propertize "[" 'face '(foreground-color . "blue"))
- (propertize type-name 'face '(foreground-color . "white"))
- (propertize "]" 'face '(foreground-color . "blue"))))))
+ (progn
+ (insert (format (concat "%" (number-to-string (- elopher-margin-width 1)) "s")
+ (concat
+ (propertize "[" 'face '(foreground-color . "blue"))
+ (propertize type-name 'face '(foreground-color . "white"))
+ (propertize "]" 'face '(foreground-color . "blue")))))
+ (insert " "))
(insert (make-string elopher-margin-width ?\s))))
(defun elopher-insert-index-record (line)
;; Index retrieval
(defun elopher-get-index-node ()
- (let ((content (elopher-node-content elopher-node-current))
- (address (elopher-node-address elopher-node-current)))
+ (let ((content (elopher-node-content elopher-current-node))
+ (address (elopher-node-address elopher-current-node)))
(if content
(insert content)
(if address
(elopher-get-selector address
(lambda (proc event)
(let ((inhibit-read-only t))
+ (erase-buffer)
(elopher-insert-index elopher-selector-string))
- (elopher-set-current-node-content (buffer-string))))
- (elopher-insert-index elopher-start-page)))))
+ (elopher-set-node-content elopher-current-node
+ (buffer-string))))
+ (let ((inhibit-read-only t))
+ (erase-buffer)
+ (elopher-insert-index elopher-start-page))))))
;; Text retrieval
(elopher-get-selector address
(lambda (proc event)
(let ((inhibit-read-only t))
+ (erase-buffer)
(insert elopher-selector-string))
- (elopher-set-current-node-content elopher-selector-string))))))
+ (elopher-set-node-content elopher-current-node
+ elopher-selector-string))))))
;;; Navigation methods
;;
(elopher-visit-node
(elopher-make-node elopher-current-node
address
- #'elopher-index-getter))))
+ #'elopher-get-index-node))))
(defun elopher-reload ()
"Reload current site."
(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.")
The Lambda Lab / projects / elpher.git / blobdiff