X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fwidgets%2Ftext.py;h=7c1039ff4d2ef517f019c7d52b71f8a75c0149ea;hb=f424aafdeb67094f1018fada3b67da2faa9dc811;hp=e4eecaacad57e2f53ffdf07a9b8419a43896166f;hpb=ee2a1f7e16272d19eb5a2dc03355ce8b851a441e;p=naja.git

diff --git a/naja/widgets/text.py b/naja/widgets/text.py
index e4eecaa..7c1039f 100644
--- a/naja/widgets/text.py
+++ b/naja/widgets/text.py
@@ -1,6 +1,7 @@
 import pygame
+import pygame.locals as pgl
 
-from naja.constants import FONT, FONT_SIZE, EIGHT_BIT_SCALE, PALETTE
+from naja.constants import FONT, FONT_SIZE, EIGHT_BIT_SCALE, PALETTE, KEYS
 from naja.resources import resources
 from naja.resources.mutators import EIGHT_BIT, blender
 from naja.utils import convert_colour
@@ -21,6 +22,9 @@ MARKUP_MAP = {
     'BLUE': ('glyphs/key.png', PALETTE.BLUE),
     'CLOCKWISE': ('glyphs/clockwise.png', None),
     'ANTICLOCKWISE': ('glyphs/anticlockwise.png', None),
+
+    'HEALTH_NOCOLOUR': ('glyphs/health.png', None),
+    'WINTOKEN_NOCOLOUR': ('glyphs/win.png', None),
 }
 
 
@@ -33,29 +37,67 @@ class Glyph(object):
 
 class TextWidget(Widget):
 
-    def __init__(self, pos, text, size=None, fontname=None, fontsize=None,
-                 colour=None):
-        super(TextWidget, self).__init__(pos, size)
+    VIEW_PORT_DY = 50
+
+    def __init__(self, pos, text, fontname=None, fontsize=None,
+                 colour=None, unselectable_colour=None, view_port=None):
+        super(TextWidget, self).__init__(pos)
 
         self.text = text
         self.fontname = fontname or FONT
         self.fontsize = (fontsize or FONT_SIZE) // EIGHT_BIT_SCALE
         self.colour = convert_colour(colour or PALETTE.BLACK)
+        if unselectable_colour is not None:
+            unselectable_colour = convert_colour(unselectable_colour)
+        self.unselectable_colour = unselectable_colour
+        self.view_port = (
+            pygame.Rect((0, 0), view_port) if view_port is not None else None)
 
     def render_line(self, text):
-        text_surf = self.font.render(text, True, self.colour)
+        colour = self.colour
+        if not self.is_selectable() and self.unselectable_colour is not None:
+            colour = self.unselectable_colour
+        text_surf = self.font.render(text, True, colour)
         text_rect = text_surf.get_rect()
         return pygame.transform.scale(
             text_surf, (text_rect.width * EIGHT_BIT_SCALE,
                         text_rect.height * EIGHT_BIT_SCALE))
 
+    def update_size(self):
+        if self.view_port is not None:
+            self.size = self.view_port.size
+        else:
+            self.size = self.surface.get_rect().size
+
     def prepare(self):
         self.font = resources.get_font(self.fontname, self.fontsize)
         self.surface = self.render_line(self.text)
-        self.size = self.surface.get_rect().size
+        self.update_size()
+
+    def handle_event(self, ev):
+        if self.view_port is None:
+            return super(TextWidget, self).handle_event(ev)
+        if ev.type == pgl.KEYDOWN:
+            if ev.key in KEYS.DOWN:
+                self.view_port.move_ip(0, self.VIEW_PORT_DY)
+                if self.view_port.bottom > self.surface.get_rect().bottom:
+                    self.view_port.bottom = self.surface.get_rect().bottom
+                return True
+            elif ev.key in KEYS.UP:
+                self.view_port.move_ip(0, -self.VIEW_PORT_DY)
+                if self.view_port.top < 0:
+                    self.view_port.top = 0
+                return True
+        return super(TextWidget, self).handle_event(ev)
 
     def draw(self, surface):
-        surface.blit(self.surface, self.pos)
+        if self.view_port is None:
+            rect = self.rect
+            area = None
+        else:
+            rect = self.pos
+            area = self.view_port
+        surface.blit(self.surface, rect, area)
 
 
 class TextBoxWidget(TextWidget):
@@ -114,6 +156,11 @@ class TextBoxWidget(TextWidget):
 
         line_count = 0
         for line in self.text.splitlines():
+            line = line.strip()
+            if not line:
+                line_count += 1
+                yield line
+                continue
             current_words = []
             remaining_words = line.split()
             while remaining_words:
@@ -134,6 +181,7 @@ class TextBoxWidget(TextWidget):
                         word = glyph.markup_text
                     remaining_words.insert(0, word)
             if current_words and words_fit(current_words):
+                line_count += 1
                 yield ' '.join(current_words)
 
     def prepare(self):
@@ -151,7 +199,7 @@ class TextBoxWidget(TextWidget):
         self.surface = pygame.surface.Surface((width, height),
                                               pygame.locals.SRCALPHA)
         self.surface.fill(self.bg_colour)
-        self.size = self.surface.get_rect().size
+        self.update_size()
 
         x, y = self.padding, self.padding
         for line_surface in rendered_lines:
@@ -159,6 +207,3 @@ class TextBoxWidget(TextWidget):
             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)