Various small changes, including Python 3.3 support

Author: 4b796c65

CHANGELOG.txt

@@ -1,4 +1,4 @@
- * added a method to iterate over all coordinates of a Console
+ * a for loop can iterate over all coordinates of a Console
  * drawStr can be configured to scroll or raise an error
  * You can now configure or disable key repeating with tdl.event.setKeyRepeat
 

dev/stressTest.py

@@ -43,7 +43,7 @@ class TestApp(tdl.event.App):
     def __init__(self, console):
         self.console = console
         self.writer = self.console
-        self.console.setScrollMode('scroll')
+        self.console.setMode('scroll')
         self.width, self.height = self.console.getSize()
         self.total = self.width * self.height
         self.cells = list(itertools.product(range(self.width), range(self.height)))

tdl/__init__.py

@@ -633,7 +633,7 @@ def getSize(self):
         """
         return self.width, self.height
 
-    def map(self):
+    def __iter__(self):
         """Return an iterator with every possible (x, y) value for this console.
         
         It goes without saying that working on the console this way is a

tdl/__tcod.py

@@ -321,6 +321,30 @@ def __iter__(self):
 KEY_PRESSED = 1
 KEY_RELEASED = 2
 
+
+#class char_t(Structure):
+#    _fields_ = [('c', c_int), # character ascii code
+#                ('cf', c_int), # character number in font
+#                ('fore', _Color), ('back', _Color),
+#                ('dirty', c_uint8)]
+                
+                
+#class TCOD_console_t(Structure):
+#    _fields_ = [('buf', POINTER(char_t)), # current console
+#                ('oldbuf', POINTER(char_t)), # console for last frame
+#                ('w', c_int), ('h', c_int), # console width and height (in characters,not pixels)
+#                ]
+                
+#	/* default background operator for print & print_rect functions */
+#	TCOD_bkgnd_flag_t bkgnd_flag;
+#	/* default alignment for print & print_rect functions */
+#	TCOD_alignment_t alignment;
+#	/* foreground (text), background and key colors */
+#	TCOD_color_t fore,back,key;
+#	uint8 fade;
+#	bool haskey; /* a key color has been defined */
+#} TCOD_console_data_t;
+
 TCOD_console_t = c_void_p
 
 _lib.TCOD_console_init_root.restype = None

tdl/event.py

@@ -225,8 +225,6 @@ class App(object):
        L{tdl.flush}.
     """
     __slots__ = ('__running', '__prevTime')
-    __running = False
-    __prevTime = None
 
     def ev_QUIT(self, event):
         """Unless overridden this method raises a SystemExit exception closing
@@ -281,7 +279,7 @@ def run(self):
         this function is called.  And then the App can be run again.
         But a single App instance can not be run multiple times simultaneously.
         """
-        if self.__running:
+        if getattr(self, '_App__running', False):
             raise _tdl.TDLError('An App can not be run multiple times simultaneously')
         self.__running = True
         while self.__running:
@@ -296,7 +294,7 @@ def runOnce(self):
         Having multiple L{App} instances and selectively calling runOnce on
         them is a decent way to create a state machine.
         """
-        if self.__prevTime is None:
+        if not hasattr(self, '_App__prevTime'):
             self.__prevTime = time.clock() # initiate __prevTime
         for event in get():
             if event.type: # exclude custom events with a blank type variable