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

diff --git a/naja/widgets/text.py b/naja/widgets/text.py
index d753e8a..ab8b53d 100644
--- a/naja/widgets/text.py
+++ b/naja/widgets/text.py
@@ -1,9 +1,25 @@
 import pygame
 
-from naja.constants import FONT, FONT_SIZE, EIGHT_BIT_SCALE
-from naja.widgets.base import Widget
+from naja.constants import FONT, FONT_SIZE, EIGHT_BIT_SCALE, PALETTE
 from naja.resources import resources
+from naja.resources.mutators import EIGHT_BIT, blender
 from naja.utils import convert_colour
+from naja.widgets.base import Widget
+
+
+MARKUP_MAP = {
+    '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),
+}
 
 
 class TextWidget(Widget):
@@ -15,7 +31,7 @@ class TextWidget(Widget):
         self.text = text
         self.fontname = fontname or FONT
         self.fontsize = (fontsize or FONT_SIZE) // EIGHT_BIT_SCALE
-        self.colour = convert_colour(colour or (0, 0, 0))
+        self.colour = convert_colour(colour or PALETTE.BLACK)
 
     def render_line(self, text):
         text_surf = self.font.render(text, True, self.colour)
@@ -38,20 +54,20 @@ class TextBoxWidget(TextWidget):
         self.padding = kwargs.pop('padding', 5)
         self.border = kwargs.pop('border', 2)
         self.bg_colour = convert_colour(kwargs.pop('bg_colour',
-                                                   (255, 255, 255, 192)))
+                                                   PALETTE.LIGHT_VIOLET))
         self.border_colour = convert_colour(kwargs.pop('border_colour',
-                                                       (0, 0, 0)))
+                                                       PALETTE.BLACK))
         self.box_width = kwargs.pop('box_width', 0)
 
         super(TextBoxWidget, self).__init__(*args, **kwargs)
 
-    def lines(self):
+    def lines(self, image_map):
         if self.box_width != 0:
-            return self._wrapped_lines()
+            return self._wrapped_lines(image_map)
         else:
             return self.text.splitlines()
 
-    def _wrapped_lines(self):
+    def _wrapped_lines(self, image_map):
         def words_fit(words):
             words_line = ' '.join(words)
             width = self.font.size(words_line)[0]
@@ -61,27 +77,52 @@ class TextBoxWidget(TextWidget):
                 Exception("Word %r too long for box." % (words[0],))
             return False
 
+        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]
+                    word = word[:-1]
+                markup_data = MARKUP_MAP.get(word, None)
+                if markup_data is not None:
+                    word = ' ' * markup_data[0]
+                word += suffix
                 current_words.append(word)
                 if words_fit(current_words):
-                    continue
+                    if markup_data is not None:
+                        size = self.font.size(
+                            ' '.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(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)
 
     def prepare(self):
         self.font = resources.get_font(self.fontname, self.fontsize)
+        image_map = {}
         rendered_lines = []
-        width, height = self.padding, self.padding
-        for line in self.lines():
+        width, height = self.padding * 2, self.padding * 2
+        for line in self.lines(image_map):
             line_surface = self.render_line(line)
             line_rect = line_surface.get_rect()
             rendered_lines.append(line_surface)
-            width = max(width, line_rect.width + self.padding)
+            width = max(width, line_rect.width + self.padding * 2)
             height += line_rect.height
 
         self.surface = pygame.surface.Surface((width, height),
@@ -93,6 +134,8 @@ class TextBoxWidget(TextWidget):
         for line_surface in rendered_lines:
             self.surface.blit(line_surface, (x, y))
             y += line_surface.get_rect().height
+        for pos, img in image_map.items():
+            self.surface.blit(img, pos)
 
     def draw(self, surface):
         surface.blit(self.surface, self.rect)