Ensure Renderer.logical_size is always initialized

Author: a-hurst

sdl2/ext/renderer.py

@@ -341,16 +341,24 @@ def __init__(self, target, backend=-1, logical_size=None,
         else:
             index = backend
 
+        _size = None
         if isinstance(target, Window):
             _renderer = render.SDL_CreateRenderer(target.window, index, flags)
+            _size = target.size
         elif isinstance(target, video.SDL_Window):
             _renderer = render.SDL_CreateRenderer(target, index, flags)
+            w, h = c_int(0), c_int(0)
+            video.SDL_GetWindowSize(target, byref(w), byref(h))
+            _size = (w.value, h.value)
         elif isinstance(target, SoftwareSprite):
             _renderer = render.SDL_CreateSoftwareRenderer(target.surface)
+            _size = target.size
         elif isinstance(target, surface.SDL_Surface):
             _renderer = render.SDL_CreateSoftwareRenderer(target)
+            _size = (target.w, target.h)
         elif "SDL_Surface" in str(type(target)):
             _renderer = render.SDL_CreateSoftwareRenderer(target.contents)
+            _size = (target.contents.w, target.contents.h)
         else:
             raise TypeError("unsupported target type")
         if not _renderer:
@@ -359,6 +367,7 @@ def __init__(self, target, backend=-1, logical_size=None,
 
         self.rendertarget = target
         self.color = (0, 0, 0, 0)  # Set black as the default draw color
+        self.logical_size = _size
         self._original_logical_size = self.logical_size
         if logical_size is not None:
             self.logical_size = logical_size
@@ -402,7 +411,7 @@ def logical_size(self):
         ``(width, height)`` tuple.
 
         """
-        w, h = c_int(), c_int()
+        w, h = c_int(0), c_int(0)
         render.SDL_RenderGetLogicalSize(self.sdlrenderer, byref(w), byref(h))
         return w.value, h.value
 
@@ -416,7 +425,7 @@ def logical_size(self, size):
     @property
     def color(self):
         """:obj:`~sdl2.ext.Color`: The current drawing color of the renderer."""
-        r, g, b, a = Uint8(), Uint8(), Uint8(), Uint8()
+        r, g, b, a = Uint8(0), Uint8(0), Uint8(0), Uint8(0)
         ret = render.SDL_GetRenderDrawColor(self.sdlrenderer, byref(r), byref(g),
                                             byref(b), byref(a))
         if ret < 0:

sdl2/test/sdl2ext_renderer_test.py

@@ -74,7 +74,7 @@ def _online(x, y, pts):
                 else:
                     assert view[y][x] in c2, msg % (x, y, view[y][x], c2)
 
-    def test_Renderer(self):
+    def test_init(self):
         sf = SDL_CreateRGBSurface(0, 10, 10, 32, 0, 0, 0, 0)
 
         # Create renderer with SDL_Surface
@@ -124,6 +124,31 @@ def test_Renderer(self):
             sdl2ext.Renderer("test")
         dogc()
 
+    def test_logical_size(self):
+        sf = SDL_CreateRGBSurface(0, 10, 10, 32, 0, 0, 0, 0)
+        window = sdl2ext.Window("Test", size=(10, 10))
+        sprite = sdl2ext.SoftwareSprite(sf.contents, True)
+
+        targets = {
+            "SDL_Surface": sf.contents,
+            "SDL_Surface_pointer": sf,
+            "SoftwareSprite": sprite,
+            "Window": window,
+            "SDL_Window": window.window
+        }
+        for name, target in targets.items():
+            target_name = name
+            renderer = sdl2ext.Renderer(target)
+            assert isinstance(renderer.sdlrenderer.contents, SDL_Renderer)
+            assert renderer.logical_size == (10, 10)
+            renderer.logical_size = (20, 30)
+            assert renderer.logical_size == (20, 30)
+            renderer.reset_logical_size()
+            assert renderer.logical_size == (10, 10)
+            renderer.destroy()
+
+        window.close()
+
     def test_Texture(self):
         # Create renderer and test surface
         rendertarget = SDL_CreateRGBSurface(0, 100, 100, 32, 0, 0, 0, 0)