X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=elopher.el;h=2907e95b8d5afef539fc08c04e2283c0c0493733;hb=3d8242afb97973597d318ed0fdc558b51ceffa20;hp=b28120badf3bd3606ec96fd60ebf88f39282ee63;hpb=42b79ed99012e13fb25ce47a59272c20ab3f5d18;p=elpher.git diff --git a/elopher.el b/elopher.el index b28120b..2907e95 100644 --- a/elopher.el +++ b/elopher.el @@ -6,58 +6,161 @@ ;;; Code: -;; (defvar elopher-mode-map nil "Keymap for gopher client.") -;; (define-key elopher-mode-map (kbd "p") 'elopher-quit) +(defvar elopher-mode-map + (let ((map (make-sparse-keymap))) + (define-key map (kbd "") 'elopher-next-link) + (define-key map (kbd "") 'elopher-prev-link) + (define-key map (kbd "u") 'elopher-history-back) + (when (require 'evil nil t) + (evil-define-key 'normal map + (kbd "C-]") 'elopher-follow-closest-link + (kbd "C-t") 'elopher-history-back + (kbd "u") 'elopher-history-back)) + map) + "Keymap for gopher client.") -;; (define-derived-mode elopher-mode special-mode "elopher" -;; "Major mode for elopher, an elisp gopher client.") +(define-derived-mode elopher-mode special-mode "elopher" + "Major mode for elopher, an elisp gopher client.") -(defun ) +(defvar elopher-margin-width 5) -(defun elopher-filter (proc string) +(defun elopher-insert-margin (&optional type-name) + (if type-name + (insert (propertize + (format (concat "%" (number-to-string elopher-margin-width) "s") + (concat "[" type-name "] ")) + 'face '(foreground-color . "yellow"))) + (insert (make-string elopher-margin-width ?\s)))) + +(defun elopher-process-record (line) + (let* ((type (elt line 0)) + (fields (split-string (substring line 1) "\t")) + (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-insert-margin) + (insert (propertize display-string + 'face '(foreground-color. "gray")))) + (?0 (elopher-insert-margin "T") + (insert-text-button display-string + 'face '(foreground-color . "white") + 'link-getter #'elopher-get-text + 'link-address address + 'action #'elopher-click-link + 'follow-link t)) + (?1 (elopher-insert-margin "/") + (insert-text-button display-string + 'face '(foreground-color . "yellow") + 'link-getter #'elopher-get-index + 'link-address address + 'action #'elopher-click-link + 'follow-link t)) + (?p (elopher-insert-margin "img") + (insert-text-button display-string + 'face '(foreground-color . "cyan") + 'link-getter #'elopher-get-image + 'link-address address + 'action #'elopher-click-link + 'follow-link t)) + (?.) ; Occurs at end of index, can safely ignore. + (tp (elopher-insert-margin (concat (char-to-string tp) "?")) + (insert (propertize display-string + 'face '(foreground-color . "red"))))) + (insert "\n"))) + +(defvar elopher-incomplete-record "") + +(defun elopher-process-complete-records (string) + (let* ((til-now (string-join (list elopher-incomplete-record string))) + (lines (split-string til-now "\r\n"))) + (dotimes (idx (length lines)) + (if (< idx (- (length lines) 1)) + (let ((line (elt lines idx))) + (unless (string-empty-p line) + (elopher-process-record line))) + (setq elopher-incomplete-record (elt lines idx)))))) + +(defun elopher-get-selector (selector host port filter) + (switch-to-buffer "*elopher*") + (elopher-mode) + (let ((inhibit-read-only t)) + (erase-buffer)) + (setq elopher-incomplete-record "") + (make-network-process + :name "elopher-process" + :host host + :service (if port port 70) + :filter filter) + (process-send-string "elopher-process" (concat selector "\n"))) + +(defun elopher-index-filter (proc string) (with-current-buffer (get-buffer "*elopher*") - (let ((marker (process-mark proc))) + (let ((marker (process-mark proc)) + (inhibit-read-only t)) (if (not (marker-position marker)) (set-marker marker 0 (current-buffer))) (save-excursion (goto-char marker) - (insert (propertize string 'face '(foreground-color . "magenta"))) + (elopher-process-complete-records string) (set-marker marker (point)))))) -(defun elopher-get-index (host &optional port path) - (switch-to-buffer-other-window "*elopher*") - (erase-buffer) - (make-network-process - :name "elopher-process" - :host host - :service (if port port 70) - :filter #'elopher-filter) - (process-send-string "elopher-process" (format "%s\n" (if path path "")))) +(defun elopher-get-index (selector host port) + (elopher-get-selector selector host port #'elopher-index-filter)) -(defun elopher () - "Start gopher client." +(defun elopher-text-filter (proc string) + (with-current-buffer (get-buffer "*elopher*") + (let ((marker (process-mark proc)) + (inhibit-read-only t)) + (if (not (marker-position marker)) + (set-marker marker 0 (current-buffer))) + (save-excursion + (goto-char marker) + (dolist (line (split-string string "\r")) + (insert line)) + (set-marker marker (point)))))) + +(defun elopher-get-text (selector host port) + (elopher-get-selector selector host port #'elopher-text-filter)) + +(defvar elopher-image-buffer "") + +(defun elopher-image-filter (proc string) + (setq elopher-image-buffer (concat elopher-image-buffer string))) + +(defun elopher-get-image (selector host port) + (setq elopher-image-buffer "") + (elopher-get-selector selector host port #'elopher-image-filter) + (insert-image (create-image elopher-image-buffer))) + +(defun elopher-history-back () + (interactive) + (let ((inhibit-read-only t)) + (undo))) + +(defun elopher-next-link () (interactive) - (elopher-get-index (read-from-minibuffer "Gopher host: ") 70)) + (forward-button 1)) -(elopher-get-index "cosmic.voyage") +(defun elopher-prev-link () + (interactive) + (backward-button 1)) -(format "%s\n" nil) +(defun elopher-click-link (button) + (apply (button-get button 'link-getter) (button-get button 'link-address))) -(delete-process "elopher-process") - - ;; (address (read-from-minibuffer "Address of gopher server: "))) - ;; (message "Connecting to '%s' ..." address) - ;; (erase-buffer) - ;; (insert (propertize "Hello, world." 'face '(foreground-color . "red"))) - ;; (newline) - ;; (insert (propertize "Hello, Tim." 'face '(foreground-color . "yellow")))) +(defun elopher-follow-closest-link () + (interactive) + (push-button)) -(defun elopher-quit () +(defun elopher () + "Start gopher client." (interactive) - (kill-buffer "*elopher*")) + (elopher-get-index "" (read-from-minibuffer "Gopher host: ") 70)) -(start-process "ls" "*elopher*" "/bin/date") +(elopher-get-index "" "gopher.floodgap.com" 70) +;; (elopher-get-image "/fun/xkcd/comics/2130/2137/text_entry.png" "gopher.floodgap.com" 70) ;;; elopher.el ends here - -(list-processes)