Merge pull request #122 from bogwonch/better-images

[rainbowstream.git] / rainbowstream / c_image.py

diff --git a/rainbowstream/c_image.py b/rainbowstream/c_image.py
index 8bd93288812662f2ac19b074d8cce8071d050362..0959150bd3d300fb6b2a1f07cf18e02bd40a4989 100644 (file)
--- a/rainbowstream/c_image.py
+++ b/rainbowstream/c_image.py
@@ -1,6 +1,7 @@
 from PIL import Image
 from os.path import join, dirname, getmtime, exists, expanduser
 from .config import *
+from .py3patch import *
 
 import ctypes
 import sys
@@ -14,8 +15,8 @@ def call_c():
     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
+        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
@@ -23,11 +24,35 @@ def call_c():
 rgb2short = call_c()
 
 
-def pixel_print(ansicolor):
+def pixel_print(pixel):
     """
     Print a pixel with given Ansi color
     """
-    sys.stdout.write('\033[48;5;%sm \033[0m' % (ansicolor))
+    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):
@@ -45,17 +70,27 @@ def image_to_display(path, start=None, length=None):
     i.load()
     width = min(w, length)
     height = int(float(h) * (float(width) / float(w)))
-    height //= 2
+    if c['HIGHER_RESOLUTION'] is False:
+        height //= 2
     i = i.resize((width, height), Image.ANTIALIAS)
     height = min(height, c['IMAGE_MAX_HEIGHT'])
 
-    for y in range(height):
-        sys.stdout.write(' ' * start)
-        for x in range(width):
-            p = i.getpixel((x, y))
-            r, g, b = p[:3]
-            pixel_print(rgb2short(r, g, b))
-        sys.stdout.write('\n')
+    if c['HIGHER_RESOLUTION'] is True:
+        for real_y in xrange(height // 2):
+            sys.stdout.write(' ' * start)
+            for x in xrange(width):
+                y = real_y * 2
+                p0 = i.getpixel((x, y))
+                p1 = i.getpixel((x, y+1))
+                block_print(p1, p0)
+            sys.stdout.write('\n')
+    else:
+        for y in xrange(height):
+            sys.stdout.write(' ' * start)
+            for x in xrange(width):
+                p = i.getpixel((x, y))
+                pixel_print(p)
+            sys.stdout.write('\n')
 
 
 """