merged master changes from today into package branch

1 files changed, 18 insertions, 0 deletions

diff --git a/asciifarm/client/display/colours.py b/asciifarm/client/display/colours.py
new file mode 100644
index 0000000..cef2675
--- /dev/null
+++ b/asciifarm/client/display/colours.py
@@ -0,0 +1,18 @@
+
+import curses
+
+class Colours:
+    
+    def __init__(self):
+        
+        self.colours = min(curses.COLORS, 16)
+        self.pairs = self.colours*self.colours
+
+        curses.use_default_colors()
+        for i in range(0, self.pairs):
+            curses.init_pair(i, i%self.colours, i//self.colours)
+    
+    def get(self, fg=0, bg=0):
+        fg %= self.colours
+        bg %= self.colours
+        return curses.color_pair(fg + bg*self.colours)