added scrolling modes, attemting to access SDL

Author: 4b796c65

CHANGELOG.txt

@@ -1,3 +1,5 @@
+ * drawStr can be configured to scroll or raise an error
+
 1.1.4
  * Merged the Typewriter and MetaConsole classes,
    You now have a virtual cursor with Console and Window objects

dev/runRegressionTest.py

@@ -219,7 +219,7 @@ def test_drawStrArray(self):
 
     def test_drawRect(self):
         consoleCopy = tdl.Console(*(self.console.getSize()))
-        for x,y in self.getDrawables():
+        for x,y in random.sample(list(self.getDrawables()), 100):
             consoleCopy.blit(self.console) # copy the console to compare untouched areas
             ch, fg, bg = self.getRandomCharacter()
             width, height = self.console.getSize()
@@ -234,7 +234,7 @@ def test_drawRect(self):
 
     def test_drawFrame(self):
         consoleCopy = tdl.Console(*(self.console.getSize()))
-        for x,y in self.getDrawables():
+        for x,y in random.sample(list(self.getDrawables()), 100):
             consoleCopy.blit(self.console) # copy the console to compare untouched areas
             ch, fg, bg = self.getRandomCharacter()
             width, height = self.console.getSize()

dev/stressTest.py

@@ -42,7 +42,8 @@ class TestApp(tdl.event.App):
 
     def __init__(self, console):
         self.console = console
-        self.writer = tdl.Typewriter(console)
+        self.writer = self.console
+        self.console.setScrollMode('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)))
@@ -59,7 +60,7 @@ class FullDrawCharTest(TestApp):
 
     def updateTest(self, deltaTime):
         # getrandbits is around 5x faster than using randint
-        bgcolors = [(random.getrandbits(6), random.getrandbits(6), random.getrandbits(6)) for _ in range(self.total)]
+        bgcolors = [(random.getrandbits(7), random.getrandbits(7), random.getrandbits(7)) for _ in range(self.total)]
         char = [random.getrandbits(8) for _ in range(self.total)]
         fgcolor = (255, 255, 255)
         for (x,y), bgcolor, char in zip(self.cells, bgcolors, char):
@@ -81,7 +82,7 @@ def updateTest(self, deltaTime):
         char = [random.getrandbits(8) for _ in range(self.total)]
         for (x,y), char in zip(self.cells, char):
             self.writer.move(x, y)
-            self.writer.addChar(char)
+            self.writer.printStr(chr(char))
 
 class ColorOnlyTest(TestApp):    
 

tdl/__init__.py

@@ -85,11 +85,12 @@ def _formatChar(char):
     """
     if char is None:
         return None
-    if isinstance(char, _INTTYPES):
-        return char
+    #if isinstance(char, _INTTYPES):
+    #    return char
     if isinstance(char, _STRTYPES) and len(char) == 1:
         return ord(char)
-    raise TypeError('Expected char parameter to be a single character string, number, or None, got: %s' % repr(char))
+    return int(char) # conversion faster than type check
+    #raise TypeError('Expected char parameter to be a single character string, number, or None, got: %s' % repr(char))
 
 _fontinitialized = False
 _rootinitialized = False
@@ -139,19 +140,8 @@ def _iscolor(color):
 #    def __len__(self):
 #        return 3
 
-def _formatColor(color):
-    """Format the color to ctypes
-    """
-    if color is None or color is False:
-        return color
-    if isinstance(color, _Color):
-        return color
-    #if isinstance(color, Color):
-    #    return color._getCType()
-    if isinstance(color, _INTTYPES):
-        # format a web style color with the format 0xRRGGBB
-        return _Color(color >> 16 & 0xff, color >> 8 & 0xff, color & 0xff)
-    return _Color(*color)
+# Format the color to ctypes, will preserve None and False
+_formatColor = _Color.new
 
 def _getImageSize(filename):
     """Try to get the width and height of a bmp of png image file"""
@@ -199,8 +189,11 @@ def _normalizePoint(self, x, y):
         Respects Pythons negative indexes.  -1 starts at the bottom right.
         Replaces the _drawable function
         """
-        assert isinstance(x, _INTTYPES), 'x must be an integer, got %s' % repr(x)
-        assert isinstance(y, _INTTYPES), 'y must be an integer, got %s' % repr(y)
+        #assert isinstance(x, _INTTYPES), 'x must be an integer, got %s' % repr(x)
+        #assert isinstance(y, _INTTYPES), 'y must be an integer, got %s' % repr(y)
+        # force int, always faster than type checking
+        x = int(x)
+        y = int(y)
 
         assert (-self.width <= x < self.width) and (-self.height <= y < self.height), \
                 ('(%i, %i) is an invalid postition on %s' % (x, y, self))
@@ -263,6 +256,32 @@ def _lockColors(self, forceUpdate=False):
             _lib.TCOD_console_set_default_foreground(self.console, self.fgcolor)
             #
 
+    def setScrollMode(self, mode):
+        """Configure how this console will react to the cursor writing past the
+        end if the console.
+        
+        This is for methods that use the virtual cursor, such as L{printStr}.
+        
+        @type mode: string
+        @param mode: Possible settings are:
+        
+                      - 'error' - A TDLError will be raised once the cursor
+                        reaches the end of the console.  Everything up until
+                        the error will still be drawn.
+                        
+                        This is the default setting.
+                        
+                      - 'scroll' - The console will scroll up as stuff is
+                        written to the end.
+                        
+                        You can restrict the region with L{tdl.Window} when
+                        doing this.
+        """
+        MODES = ['error', 'scroll']
+        if mode.lower() not in MODES:
+            raise TDLError('mode must be one of %s, got %s' % (MODES, repr(mode)))
+        self._scrollMode = mode.lower()
+            
     def setColors(self, fg=None, bg=None):
         """Sets the colors to be used with the L{printStr} function.
         

tdl/__tcod.py

@@ -18,36 +18,37 @@ def _unpackfile(filename):
         return os.path.abspath(os.path.join(__path__[0], filename))
 
 def _unpackFramework(framework, path):
-    # get framework.tar file, remove ".tar" and add path
+    """get framework.tar file, remove ".tar" and add path"""
     return os.path.abspath(os.path.join(_unpackfile(framework)[:-4], path))
 
 def _loadDLL(dll):
-    # shorter version of file unpacking and linking
+    """shorter version of file unpacking and linking"""
     return cdll.LoadLibrary(_unpackfile(dll))
 
 
 def _get_library_crossplatform():
     bits, linkage = platform.architecture()
     libpath = None
     if 'win32' in sys.platform:
-        _loadDLL('lib/win32/SDL.dll')
+        libSDL = _loadDLL('lib/win32/SDL.dll')
         _loadDLL('lib/win32/zlib1.dll')
-        return _loadDLL('lib/win32/libtcod-VS.dll')
-        #return _loadDLL('lib/win32/libtcod-mingw.dll')
+        libTCOD = _loadDLL('lib/win32/libtcod-VS.dll')
     elif 'linux' in sys.platform:
+        libSDL = None
+        #libSDL = cdll.LoadLibrary('SDL.so')
         if bits == '32bit':
-            return _loadDLL('lib/linux32/libtcod.so')
+            libTCOD = _loadDLL('lib/linux32/libtcod.so')
         elif bits == '64bit':
-            return _loadDLL('lib/linux64/libtcod.so')
+            libTCOD = _loadDLL('lib/linux64/libtcod.so')
     elif 'darwin' in sys.platform:
-        #sys.path.insert(0, _unpackfile('lib/darwin/Frameworks/'))
-        #_loadDLL('lib/darwin/libpng14')
-        return _loadDLL('lib/darwin/libtcod.dylib')
+        libSDL = _loadDLL('lib/darwin/SDL.dylib')
+        libTCOD = _loadDLL('lib/darwin/libtcod.dylib')
 
     else:
         raise ImportError('Operating system "%s" has no supported dynamic link libarary. (%s, %s)' % (sys.platform, bits, linkage))
+    return libTCOD, libSDL
 
-_lib = _get_library_crossplatform()
+_lib, _libSDL = _get_library_crossplatform()
 
 try:
     c_bool
@@ -58,7 +59,25 @@ def _get_library_crossplatform():
 
 class _Color(Structure):
     _fields_ = [('r', c_uint8), ('g', c_uint8), ('b', c_uint8)]
-
+    
+    @staticmethod
+    def new(color):
+        if color is None or color is False:
+            return color
+        if isinstance(color, _Color):
+            return color
+        if isinstance(color, int):
+            # format a web style color with the format 0xRRGGBB
+            return _Color(color >> 16 & 0xff, color >> 8 & 0xff, color & 0xff)
+        return _Color(*color)
+    
+    def set(self, r, g, b):
+        """perform a slightly faster in-place assignment of this object"""
+        self.r = r
+        self.g = g
+        self.b = b
+        return self
+    
     def __iter__(self):
         'to make this class more tuple-like'
         return iter((self.r, self.g, self.b))