X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fwidgets%2Fbase.py;fp=naja%2Fwidgets%2Fbase.py;h=81f11b649df9734371017f34891fa3ec6b360505;hb=bcc041da95b01ae36c2198b5c6bc4bd75dcc0c24;hp=133cc532c2ae8fb0886117255decbba65f1e374c;hpb=45109afcc6821713cea286b4085f2438427567ac;p=naja.git

diff --git a/naja/widgets/base.py b/naja/widgets/base.py
index 133cc53..81f11b6 100644
--- a/naja/widgets/base.py
+++ b/naja/widgets/base.py
@@ -1,4 +1,8 @@
+from collections import defaultdict
+
 import pygame
+from pygame import locals as pgl
+
 from naja.events import InvalidateTheWorld
 
 
@@ -7,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):
@@ -33,8 +38,17 @@ class Widget(object):
             # True for for this event
             self._prepared = False
             return False
+        if ev.type == pgl.MOUSEBUTTONDOWN:
+            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)
+
 
 class Container(object):
     def __init__(self, *widgets):
@@ -50,7 +64,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