Allow customizing Sixel scaling and aspect ratio

* eat.el (eat-sixel-scale, eat-sixel-aspect-ratio): New user option. * eat.el (eat--t-term): Remove slot 'sixel-image-height'. New slot 'sixel-image-extra-props'. * eat.el (eat--t-sixel-flush-line): Give more control to the UI on the image properties. * eat.el (eat-term-set-parameter): Don't treat parameter 'sixel-image-height' specially. Treat parameter 'sixel-image-extra-properties' specially. * eat.el (eat--set-term-sixel-params): New function. * eat.el (eat-exec, eat--eshell-setup-proc-and-term): Set Sixel related terminal parameters with 'eat--set-term-sixel-params'. * eat.texi (Sixel): Document 'eat-sixel-scale' and 'eat-sixel-aspect-ratio'.
2023-10-02 13:43:01 +06:00 · 2023-10-02 13:43:01 +06:00 · 852168d716
commit 852168d716
parent 2df07e6613
2 changed files with 71 additions and 30 deletions
--- a/eat.el
+++ b/eat.el
@ -182,6 +182,22 @@ FUNCTION      Call FUNCTION with the command and arguments (using
                (function :tag "Function"))
  :group 'eat-eshell)

+(defcustom eat-sixel-scale 1.0
+  "Scale Sixel images by this amount."
+  :type 'number
+  :group 'eat-ui
+  :group 'eat-eshell)
+
+(defcustom eat-sixel-aspect-ratio 1.0
+  "Aspect ratio of Sixel images.
+
+The value is a positive number specifying the ratio of the width and
+height of a Sixel pixel.  For example, the value of 1.5 means the
+aspect ratio of 3:2."
+  :type 'number
+  :group 'eat-ui
+  :group 'eat-eshell)
+
 (defcustom eat-sixel-render-formats '(svg half-block background none)
  "List of formats to render Sixel, in order of preference."
  :type '(repeat (choice (const :tag "SVG Image" svg)
@ -1144,9 +1160,9 @@ Nil when not in alternative display mode.")
  (sixel-render-format
   'background
   :documentation "Format to render Sixel images in.")
-  (sixel-image-height
+  (sixel-image-extra-props
   nil
-   :documentation "Height of images used to display Sixel.")
+   :documentation "Extra properties of images used to display Sixel.")
  (sixel-scroll-mode t :documentation "Whether to auto-scroll.")
  (sixel-initial-cursor-pos
   '(1 . 1)
@ -3075,9 +3091,8 @@ If NULLIFY is non-nil, nullify flushed part of Sixel buffer."
                              (format " fill=\"%s\"></rect>" color))
                             strs))))
                      strs))
-                  :height ,(eat--t-term-sixel-image-height
-                            eat--t-term)
-                  :ascent center)))))
+                  ,@(eat--t-term-sixel-image-extra-props
+                     eat--t-term))))))
          (forward-char)
          (eat--t-fix-partial-multi-col-char 'preserve-face))))
    (dotimes (_ (cdr char-size))
@ -4000,8 +4015,8 @@ If NULLIFY is non-nil, nullify flushed part of Sixel buffer."
       (error "`sixel-render-format' parameter must be set to one of\
 the supported methods"))
     (setf (eat--t-term-sixel-render-format terminal) value))
-    ('sixel-image-height
-     (setf (eat--t-term-sixel-image-height terminal) value)))
+    ('sixel-image-extra-properties
+     (setf (eat--t-term-sixel-image-extra-props terminal) value)))
  ;; Set the parameter.
  (puthash parameter value (eat--t-term-params terminal)))

@ -5075,6 +5090,35 @@ selection, or nil if none."
                (cl-return 'svg)))))
    'none))

+(defun eat--set-term-sixel-params ()
+  "Set Sixel related parameters of the terminal."
+  (let* ((render-fmt (eat--sixel-render-format))
+         (dimensions
+          (pcase render-fmt
+            ((or 'background 'none) '(1 . 1))
+            ('half-block '(1 . 2))
+            (_ (cons (default-font-width) (default-font-height)))))
+         (scale-x (* eat-sixel-aspect-ratio eat-sixel-scale))
+         (scale-y eat-sixel-scale)
+         (font-size (font-get (font-spec :name (face-font 'default))
+                              :size)))
+    (setf (car dimensions) (round (/ (car dimensions)
+                                     (float scale-x))))
+    (setf (cdr dimensions) (round (/ (cdr dimensions)
+                                     (float scale-y))))
+    (setf (eat-term-parameter eat-terminal 'sixel-render-format)
+          render-fmt)
+    (setf (eat-term-parameter eat-terminal 'char-dimensions)
+          dimensions)
+    (unless (memq render-fmt '(none background half-block))
+      (setf
+       (eat-term-parameter eat-terminal 'sixel-image-extra-properties)
+       `( :ascent center
+          :height ,(cons (/ (float (default-font-height)) font-size)
+                         'em)
+          :width ,(cons (/ (float (default-font-width)) font-size)
+                        'em))))))
+
 (defun eat--set-cwd (_ host cwd)
  "Set CWD as the current working directory (`default-directory').

@ -6920,17 +6964,7 @@ same Eat buffer.  The hook `eat-exec-hook' is run after each exec."
      (setf (eat-term-set-cwd-function eat-terminal) #'eat--set-cwd)
      (setf (eat-term-parameter eat-terminal 'ui-command-function)
            #'eat--handle-uic)
-      (setf (eat-term-parameter eat-terminal 'sixel-render-format)
-            (eat--sixel-render-format))
-      (when (display-graphic-p)
-        (setf (eat-term-parameter eat-terminal 'sixel-image-height)
-              (cons (/ (float (default-font-height))
-                       (font-get
-                        (font-spec :name (face-font 'default))
-                        :size))
-                    'em)))
-      (setf (eat-term-parameter eat-terminal 'char-dimensions)
-            (cons (default-font-width) (default-font-height)))
+      (eat--set-term-sixel-params)
      ;; Crank up a new process.
      (let* ((size (eat-term-size eat-terminal))
             (process-environment
@ -7282,7 +7316,7 @@ PROGRAM can be a shell command."
    (process-put proc 'adjust-window-size-function
                 #'eat--adjust-process-window-size)
    (setq eat-terminal (eat-term-make (current-buffer)
-                                       (process-mark proc)))
+                                      (process-mark proc)))
    (set-marker (process-mark proc) (eat-term-end eat-terminal))
    (setf (eat-term-input-function eat-terminal) #'eat--send-input)
    (setf (eat-term-set-cursor-function eat-terminal)
@ -7295,17 +7329,7 @@ PROGRAM can be a shell command."
    (setf (eat-term-set-cwd-function eat-terminal) #'eat--set-cwd)
    (setf (eat-term-parameter eat-terminal 'ui-command-function)
          #'eat--eshell-handle-uic)
-    (setf (eat-term-parameter eat-terminal 'sixel-render-format)
-          (eat--sixel-render-format))
-    (when (display-graphic-p)
-      (setf (eat-term-parameter eat-terminal 'sixel-image-height)
-            (cons (/ (float (default-font-height))
-                     (font-get
-                      (font-spec :name (face-font 'default))
-                      :size))
-                  'em)))
-    (setf (eat-term-parameter eat-terminal 'char-dimensions)
-          (cons (default-font-width) (default-font-height)))
+    (eat--set-term-sixel-params)
    (setf (eat-term-parameter eat-terminal 'eat--process) proc)
    (unless (>= emacs-major-version 29)
      (setf (eat-term-parameter eat-terminal 'eat--input-process)
--- a/eat.texi
+++ b/eat.texi
@ -967,6 +967,23 @@ Eat can show Sixel graphics.  Sixel is a bitmap graphics format that
 can be used to display graphics in a terminal, for example, images, or
 plotting graphs.

+You can control the display of Sixel images by customizing the
+following user options.
+
+@vindex eat-sixel-scale
+@defopt eat-sixel-scale
+This is a non-negative number that specifies the amount to scale the
+image by.
+@end defopt
+
+@vindex eat-sixel-aspect-ratio
+@defopt eat-sixel-aspect-ratio
+This is a non-negative number that specifies the aspect ratio, i.e.
+the ratio of width and height of a Sixel pixel.  For example, the
+value of 2 means the width of a Sixel pixel is the double of its
+height.
+@end defopt
+
 Eat converts Sixel graphics to an image format Emacs can natively
 display.  This preference of image formats can be configured by
 customizing the @code{eat-sixel-render-formats} user option.