Initial string processing function seems to work.

[sixel.git] / sixel.el

diff --git a/sixel.el b/sixel.el
index cd7fd31..2539356 100644 (file)
--- a/sixel.el
+++ b/sixel.el
@@ -14,12 +14,6 @@
   "Retrieve data string."
   (substring string (1+ (string-match "q" string))))
 
-(defvar sixel-colour-map nil
-  "Map of two-character names to RGB colour triples.")
-
-(defvar sixel-current-colour nil
-  "Current colour.")
-
 (defun sixel-compute-row-length (string)
   (apply 'max
          (mapcar
@@ -37,54 +31,63 @@
         (aset sixel i tag))
     (setq n (/ n 2))))
 
-(defun sixel-tag-sixel-in-row (row-variable index char tag)
+(defun sixel-tag-sixel-in-row (row index char tag)
   "Tag the bits of the sixel at INDEX in the list identified by
 the variable ROW-VARIABLE corresponding to input character CHAR
 with TAG."
-  (while (not (< index (length (symbol-value row-variable))))
-    (add-to-list row-variable (make-vector 6 nil)))
-  (let ((sixel (elt (symbol-value row-variable) index)))
-    (sixel-tag-bits sixel (- char 63) tag)))
+  (while (not (< index (length row)))
+    (push (make-vector 6 nil) row))
+  (let ((sixel (elt row (- (length row) 1 index))))
+    (sixel-tag-bits sixel (- char 63) tag))
+  row)
 
-(defun sixel-process-row (string)
-  (let ((idx-in 0)
-        (idx-out 0)
-        result)
-    (while (< idx-in (length string))
-      (let (trunc-string (substring string index-in))
+(defun sixel-process-data (string)
+  "Convert STRING into a list of lists representing individual sixels."
+  (with-temp-buffer
+    (insert string)
+    (goto-char (point-min))
+    (let ((idx-out 0)
+          this-row rows
+          current-colour colour-map
+          finished)
+      (while  (not finished)
         (cond
-         ((string-match "^#\\([0-9]+\\);\\([0-9]+\\);\\([0-9]+\\);\\([0-9]+\\);\\([0-9]+\\)"
-                        trunc-string)
-          (let ((tag (intern (string-to (match-string 1 trunc-string))))
-                (mode (match-string 2 trunc-string))
-                (r (string-to-number (match-string 3 trunc-string)))
-                (g (string-to-number (match-string 4 trunc-string)))
-                (b (string-to-number (match-string 5 trunc-string))))
-            (add-to-list 'sixel-colour-map (list (tag r g b)))
-            (setq idx-in (match-end 0))))
-         ((string-match "^#\\([0-9]+\\)" trunc-string)
-          (let ((tag (intern (match-string 1 trunc-string))))
-            (setq sixel-current-colour tag)
-            (setq idx-in (match-end 0))))
-         ((string-match "^$" trunc-string)
-          (setq idx-out 0)
-          (setq idx-in (match-end 0 trunc-string)))
-         ((string-match "^!\\([0-9]+\\)\\([?-~]\\)" trunc-string)
-          (let ((repeat-count (string-to-number (match-string 1 trunc-string)))
-                (char (elt (match-string 2 trunc-string) 0)))
+         ((looking-at "#\\([0-9]+\\);\\([0-9]+\\);\\([0-9]+\\);\\([0-9]+\\);\\([0-9]+\\)")
+          (let ((tag (intern (match-string 1)))
+                (mode (match-string 2))
+                (r (string-to-number (match-string 3)))
+                (g (string-to-number (match-string 4)))
+                (b (string-to-number (match-string 5))))
+            (push (list tag r g b) colour-map)))
+
+         ((looking-at "#\\([0-9]+\\)")
+          (let ((tag (intern (match-string 1))))
+            (setq current-colour tag)))
+
+         ((looking-at "\\$")
+          (setq idx-out 0))
+
+         ((looking-at "-")
+          (push (reverse this-row) rows)
+          (setq this-row nil)
+          (setq idx-out 0))
+
+         ((looking-at "!\\([0-9]+\\)\\([?-~]\\)")
+          (let ((repeat-count (string-to-number (match-string 1)))
+                (char (elt (match-string 2) 0)))
             (dotimes (i repeat-count)
-              (sixel-tag-sixel-in-row 'result idx-out char sixel-current-colour)
-              (setq idx-out (+1 idx-out)))))
-         ((string-match "^\\([?-~]\\)" trunc-string)
-          (let ((char (elt (match-string 1 trunc-string) 0)))
-            (sixel-tag-sixel-in-row 'result idx-out char sixel-current-colour))
-          (setq idx-out (+1 idx-out))))))))
-              
-(sixel-get-rows test-string)
+              (setq this-row
+                    (sixel-tag-sixel-in-row this-row idx-out char current-colour))
+              (setq idx-out (1+ idx-out)))))
+
+         ((looking-at "\\([?-~]\\)")
+          (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))))
 
-(defun sixel-to-xpm (string)
-  "Converts the given sixel string into an XPM image."
+         (t (setq finished t)))
 
-  (let* ((sp (split-string string "q"))
-         (control-string (car sp))
-         ())))
+        (goto-char (match-end 0)))
+      (push (reverse this-row) rows)
+      (reverse rows))))