Merge lp:~codeforger/simplegc/simplegc into lp:simplegc

[Sam Bull]

[Sam Bull (dreamsorcerer)]

Unresolved conflicts that should never have been committed.
Remove extra line breaks added into multiple files.
Remove matrix.py and revert opengl.py.

review: Needs Fixing

[Sam Bull (dreamsorcerer)]

My mistake, conflicts are with newer trunk. Resolve the conflicts, and also revert helloworld.py (this is for one of the tutorials, put you example code into test.py), _locals.py, base_widget.py, menu.py, radio_button.py.

[Michael Rochester (codeforger)]

This merge also contains the new button style I invented, would you like me to revert that too?

[lp:~codeforger/simplegc/simplegc]

273. By Michael Rochester on 2012-07-20

merge

274. By Michael Rochester on 2012-07-20

merge

275. By Michael Rochester on 2012-07-20

moved test code to test.py

276. By Michael Rochester on 2012-07-20

reverted /example/helloworld.py

277. By Michael Rochester on 2012-07-20

fixed my idiocy with test.py

278. By Michael Rochester on 2012-07-20

removed matrix.py as requested

[Sam Bull (dreamsorcerer)]

> This merge also contains the new button style I invented, would you like me to
> revert that too?

Yes please.

[lp:~codeforger/simplegc/simplegc]

279. By Michael Rochester on 2012-07-21

reverted button.py to the old buttons style

=== added file 'example/test_lists.py'
--- example/test_lists.py	1970-01-01 00:00:00 +0000
+++ example/test_lists.py	2012-07-21 12:53:18 +0000
@@ -0,0 +1,68 @@
+import sgc
+from sgc.locals import *
+
+import pygame
+from pygame.locals import *
+
+pygame.display.init()
+pygame.font.init()
+
+screen = sgc.surface.Screen((640,480))
+
+clock = pygame.time.Clock()
+
+lst = sgc._List(width=(100),pos=(10,10),multi_selection=True,content=("hello","world","nice","to","meet","you"))
+lst.add(0)
+
+mullst = sgc._MultiList(pos=(10,150),columnwidth=(150,150),content=(["hello","world"],["nice","to"],["meet","you"]))
+mullst.add(0)
+
+listb = sgc.ListBox((100,100),pos=(150,10),multi_selection=True,content=("hello","world","nice","to","meet","you"))
+listb.add(0)
+
+list2 = sgc.ListBox((100,100),pos=(300,10),header="head",content=("hello","world","nice","to","meet","you"))
+list2.add(0)
+
+data = (["Hello","12Mb","30/06/2012"],
+        ["World","15Mb","30/06/2012"],
+        ["Nice","123Kb","19/06/2012"],
+        ["To","1.2Gb","29/06/2012"],
+        ["Meet","12Mb","25/06/2012"],
+        ["You","6Mb","30/06/2012"])
+
+
+mullist = sgc.MultiListBox((200,100), pos=(370,150), columnwidth=(150,50,100), content=data)
+mullist.add(0)
+
+head = ("Name","Size","Modified")
+
+mullist2 = sgc.MultiListBox((100,100), pos=(100,300), multi_selection=True, header=head, columnwidth=(150,150,150), content=data)
+mullist2.add(0)
+
+def print_attr():
+    x = mullist2.selected_text
+    print x
+
+def print_pos():
+    x = mullist2.selected_pos
+    print x
+
+btn = sgc.Button(pos=(300,400), label="get attr")
+btn.on_click = print_attr
+btn.add(0)
+
+btn2 = sgc.Button(pos=(300,300), label="get pos")
+btn2.on_click = print_pos
+btn2.add(0)
+
+while True:
+    time = clock.tick(30)
+
+    for event in pygame.event.get():
+        sgc.event(event)
+        if event.type == QUIT:
+            exit()
+
+    screen.fill((200,200,200))
+    sgc.update(time)
+    pygame.display.flip()
 
=== modified file 'sgc/__init__.py'
--- sgc/__init__.py	2012-07-19 13:33:13 +0000
+++ sgc/__init__.py	2012-07-21 12:53:18 +0000
@@ -21,12 +21,18 @@
 from widgets.boxes import VBox, HBox
 from widgets.button import Button
 from widgets.container import Container
+from widgets.composite.dialogs import DialogSaveQuit
 from widgets.dialog import Dialog
 from widgets.fps_counter import FPSCounter
 from widgets.input_box import InputBox
 from widgets.label import Label
+from widgets.lists import MultiListBox
+from widgets.lists import ListBox
+from widgets.lists import _List
+from widgets.lists import _MultiList
 from widgets.menu import Menu
 from widgets.radio_button import Radio
 from widgets.scroll_box import ScrollBox
 from widgets.settings import Keys
 from widgets.switch import Switch
+
 
=== modified file 'sgc/widgets/base_widget.py'
--- sgc/widgets/base_widget.py	2012-07-18 09:38:26 +0000
+++ sgc/widgets/base_widget.py	2012-07-21 12:53:18 +0000
@@ -237,6 +237,9 @@
                 return surf
             elif isinstance(surf, str):
                 return pygame.image.load(surf).convert_alpha()
+            elif isinstance(surf, opengl.OpenGLImage):
+                self._custom_image = True
+                return surf
 
         # Create base images
         self._custom_image = False
 
=== modified file 'sgc/widgets/button.py'
--- sgc/widgets/button.py	2012-06-16 11:01:51 +0000
+++ sgc/widgets/button.py	2012-07-21 12:53:18 +0000
@@ -58,16 +58,15 @@
         # Clear previous renderings
         del self._settings["label"][1:]
         label = self._settings["label"][0].split("\n")
-        f = Font["widget"]
-        h = f.get_ascent()
         for count, line in enumerate(label):
-            lbl = Simple(f.render(line, True, self._settings["label_col"]))
+            lbl = Simple(Font["widget"].render(line, True,
+                                               self._settings["label_col"]))
             self._settings["label"].append(lbl)
-            y = (self.rect.h - (h * len(label)) + f.get_descent()) / 2 + \
-                (h * count)
+            y = (self.rect.h - (lbl.rect.h * len(label))) / 2 + \
+                (lbl.rect.h * count)
             lbl.rect.midtop = (self.rect.w/2, y)
 
-    def _draw_base(self, draw):
+    def _draw(self, draw):
         # Frames around edge of button
         x = min(self.image.get_size()) / 8
         self._frame_lt = ((0,0), (self.rect.w,0), (self.rect.w-x,x),
@@ -81,18 +80,16 @@
         cols["over"] = [min(c*1.1, 255) for c in self._settings["col"]]
         cols["down"] = [c*0.8 for c in self._settings["col"]]
         for img in cols:
-            self._images[img].fill(cols[img])
-            # Draw a frame around the edges of the button
-            frame_lt_c = [min(c*1.3,255) for c in cols[img]]
-            frame_rb_c = [c*0.8 for c in cols[img]]
-            draw.polygon(self._images[img], frame_lt_c, self._frame_lt)
-            draw.polygon(self._images[img], frame_rb_c, self._frame_rb)
-
-    def _draw_final(self, draw):
-        for img in self._images.values():
+            if not self._custom_image:
+                self._images[img].fill(cols[img])
+                # Draw a frame around the edges of the button
+                frame_lt_c = [min(c*1.3,255) for c in cols[img]]
+                frame_rb_c = [c*0.8 for c in cols[img]]
+                draw.polygon(self._images[img], frame_lt_c, self._frame_lt)
+                draw.polygon(self._images[img], frame_rb_c, self._frame_rb)
             # Blit label onto button
             for line in self._settings["label"][1:]:
-                img.blit(line.image, line.pos)
+                self._images[img].blit(line.image, line.pos)
         self._draw_button()
 
     def on_click(self):
 
=== added directory 'sgc/widgets/composite'
=== added file 'sgc/widgets/composite/__init__.py'
=== added file 'sgc/widgets/composite/dialogs.py'
--- sgc/widgets/composite/dialogs.py	1970-01-01 00:00:00 +0000
+++ sgc/widgets/composite/dialogs.py	2012-07-21 12:53:18 +0000
@@ -0,0 +1,98 @@
+#!/usr/bin/env python
+
+# Copyright (C) 2012 Michael Rochester
+
+"""
+Dialog composite widgets. A list of predefined common dialogs
+
+"""
+import sgc
+from sgc.locals import *
+
+from ..dialog import *
+
+class DialogSaveQuit (Dialog):
+    """
+    This dialog is designed to be called when a user tries to quit without saving.
+    It will emmit 2 GUI events: 'quit' and 'save'.
+    If the final option 'cancel' is selected, the dialog will remove its self.
+    """
+    def _config(self, **kwargs):
+        """
+        doctitle: ``str`` The text that will be used as the documents Title.
+        """
+        if "init" in kwargs:
+            self.lbl = sgc.Label(pos=(10,10),text="The document has not been saved.\nWould you like to save the changes before quitting?", col=(20,20,20))
+            self.btn_save = sgc.Button(pos=(200,100), label="Save")
+            self.btn_save.on_click = self.send_save
+            self.btn_quit = sgc.Button((200,50), pos=(0,100), label="Close without saving")
+            self.btn_quit.on_click = self.send_quit
+            self.btn_cancel = sgc.Button(pos=(310,100), label="Cancel")
+            self.btn_cancel.on_click = self.send_cancel
+            contain = sgc.Container(pos=(0,0), widgets=[self.lbl,self.btn_quit,self.btn_cancel,self.btn_save] )
+            
+            kwargs["widget"] = contain;
+            kwargs["title"]="Save changes?"
+            sgc.Dialog._config(self,**kwargs)
+        if "doctitle" in kwargs:
+            self.lbl.text = "The document \"" + kwargs["doctitle"] + "\" has not been saved.\nWould you like to save the changes before quitting?" 
+    def send_quit(self):
+        ev = pygame.event.Event(GUI, {"gui_type": "quit",
+                                      "widget_type": self.__class__,
+                                      "widget":self})
+        pygame.event.post(ev)
+
+    def send_save(self):
+        ev = pygame.event.Event(GUI, {"gui_type": "save",
+                                      "widget_type": self.__class__,
+                                      "widget":self})
+        pygame.event.post(ev)
+    def send_cancel(self):
+        ev = pygame.event.Event(GUI, {"gui_type": "cancel",
+                                      "widget_type": self.__class__,
+                                      "widget":self})
+        pygame.event.post(ev)
+
+class DialogSave (Dialog):
+    """
+    This dialog is designed to be called when a user tries to quit without saving.
+    It will emmit 2 GUI events: 'quit' and 'save'.
+    If the final option 'cancel' is selected, the dialog will remove its self.
+    """
+    def _config(self, **kwargs):
+        """
+        doctitle: ``str`` The text that will be used as the documents Title.
+        """
+        if "init" in kwargs:
+            self.lbl = sgc.Label(pos=(10,10),text="The document has not been saved.\nWould you like to save the changes before quitting?", col=(20,20,20))
+            self.btn_save = sgc.Button(pos=(200,100), label="Save")
+            self.btn_save.on_click = self.send_save
+            self.btn_quit = sgc.Button((200,50), pos=(0,100), label="Close without saving")
+            self.btn_quit.on_click = self.send_quit
+            self.btn_cancel = sgc.Button(pos=(310,100), label="Cancel")
+            self.btn_cancel.on_click = self.send_cancel
+            contain = sgc.Container(pos=(0,0), widgets=[self.lbl,self.btn_quit,self.btn_cancel,self.btn_save] )
+            
+            kwargs["widget"] = contain;
+            kwargs["title"]="Save changes?"
+            sgc.Dialog._config(self,**kwargs)
+        if "doctitle" in kwargs:
+            self.lbl.text = "The document \"" + kwargs["doctitle"] + "\" has not been saved.\nWould you like to save the changes before quitting?" 
+    def send_quit(self):
+        ev = pygame.event.Event(GUI, {"gui_type": "quit",
+                                      "widget_type": self.__class__,
+                                      "widget":self})
+        pygame.event.post(ev)
+
+    def send_save(self):
+        ev = pygame.event.Event(GUI, {"gui_type": "save",
+                                      "widget_type": self.__class__,
+                                      "widget":self})
+        pygame.event.post(ev)
+    def send_cancel(self):
+        ev = pygame.event.Event(GUI, {"gui_type": "cancel",
+                                      "widget_type": self.__class__,
+                                      "widget":self})
+        pygame.event.post(ev)
+    
+
 
=== added file 'sgc/widgets/lists.py'
--- sgc/widgets/lists.py	1970-01-01 00:00:00 +0000
+++ sgc/widgets/lists.py	2012-07-21 12:53:18 +0000
@@ -0,0 +1,383 @@
+#!/usr/bin/env python
+
+# Copyright (C) 2012  Michael Rochester
+
+import sgc
+from sgc.locals import *
+
+import pygame.mouse
+from pygame.locals import *
+
+from _locals import *
+from base_widget import Simple
+
+class _List(Simple):
+
+    _can_focus = True
+    _settings_default = {"col": (118, 45, 215),
+                         "font": Font["widget"],
+                         "padding": 3,"offset": 0,"width":None,
+                         "mult": False}
+    
+
+    def _config(self,**kwargs):
+        self.anchor = False
+        if "multi_selection" in kwargs: 
+            self._settings["mult"] = kwargs["multi_selection"]
+        if "padding" in kwargs:
+            self._settings["padding"] = kwargs["padding"]
+        if "init" in kwargs:
+            self.color = (118, 45, 215)
+            self.contain = sgc.Container(border=self._settings["padding"])
+            self.lbls=[]
+            self.selected=[]
+        if "col" in kwargs:
+            self.color = kwargs["col"]
+        if "font" in kwargs:
+            self._settings["font"] = kwargs["font"]
+        if "width" in kwargs:
+            self._settings["width"] = kwargs["width"]
+        if "content" in kwargs:
+            self.content = kwargs["content"]
+            self.texth = self._settings["font"].get_ascent()+\
+                         self._settings["font"].get_descent()+\
+                         (self._settings["padding"]*2)
+            p=0
+            for string in kwargs["content"]:
+                lbl = sgc.Label(pos=(0,p),col=(10,10,10),text=string, 
+                                font=self._settings["font"])
+                p+=self.texth
+                self.lbls.append(lbl)
+            self.contain.config(widgets=self.lbls)
+            if not hasattr(self, "image"):
+                self._create_base_images((self.contain.image.get_width() if
+                    self._settings["width"] == None else self._settings["width"]
+                   ,self.contain.image.get_height()))
+
+    def _event(self, event):
+        if event.type == MOUSEBUTTONDOWN and event.button == 1:
+            sel = self.colide_item(event.pos)
+            if sel > 0 and sel < len(self.content)+1:
+                if (pygame.key.get_mods() & KMOD_CTRL and self._settings["mult"]):
+                    
+                    if sel in self.selected:
+                        self.selected.remove(sel)
+                    else:
+                        self.selected.append(sel)
+                elif (pygame.key.get_mods() & KMOD_SHIFT
+                      and self._settings["mult"] and self.anchor):
+                    self.selected=[]
+                    for new in range(abs(self.anchor-sel)+1):
+                        self.selected.append(new+(min(self.anchor,sel)))
+                else:
+                    self.anchor = sel
+                    self.selected = [sel]
+
+    def update(self, time):
+        draw = self.get_draw()
+        
+        self.contain.update(time)
+        self.image.fill((255,255,255))
+
+        for sel in self.selected:
+            w = (self.image.get_width())
+            selection = Simple((w, self.texth))
+            selection.pos = (0,(sel-1)*self.texth+self._settings["padding"])
+            selection.image.fill(self.color)
+            selection.image.set_alpha(100)
+            self.image.blit(selection.image, selection.pos)
+        self.image.blit(self.contain.image,(0,0))
+        self.image.blit(self._images["image"],(0,0))
+    
+    def colide_item(self,pos):
+        pos = pos[1]-self.rect_abs.y
+        return ((pos-self._settings["padding"])/self.texth)+1
+
+    def _focus_enter(self, focus):
+        self.color = self._settings["col"]
+
+    def _focus_exit(self):
+        self.color = (179,179,179)
+    
+    @property
+    def selected_text(self):
+        return [self.content[x-1] for x in self.selected]
+
+    @property
+    def selected_pos(self):
+        return [x-1 for x in self.selected]
+
+class ListBox(Simple):
+
+    _can_focus = True
+    _default_size = (100,100)
+    _settings_default = {"headfont": Font["widget"],
+                         "offset": 0}
+
+    def _config(self,**kwargs):
+        if "header" in kwargs:
+            self._settings["header"] = kwargs["header"]
+            self._settings["offset"] = self._settings["headfont"].get_ascent()+\
+                                       self._settings["headfont"].get_descent()+6
+        if "init" in kwargs:
+            self.list = _List(width=self.image.get_width())
+            self.scroll = sgc.ScrollBox((self.rect.w,self.rect.h-self._settings["offset"]),pos=(0,self._settings["offset"]),widget=self.list)
+            self.scroll._parent = self
+        self.list.config(**kwargs)
+        self.scroll.config(widget=self.list,**kwargs)
+    
+    def _draw(self,draw):
+        if "header" in self._settings:
+            lbl = sgc.Label(pos=(0,0),col=(10,10,10),
+                                  text=self._settings["header"], 
+                                  font=self._settings["headfont"])
+            self._images["image"].blit(lbl.image,(3,1))
+            draw.line(self._images["image"],(150,150,150),
+                      (1,self._settings["offset"]),
+                      (self.image.get_width()-2,self._settings["offset"]))
+
+        draw.line(self._images["image"],(150,150,150),
+                  (1,0),(self.image.get_width()-2,0))
+        draw.line(self._images["image"],(150,150,150),
+                  (1,self.image.get_height()-1),
+                  (self.image.get_width()-2,self.image.get_height()-1))
+        draw.line(self._images["image"],(150,150,150),
+                  (0,1),(0,self.image.get_height()-2))
+        draw.line(self._images["image"],(150,150,150),
+                  (self.image.get_width()-1,1), 
+                  (self.image.get_width()-1,self.image.get_height()-2))
+        
+    def _event(self, event):
+        self.scroll._event(event)
+
+    def update(self, time):
+        self.scroll.update(time)
+        self.image.fill((255,255,255))
+        self.image.blit(self.scroll.image,(0,self._settings["offset"]))
+        self.image.blit(self._images["image"],(0,0))
+
+    def _focus_enter(self, focus):
+        self.scroll._focus_enter(focus)
+
+    def _focus_exit(self):
+        self.scroll._focus_exit()
+    
+    @property
+    def selected_text(self):
+        return [x for x in self.list.selected_text]
+
+    @property
+    def selected_pos(self):
+        return [x for x in self.list.selected]
+
+
+class _MultiList(_List):
+
+    _can_focus = True
+    _settings_default = {"col": (118, 45, 215),
+                         "font": Font["widget"],
+                         "padding": 3,"offset": 0,
+                         "mult": False,"colwid":False}
+    
+
+    def _config(self,**kwargs):
+        self.anchor = False
+        if "multi_selection" in kwargs: 
+            self._settings["mult"] = kwargs["multi_selection"]
+        if "padding" in kwargs:
+            self._settings["padding"] = kwargs["padding"]
+        if "init" in kwargs:
+            self.color = (118, 45, 215)
+            self.lbls=[]
+            self.selected=[]
+        if "col" in kwargs:
+            self.color = kwargs["col"]
+        if "font" in kwargs:
+            self._settings["font"] = kwargs["font"]
+        if "columnwidth" in kwargs:
+            self._settings["colwid"] = kwargs["columnwidth"]
+        if "content" in kwargs:
+            
+            self.columns = []
+            self.content = kwargs["content"]
+            self.texth = self._settings["font"].get_ascent()+\
+                         self._settings["font"].get_descent()+\
+                         (self._settings["padding"]*2)
+            w = []
+            for x in range(len(kwargs["content"][0])):
+                labels = []
+                p=0
+                for y in range(len(kwargs["content"])):
+                    lbl = sgc.Label(pos=(0,p),col=(10,10,10),text=kwargs["content"][y][x], 
+                                    font=self._settings["font"])
+                    p+=self.texth
+                    labels.append(lbl)
+                    w.append(lbl)
+                self.lbls.append(labels)
+                if self._settings["colwid"]:
+                    column = sgc.Container((self._settings["colwid"][x],len(kwargs["content"])*self.texth),widgets=labels)
+                else:                    
+                    column = sgc.Container(widgets=labels)
+                self.columns.append(column)
+
+            self.contain = sgc.HBox(border=self._settings["padding"],widgets=self.columns)
+            self.rect.w = self.contain.rect.w
+            self.rect.h = self.contain.rect.h
+            if not hasattr(self, "image"):
+                self._create_base_images((self.contain.image.get_width()
+                   ,self.contain.image.get_height()))
+
+    @property
+    def selected_text(self):
+        return [self.content[x-1] for x in self.selected]
+
+    @property
+    def selected_pos(self):
+        return [x-1 for x in self.selected]
+
+class MultiListBox(ListBox):
+
+    _can_focus = True
+    _default_size = (100,100)
+    _settings_default = {"headfont": Font["widget"],
+                         "offset": 0,"colwid": 100,"header":None}
+
+
+    def _config(self,**kwargs):
+        if "content" in kwargs:
+            self.content = kwargs["content"]
+        if "columnwidth" in kwargs:
+            self.colpos=[0]
+            self._settings["colwid"] = [c for c in kwargs["columnwidth"]]
+            for x in range(len(kwargs["columnwidth"])):
+                self.colpos.append((self.colpos[x]+self._settings["colwid"][x]))
+        if "header" in kwargs:
+            self._settings["header"] = kwargs["header"]
+            self._settings["offset"] = self._settings["headfont"].get_ascent()+\
+                                       self._settings["headfont"].get_descent()+6
+            
+               
+        if "init" in kwargs:
+            strings = pygame.cursors.sizer_x_strings
+            cursor = pygame.cursors.compile(strings)
+            size = (len(strings[0]), len(strings))
+            hotspot = (size[0]/2, size[1]/2)
+            self._cursor = (size, hotspot) + cursor
+            self._cursor_set = False
+
+            self.move = False
+            self.mouse = False
+            self.resize = False
+            self.list = _MultiList()
+            self.scroll = sgc.ScrollBox((self.rect.w,self.rect.h-self._settings["offset"]),pos=(0,self._settings["offset"]),widget=self.list)
+            self.scroll._parent = self
+        if self._settings["colwid"] != 100:
+            kwargs["columnwidth"] = self._settings["colwid"]
+        if "content" not in kwargs:
+            kwargs["content"]=self.content
+        self.list.config(**kwargs)
+        if "init" in kwargs:
+            self.scroll.config(widget=self.list,**kwargs)
+    
+    def _draw(self,draw):
+        
+        if self._settings["header"]:
+            self.header = sgc.Simple((self.colpos[-1]+10,self._settings["offset"]))
+            for p, header in enumerate(self._settings["header"]):
+                lbl = sgc.Label((self._settings["colwid"][p],self._settings["offset"]),pos=(0,0),
+                                      text=header, 
+                                      col=(10,10,10),
+                                      
+                                      font=self._settings["headfont"])
+                draw.rect(self.header.image,(255,255,255),((self.colpos[p],0),(self.colpos[p]+self._settings["colwid"][p],self._settings["offset"])),0)
+                self.header.image.blit(lbl.image,(self.colpos[p]+6*p+3,1))
+                draw.line(self.header.image,(150,150,150),
+                          (self.colpos[p]+6*(p),0),
+                          (self.colpos[p]+6*(p),self._settings["offset"]))
+
+
+        draw.line(self._images["image"],(150,150,150),
+                  (1,0),(self.image.get_width()-2,0))
+        draw.line(self._images["image"],(150,150,150),
+                  (1,self.image.get_height()-1),
+                  (self.image.get_width()-2,self.image.get_height()-1))
+        draw.line(self._images["image"],(150,150,150),
+                  (0,1),(0,self.image.get_height()-2))
+        draw.line(self._images["image"],(150,150,150),
+                  (self.image.get_width()-1,1), 
+                  (self.image.get_width()-1,self.image.get_height()-2))
+        self.image.fill((255,0,0))
+        
+    def _event(self, event):
+        if (event.type == MOUSEBUTTONDOWN and event.button == 1
+            and (self.collidehead(event.pos)is not False)):
+                self.move = self.collidehead(event.pos)
+                self.mouse = event.pos[0]
+        elif event.type == MOUSEBUTTONUP:
+            if self.resize is not False and self.mouse is not False:
+                self.scroll = sgc.ScrollBox((self.rect.w,self.rect.h-self._settings["offset"]),pos=(0,self._settings["offset"]),widget=self.list)
+                self.scroll._parent = self
+            self.mouse = False
+            self.resize = False
+        elif event.type == MOUSEMOTION:
+            if self.collidehead(event.pos) is False and self._cursor_set==True:
+                self._remove_cursor()
+                self._cursor_set = False
+            elif self.collidehead(event.pos) is not False and self._cursor_set==False:
+                self._set_cursor(*self._cursor)
+                self._cursor_set = True
+            if self.resize is not False and self.mouse is not False:
+                dif = event.pos[0] - self.mouse
+                self.mouse = event.pos[0]
+                self._settings["colwid"][self.move]+=dif
+                if self._settings["colwid"][self.move] < 0:
+                    self._settings["colwid"][self.move] = 0
+                self.config(columnwidth=self._settings["colwid"], content=self.content)
+                self.list._create_base_images((self.list.rect.w, self.list.rect.h))
+            elif self.mouse is not False:
+                if abs(event.pos[0] - self.mouse) > 4:
+                    self.resize = True
+        self.scroll._event(event)
+        
+    def collidehead(self,pos):
+        for p, x in enumerate(self.colpos[1:],1):
+            if (pos[0]-self.pos_abs[0]>=self.scroll._settings["widget"].pos[0]+x+6*p-2 and
+                pos[0]-self.pos_abs[0]<=self.scroll._settings["widget"].pos[0]+x+6*p+2 and
+                pos[1] < self.pos_abs[1]+self._settings["offset"] and
+                pos[1] > self.pos_abs[1]):                
+                return p-1  
+        return False
+
+    def update(self, time):
+        self.scroll.update(time)
+        self.image.fill((255,255,255))
+        self.image.blit(self.scroll.image,(0,self._settings["offset"]))
+        if self._settings["header"]:
+            self.image.blit(self.header.image,(self.scroll._settings["widget"].pos[0],0)) #MAYBE A HACK, PROBABLY
+        self.image.blit(self._images["image"],(0,0))
+
+    def _focus_enter(self, focus):
+        self.scroll._focus_enter(focus)
+
+    def _focus_exit(self):
+        self.scroll._focus_exit()
+    
+    @property
+    def selected_text(self):
+        return [x for x in self.list.selected_text]
+
+    @property
+    def selected_pos(self):
+        return [x for x in self.list.selected]
+
+
+
+
+
+
+
+
+
+
+
+
 
=== modified file 'sgc/widgets/menu.py'
--- sgc/widgets/menu.py	2012-07-18 11:56:10 +0000
+++ sgc/widgets/menu.py	2012-07-21 12:53:18 +0000
@@ -120,18 +120,24 @@
                 widgets.append(div)
             # Widget
             elif item[0].startswith("w:"):
-                args = item[1]
-                name = args.pop("name", None)
-                try:
-                    # Try to load existing widget
-                    widget = eval(item[0][2:])
-                except NameError:
-                    # Try to import custom widget
-                    parts = item[0][2:].rpartition(".")
-                    mod = __import__(parts[0])
-                    widget = getattr(mod, parts[2])
-                widget = widget(**args)
-                if name: self._dict[name] = widget
+                args = self._get_args(item[1:])
+                name = args.pop("name")
+                f = args.pop("func") if ("func" in args) else None
+                if item[0].endswith("input_box"):
+                    widget = input_box.InputBox(**args)
+                elif item[0].endswith("button"):
+                    if "surf" in args:
+                        args["surf"] = eval(args["surf"])
+                    widget = button.Button(**args)
+                elif item[0].endswith("radio"):
+                    if "surf" in args:
+                        args["surf"] = eval(args["surf"])
+                    widget = radio_button.Radio(**args)
+                elif item[0].endswith("label"):
+                    widget = label.Label(**args)
+                self._dict[name] = widget
+                if f: widget.on_click = self._funcs[f]
+                widget.name = name
                 widgets.append(widget)
             # Function
             elif item[0].startswith("f:"):
@@ -176,6 +182,7 @@
     def update(self, time):
         menu = self._menus[self._curr_menu]
         menu.update(time)
+        self.image.fill(0)  # Hack for OpenGL
         if self._old_menu is not None:
             self.image.blit(self._menus[self._old_menu].image, (0,0))
             menu.image.set_alpha(menu._fade)
 
=== modified file 'sgc/widgets/opengl.py'
--- sgc/widgets/opengl.py	2011-09-22 09:41:10 +0000
+++ sgc/widgets/opengl.py	2012-07-21 12:53:18 +0000
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
-# Copyright (C) 2011  Sam Bull
+# Copyright (C) 2011-2012  Sam Bull
 
 """
-Base widget, all widgets inherit from this.
+OpenGL functions.
 
 """
 
@@ -11,10 +11,11 @@
 from OpenGL.GL import *
 import FTGL
 
-from ..surface import SurfaceBase
-
-
-class OpenGLImage(SurfaceBase):
+from _locals import *
+from matrix import Matrix
+
+
+class OpenGLImage():
     """
     Class used to emulate the interface of Surface for OpenGL drawing.
 
@@ -28,39 +29,49 @@
         self._lock = False
         self.display_list = []
         self._children = []
-        if parent:
-            self._parent = parent # Parent surface used for _abs
-        else:
-            self._parent = self._default_screen
+        self.matrix = Matrix()
+        self._parent = parent  # Parent surface used for _abs
 
-        self._rect = Rect((0,0), (0,0))
+        self.rect = Rect((0,0), (0,0))
         if isinstance(surf, (tuple,list)):
-            self._rect.size = surf
+            self.rect.size = surf
         elif isinstance(surf, OpenGLFont):
-            self._rect.size = (surf.size)
+            self.rect.size = (surf.size)
             self.display_list.extend(surf.display_list)
         elif isinstance(surf, OpenGLImage):
-            self._rect = surf._rect
+            self.matrix = surf.matrix.copy()
+            self.rect = Rect(surf.rect)
             self._a = surf._a
-            self.display_list = surf.display_list
-            self._children = surf._children
+            self.display_list = surf.display_list[:]
+            for child in surf._children:
+                self.blit(child.copy())
 
-    def blit(self, surf, pos=None):
+    def blit(self, surf, pos=None, area=None):
         assert isinstance(surf, OpenGLImage)
         if surf not in self._children:
             if pos is not None: surf.pos = pos
+            surf.rect.topleft = surf.pos
             surf._parent = self
             self._children.append(surf)
 
     def draw(self):
         glLoadIdentity()
-        if self.rect.w <= self._parent.rect.w and \
-           self.rect.h <= self._parent.rect.h:
+        if self._parent:
+            r = self._parent.rect
+        else:
+            r = Rect(0,0,10000,10000)
+        if self.rect.w <= r.w and self.rect.h <= r.h:
             # Mask the area, so nothing is drawn outside surface area.
-            bottom = self._default_screen.h - self.rect_abs.bottom
+            bottom = 480 - self.rect_abs.bottom  # Screen height...
             glScissor(self.rect_abs.x, bottom,
                       self.rect.w+1, self.rect.h+1)
         glTranslatef(self.pos_abs[0], self.pos_abs[1], 0)
+        if not isinstance(self.matrix, (list, tuple)):
+            glMultMatrixf(self.matrix.to_opengl())
+        else:
+            for m in self.matrix:
+                glMultMatrixf(m.to_opengl())
+
         for dl,col in self.display_list:
             if col is not None: glColor(col[0], col[1], col[2], self.a)
             glCallList(dl)
@@ -73,7 +84,7 @@
             # Clear the surface
             self.display_list = []
             self._children = []
-            rect = Rect((0,0), self.size)
+            rect = Rect((0,0), self.rect.size)
         if col != 0:
             col = [c/255. for c in col]
             dl = glGenLists(1)
@@ -86,7 +97,13 @@
         return OpenGLImage(self)
 
     def get_size(self):
-        return self.size
+        return self.rect.size
+
+    def get_height(self):
+        return self.rect.h
+
+    def get_width(self):
+        return self.rect.w
 
     def set_alpha(self, alpha):
         self._a = alpha/255.
@@ -127,7 +144,7 @@
         self._lock = False
 
     def replace(self, surf, **kwargs):
-        self._rect.size = surf.size
+        self.rect.size = surf.size
         self.display_list = surf.display_list[:]
         self._children = surf._children[:]
 
@@ -136,7 +153,33 @@
         if self._a is not None:
             return self._a
         else:
-            return self._parent.a
+            if self._parent:
+                return self._parent.a
+            else:
+                return 1
+
+    @property
+    def rect_abs(self):
+        if self._parent is None:
+            return self.rect
+        else:
+            p_abs = self._parent.pos_abs
+            p = (self.rect.x + p_abs[0], self.rect.y + p_abs[1])
+            return Rect(p, self.rect.size)
+
+    @property
+    def pos(self):
+        return self.rect.topleft
+    @pos.setter
+    def pos(self, value):
+        self.rect.topleft = value
+    @property
+    def pos_abs(self):
+        if self._parent is None:
+            return self.rect.topleft
+        else:
+            p_abs = self._parent.pos_abs
+            return (self.rect.x + p_abs[0], self.rect.y + p_abs[1])
 
     # --- Dummy methods. Ignore. ---
 
@@ -152,17 +195,27 @@
     to an OpenGLImage object in the same manner as pygame.Font.
 
     """
-    def __init__(self, font, size):
+    def __init__(self, font, size=16):
+        self.rect = Rect(0,0,0,0)
         self._children = []
-        self.font = FTGL.TextureFont(font)
-        self.font.FaceSize(16)
-        self.y_offset = self.font.line_height * .75
+        self.matrix = Matrix()
+        self.display_list = []
+        if isinstance(font, OpenGLFont):
+            self.font = font.font
+            self.y_offset = font.y_offset
+            self.size = font.size
+        else:
+            self.font = FTGL.TextureFont(font)  # BufferFont
+            self.font.FaceSize(size)
+            self.y_offset = self.font.line_height * .75
 
     def render(self, text, antialias, color, background=None):
+        temp = OpenGLImage((self.font.Advance(text.encode()), self.font.line_height))
         text = text.encode()
         col = [c/255. for c in color]
         dl = glGenLists(1)
         self.size = (self.font.Advance(text), self.font.line_height)
+        self.rect = Rect((0,0), self.size)
         glNewList(dl, GL_COMPILE)
         glPushMatrix()
         # Flip text right way up
@@ -173,16 +226,33 @@
         self.font.Render(text)
         glPopMatrix()
         glEndList()
-        self.display_list = [(dl, col)]
-        return self
+        temp.display_list = [(dl, col)]
+        return temp
+
+    def get_linesize(self):
+        """TODO"""
+        return self.rect.h
+
+    def get_ascent(self):
+        """TODO"""
+        return self.rect.h-4
+
+    def get_descent(self):
+        """TODO"""
+        return -4
+
+    def metrics(self, text):
+        """TODO"""
+        return [(0,0,0,0,10) for c in text]
 
 class Draw():
     """
     Class to emulate the pygame.draw module.
-    Functions should work in the same manner.
+    Functions should work in the same manner, except where otherwise stated.
 
     """
     def rect(self, surf, col, rect, width=0):
+        rect = Rect(rect)
         col = [c/255. for c in col]
         dl = glGenLists(1)
         glNewList(dl, GL_COMPILE)
@@ -220,6 +290,8 @@
             for v in pointlist:
                 glVertex(v)
             glEnd()
+        else:
+            raise NotImplementedError
         glEndList()
         surf.display_list.append((dl, col))
 
@@ -235,10 +307,18 @@
             glVertex(pos)
             glEnd()
             glDisable(GL_POINT_SMOOTH)
-            glPointSize()
+            #glPointSize()
+        else:
+            raise NotImplementedError
         glEndList()
         surf.display_list.append((dl, col))
 
+    def ellipse(self, surf, col, rect, width=0):
+        raise NotImplementedError
+
+    def arc(self, surf, col, rect, start_angle, stop_angle, width=1):
+        raise NotImplementedError
+
     def line(self, surf, col, start_pos, end_pos, width=1):
         col = [c/255. for c in col]
         dl = glGenLists(1)
@@ -251,5 +331,14 @@
         glEndList()
         surf.display_list.append((dl, col))
 
+    def lines(self, surf, col, closed, pointlist, width=1):
+        raise NotImplementedError
+
+    def aaline(self, surf, col, startpos, endpos, blend=1):
+        raise NotImplementedError
+
+    def aalines(self, surf, col, closed, pointlist, blend=1):
+        raise NotImplementedError
+
 # Export Draw functions
 draw = Draw()
 
=== modified file 'sgc/widgets/radio_button.py'
--- sgc/widgets/radio_button.py	2012-06-19 20:41:57 +0000
+++ sgc/widgets/radio_button.py	2012-07-21 12:53:18 +0000
@@ -73,8 +73,8 @@
         draw.circle(self._images["image"], (255,255,255), pos, r)
         draw.circle(self._images["over"], self._settings["col"], pos, r)
         # Border circles
-        draw.circle(self._images["image"], (0,0,1), pos, r, 1)
-        draw.circle(self._images["over"], (0,0,1), pos, r, 1)
+        draw.circle(self._images["image"], (0,0,1), pos, r)
+        draw.circle(self._images["over"], (0,0,1), pos, r)
 
     def _draw_active(self, draw, image):
         # Central dot for 'active' state