log++ qq bugfixes.

[minwii.git] / src / app / events.py

diff --git a/src/app/events.py b/src/app/events.py
index c27e951..eee6445 100755 (executable)
--- a/src/app/events.py
+++ b/src/app/events.py
@@ -1,14 +1,43 @@
 import pygame
 import pygame

-base = pygame.USEREVENT
-print 'events base :', pygame.USEREVENT
-TIMEOUT = base + 1
-NOTEON  = base + 2
-NOTEOFF = base + 3
-NOTEEND = base + 4
-COLDOWN = base + 5
-COLUP   = base + 6
-COLOVER = base + 7
-
-pygame.USEREVENT = COLOVER
-if pygame.USEREVENT > pygame.NUMEVENTS :
-    pygame.NUMEVENTS = pygame.USEREVENT
+from sys import modules
+
+events = ['TIMEOUT',
+          'NOTEON',
+          'NOTEOFF',
+          'NOTEEND',
+          'COLDOWN',
+          'COLUP',
+          'COLOVER',
+          'COLSTATECHANGE']
+
+eventNames = {}
+self = modules[__name__]
+
+for i, name in enumerate(events) :
+    eventType = pygame.USEREVENT+i
+    eventNames[eventType] = name
+    setattr(self, name, eventType)
+
+pygame_events = [
+    'NOEVENT',
+    'ACTIVEEVENT',
+    'KEYDOWN',
+    'KEYUP',
+    'MOUSEMOTION',
+    'MOUSEBUTTONDOWN',
+    'MOUSEBUTTONUP',
+    'JOYAXISMOTION',
+    'JOYBALLMOTION',
+    'JOYHATMOTION',
+    'JOYBUTTONDOWN',
+    'JOYBUTTONUP',
+    'VIDEORESIZE',
+    'VIDEOEXPOSE',
+    'QUIT',
+    'SYSWMEVENT',
+    'USEREVENT',
+    'NUMEVENTS'
+    ]
+
+for name in pygame_events :
+    eventNames[getattr(pygame, name)] = name