X-Git-Url: https://vcs.fsf.org/?p=rainbowstream.git;a=blobdiff_plain;f=rainbowstream%2Fc_image.py;h=e440d405e509b66ba0e4264ddff597e310cd32ec;hp=95e1c66ee9e37410b8fbabd136c3b6a33e98e5e0;hb=8b8566d13f923932bee8eec9487d35956797b796;hpb=991c30af2171bac652a3c8402f938e23b955a8d1;ds=sidebyside

diff --git a/rainbowstream/c_image.py b/rainbowstream/c_image.py
index 95e1c66..e440d40 100644
--- a/rainbowstream/c_image.py
+++ b/rainbowstream/c_image.py
@@ -1,6 +1,6 @@
 from PIL import Image
-from functools import partial
 from os.path import join, dirname, getmtime, exists, expanduser
+from .config import *
 
 import ctypes
 import sys
@@ -24,25 +24,29 @@ def pixel_print(ansicolor):
     sys.stdout.write('\033[48;5;%sm \033[0m' % (ansicolor))
 
 
-def image_to_display(path):
+def image_to_display(path, start=None, length=None):
+    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
     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 x in xrange(width):
+    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))
-        print ''
+        sys.stdout.write('\n')
 
 if __name__ == '__main__':
     image_to_display(sys.argv[1])