X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=sixel.el;h=8f00687eaff9b8433092293917e50a0eb080837d;hb=6e4e229e1afb1a5d12147441afb30fd20ff248d3;hp=f2532e56ba5796b28935e8b9f120c5ed4ff06f1f;hpb=6b9058e99e890e33246c6e4e3cad2d4dc81dd951;p=sixel.git diff --git a/sixel.el b/sixel.el index f2532e5..8f00687 100644 --- a/sixel.el +++ b/sixel.el @@ -14,15 +14,15 @@ ;;; Code: (defvar test-string - (concat "q" + (concat "Pq" "#0;2;0;0;0#1;2;100;100;0#2;2;0;100;0" "#1~~@@vv@@~~@@~~$" - "#2??GG????-" - "#1!14@")) + "#2??}}GG}}??}}??-" + "#1!14@\\")) (defun sixel-get-params (string) "Retrieve the sixel parameters." - (car (split-string string "q"))) + (car (split-string (substring string 2) "q"))) (defun sixel-get-data (string) "Retrieve data string." @@ -57,6 +57,7 @@ Returns a sixel image object." finished) (while (not finished) (cond + ;; Define colour: ((looking-at "#\\([0-9]+\\);\\([0-9]+\\);\\([0-9]+\\);\\([0-9]+\\);\\([0-9]+\\)") (let ((tag (format "%02x" (string-to-number (match-string 1)))) (mode (match-string 2)) @@ -64,19 +65,19 @@ Returns a sixel image object." (g (string-to-number (match-string 4))) (b (string-to-number (match-string 5)))) (push (list tag r g b) colour-map))) - + ;; Set current colour: ((looking-at "#\\([0-9]+\\)") (let ((tag (format "%02x" (string-to-number (match-string 1))))) (setq current-colour tag))) - + ;; Carriage return: ((looking-at "\\$") (setq idx-out 0)) - + ;; New line: ((looking-at "-") (push (reverse this-row) rows) (setq this-row nil) (setq idx-out 0)) - + ;; RLE sixel char sequence: ((looking-at "!\\([0-9]+\\)\\([?-~]\\)") (let ((repeat-count (string-to-number (match-string 1))) (char (elt (match-string 2) 0))) @@ -84,20 +85,35 @@ Returns a sixel image object." (setq this-row (sixel-tag-sixel-in-row this-row idx-out char current-colour)) (setq idx-out (1+ idx-out))))) - - ((looking-at "\\([?-~]\\)") + ;; Sixel char: + ((looking-at "\\([?-~]\\)") ; Sixel char (let ((char (elt (match-string 1) 0))) (setq this-row (sixel-tag-sixel-in-row this-row idx-out char current-colour)) (setq idx-out (1+ idx-out)))) - - (t (setq finished t))) - + ;; Termination sequence: + ((looking-at "\\\\") + (setq finished t)) + ;; Skip other char: + ((looking-at "[[:ascii:]]"))) (goto-char (match-end 0))) (push (reverse this-row) rows) (cons colour-map (reverse rows))))) +(defun sixel-pad-rows (sixel-image) + "Pad out contents of rows in SIXEL-IMAGE so that all rows are the same length." + (let ((width (car (sixel-image-dims sixel-image))) + (rows (cdr sixel-image))) + (dotimes (row-idx (length rows)) + (let* ((row-cdr (nthcdr row-idx rows)) + (row-width (length (car row-cdr)))) + (if (< row-width width) + (setcar row-cdr (append (car row-cdr) + (make-list (- width row-width) + [nil nil nil nil nil nil]))))))) + sixel-image) + (defun sixel-image-colour-map (sixel-image) "Extract colour map from SIXEL-DATA." (car sixel-image)) @@ -111,46 +127,74 @@ Returns a sixel image object." (let ((sixels (sixel-image-sixels sixel-image))) (cons (apply #'max (mapcar (lambda (row) (length row)) sixels)) - (length sixels)))) + (* 6 (length sixels))))) (defun sixel-image-to-xpm-values (sixel-image) + "Produce string representing parameter values component of XPM +representation of SIXEL-IMAGE." (let* ((dims (sixel-image-dims sixel-image)) (colour-map (sixel-image-colour-map sixel-image)) - (n-colours (length colour-map))) + (n-colours (1+ (length colour-map)))) (concat "\"" (number-to-string (car dims)) " " (number-to-string (cdr dims)) " " (number-to-string n-colours) " 2\""))) (defun sixel-image-to-xpm-colours (sixel-image) + "Produce string representing colour definitions component of XPM +representation of SIXEL-IMAGE." (let ((colour-map (sixel-image-colour-map sixel-image))) - (string-join - (mapcar (lambda (colour) - (concat - "\"" - (elt colour 0) " " - "c #" - (format "%02x%02x%02x" - (elt colour 1) - (elt colour 2) - (elt colour 3)) - "\"")) - colour-map) - ","))) + (concat + (string-join + (mapcar (lambda (colour) + (concat + "\"" + (elt colour 0) " " + "c #" + (format "%02x%02x%02x" + (elt colour 1) + (elt colour 2) + (elt colour 3)) + "\"")) + colour-map) + ",\n") + ",\n" + "\"-- c #000000\""))) + +(defun sixel-image-to-xpm-pixels (sixel-image) + "Produce string representating pixels component of XPM representation +of SIXEL-IMAGE." + (concat + "\"" + (string-join + (mapcar (lambda (sixel-row) + (string-join + (mapcar (lambda (i) + (string-join + (mapcar (lambda (sixel) + (let ((pixel (elt sixel i))) + (if pixel + pixel + "--"))) + sixel-row))) + (number-sequence 0 5)) + "\",\n\"")) + (sixel-image-sixels sixel-image)) + "\",\n\"") + "\"")) (defun sixel-to-xpm (string) "Returns an XPM image representation of the SIXEL graphic encoded in STRING." (let* ((param-string (sixel-get-params string)) (data-string (sixel-get-data string)) - (sixel-image (sixel-process-data data-string))) - (concat - "/* XPM */" - "static char * pixmap = {" - (sixel-image-to-xpm-values sixel-image) ",\n" - (sixel-image-to-xpm-colours sixel-image) - ;; (sixel-data-to-XPM-pixels data) - "};"))) - - + (sixel-image (sixel-pad-rows (sixel-process-data data-string)))) + (if (string-prefix-p "P" string) + (concat + "/* XPM */" + "static char * pixmap[] = {" + (sixel-image-to-xpm-values sixel-image) ",\n" + (sixel-image-to-xpm-colours sixel-image) ",\n" + (sixel-image-to-xpm-pixels sixel-image) "};") + (error "Incorrecly formatted sixel string.")))) ;; sixel.el ends here