X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fwidgets%2Fbase.py;h=ee6190b91939bdd35176e11257fc570ac2a78adf;hb=1521f5cdb98df760ed59746901bfbc212c7466a4;hp=bda00a4b755a4c91b8738096a003b6e40f65aac9;hpb=e3f865facdb9c4b3b94c1b89d0734ed09fd6b205;p=naja.git

diff --git a/naja/widgets/base.py b/naja/widgets/base.py
index bda00a4..ee6190b 100644
--- a/naja/widgets/base.py
+++ b/naja/widgets/base.py
@@ -1,4 +1,9 @@
+from collections import defaultdict
+
 import pygame
+from pygame import locals as pgl
+
+from naja.events import InvalidateTheWorld, SelectEvent
 
 
 class Widget(object):
@@ -6,6 +11,7 @@ class Widget(object):
         self.pos = pos
         self.size = size or (0, 0)
         self._prepared = False
+        self.callbacks = defaultdict(list)
 
     @property
     def rect(self):
@@ -27,8 +33,23 @@ class Widget(object):
 
     def handle_event(self, ev):
         '''Return True if the event has been handled'''
+        if InvalidateTheWorld.matches(ev):
+            # Invalidate has special handling. Widgets should never return
+            # True for for this event
+            self._prepared = False
+            return False
+        if SelectEvent.matches(ev) or ev.type == pgl.MOUSEBUTTONDOWN:
+            return self.callback('click')
         return False
 
+    def add_callback(self, event, callback):
+        self.callbacks[event].append(callback)
+
+    def callback(self, event):
+        for callback in self.callbacks[event]:
+            callback(event)
+        return bool(self.callbacks[event])
+
 
 class Container(object):
     def __init__(self, *widgets):
@@ -44,7 +65,16 @@ class Container(object):
             widget.render(surface)
 
     def handle_event(self, ev):
-        for widget in self.widgets:
-            if widget.handle_event(ev):
-                return True
+        if hasattr(ev, 'pos'):
+            for widget in self.widgets:
+                if isinstance(widget, Container):
+                    if widget.handle_event(ev):
+                        return True
+                elif widget.rect.collidepoint(ev.pos):
+                    if widget.handle_event(ev):
+                        return True
+        else:
+            for widget in self.widgets:
+                if widget.handle_event(ev):
+                    return True
         return False