polish up demoiselle, add sugargame

4 files changed, 362 insertions, 48 deletions

diff --git a/demoiselle.py b/demoiselle.py
index 9131f7a..55c6d22 100644..100755
--- a/demoiselle.py
+++ b/demoiselle.py
@@ -22,10 +22,52 @@
 
 import pygame, math, sys
 from pygame.locals import *
-screen = pygame.display.set_mode((1024, 768))
-background = pygame.image.load('sky.jpg')
-screen.blit(background, (0,0))
-clock = pygame.time.Clock()
+
+class Demoiselle:
+    def __init__(self):
+        self.background = pygame.image.load('sky.jpg')
+        self.screen = pygame.display.get_surface()
+        self.screen.blit(self.background, (0,0))
+        self.clock = pygame.time.Clock()
+
+        pads = [
+            PadSprite((200, 200)),
+            PadSprite((800, 200)),
+            PadSprite((200, 600)),
+            PadSprite((800, 600)),
+        ]
+        self. pad_group = pygame.sprite.RenderPlain(*pads)
+        
+    def run(self):
+        rect = self.screen.get_rect()
+        airplane = AirplaneSprite('demoiselle.png', rect.center)
+        airplane_sprite = pygame.sprite.RenderPlain(airplane)
+        while 1:
+            deltat = self.clock.tick(30)
+            for event in pygame.event.get():
+                if not hasattr(event, 'key'): 
+                    continue
+                down = event.type == KEYDOWN
+                if event.key == K_DOWN or event.key == K_KP2: 
+                    airplane.joystick_back = down * 5
+                elif event.key == K_UP or event.key == K_KP8: 
+                    airplane.joystick_forward = down * -5
+                elif event.key == K_EQUALS or event.key == K_KP_PLUS: 
+                    airplane.throttle_up = down * 2
+                elif event.key == K_MINUS or event.key == K_KP_MINUS: 
+                    airplane.throttle_down = down * -2
+                elif event.key == K_ESCAPE: 
+                    sys.exit(0)
+
+            self.pad_group.clear(self.screen, self.background)
+            airplane_sprite.clear(self.screen, self.background)
+            collisions = pygame.sprite.spritecollide(airplane, self.pad_group,  False)
+            self.pad_group.update(collisions)
+            self.pad_group.draw(self.screen)
+            airplane_sprite.update(deltat)
+            airplane_sprite.draw(self.screen)
+            pygame.display.flip()
+
 class AirplaneSprite(pygame.sprite.Sprite):
     MAX_FORWARD_SPEED = 10
     MIN_FORWARD_SPEED = 1
@@ -39,29 +81,30 @@ class AirplaneSprite(pygame.sprite.Sprite):
         self.rect.center = self.position
         self.speed = 1
         self.direction = 0
-        self.k_left = self.k_right = self.k_down = self.k_up = 0
+        self.joystick_back = self.joystick_forward = self.throttle_down = self.throttle_up = 0
+        
     def update(self, deltat):
-        # SIMULATION
-        self.speed += (self.k_up + self.k_down)
+        self.speed += (self.throttle_up + self.throttle_down)
         if self.speed > self.MAX_FORWARD_SPEED:
             self.speed = self.MAX_FORWARD_SPEED
         if self.speed < self.MIN_FORWARD_SPEED:
             self.speed = self.MIN_FORWARD_SPEED
-        self.direction += (self.k_right + self.k_left)
+        self.direction += (self.joystick_forward + self.joystick_back)
         x, y = self.position
         rad = self.direction * math.pi / 180
         x += -self.speed * math.cos(rad)
         y += -self.speed * math.sin(rad)
+        screen = pygame.display.get_surface()
         if y < 0:
-            y = 768
+            y = screen.get_height()
             
         if x < 0:
-            x = 1024
+            x = screen.get_width()
             
-        if x > 1024:
+        if x > screen.get_width():
             x = 0
             
-        if y > 768:
+        if y > screen.get_height():
             y = 0
         self.position = (x, y)
         self.image = pygame.transform.rotate(self.src_image, -self.direction)
@@ -82,40 +125,13 @@ class PadSprite(pygame.sprite.Sprite):
         else: 
             self.image = self.normal
 
-pads = [
-    PadSprite((200, 200)),
-    PadSprite((800, 200)),
-    PadSprite((200, 600)),
-    PadSprite((800, 600)),
-]
-pad_group = pygame.sprite.RenderPlain(*pads)
+# This function is called when the game is run directly from the command line:
+# ./demoiselle.py 
+def main():
+    pygame.init()
+    pygame.display.set_mode((0, 0), pygame.RESIZABLE)
+    game = Demoiselle() 
+    game.run()
 
-# CREATE AN AIRPLANE AND RUN
-rect = screen.get_rect()
-airplane = AirplaneSprite('demoiselle.png', rect.center)
-airplane_sprite = pygame.sprite.RenderPlain(airplane)
-while 1:
-    # USER INPUT
-    deltat = clock.tick(30)
-    for event in pygame.event.get():
-        if not hasattr(event, 'key'): continue
-        down = event.type == KEYDOWN
-        if event.key == K_RIGHT: 
-            airplane.k_right = down * -5
-        elif event.key == K_LEFT: 
-            airplane.k_left = down * 5
-        elif event.key == K_UP: 
-            airplane.k_up = down * 2
-        elif event.key == K_DOWN: 
-            airplane.k_down = down * -2
-        elif event.key == K_ESCAPE: 
-            sys.exit(0)
-    # RENDERING
-    pad_group.clear(screen, background)
-    airplane_sprite.clear(screen, background)
-    collisions = pygame.sprite.spritecollide(airplane, pad_group,  False)
-    pad_group.update(collisions)
-    pad_group.draw(screen)
-    airplane_sprite.update(deltat)
-    airplane_sprite.draw(screen)
-    pygame.display.flip()
+if __name__ == '__main__':
+    main()
diff --git a/sugargame/__init__.py b/sugargame/__init__.py
new file mode 100644
index 0000000..7e49527
--- /dev/null
+++ b/sugargame/__init__.py
@@ -0,0 +1 @@
+__version__ = '1.0'
diff --git a/sugargame/canvas.py b/sugargame/canvas.py
new file mode 100644
index 0000000..cf99a13
--- /dev/null
+++ b/sugargame/canvas.py
@@ -0,0 +1,56 @@
+import os
+import gtk
+import gobject
+import pygame
+import event
+
+CANVAS = None
+
+class PygameCanvas(gtk.EventBox):
+    def __init__(self, mainwindow):
+        gtk.EventBox.__init__(self)
+
+        global CANVAS
+        assert CANVAS == None, "Only one PygameCanvas can be created, ever."
+        CANVAS = self
+
+        self._mainwindow = mainwindow
+
+        self.set_flags(gtk.CAN_FOCUS)
+        
+        self._socket = gtk.Socket()
+        self.add(self._socket)
+        self.show_all()
+
+    def run_pygame(self, main_fn):
+        # Run the main loop after a short delay.  The reason for the delay is that the
+        # Sugar activity is not properly created until after its constructor returns.
+        # If the Pygame main loop is called from the activity constructor, the 
+        # constructor never returns and the activity freezes.
+        gobject.idle_add(self._run_pygame_cb, main_fn)
+
+    def _run_pygame_cb(self, main_fn):
+        assert pygame.display.get_surface() is None, "PygameCanvas.run_pygame can only be called once."
+        
+        # Preinitialize Pygame with the X window ID.
+        assert pygame.display.get_init() == False, "Pygame must not be initialized before calling PygameCanvas.run_pygame."
+        os.environ['SDL_WINDOWID'] = str(self._socket.get_id())
+        pygame.init()
+        
+        # Restore the default cursor.
+        self._socket.get_window().set_cursor(None)
+
+        # Initialize the Pygame window.
+        r = self.get_allocation()
+        pygame.display.set_mode((r.width, r.height), pygame.RESIZABLE)
+
+        # Hook certain Pygame functions with GTK equivalents.
+        translator = event.Translator(self._mainwindow, self)
+        translator.hook_pygame()
+
+        # Run the Pygame main loop.
+        main_fn()
+        return False
+
+    def get_pygame_widget(self):
+        return self._socket
diff --git a/sugargame/event.py b/sugargame/event.py
new file mode 100644
index 0000000..52ca4ab
--- /dev/null
+++ b/sugargame/event.py
@@ -0,0 +1,241 @@
+import gtk
+import gobject
+import pygame
+import pygame.event
+import logging 
+
+class _MockEvent(object):
+    def __init__(self, keyval):
+        self.keyval = keyval
+
+class Translator(object):
+    key_trans = {
+        'Alt_L': pygame.K_LALT,
+        'Alt_R': pygame.K_RALT,
+        'Control_L': pygame.K_LCTRL,
+        'Control_R': pygame.K_RCTRL,
+        'Shift_L': pygame.K_LSHIFT,
+        'Shift_R': pygame.K_RSHIFT,
+        'Super_L': pygame.K_LSUPER,
+        'Super_R': pygame.K_RSUPER,
+        'KP_Page_Up' : pygame.K_KP9, 
+        'KP_Page_Down' : pygame.K_KP3,
+        'KP_End' : pygame.K_KP1, 
+        'KP_Home' : pygame.K_KP7,
+        'KP_Up' : pygame.K_KP8,
+        'KP_Down' : pygame.K_KP2,
+        'KP_Left' : pygame.K_KP4,
+        'KP_Right' : pygame.K_KP6,
+
+    }
+    
+    mod_map = {
+        pygame.K_LALT: pygame.KMOD_LALT,
+        pygame.K_RALT: pygame.KMOD_RALT,
+        pygame.K_LCTRL: pygame.KMOD_LCTRL,
+        pygame.K_RCTRL: pygame.KMOD_RCTRL,
+        pygame.K_LSHIFT: pygame.KMOD_LSHIFT,
+        pygame.K_RSHIFT: pygame.KMOD_RSHIFT,
+    }
+    
+    def __init__(self, mainwindow, inner_evb):
+        """Initialise the Translator with the windows to which to listen"""
+        self._mainwindow = mainwindow
+        self._inner_evb = inner_evb
+
+        # Enable events
+        self._mainwindow.set_events(
+            gtk.gdk.KEY_PRESS_MASK | \
+            gtk.gdk.KEY_RELEASE_MASK \
+        )
+        
+        self._inner_evb.set_events(
+            gtk.gdk.POINTER_MOTION_MASK | \
+            gtk.gdk.POINTER_MOTION_HINT_MASK | \
+            gtk.gdk.BUTTON_MOTION_MASK | \
+            gtk.gdk.BUTTON_PRESS_MASK | \
+            gtk.gdk.BUTTON_RELEASE_MASK 
+        )
+
+        self._mainwindow.set_flags(gtk.CAN_FOCUS)
+        self._inner_evb.set_flags(gtk.CAN_FOCUS)
+        
+        # Callback functions to link the event systems
+        self._mainwindow.connect('unrealize', self._quit_cb)
+        self._inner_evb.connect('key_press_event', self._keydown_cb)
+        self._inner_evb.connect('key_release_event', self._keyup_cb)
+        self._inner_evb.connect('button_press_event', self._mousedown_cb)
+        self._inner_evb.connect('button_release_event', self._mouseup_cb)
+        self._inner_evb.connect('motion-notify-event', self._mousemove_cb)
+        self._inner_evb.connect('expose-event', self._expose_cb)
+        self._inner_evb.connect('configure-event', self._resize_cb)
+        
+        # Internal data
+        self.__stopped = False
+        self.__keystate = [0] * 323
+        self.__button_state = [0,0,0]
+        self.__mouse_pos = (0,0)
+        self.__repeat = (None, None)
+        self.__held = set()
+        self.__held_time_left = {}
+        self.__held_last_time = {}
+        self.__tick_id = None
+
+    def hook_pygame(self):
+        pygame.key.get_pressed = self._get_pressed
+        pygame.key.set_repeat = self._set_repeat
+        pygame.mouse.get_pressed = self._get_mouse_pressed
+        pygame.mouse.get_pos = self._get_mouse_pos
+        
+    def _expose_cb(self, event, widget):
+        pygame.event.post(pygame.event.Event(pygame.VIDEOEXPOSE))
+        return True
+
+    def _resize_cb(self, widget, event):
+        evt = pygame.event.Event(pygame.VIDEORESIZE, 
+                                 size=(event.width,event.height), width=event.width, height=event.height)
+        pygame.event.post(evt)
+        return False # continue processing
+
+    def _quit_cb(self, data=None):
+        self.__stopped = True
+        pygame.event.post(pygame.event.Event(pygame.QUIT))
+
+    def _keydown_cb(self, widget, event):
+        key = event.keyval
+        if key in self.__held:
+            return True
+        else:
+            if self.__repeat[0] is not None:
+                self.__held_last_time[key] = pygame.time.get_ticks()
+                self.__held_time_left[key] = self.__repeat[0]
+            self.__held.add(key)
+            
+        return self._keyevent(widget, event, pygame.KEYDOWN)
+        
+    def _keyup_cb(self, widget, event):
+        key = event.keyval
+        if self.__repeat[0] is not None:
+            if key in self.__held:
+                # This is possibly false if set_repeat() is called with a key held
+                del self.__held_time_left[key]
+                del self.__held_last_time[key]
+        self.__held.discard(key)
+
+        return self._keyevent(widget, event, pygame.KEYUP)
+        
+    def _keymods(self):
+        mod = 0
+        for key_val, mod_val in self.mod_map.iteritems():
+            mod |= self.__keystate[key_val] and mod_val
+        return mod
+        
+    def _keyevent(self, widget, event, type):
+        key = gtk.gdk.keyval_name(event.keyval)
+        if key is None:
+            # No idea what this key is.
+            return False 
+        
+        keycode = None
+        if key in self.key_trans:
+            keycode = self.key_trans[key]
+        elif hasattr(pygame, 'K_'+key.upper()):
+            keycode = getattr(pygame, 'K_'+key.upper())
+        elif hasattr(pygame, 'K_'+key.lower()):
+            keycode = getattr(pygame, 'K_'+key.lower())
+        elif key == 'XF86Start':
+            # view source request, specially handled...
+            self._mainwindow.view_source()
+        else:
+            print 'Key %s unrecognized' % key
+            
+        if keycode is not None:
+            if type == pygame.KEYDOWN:
+                mod = self._keymods()
+            self.__keystate[keycode] = type == pygame.KEYDOWN
+            if type == pygame.KEYUP:
+                mod = self._keymods()
+            ukey = unichr(gtk.gdk.keyval_to_unicode(event.keyval))
+            if ukey == '\000':
+                ukey = ''
+            evt = pygame.event.Event(type, key=keycode, unicode=ukey, mod=mod)
+            self._post(evt)
+            
+        return True
+
+    def _get_pressed(self):
+        return self.__keystate
+
+    def _get_mouse_pressed(self):
+        return self.__button_state
+
+    def _mousedown_cb(self, widget, event):
+        self.__button_state[event.button-1] = 1
+        return self._mouseevent(widget, event, pygame.MOUSEBUTTONDOWN)
+
+    def _mouseup_cb(self, widget, event):
+        self.__button_state[event.button-1] = 0
+        return self._mouseevent(widget, event, pygame.MOUSEBUTTONUP)
+        
+    def _mouseevent(self, widget, event, type):
+        evt = pygame.event.Event(type, button=event.button, pos=(event.x, event.y))
+        self._post(evt)
+        return True
+        
+    def _mousemove_cb(self, widget, event):
+        # From http://www.learningpython.com/2006/07/25/writing-a-custom-widget-using-pygtk/
+        # if this is a hint, then let's get all the necessary 
+        # information, if not it's all we need.
+        if event.is_hint:
+            x, y, state = event.window.get_pointer()
+        else:
+            x = event.x
+            y = event.y
+            state = event.state
+
+        rel = (x - self.__mouse_pos[0], y - self.__mouse_pos[1])
+        self.__mouse_pos = (x, y)
+        
+        self.__button_state = [
+            state & gtk.gdk.BUTTON1_MASK and 1 or 0,
+            state & gtk.gdk.BUTTON2_MASK and 1 or 0,
+            state & gtk.gdk.BUTTON3_MASK and 1 or 0,
+        ]
+        
+        evt = pygame.event.Event(pygame.MOUSEMOTION,
+                                 pos=self.__mouse_pos, rel=rel, buttons=self.__button_state)
+        self._post(evt)
+        return True
+        
+    def _tick_cb(self):
+        cur_time = pygame.time.get_ticks()
+        for key in self.__held:
+            delta = cur_time - self.__held_last_time[key] 
+            self.__held_last_time[key] = cur_time
+            
+            self.__held_time_left[key] -= delta
+            if self.__held_time_left[key] <= 0:
+                self.__held_time_left[key] = self.__repeat[1]
+                self._keyevent(None, _MockEvent(key), pygame.KEYDOWN)
+                
+        return True
+        
+    def _set_repeat(self, delay=None, interval=None):
+        if delay is not None and self.__repeat[0] is None:
+            self.__tick_id = gobject.timeout_add(10, self._tick_cb)
+        elif delay is None and self.__repeat[0] is not None:
+            gobject.source_remove(self.__tick_id)
+        self.__repeat = (delay, interval)
+        
+    def _get_mouse_pos(self):
+        return self.__mouse_pos
+
+    def _post(self, evt):
+        try:
+            pygame.event.post(evt)
+        except pygame.error, e:
+            if str(e) == 'Event queue full':
+                print "Event queue full!"
+                pass
+            else:
+                raise e