convert to Cairo; toolbar_utils.py

6 files changed, 407 insertions, 224 deletions

diff --git a/PukllanapacActivity.py b/PukllanapacActivity.py
index 5efb3b4..9777b5e 100644
--- a/PukllanapacActivity.py
+++ b/PukllanapacActivity.py
@@ -29,16 +29,14 @@ if _have_toolbox:
     from sugar.activity.widgets import StopButton
     from sugar.graphics.toolbarbox import ToolbarButton
 
-from sugar.graphics.toolbutton import ToolButton
-from sugar.graphics.menuitem import MenuItem
-from sugar.graphics.icon import Icon
 from sugar.datastore import datastore
 
 from gettext import gettext as _
 import locale
 import os.path
 
-from sprites import *
+from toolbar_utils import radio_factory, label_factory, separator_factory, \
+    button_factory
 from window import Game
 
 SERVICE = 'org.sugarlabs.PukllanapacActivity'
@@ -48,47 +46,6 @@ LEVEL_ICONS = ['level1', 'level2', 'level3']
 GAME_ICONS = ['rectangle', 'hexagon', 'hexagon2']
 
 
-def _button_factory(icon_name, tooltip, callback, toolbar, cb_arg=None,
-                    accelerator=None):
-    """Factory for making toolbar buttons"""
-    my_button = ToolButton(icon_name)
-    my_button.set_tooltip(tooltip)
-    my_button.props.sensitive = True
-    if accelerator is not None:
-        my_button.props.accelerator = accelerator
-    if cb_arg is not None:
-        my_button.connect('clicked', callback, cb_arg)
-    else:
-        my_button.connect('clicked', callback)
-    if hasattr(toolbar, 'insert'):  # the main toolbar
-        toolbar.insert(my_button, -1)
-    else:  # or a secondary toolbar
-        toolbar.props.page.insert(my_button, -1)
-    my_button.show()
-    return my_button
-
-
-def _label_factory(label, toolbar):
-    """ Factory for adding a label to a toolbar """
-    my_label = gtk.Label(label)
-    my_label.set_line_wrap(True)
-    my_label.show()
-    _toolitem = gtk.ToolItem()
-    _toolitem.add(my_label)
-    toolbar.insert(_toolitem, -1)
-    _toolitem.show()
-    return my_label
-
-
-def _separator_factory(toolbar, visible=True, expand=False):
-    """ Factory for adding a separator to a toolbar """
-    _separator = gtk.SeparatorToolItem()
-    _separator.props.draw = visible
-    _separator.set_expand(expand)
-    toolbar.insert(_separator, -1)
-    _separator.show()
-
-
 class PukllanapacActivity(activity.Activity):
     """ Sliding puzzle game """
 
@@ -108,35 +65,35 @@ class PukllanapacActivity(activity.Activity):
         canvas.show()
         self.show_all()
 
-        self.tw = Game(canvas, os.path.join(activity.get_bundle_path(),
+        self.win = Game(canvas, os.path.join(activity.get_bundle_path(),
                                             'images'), self)
 
         # Restore game state from Journal or start new game
         if 'play_level' in self.metadata:
             self.change_play_level_cb(play_level=int(
                     self.metadata['play_level']))
-            if 'play_mode' in self.metadata:
-                self.change_play_mode_cb(play_mode=int(
-                        self.metadata['play_mode']))
-            grid = []
-            for i in range(24):
-                if 'card' + str(i) in self.metadata:
-                    grid.append(int(self.metadata['card' + str(i)]))
-            self.tw.grid.restore_grid(grid, self.tw.mode)
-            for i in range(24):
-                if 'rotate' + str(i) in self.metadata:
-                    self.tw.grid.card_table[grid[i]].set_orientation(
-                        int(self.metadata['rotate' + str(i)]))
-        self.tw.mask(self._play_level)
+        if 'play_mode' in self.metadata:
+            self.change_play_mode_cb(play_mode=int(
+                    self.metadata['play_mode']))
+        grid = []
+        for i in range(24):
+            if 'card' + str(i) in self.metadata:
+                grid.append(int(self.metadata['card' + str(i)]))
+            self.win.grid.restore_grid(grid, self.win.mode)
+        for i in range(24):
+            if 'rotate' + str(i) in self.metadata:
+                self.win.grid.card_table[grid[i]].set_orientation(
+                    int(self.metadata['rotate' + str(i)]))
+        self.win.mask(self._play_level)
 
     def write_file(self, file_path):
         """ Write the grid status to the Journal """
         self.metadata['play_mode'] = self._play_mode
         self.metadata['play_level'] = self._play_level
         for i in range(24):
-            self.metadata['card' + str(i)] = str(self.tw.grid.grid[i])
+            self.metadata['card' + str(i)] = str(self.win.grid.grid[i])
             self.metadata['rotate' + str(i)] = str(
-                self.tw.grid.card_table[self.tw.grid.grid[i]].orientation)
+                self.win.grid.card_table[self.win.grid.grid[i]].orientation)
 
     def _setup_toolbars(self, have_toolbox):
         """ Setup the toolbars.. """
@@ -165,21 +122,30 @@ class PukllanapacActivity(activity.Activity):
             toolbar = games_toolbar
 
         # Add the buttons and labels to the toolbars
-        self.level_button = _button_factory(LEVEL_ICONS[self._play_level],
-                                            _('Set difficulty level.'),
-                                            self.change_play_level_cb, toolbar)
+        self.level_button = button_factory(
+            LEVEL_ICONS[self._play_level], toolbar, self.change_play_level_cb,
+            tooltip=_('Set difficulty level.'))
         mode = self._play_mode
         mode += 1
         if mode == len(GAME_ICONS):
             mode = 0
-        self.game_button = _button_factory(GAME_ICONS[mode],
-                                            _('Select game.'),
-                                            self.change_play_mode_cb, toolbar)
-        _separator_factory(toolbar, True, False)
-        self.status_label = _label_factory(_("drag to swap"), toolbar)
+        self.game_buttons = []
+        for i in range(len(GAME_ICONS)):
+            if i==0:
+                self.game_buttons.append(radio_factory(
+                        GAME_ICONS[0], toolbar, self.change_play_mode_cb,
+                        cb_arg=0, tooltip=_('Select game.'), group=None))
+            else:
+                self.game_buttons.append(radio_factory(
+                        GAME_ICONS[i], toolbar, self.change_play_mode_cb,
+                        cb_arg=i, tooltip=_('Select game.'),
+                        group=self.game_buttons[0]))
+        self.game_buttons[mode].set_active(True)
+        separator_factory(toolbar, False, True)
+        self.status_label = label_factory(toolbar, _("drag to swap"))
 
         if _have_toolbox:
-            _separator_factory(toolbox.toolbar, False, True)
+            separator_factory(toolbox.toolbar, True, False)
 
             stop_button = StopButton(self)
             stop_button.props.accelerator = '<Ctrl>q'
@@ -197,8 +163,8 @@ class PukllanapacActivity(activity.Activity):
         else:
             self._play_level = play_level
         self.level_button.set_icon(LEVEL_ICONS[self._play_level])
-        self.tw.grid.reset(GAME_ICONS[self._play_mode])
-        self.tw.mask(self._play_level)
+        self.win.grid.reset(GAME_ICONS[self._play_mode])
+        self.win.mask(self._play_level)
 
     def change_play_mode_cb(self, button=None, play_mode=None):
         """ Cycle between game modes """
@@ -212,13 +178,13 @@ class PukllanapacActivity(activity.Activity):
         mode += 1
         if mode == len(GAME_ICONS):
             mode = 0
-        self.game_button.set_icon(GAME_ICONS[mode])
-        self.tw.mode = GAME_ICONS[self._play_mode]
-        self.tw.grid.initialize_cards(self.tw.sprites, self.tw.path,
-                                      self.tw.card_dim, self.tw.scale,
-                                      GAME_ICONS[self._play_mode])
-        if self._play_mode > 0:
-            self._play_level = len(LEVEL_ICONS) - 1
-            self.level_button.set_icon(LEVEL_ICONS[self._play_level])
-            self.tw.mask(self._play_level)
-        self.tw.grid.reset(GAME_ICONS[self._play_mode])
+        if hasattr(self, 'win'):
+            self.win.mode = GAME_ICONS[self._play_mode]
+            self.win.grid.initialize_cards(self.win.sprites, self.win.path,
+                                          self.win.card_dim, self.win.scale,
+                                          GAME_ICONS[self._play_mode])
+            if self._play_mode > 0:
+                self._play_level = len(LEVEL_ICONS) - 1
+                self.level_button.set_icon(LEVEL_ICONS[self._play_level])
+                self.win.mask(self._play_level)
+            self.win.grid.reset(GAME_ICONS[self._play_mode])
diff --git a/card.py b/card.py
index 13a8853..8b2f489 100644
--- a/card.py
+++ b/card.py
@@ -1,4 +1,4 @@
-#Copyright (c) 2010 Walter Bender
+#Copyright (c) 2010, 2011 Walter Bender
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -72,7 +72,6 @@ class Card:
 
         # create sprite from svg file
         self.spr = Sprite(sprites, x, y, self.images[0])
-        self.spr.draw()
 
     def reset_image(self, tw):
         """ Reset image to orientation 0. """
@@ -98,5 +97,4 @@ class Card:
         self.orientation += self.increment
         if self.orientation == 360:
             self.orientation = 0
-        self.spr.images[0] = self.images[int(self.orientation/self.increment)]
-        self.spr.draw()
+        self.spr.set_shape(self.images[int(self.orientation/self.increment)])
diff --git a/grid.py b/grid.py
index 4bd2692..38841ed 100644
--- a/grid.py
+++ b/grid.py
@@ -1,4 +1,4 @@
-#Copyright (c) 2010 Walter Bender
+#Copyright (c) 2010, 2011 Walter Bender
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,7 +15,6 @@ pygtk.require('2.0')
 import gtk
 import gobject
 
-from sprites import Sprite
 from card import Card
 
 HEX_TO_GRID = [-1, 0, 1, -1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
@@ -32,19 +31,20 @@ GRID_TO_HEX2 = [1, 2, 3, 4, 6, 7, 8, 9, 10, 12, 13, 14, 15, 16, 17, 18, 19, 20,
 class Grid:
     """ Class for defining matrix of cards """
 
-    def __init__(self, tw, shape='rectangle'):
+    def __init__(self, win, shape='rectangle'):
         """ Set initial grid positions: either a rectangle or a hexgaon """
         self.grid = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
                      17, 18, 19, 20, 21, 22, 23]
         # Stuff to keep around for the graphics
-        self.w = int(tw.width)
-        self.h = int(tw.height)
-        self.d = int(tw.card_dim * tw.scale)
+        self.w = int(win.width)
+        self.h = int(win.height)
+        self.d = int(win.card_dim * win.scale)
         self.dx = self.d * 0.85
         self.dy = self.d * 0.5
         self.dy2 = self.d * 0.75
-        self.s = tw.scale
-        self.initialize_cards(tw.sprites, tw.path, tw.card_dim, tw.scale, shape)
+        self.s = win.scale
+        self.initialize_cards(win.sprites, win.path, win.card_dim, win.scale,
+                              shape)
 
     def initialize_cards(self, sprites, path, card_dim, scale, shape):
         if hasattr(self, 'card_table'):
diff --git a/sprites.py b/sprites.py
index 41b1a59..baae94f 100644
--- a/sprites.py
+++ b/sprites.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 #Copyright (c) 2007-8, Playful Invention Company.
-#Copyright (c) 2008-10 Walter Bender
+#Copyright (c) 2008-11 Walter Bender
 
 #Permission is hereby granted, free of charge, to any person obtaining a copy
 #of this software and associated documentation files (the "Software"), to deal
@@ -21,29 +21,23 @@
 #OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #THE SOFTWARE.
 
-"""
+'''
 
 sprites.py is a simple sprites library for managing graphics objects,
-'sprites', on a canvas. It manages multiple sprites with methods such
-as move, hide, set_layer, etc.
+'sprites', on a gtk.DrawingArea. It manages multiple sprites with
+methods such as move, hide, set_layer, etc.
 
 There are two classes:
 
-class Sprites maintains a collection of sprites.
+class Sprites maintains a collection of sprites
 class Sprite manages individual sprites within the collection.
 
 Example usage:
         # Import the classes into your program.
         from sprites import Sprites Sprite
 
-        # In your expose callback event handler, call refresh
-        def _expose_cb(self, win, event):
-            self.sprite_list.refresh(event)
-            return True
-
-        # Create a new sprite collection for a gtk Drawing Area.
-        my_drawing_area = gtk.DrawingArea()
-        self.sprite_list = Sprites(my_drawing_area)
+        # Create a new sprite collection associated with your widget
+        self.sprite_list = Sprites(widget)
 
         # Create a "pixbuf" (in this example, from SVG).
         my_pixbuf = svg_str_to_pixbuf("<svg>...some svg code...</svg>")
@@ -68,6 +62,10 @@ Example usage:
         # Now put my_sprite on top of your_sprite.
         my_sprite.set_layer(300)
 
+        cr = self.window.cairo_create()
+        # In your activity's do_expose_event, put in a call to redraw_sprites
+        self.sprites.redraw_sprites(event.area, cairo_context)
+
 # method for converting SVG to a gtk pixbuf
 def svg_str_to_pixbuf(svg_string):
     pl = gtk.gdk.PixbufLoader('svg')
@@ -75,46 +73,46 @@ def svg_str_to_pixbuf(svg_string):
     pl.close()
     pixbuf = pl.get_pixbuf()
     return pixbuf
-"""
+
+'''
 
 import pygtk
 pygtk.require('2.0')
 import gtk
 import pango
-
+import pangocairo
+import cairo
 
 class Sprites:
-    """ A class for the list of sprites and everything they share in common """
-
-    def __init__(self, canvas, area=None, gc=None):
-        """ Initialize an empty array of sprites """
-        self.canvas = canvas
-        if area == None:
-            self.area = self.canvas.window
-            self.gc = self.area.new_gc()
-        else:
-            self.area = area
-            self.gc = gc
-        self.cm = self.gc.get_colormap()
+    ''' A class for the list of sprites and everything they share in common '''
+
+    def __init__(self, widget):
+        ''' Initialize an empty array of sprites '''
+        self.widget = widget
         self.list = []
+        self.cr = None
+
+    def set_cairo_context(self, cr):
+        ''' Cairo context may be set or reset after __init__ '''
+        self.cr = cr
 
     def get_sprite(self, i):
-        """ Return a sprint from the array """
-        if i < 0 or i > len(self.list)-1:
+        ''' Return a sprint from the array '''
+        if i < 0 or i > len(self.list) - 1:
             return(None)
         else:
             return(self.list[i])
 
     def length_of_list(self):
-        """ How many sprites are there? """
+        ''' How many sprites are there? '''
         return(len(self.list))
 
     def append_to_list(self, spr):
-        """ Append a new sprite to the end of the list. """
+        ''' Append a new sprite to the end of the list. '''
         self.list.append(spr)
 
     def insert_in_list(self, spr, i):
-        """ Insert a sprite at position i. """
+        ''' Insert a sprite at position i. '''
         if i < 0:
             self.list.insert(0, spr)
         elif i > len(self.list) - 1:
@@ -123,41 +121,45 @@ class Sprites:
             self.list.insert(i, spr)
 
     def remove_from_list(self, spr):
-        """ Remove a sprite from the list. """
+        ''' Remove a sprite from the list. '''
         if spr in self.list:
             self.list.remove(spr)
 
-    def find_sprite(self, pos, alpha=True):
-        """ Search based on (x, y) position. Return the 'top/first' one. """
+    def find_sprite(self, pos):
+        ''' Search based on (x, y) position. Return the 'top/first' one. '''
         list = self.list[:]
         list.reverse()
         for spr in list:
             if spr.hit(pos):
-                if not alpha or spr.get_pixel(pos)[3] == 255:
-                    return spr
+                return spr
         return None
 
-    def refresh(self, event):
-        """ Handle expose event refresh """
-        self.redraw_sprites(event.area)
-
-    def redraw_sprites(self, area=None):
-        """ Redraw the sprites that intersect area. """
+    def redraw_sprites(self, area=None, cr=None):
+        ''' Redraw the sprites that intersect area. '''
+        # I think I need to do this to save Cairo some work
+        if cr is None:
+            cr = self.cr
+        else:
+            self.cr = cr
+        if cr is None:
+            print 'sprites.redraw_sprites: no Cairo context'
+            return
         for spr in self.list:
             if area == None:
-                spr.draw()
+                spr.draw(cr=cr)
             else:
                 intersection = spr.rect.intersect(area)
                 if intersection.width > 0 or intersection.height > 0:
-                    spr.draw()
+                    spr.draw(cr=cr)
 
 
 class Sprite:
-    """ A class for the individual sprites """
+    ''' A class for the individual sprites '''
 
     def __init__(self, sprites, x, y, image):
-        """ Initialize an individual sprite """
+        ''' Initialize an individual sprite '''
         self._sprites = sprites
+        self.save_xy = (x, y)  # remember initial (x, y) position
         self.rect = gtk.gdk.Rectangle(int(x), int(y), 0, 0)
         self._scale = [12]
         self._rescale = [True]
@@ -170,26 +172,26 @@ class Sprite:
         self._margins = [0, 0, 0, 0]
         self.layer = 100
         self.labels = []
-        self.images = []
+        self.cached_surfaces = []
         self._dx = []  # image offsets
         self._dy = []
+        self.type = None
         self.set_image(image)
         self._sprites.append_to_list(self)
 
     def set_image(self, image, i=0, dx=0, dy=0):
-        """ Add an image to the sprite. """
-        while len(self.images) < i + 1:
-            self.images.append(None)
+        ''' Add an image to the sprite. '''
+        while len(self.cached_surfaces) < i + 1:
+            self.cached_surfaces.append(None)
             self._dx.append(0)
             self._dy.append(0)
-        self.images[i] = image
         self._dx[i] = dx
         self._dy[i] = dy
-        if isinstance(self.images[i], gtk.gdk.Pixbuf):
-            w = self.images[i].get_width()
-            h = self.images[i].get_height()
+        if isinstance(image, gtk.gdk.Pixbuf):
+            w = image.get_width()
+            h = image.get_height()
         else:
-            w, h = self.images[i].get_size()
+            w, h = image.get_size()
         if i == 0:  # Always reset width and height when base image changes.
             self.rect.width = w + dx
             self.rect.height = h + dy
@@ -198,42 +200,51 @@ class Sprite:
                 self.rect.width = w + dx
             if h + dy > self.rect.height:
                 self.rect.height = h + dy
+        surface = cairo.ImageSurface(
+            cairo.FORMAT_ARGB32, self.rect.width, self.rect.height)
+        context = cairo.Context(surface)
+        context = gtk.gdk.CairoContext(context)
+        context.set_source_pixbuf(image, 0, 0)
+        context.rectangle(0, 0, self.rect.width, self.rect.height)
+        context.fill()
+        self.cached_surfaces[i] = surface
 
     def move(self, pos):
-        """ Move to new (x, y) position """
+        ''' Move to new (x, y) position '''
         self.inval()
         self.rect.x, self.rect.y = int(pos[0]), int(pos[1])
         self.inval()
 
     def move_relative(self, pos):
-        """ Move to new (x+dx, y+dy) position """
+        ''' Move to new (x+dx, y+dy) position '''
         self.inval()
         self.rect.x += int(pos[0])
         self.rect.y += int(pos[1])
         self.inval()
 
     def get_xy(self):
-        """ Return current (x, y) position """
+        ''' Return current (x, y) position '''
         return (self.rect.x, self.rect.y)
 
     def get_dimensions(self):
-        """ Return current size """
+        ''' Return current size '''
         return (self.rect.width, self.rect.height)
 
     def get_layer(self):
-        """ Return current layer """
+        ''' Return current layer '''
         return self.layer
 
     def set_shape(self, image, i=0):
-        """ Set the current image associated with the sprite """
+        ''' Set the current image associated with the sprite '''
         self.inval()
         self.set_image(image, i)
         self.inval()
 
-    def set_layer(self, layer):
-        """ Set the layer for a sprite """
+    def set_layer(self, layer=None):
+        ''' Set the layer for a sprite '''
         self._sprites.remove_from_list(self)
-        self.layer = layer
+        if layer is not None:
+            self.layer = layer
         for i in range(self._sprites.length_of_list()):
             if layer < self._sprites.get_sprite(i).layer:
                 self._sprites.insert_in_list(self, i)
@@ -243,7 +254,7 @@ class Sprite:
         self.inval()
 
     def set_label(self, new_label, i=0):
-        """ Set the label drawn on the sprite """
+        ''' Set the label drawn on the sprite '''
         self._extend_labels_array(i)
         if type(new_label) is str or type(new_label) is unicode:
             # pango doesn't like nulls
@@ -253,15 +264,15 @@ class Sprite:
         self.inval()
 
     def set_margins(self, l=0, t=0, r=0, b=0):
-        """ Set the margins for drawing the label """
+        ''' Set the margins for drawing the label '''
         self._margins = [l, t, r, b]
 
     def _extend_labels_array(self, i):
-        """ Append to the labels attribute list """
+        ''' Append to the labels attribute list '''
         if self._fd is None:
             self.set_font('Sans')
         if self._color is None:
-            self._color = self._sprites.cm.alloc_color('black')
+            self._color = (0., 0., 0.)
         while len(self.labels) < i + 1:
             self.labels.append(" ")
             self._scale.append(self._scale[0])
@@ -270,16 +281,27 @@ class Sprite:
             self._vert_align.append(self._vert_align[0])
 
     def set_font(self, font):
-        """ Set the font for a label """
+        ''' Set the font for a label '''
         self._fd = pango.FontDescription(font)
 
     def set_label_color(self, rgb):
-        """ Set the font color for a label """
-        self._color = self._sprites.cm.alloc_color(rgb)
+        ''' Set the font color for a label '''
+        COLORTABLE = {'black': '#000000', 'white': '#FFFFFF',
+                      'red': '#FF0000', 'yellow': '#FFFF00',
+                      'green': '#00FF00', 'cyan': '#00FFFF',
+                      'blue': '#0000FF', 'purple': '#FF00FF',
+                      'gray': '#808080'}
+        if rgb.lower() in COLORTABLE:
+            rgb = COLORTABLE[rgb.lower()]
+        # Convert from '#RRGGBB' to floats
+        self._color = (int('0x' + rgb[1:3], 16) / 256.,
+                       int('0x' + rgb[3:5], 16) / 256.,
+                       int('0x' + rgb[5:7], 16) / 256.)
+        return
 
     def set_label_attributes(self, scale, rescale=True, horiz_align="center",
                              vert_align="middle", i=0):
-        """ Set the various label attributes """
+        ''' Set the various label attributes '''
         self._extend_labels_array(i)
         self._scale[i] = scale
         self._rescale[i] = rescale
@@ -287,31 +309,40 @@ class Sprite:
         self._vert_align[i] = vert_align
 
     def hide(self):
-        """ Hide a sprite """
+        ''' Hide a sprite '''
         self.inval()
         self._sprites.remove_from_list(self)
 
+    def restore(self):
+        ''' Restore a hidden sprite '''
+        self.set_layer()
+
     def inval(self):
-        """ Force a region redraw by gtk """
-        self._sprites.area.invalidate_rect(self.rect, False)
-
-    def draw(self):
-        """ Draw the sprite (and label) """
-        for i, img in enumerate(self.images):
-            if isinstance(img, gtk.gdk.Pixbuf):
-                self._sprites.area.draw_pixbuf(self._sprites.gc, img, 0, 0,
-                                               self.rect.x + self._dx[i],
-                                               self.rect.y + self._dy[i])
-            elif img is not None:
-                self._sprites.area.draw_drawable(self._sprites.gc, img, 0, 0,
-                                                 self.rect.x + self._dx[i],
-                                                 self.rect.y + self._dy[i],
-                                                 -1, -1)
+        ''' Invalidate a region for gtk '''
+        self._sprites.widget.queue_draw_area(self.rect.x,
+                                             self.rect.y,
+                                             self.rect.width,
+                                             self.rect.height)
+
+    def draw(self, cr=None):
+        ''' Draw the sprite (and label) '''
+        if cr is None:
+            print 'sprite.draw: no Cairo context.'
+            return
+        for i, surface in enumerate(self.cached_surfaces):
+            cr.set_source_surface(surface,
+                                  self.rect.x + self._dx[i],
+                                  self.rect.y + self._dy[i])
+            cr.rectangle(self.rect.x + self._dx[i],
+                         self.rect.y + self._dy[i],
+                         self.rect.width,
+                         self.rect.height)
+            cr.fill()
         if len(self.labels) > 0:
-            self.draw_label()
+            self.draw_label(cr)
 
     def hit(self, pos):
-        """ Is (x, y) on top of the sprite? """
+        ''' Is (x, y) on top of the sprite? '''
         x, y = pos
         if x < self.rect.x:
             return False
@@ -323,14 +354,17 @@ class Sprite:
             return False
         return True
 
-    def draw_label(self):
-        """ Draw the label based on its attributes """
+    def draw_label(self, cr):
+        ''' Draw the label based on its attributes '''
+        # Create a pangocairo context
+        cr = pangocairo.CairoContext(cr)
         my_width = self.rect.width - self._margins[0] - self._margins[2]
         if my_width < 0:
             my_width = 0
         my_height = self.rect.height - self._margins[1] - self._margins[3]
         for i in range(len(self.labels)):
-            pl = self._sprites.canvas.create_pango_layout(str(self.labels[i]))
+            pl = cr.create_layout()
+            pl.set_text(str(self.labels[i]))
             self._fd.set_size(int(self._scale[i] * pango.SCALE))
             pl.set_font_description(self._fd)
             w = pl.get_size()[0] / pango.SCALE
@@ -343,8 +377,8 @@ class Sprite:
                 else:
                     j = len(self.labels[i]) - 1
                     while(w > my_width and j > 0):
-                        pl = self._sprites.canvas.create_pango_layout(
-                              "…" + self.labels[i][len(self.labels[i]) - j:])
+                        pl.set_text(
+                            "…" + self.labels[i][len(self.labels[i]) - j:])
                         self._fd.set_size(int(self._scale[i] * pango.SCALE))
                         pl.set_font_description(self._fd)
                         w = pl.get_size()[0] / pango.SCALE
@@ -362,49 +396,59 @@ class Sprite:
                 y = int(self.rect.y + self._margins[1])
             else: # bottom
                 y = int(self.rect.y + self.rect.height - h - self._margins[3])
-            self._sprites.gc.set_foreground(self._color)
-            self._sprites.area.draw_layout(self._sprites.gc, x, y, pl)
+            cr.save()
+            cr.translate(x, y)
+            cr.set_source_rgb(self._color[0], self._color[1], self._color[2])
+            cr.update_layout(pl)
+            cr.show_layout(pl)
+            cr.restore()
 
     def label_width(self):
-        """ Calculate the width of a label """
-        max = 0
-        for i in range(len(self.labels)):
-            pl = self._sprites.canvas.create_pango_layout(self.labels[i])
-            self._fd.set_size(int(self._scale[i] * pango.SCALE))
-            pl.set_font_description(self._fd)
-            w = pl.get_size()[0] / pango.SCALE
-            if w > max:
-                max = w
-        return max
+        ''' Calculate the width of a label '''
+        cr = pangocairo.CairoContext(self._sprites.cr)
+        if cr is not None:
+            max = 0
+            for i in range(len(self.labels)):
+                pl = cr.create_layout()
+                pl.set_text(self.labels[i])
+                self._fd.set_size(int(self._scale[i] * pango.SCALE))
+                pl.set_font_description(self._fd)
+                w = pl.get_size()[0] / pango.SCALE
+                if w > max:
+                    max = w
+            return max
+        else:
+            return self.rect.width
 
     def label_safe_width(self):
-        """ Return maximum width for a label """
+        ''' Return maximum width for a label '''
         return self.rect.width - self._margins[0] - self._margins[2]
 
     def label_safe_height(self):
-        """ Return maximum height for a label """
+        ''' Return maximum height for a label '''
         return self.rect.height - self._margins[1] - self._margins[3]
 
     def label_left_top(self):
-        """ Return the upper-left corner of the label safe zone """
+        ''' Return the upper-left corner of the label safe zone '''
         return(self._margins[0], self._margins[1])
 
     def get_pixel(self, pos, i=0):
-        """ Return the pixl at (x, y) """
-        x, y = pos
-        x = x - self.rect.x
-        y = y - self.rect.y
-        if y > self.images[i].get_height() - 1:
-            return(-1, -1, -1, -1)
-        try:
-            array = self.images[i].get_pixels()
-            if array is not None:
-                offset = (y * self.images[i].get_width() + x) * 4
-                r, g, b, a = ord(array[offset]), ord(array[offset + 1]),\
-                             ord(array[offset + 2]), ord(array[offset + 3])
-                return(r, g, b, a)
-            else:
-                return(-1, -1, -1, -1)
-        except IndexError:
-            print "Index Error: %d %d" % (len(array), offset)
+        ''' Return the pixel at (x, y) '''
+        x = int(pos[0] - self.rect.x)
+        y = int(pos[1] - self.rect.y)
+        if x < 0 or x > (self.rect.width - 1) or \
+                y < 0 or y > (self.rect.height - 1):
             return(-1, -1, -1, -1)
+
+        # create a new 1x1 cairo surface
+        cs = cairo.ImageSurface(cairo.FORMAT_RGB24, 1, 1);
+        cr = cairo.Context(cs)
+        cr.set_source_surface(self.cached_surfaces[i], -x, -y)
+        cr.rectangle(0,0,1,1)
+        cr.set_operator(cairo.OPERATOR_SOURCE)
+        cr.fill()
+        cs.flush() # ensure all writing is done
+        # Read the pixel
+        pixels = cs.get_data()
+        return (ord(pixels[2]), ord(pixels[1]), ord(pixels[0]), 0)
+
diff --git a/toolbar_utils.py b/toolbar_utils.py
new file mode 100644
index 0000000..94e6883
--- /dev/null
+++ b/toolbar_utils.py
@@ -0,0 +1,164 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2011, Walter Bender
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# You should have received a copy of the GNU General Public License
+# along with this library; if not, write to the Free Software
+# Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA
+
+
+import gtk
+
+from sugar.graphics.radiotoolbutton import RadioToolButton
+from sugar.graphics.toolbutton import ToolButton
+from sugar.graphics.combobox import ComboBox
+from sugar.graphics.toolcombobox import ToolComboBox
+
+
+def combo_factory(combo_array, toolbar, callback, cb_arg=None,
+                  tooltip=None, default=None):
+    '''Factory for making a toolbar combo box'''
+    combo = ComboBox()
+    if tooltip is not None and hasattr(combo, 'set_tooltip_text'):
+        combo.set_tooltip_text(tooltip)
+    if cb_arg is not None:
+        combo.connect('changed', callback, cb_arg)
+    else:
+        combo.connect('changed', callback)
+    for i, selection in enumerate(combo_array):
+        combo.append_item(i, selection, None)
+    combo.show()
+    toolitem = gtk.ToolItem()
+    toolitem.add(combo)
+    if hasattr(toolbar, 'insert'):  # the main toolbar
+        toolbar.insert(toolitem, -1)
+    else:  # or a secondary toolbar
+        toolbar.props.page.insert(toolitem, -1)
+    toolitem.show()
+    if default is not None:
+        combo.set_active(combo_array.index(default))
+    return combo
+
+
+def entry_factory(default_string, toolbar, tooltip=None, max=3):
+    ''' Factory for adding a text box to a toolbar '''
+    entry = gtk.Entry()
+    entry.set_text(default_string)
+    if tooltip is not None and hasattr(entry, 'set_tooltip_text'):
+        entry.set_tooltip_text(tooltip)
+    entry.set_width_chars(max)
+    entry.show()
+    toolitem = gtk.ToolItem()
+    toolitem.add(entry)
+    if hasattr(toolbar, 'insert'):  # the main toolbar
+        toolbar.insert(toolitem, -1)
+    else:  # or a secondary toolbar
+        toolbar.props.page.insert(toolitem, -1)
+    toolitem.show()
+    return entry
+
+
+def button_factory(icon_name, toolbar, callback, cb_arg=None, tooltip=None,
+                   accelerator=None):
+    '''Factory for making tooplbar buttons'''
+    button = ToolButton(icon_name)
+    if tooltip is not None:
+        button.set_tooltip(tooltip)
+    button.props.sensitive = True
+    if accelerator is not None:
+        button.props.accelerator = accelerator
+    if cb_arg is not None:
+        button.connect('clicked', callback, cb_arg)
+    else:
+        button.connect('clicked', callback)
+    if hasattr(toolbar, 'insert'):  # the main toolbar
+        toolbar.insert(button, -1)
+    else:  # or a secondary toolbar
+        toolbar.props.page.insert(button, -1)
+    button.show()
+    return button
+
+
+def radio_factory(name, toolbar, callback, cb_arg=None, tooltip=None,
+                  group=None):
+    ''' Add a radio button to a toolbar '''
+    button = RadioToolButton(group=group)
+    button.set_named_icon(name)
+    if callback is not None:
+        if cb_arg is None:
+            button.connect('clicked', callback)
+        else:
+            button.connect('clicked', callback, cb_arg)
+    if hasattr(toolbar, 'insert'):  # Add button to the main toolbar...
+        toolbar.insert(button, -1)
+    else:  # ...or a secondary toolbar.
+        toolbar.props.page.insert(button, -1)
+    button.show()
+    if tooltip is not None:
+        button.set_tooltip(tooltip)
+    return button
+
+
+def label_factory(toolbar, label_text, width=None):
+    ''' Factory for adding a label to a toolbar '''
+    label = gtk.Label(label_text)
+    label.set_line_wrap(True)
+    if width is not None:
+        label.set_size_request(width, -1)  # doesn't work on XOs
+    label.show()
+    toolitem = gtk.ToolItem()
+    toolitem.add(label)
+    if hasattr(toolbar, 'insert'):  # the main toolbar
+        toolbar.insert(toolitem, -1)
+    else:  # or a secondary toolbar
+        toolbar.props.page.insert(toolitem, -1)
+    toolitem.show()
+    return label
+
+
+def separator_factory(toolbar, expand=False, visible=True):
+    ''' add a separator to a toolbar '''
+    separator = gtk.SeparatorToolItem()
+    separator.props.draw = visible
+    separator.set_expand(expand)
+    if hasattr(toolbar, 'insert'):  # the main toolbar
+        toolbar.insert(separator, -1)
+    else:  # or a secondary toolbar
+        toolbar.props.page.insert(separator, -1)
+    separator.show()
+
+
+def image_factory(image, toolbar, tooltip=None):
+    ''' Add an image to the toolbar '''
+    img = gtk.Image()
+    img.set_from_pixbuf(image)
+    img_tool = gtk.ToolItem()
+    img_tool.add(img)
+    if tooltip is not None:
+        img.set_tooltip_text(tooltip)
+    if hasattr(toolbar, 'insert'):  # the main toolbar
+        toolbar.insert(img_tool, -1)
+    else:  # or a secondary toolbar
+        toolbar.props.page.insert(img_tool, -1)
+    img_tool.show()
+    return img
+
+
+def spin_factory(default, min, max, callback, toolbar):
+    spin_adj = gtk.Adjustment(default, min, max, 1, 32, 0)
+    spin = gtk.SpinButton(spin_adj, 0, 0)
+    spin_id = spin.connect('value-changed', callback)
+    spin.set_numeric(True)
+    spin.show()
+    toolitem = gtk.ToolItem()
+    toolitem.add(spin)
+    if hasattr(toolbar, 'insert'):  # the main toolbar
+        toolbar.insert(toolitem, -1)
+    else:
+        toolbar.props.page.insert(toolitem, -1)
+    toolitem.show()
+    return spin
diff --git a/window.py b/window.py
index 5c55a30..307802d 100644
--- a/window.py
+++ b/window.py
@@ -1,4 +1,4 @@
-#Copyright (c) 2010 Walter Bender
+#Copyright (c) 2010,11 Walter Bender
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -130,9 +130,20 @@ class Game():
         k = gtk.gdk.keyval_name(event.keyval)
 
     def _expose_cb(self, win, event):
-        self.sprites.refresh(event)
+        ''' Callback to handle window expose events '''
+        self.do_expose_event(event)
         return True
 
+    def do_expose_event(self, event):
+        ''' Handle the expose-event by drawing '''
+        # Restrict Cairo to the exposed area
+        cr = self.canvas.window.cairo_create()
+        cr.rectangle(event.area.x, event.area.y,
+                event.area.width, event.area.height)
+        cr.clip()
+        # Refresh sprite list
+        self.sprites.redraw_sprites(cr=cr)
+
     def _destroy_cb(self, win, event):
         gtk.main_quit()