Rearranged drawing parameters to make code look better.

Author: 4B796C65@gmail.com

examples/eventget.py

@@ -13,25 +13,25 @@ def print_line_append(string):
     # move everything on the console up a line with blit
     console.blit(console, 0, 0, 80, 57, 0, 1)
     # clear the bottom line with drawRect
-    console.drawRect(' ', 0, 57, None, 1)
+    console.drawRect(0, 57, None, 1, ' ')
     # print the string
-    console.drawStr(string, 0, 57)
+    console.drawStr(0, 57, string)
 
 tdl.setFPS(24) # slow down the program so that the user can clearly see the motion events
 
 while 1:
     for event in tdl.event.get():
         if event.type == tdl.QUIT:
             raise SystemExit()
-        elif event.type == tdl.KEYDOWN:
+        elif event.type == 'KEYDOWN':
             print_line_append('KEYDOWN event - key=%.2i char=%s keyname=%s alt=%i ctrl=%i shift=%i' % (event.key, repr(event.char), repr(event.keyname), event.alt, event.ctrl, event.shift))
-        elif event.type == tdl.KEYUP:
+        elif event.type == 'KEYUP':
             print_line_append('KEYUP   event - key=%.2i char=%s keyname=%s alt=%i ctrl=%i shift=%i' % (event.key, repr(event.char), repr(event.keyname), event.alt, event.ctrl, event.shift))
-        elif event.type == tdl.MOUSEMOTION:
-            console.drawRect(' ', 0, 59)
-            console.drawStr('MOUSEMOTION event - pos=%i,%i cell=%i,%i motion=%i,%i cellmotion=%i,%i' % (event.pos + event.cell + event.motion + event.cellmotion), 0, 59)
-        elif event.type == tdl.MOUSEDOWN:
+        elif event.type == 'MOUSEMOTION':
+            console.drawRect(0, 59, None, None, ' ')
+            console.drawStr(0, 59, 'MOUSEMOTION event - pos=%i,%i cell=%i,%i motion=%i,%i cellmotion=%i,%i' % (event.pos + event.cell + event.motion + event.cellmotion))
+        elif event.type == 'MOUSEDOWN':
             print_line_append('MOUSEDOWN event - pos=%i,%i cell=%i,%i button=%i' % (event.pos + event.cell + (event.button,)))
-        elif event.type == tdl.MOUSEUP:
+        elif event.type == 'MOUSEUP':
             print_line_append('MOUSEUP   event - pos=%i,%i cell=%i,%i button=%i' % (event.pos + event.cell + (event.button,)))
     tdl.flush()

examples/hello_world.py

@@ -16,7 +16,7 @@
 
 # draw the string "Hello World" at the top left corner using the default colors:
 # a white forground on a black background.
-console.drawStr('Hello World', 0,0)
+console.drawStr(0, 0, 'Hello World')
 
 # display the changes to the console with flush.
 # if you forget this part the screen will stay black emptiness forever.

examples/stress_test.py

@@ -61,10 +61,10 @@ def main():
             char = [random.getrandbits(8) for _ in range(TOTAL)]
         with drawTimer:
             for (x,y), bgcolor, char in zip(CELLS, bgcolors, char):
-                console.drawChar(char=char,  x=x, y=y, fgcolor=(255, 255, 255), bgcolor=bgcolor)
-        console.drawStr('Random%7.2fms ' % (randomTimer.getMeanTime() * 1000), 0, 0, tdl.C_WHITE, tdl.C_BLACK)
-        console.drawStr('DrawCh%7.2fms ' % (drawTimer.getMeanTime() * 1000), 0, 1, tdl.C_WHITE, tdl.C_BLACK)
-        console.drawStr('Flush %7.2fms ' % (flushTimer.getMeanTime() * 1000), 0, 2, tdl.C_WHITE, tdl.C_BLACK)
+                console.drawChar(x=x, y=y, char=char, fgcolor=(255, 255, 255), bgcolor=bgcolor)
+        console.drawStr(0, 0, 'Random%7.2fms ' % (randomTimer.getMeanTime() * 1000), tdl.C_WHITE, tdl.C_BLACK)
+        console.drawStr(0, 1, 'DrawCh%7.2fms ' % (drawTimer.getMeanTime() * 1000), tdl.C_WHITE, tdl.C_BLACK)
+        console.drawStr(0, 2, 'Flush %7.2fms ' % (flushTimer.getMeanTime() * 1000), tdl.C_WHITE, tdl.C_BLACK)
         with flushTimer:
             tdl.flush()
         tdl.setTitle('%i FPS' % tdl.getFPS())

tdl/__init__.py

@@ -301,7 +301,7 @@ def _setChar(self, char, x, y, fgcolor=None, bgcolor=None, bgblend=BND_SET):
         if bgcolor is not None:
             _setback(self, x, y, _formatColor(bgcolor), bgblend)
 
-    def drawChar(self, char, x=None, y=None, fgcolor=None, bgcolor=None):
+    def drawChar(self, x=None, y=None, char=None, fgcolor=C_WHITE, bgcolor=C_BLACK):
         """Draws a single character.
 
         char should be an integer, single character string, or None
@@ -315,19 +315,15 @@ def drawChar(self, char, x=None, y=None, fgcolor=None, bgcolor=None):
         """
         # hardcode alpha settings for now
         bgblend=BND_SET
-        #if isinstance(char, (str, bytes)):
-        #    assert len(char) == 1, 'strings must only have one character'
-        #    char = ord(char)
-        #assert isinstance(char, int) or char is None, \
-        #       'char must be an integer, single character string, or None'
+        
         char = _formatChar(char)
         _verify_colors(fgcolor, bgcolor)
         x, y = self._cursor_move(x, y)
 
         self._setChar(char, x, y, _formatColor(fgcolor), _formatColor(bgcolor), bgblend)
         self._cursor_advance()
 
-    def drawStr(self, string, x=None, y=None, fgcolor=None, bgcolor=None):
+    def drawStr(self, x=None, y=None, string='', fgcolor=C_WHITE, bgcolor=C_BLACK):
         """Draws a string starting at x and y.
 
         A string that goes past the end will wrap around.  No warning will be
@@ -347,10 +343,10 @@ def drawStr(self, string, x=None, y=None, fgcolor=None, bgcolor=None):
         fgcolor, bgcolor = _formatColor(fgcolor), _formatColor(bgcolor)
 
         for char in string:
-            self._setChar(char, self.cursorX, self.cursorY, fgcolor, bgcolor, bgblend)
+            self._setChar(x=self.cursorX, y=self.cursorY, char=char, fgcolor=fgcolor, bgcolor=bgcolor)
             self._cursor_advance()
 
-    def drawRect(self, char, x=0, y=0, width=None, height=None, fgcolor=None, bgcolor=None):
+    def drawRect(self, x=0, y=0, width=None, height=None, char=None, fgcolor=C_WHITE, bgcolor=C_BLACK):
         """Draws a rectangle starting from x and y and extending to width and
         height.  If width or height are None then it will extend to the edge
         of the console.  The rest are the same as drawChar.
@@ -370,7 +366,7 @@ def drawRect(self, char, x=0, y=0, width=None, height=None, fgcolor=None, bgcolo
             for cellX in range(x, x + width):
                 self._setChar(char, cellX, cellY, fgcolor, bgcolor, bgblend)
 
-    def drawFrame(self, char, x=0, y=0, width=None, height=None, fgcolor=None, bgcolor=None):
+    def drawFrame(self, x=0, y=0, width=None, height=None, char=None, fgcolor=C_WHITE, bgcolor=C_BLACK):
         "Similar to drawRect but only draws the outline of the rectangle"
         # hardcode alpha settings for now
         bgblend=BND_SET
@@ -425,8 +421,8 @@ def __init__(self, console, x=0, y=0, width=None, height=None):
             raise TypeError('console parameter must be a Console or Window instance')
         assert isinstance(x, int)
         assert isinstance(y, int)
-        assert isinstance(width, int) or width is None
-        assert isinstance(height, int) or height is None
+        assert (isinstance(width, int) or width is None)
+        assert (isinstance(height, int) or height is None)
         if not console._rectInBounds(x, y, width, height):
             raise TDLError('New Window is not within bounds of it\'s parent')
         self.parent = console
@@ -481,8 +477,6 @@ def __repr__(self):
                                                           self.height)
 
 
-
-
 def init(width, height, title='TDL', fullscreen=False):
     """Start the main console with the given width and height and return the
     root console.
@@ -521,10 +515,14 @@ def flush():
     """
     if not _rootinitialized:
         raise TDLError('Cannot flush without first initializing with tdl.init')
+    
+    # old hack to prevent locking up on old libtcod
+    # you can probably delete all autoflush releated stuff
     if event._autoflush and not event._eventsflushed:
         event.get()
     else: # do not flush events after the user starts using them
         event._autoflush = False
+    
     event._eventsflushed = False
     _lib.TCOD_console_flush()
 
@@ -582,15 +580,16 @@ def screenshot(fileobj=None):
         raise TDLError('Initialize first with tdl.init')
     if isinstance(fileobj, str):
         _lib.TCOD_sys_save_screenshot(_format_string(fileobj))
-    elif isinstance(fileobj, file):
-        filename = os.tempnam()
-        _lib.TCOD_sys_save_screenshot(_format_string(filename))
-        fileobj.write(file(filename, 'r').read())
-        os.remove(filename)
-    elif fileobj is None:
+    elif isinstance(fileobj, file): # save to temp file and copy to file-like obj
+        tmpname = os.tempnam()
+        _lib.TCOD_sys_save_screenshot(_format_string(tmpname))
+        with tmpname as tmpfile:
+            fileobj.write(tmpfile.read())
+        os.remove(tmpname)
+    elif fileobj is None: # save to screenshot001.png, screenshot002.png, ...
         filelist = os.listdir('.')
-        n = 0
-        filename = 'screenshot%.4i.png' % n
+        n = 1
+        filename = 'screenshot%.3i.png' % n
         while filename in filelist:
             n += 1
             filename = 'screenshot%.4i.png' % n

tdl/tcod.py

@@ -55,7 +55,7 @@ class _Color(Structure):
     _fields_ = [('r', c_uint8), ('g', c_uint8), ('b', c_uint8)]
 
     def __iter__(self):
-        'to make this class more tuple-like
+        'to make this class more tuple-like'
         return iter((self.r, self.g, self.b))
 
     def __len__(self):