diff options
Diffstat (limited to 'custom')
| -rw-r--r-- | custom/jao-custom-browse.el | 2 | ||||
| -rw-r--r-- | custom/jao-custom-pdf.el | 80 |
2 files changed, 8 insertions, 74 deletions
diff --git a/custom/jao-custom-browse.el b/custom/jao-custom-browse.el index 1f7ccc3..ba5ac79 100644 --- a/custom/jao-custom-browse.el +++ b/custom/jao-custom-browse.el @@ -5,7 +5,7 @@ ;;; Browsing ;;;; variables -(defvar jao-browse-doc-use-emacs-p (jao-is-linux)) +(defvar jao-browse-doc-use-emacs-p t) (defvar jao-browse-url-function nil) (defvar jao-browse-url-external-function nil) diff --git a/custom/jao-custom-pdf.el b/custom/jao-custom-pdf.el index 5e2c27d..98a28b1 100644 --- a/custom/jao-custom-pdf.el +++ b/custom/jao-custom-pdf.el @@ -1,84 +1,19 @@ ;; -*- lexical-binding: t -*- ;;;; open pdfs -(jao-when-linux - (use-package saveplace-pdf-view +(use-package saveplace-pdf-view :ensure t :demand t - :after doc-view)) + :after doc-view) -(use-package jao-pdf :demand t) - -(setq jao-open-doc-fun 'jao-find-or-open) -(setq jao-org-open-pdf-fun 'jao-find-or-open) - -(defun jao-zathura-open (file page) - (let ((id (jao-x11-search-window (jao-pdf-zathura-title-rx file)))) - (if (string-blank-p id) - (progn - (when jao-xmonad-enabled (jao-x11-goto-ws 2)) - (jao-shell-exec (jao-pdf-zathura-open-cmd file page))) - (let* ((page (if page (format " && xdotool type %dg" page) "")) - (cmd (format "xdotool windowactivate %s%s" id page))) - (jao-shell-exec cmd t))))) - -(defun jao-x11-zathura-goto-org (&optional title no-ask) - (let ((title (or title (jao-shell-string "xdotool" - "getactivewindow" - "getwindowname")))) - (jao-org-open-from-zathura title no-ask))) - -(defun jao-find-or-open (file &optional page height) - (cond ((and jao-browse-doc-use-emacs-p window-system) - (let* ((buffs (buffer-list)) - (b (catch 'done - (while buffs - (when (string-equal (buffer-file-name (car buffs)) file) - (throw 'done (car buffs))) - (setq buffs (cdr buffs)))))) - (jao-afio-goto-docs) - (if b (pop-to-buffer b) (find-file file)) - (when page (jao-doc-view-goto-page page height)))) - (jao-river-enabled (jao-river-open-with-zathura file page)) - (jao-sway-enabled (jao-sway-open-with-zathura file page)) - (t (jao-zathura-open file page)))) - -(defun jao-open-doc (&optional file page height) - (interactive) - (when-let (file (or file - (read-file-name "Document: " - (concat jao-org-dir "/doc/")))) - (funcall jao-open-doc-fun file page height))) - -(defun jao-select-pdf () - (interactive) - (jao-buffer-same-mode '(pdf-view-mode doc-view-mode) - #'jao-afio-goto-docs)) - -(defun jao-open-with-zathura () - (interactive) - (when-let (f buffer-file-name) - (let ((p (jao-doc-view-current-page))) - (cond (jao-river-enabled (jao-river-open-with-zathura f p)) - (jao-sway-enabled (jao-sway-open-with-zathura f p)) - (t (jao-zathura-open f p)))))) - -;; doc:// links for browse-url -(defun jao-open-doc-url (url &rest _) - (when (string-match "doc://\\([^?]+\\)\\(\\?.*\\)?" url) - (let ((file (match-string 1 url)) - (page (when-let* ((qs (match-string 2 url)) - (long (> (length qs) 1)) - (ps (url-parse-query-string (substring qs 1))) - (pn (cadr (assoc "page" ps)))) - (string-to-number pn)))) - (jao-open-doc (expand-file-name (concat "doc/" file) jao-org-dir) page)))) - -(add-to-list 'browse-url-handlers (cons "^doc://.+" 'jao-open-doc-url)) +(use-package jao-pdf + :demand t + :config + (setq jao-open-doc-fun (jao-d-l 'jao-pdf-open-in-devon 'jao-find-or-open)) + (setq jao-org-open-pdf-fun jao-open-doc-fun)) ;;;; doc-view (use-package doc-view - :if (jao-is-linux) :init (setq doc-view-cache-directory "~/.emacs.d/cache/docview" doc-view-resolution 110 @@ -96,7 +31,6 @@ (use-package jao-doc-session :demand t) (use-package jao-doc-view - :if (jao-is-linux) :demand t :bind (:map doc-view-mode-map ("b" . jao-doc-view-back) |