diff options
Diffstat (limited to 'modules/dirvish-config.el')
| -rw-r--r-- | modules/dirvish-config.el | 53 |
1 files changed, 50 insertions, 3 deletions
diff --git a/modules/dirvish-config.el b/modules/dirvish-config.el index 713a5e69..edbb0b35 100644 --- a/modules/dirvish-config.el +++ b/modules/dirvish-config.el @@ -8,8 +8,8 @@ ;; Load shape: eager. ;; Eager reason: none; file manager, a command/hook-loaded deferral candidate. ;; Top-level side effects: three add-hook, package configuration via use-package. -;; Runtime requires: user-constants, system-utils, host-environment, system-lib, -;; external-open-lib. +;; Runtime requires: user-constants, system-utils, external-open, +;; host-environment, system-lib, external-open-lib. ;; Direct test load: yes. ;; ;; Enhanced file management via Dirvish (modern dired replacement) with icons, @@ -34,7 +34,8 @@ ;;; Code: (require 'user-constants) ;; code-dir, music-dir, pix-dir et al. used at load time -(require 'system-utils) ;; cj/xdg-open, cj/open-file-with-command bound to keys +(require 'system-utils) ;; cj/open-file-with-command bound to keys +(require 'external-open) ;; cj/xdg-open bound to keys ("o" and OS-handler fallback) (require 'host-environment) (require 'system-lib) (require 'external-open-lib) @@ -589,6 +590,7 @@ no popup frame is live." ("ps" ,(concat pix-dir "/screenshots/") "pictures screenshots") ("px" ,pix-dir "pictures directory") ("wp" ,(concat pix-dir "/wallpaper/") "pictures wallpaper") + ("fp" "/ftp:android@192.168.86.13#2221:/" "phone ftp (android)") ("rcj" "/sshx:cjennings@cjennings.net:~" "remote c@cjennings.net") ("rtl" "/sshx:cjennings@truenas.local:~" "remote cjennings@truenas.local") ("rtt" "/sshx:cjennings@truenas:~" "remote cjennings@truenas (tailscale)") @@ -685,6 +687,51 @@ no popup frame is live." ("v" . dirvish-vc-menu) ("y" . dirvish-yank-menu))) +;;; --------------------- Dirvish Thumbnail Cache Width Bucket ------------------ +;; dirvish keys its media thumbnail cache path on the exact preview-window pixel +;; width (thumbnails/<width>/<md5>.jpg). Fast image thumbnails finish before the +;; window settles, so their width is stable across a landing. Slow video (webm +;; VP9 decode + seek) loses that race: the jpg is written at the generation-time +;; width, then `dirvish-media--cache-sentinel' recomputes the width for redisplay, +;; and if the preview window jittered even one pixel across a `floor' boundary the +;; lookup hits a different bucket, misses, regenerates, and flashes blank. +;; Quantizing the computed size to a coarse bucket maps that jitter to one stable +;; key. A local workaround for the upstream cache design. + +(defgroup cj/dirvish nil + "Local dirvish tweaks on top of the upstream package." + :group 'dirvish) + +(defcustom cj/dirvish-thumb-width-bucket 100 + "Pixel bucket dirvish's thumbnail cache width is quantized to. +Rounding `dirvish-media--img-size' to this bucket keeps small preview-window +jitter on one cache key, so a slow video thumbnail isn't looked up under a +different width than it was written at. A larger bucket tolerates more jitter at +a slight thumbnail-resolution cost. Set to 0 or nil to disable quantization." + :type '(choice (const :tag "Off" nil) integer) + :group 'cj/dirvish) + +(defun cj/--dirvish-quantize-thumb-size (size bucket) + "Round SIZE to the nearest multiple of BUCKET, clamped to at least BUCKET. +BUCKET nil or non-positive returns SIZE unchanged (quantization off). Pure +helper behind the `dirvish-media--img-size' advice." + (if (and (integerp bucket) (> bucket 0)) + (max bucket (* bucket (round size bucket))) + size)) + +(defun cj/--dirvish-thumb-size-advice (size) + "Quantize dirvish's computed thumbnail SIZE to a stable cache bucket. +`:filter-return' advice on `dirvish-media--img-size'; the bucket is +`cj/dirvish-thumb-width-bucket'." + (cj/--dirvish-quantize-thumb-size size cj/dirvish-thumb-width-bucket)) + +;; dirvish-media--img-size lives in dirvish-widgets.el (loaded lazily on the +;; first media preview), so advise it only once that file is present. advice-add +;; with a named function is idempotent, so a module reload never stacks copies. +(with-eval-after-load 'dirvish-widgets + (advice-add 'dirvish-media--img-size :filter-return + #'cj/--dirvish-thumb-size-advice)) + ;;; ----------------------------- Dired Text Greying ---------------------------- ;; `default' is remapped buffer-locally to `shadow' inside dired/dirvish (see |