X-Git-Url: https://vcs.fsf.org/?p=rainbowstream.git;a=blobdiff_plain;f=rainbowstream%2Fc_image.py;h=75787532890f68f5165e580177805e71cb4244cf;hp=a9e73de33b14b20d8b1d7a08581eaafe9d7d01a3;hb=685c4aa01ec277d8a81c1baa3a1585e3ba8ca684;hpb=0418d4438a6d413aacdb630b8a0bcbbc76a23e0e

diff --git a/rainbowstream/c_image.py b/rainbowstream/c_image.py
index a9e73de..7578753 100644
--- a/rainbowstream/c_image.py
+++ b/rainbowstream/c_image.py
@@ -1,43 +1,91 @@
+# -*- coding: utf-8 -*-
 from PIL import Image
-from functools import partial
 from os.path import join, dirname, getmtime, exists, expanduser
+from .config import *
+from .py3patch import *
+
+import ctypes
+import sys
+import os
 
-import ctypes, sys, os
 
 def call_c():
+    """
+    Call the C program for converting RGB to Ansi colors
+    """
     library = expanduser('~/.image.so')
     sauce = join(dirname(__file__), 'image.c')
     if not exists(library) or getmtime(sauce) > getmtime(library):
-        build = "gcc -fPIC -shared -o %s %s" % (library, sauce)
-        assert os.system(build + " >/dev/null 2>&1") == 0
-    image_c= ctypes.cdll.LoadLibrary(library)
+        build = "cc -fPIC -shared -o %s %s" % (library, sauce)
+        os.system(build + " >/dev/null 2>&1")
+    image_c = ctypes.cdll.LoadLibrary(library)
     image_c.init()
     return image_c.rgb_to_ansi
 
 rgb2short = call_c()
- 
-def pixel_print(ansicolor):
-    sys.stdout.write('\033[48;5;%sm \033[0m' % (ansicolor))
-  
-def image_to_display(path):
-    i = Image.open(path) 
+
+
+def pixel_print(pixel):
+    """
+    Print a pixel with given Ansi color
+    """
+    r, g, b = pixel[:3]
+
+    if c['24BIT'] is True:
+        sys.stdout.write('\033[48;2;%d;%d;%dm \033[0m'
+                         % (r, g, b))
+    else:
+        ansicolor = rgb2short(r, g, b)
+        sys.stdout.write('\033[48;5;%sm \033[0m' % (ansicolor))
+
+
+def block_print(higher, lower):
+    """
+    Print two pixels arranged above each other with Ansi color.
+    Abuses Unicode to print two pixels in the space of one terminal block.
+    """
+    r0, g0, b0 = lower[:3]
+    r1, g1, b1 = higher[:3]
+
+    if c['24BIT'] is True:
+        sys.stdout.write('\033[38;2;%d;%d;%dm\033[48;2;%d;%d;%dm▄\033[0m'
+                         % (r1, g1, b1, r0, g0, b0))
+    else:
+        i0 = rgb2short(r0, g0, b0)
+        i1 = rgb2short(r1, g1, b1)
+        sys.stdout.write('\033[38;5;%sm\033[48;5;%sm▄\033[0m' % (i1, i0))
+
+
+def image_to_display(path, start=None, length=None):
+    """
+    Display an image
+    """
+    rows, columns = os.popen('stty size', 'r').read().split()
+    if not start:
+        start = c['IMAGE_SHIFT']
+    if not length:
+        length = int(columns) - 2 * start
+    i = Image.open(path)
     i = i.convert('RGBA')
-    w,h = i.size
+    w, h = i.size
     i.load()
-    rows, columns = os.popen('stty size', 'r').read().split()
-    width = min(w, int(columns)-2*6)
+    width = min(w, length)
     height = int(float(h) * (float(width) / float(w)))
-    height //= 2
-    i = i.resize((width, height), Image.BICUBIC)
-    height = min(height,30)
+    i = i.resize((width, height), Image.ANTIALIAS)
+    height = min(height, c['IMAGE_MAX_HEIGHT'])
 
-    for y in xrange(height):
-        print ' '*6 ,
+    for real_y in xrange(height // 2):
+        sys.stdout.write(' ' * start)
         for x in xrange(width):
-            p = i.getpixel((x,y))
-            r, g, b = p[:3]
-            pixel_print(rgb2short(r,g,b))
-        print ''
+            y = real_y * 2
+            p0 = i.getpixel((x, y))
+            p1 = i.getpixel((x, y+1))
+            block_print(p1, p0)
+        sys.stdout.write('\n')
+
 
+"""
+For direct using purpose
+"""
 if __name__ == '__main__':
     image_to_display(sys.argv[1])