X-Git-Url: https://vcs.fsf.org/?p=rainbowstream.git;a=blobdiff_plain;f=rainbowstream%2Fcolors.py;h=909a85af3e5fc0bcc9fc32dad41d0935ff4c70c7;hp=694af96ff71c5647ef00ebae3f695d292ee76a51;hb=f75930c6e0b0ec505732b758d414162a8bebdece;hpb=42fde7758a905592bbebfe849b210d39508a3187

diff --git a/rainbowstream/colors.py b/rainbowstream/colors.py
index 694af96..909a85a 100644
--- a/rainbowstream/colors.py
+++ b/rainbowstream/colors.py
@@ -1,37 +1,78 @@
 import random
 import itertools
 from functools import wraps
-from termcolor import *
 from pyfiglet import figlet_format
+from .config import *
 from functools import reduce
 
-grey = lambda x: colored(x, 'grey', attrs=['bold'])
-red = lambda x: colored(x, 'red', attrs=['bold'])
-green = lambda x: colored(x, 'green', attrs=['bold'])
-yellow = lambda x: colored(x, 'yellow', attrs=['bold'])
-blue = lambda x: colored(x, 'blue', attrs=['bold'])
-magenta = lambda x: colored(x, 'magenta', attrs=['bold'])
-cyan = lambda x: colored(x, 'cyan', attrs=['bold'])
-white = lambda x: colored(x, 'white', attrs=['bold'])
-
-on_grey = lambda x: colored(x, 'white', 'on_grey', attrs=['bold'])
-on_red = lambda x: colored(x, 'white', 'on_red', attrs=['bold'])
-on_green = lambda x: colored(x, 'white', 'on_green', attrs=['bold'])
-on_yellow = lambda x: colored(x, 'white', 'on_yellow', attrs=['bold'])
-on_blue = lambda x: colored(x, 'white', 'on_blue', attrs=['bold'])
-on_magenta = lambda x: colored(x, 'white', 'on_magenta', attrs=['bold'])
-on_cyan = lambda x: colored(x, 'white', 'on_cyan', attrs=['bold'])
-on_white = lambda x: colored(x, 'white', 'on_white', attrs=['bold'])
-
-colors_shuffle = [grey, red, green, yellow, blue, magenta, cyan]
+
+def basic_color(code):
+    """
+    16 colors supported
+    """
+    def inner(text, bold=True):
+        c = code
+        if bold:
+            c = "1;%s" % c
+        return "\033[%sm%s\033[0m" % (c, text)
+    return inner
+
+
+def RGB(code):
+    """
+    256 colors supported
+    """
+    def inner(text):
+        c = code
+        return "\033[38;5;%sm%s\033[0m" % (c, text)
+    return inner
+
+
+default = basic_color('39')
+black = basic_color('30')
+red = basic_color('31')
+green = basic_color('32')
+yellow = basic_color('33')
+blue = basic_color('34')
+magenta = basic_color('35')
+cyan = basic_color('36')
+grey = basic_color('90')
+light_red = basic_color('91')
+light_green = basic_color('92')
+light_yellow = basic_color('93')
+light_blue = basic_color('94')
+light_magenta = basic_color('95')
+light_cyan = basic_color('96')
+white = basic_color('97')
+
+on_default = basic_color('49')
+on_black = basic_color('40')
+on_red = basic_color('41')
+on_green = basic_color('42')
+on_yellow = basic_color('43')
+on_blue = basic_color('44')
+on_magenta = basic_color('45')
+on_cyan = basic_color('46')
+on_grey = basic_color('100')
+on_light_red = basic_color('101')
+on_light_green = basic_color('102')
+on_light_yellow = basic_color('103')
+on_light_blue = basic_color('104')
+on_light_magenta = basic_color('105')
+on_light_cyan = basic_color('106')
+on_white = basic_color('107')
+
+colors_shuffle = [locals()[i.encode('utf8')] if not i.startswith(
+    'RGB_') else RGB(int(i[4:])) for i in c['CYCLE_COLOR']]
+
 background_shuffle = [
     on_grey,
-    on_red,
-    on_green,
-    on_yellow,
-    on_blue,
-    on_magenta,
-    on_cyan]
+    on_light_red,
+    on_light_green,
+    on_light_yellow,
+    on_light_blue,
+    on_light_magenta,
+    on_light_cyan]
 cyc = itertools.cycle(colors_shuffle[1:])