X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fwidgets%2Ftext.py;h=ab8b53d0f52be79da8fff14b70d5ac9627bdf1c1;hb=b5cab68eccc2d397157a5dee6b57503eb3df7fe8;hp=0dea54067b08f104707939873f9ae194d3b7d5a9;hpb=25d1332b1c51c542a545ca937d195aef572228c4;p=naja.git

diff --git a/naja/widgets/text.py b/naja/widgets/text.py
index 0dea540..ab8b53d 100644
--- a/naja/widgets/text.py
+++ b/naja/widgets/text.py
@@ -8,10 +8,17 @@ from naja.widgets.base import Widget
 
 
 MARKUP_MAP = {
-    'NORTH': (1, 'glyphs/arrow_up.png'),
-    'SOUTH': (1, 'glyphs/arrow_down.png'),
-    'EAST': (1, 'glyphs/arrow_right.png'),
-    'WEST': (1, 'glyphs/arrow_left.png'),
+    'NORTH': (1, 'glyphs/arrow_up.png', None),
+    'SOUTH': (1, 'glyphs/arrow_down.png', None),
+    'EAST': (1, 'glyphs/arrow_right.png', None),
+    'WEST': (1, 'glyphs/arrow_left.png', None),
+    'HEALTH': (1, 'glyphs/health.png', PALETTE.DARK_RED),
+    'WINTOKEN': (1, 'glyphs/win.png', PALETTE.DARK_OLIVE),
+    'KEY': (1, 'glyphs/key.png', None),
+    'MSB': (1, 'glyphs/msb.png', None),
+    'REDKEY': (1, 'glyphs/key.png', PALETTE.ORANGE),
+    'GREENKEY': (1, 'glyphs/key.png', PALETTE.GREEN),
+    'BLUEKEY': (1, 'glyphs/key.png', PALETTE.BLUE),
 }
 
 
@@ -73,7 +80,9 @@ class TextBoxWidget(TextWidget):
         line_count = 0
         for line in self.text.splitlines():
             current_words = []
-            for word in line.split():
+            remaining_words = line.split()
+            while remaining_words:
+                word = remaining_words[0]
                 suffix = ''
                 if word[-1] in '.,':
                     suffix = word[-1]
@@ -86,18 +95,21 @@ class TextBoxWidget(TextWidget):
                 if words_fit(current_words):
                     if markup_data is not None:
                         size = self.font.size(
-                            ' '.join(current_words[:-1]) + ' ')
+                            ' '.join(current_words[:-1] + ['']))
                         pos = (size[0] * EIGHT_BIT_SCALE,
                                size[1] * line_count * EIGHT_BIT_SCALE)
                         pos = (pos[0] + self.padding, pos[1] + self.padding)
+                        colour = self.colour
+                        if markup_data[2] is not None:
+                            colour = markup_data[2]
                         image_map[pos] = resources.get_image(
                             markup_data[1],
-                            transforms=(EIGHT_BIT, blender(self.colour)))
-                        continue
+                            transforms=(EIGHT_BIT, blender(colour)))
+                    remaining_words.pop(0)
                 else:
                     line_count += 1
                     yield ' '.join(current_words[:-1])
-                    current_words = current_words[-1:]
+                    current_words = []
             if current_words and words_fit(current_words):
                 yield ' '.join(current_words)