Move Window to pygame.window.Window namespace (#2604)

* Move Window to pygame.window.Window namespace

* Window type hint fixes

* Edit gen_stubs for Window

Author: Starbuck5

buildconfig/Setup.Android.SDL2.in

@@ -61,5 +61,5 @@ pixelarray src_c/pixelarray.c $(SDL) $(DEBUG)
 math src_c/math.c $(SDL) $(DEBUG)
 pixelcopy src_c/pixelcopy.c $(SDL) $(DEBUG)
 newbuffer src_c/newbuffer.c $(SDL) $(DEBUG)
-_window src_c/window.c $(SDL) $(DEBUG)
+window src_c/window.c $(SDL) $(DEBUG)
 geometry src_c/geometry.c $(SDL) $(DEBUG)

buildconfig/Setup.Emscripten.SDL2.in

@@ -58,7 +58,7 @@ surflock src_c/void.c
 rect src_c/void.c
 rwobject src_c/void.c
 system src_c/void.c
-_window src_c/void.c
+window src_c/void.c
 geometry src_c/void.c
 
 #_sdl2.controller src_c/_sdl2/controller.c $(SDL) $(DEBUG) -Isrc_c

buildconfig/Setup.SDL2.in

@@ -73,4 +73,4 @@ pixelcopy src_c/pixelcopy.c $(SDL) $(DEBUG)
 newbuffer src_c/newbuffer.c $(SDL) $(DEBUG)
 system src_c/system.c $(SDL) $(DEBUG)
 geometry src_c/geometry.c $(SDL) $(DEBUG)
-_window src_c/window.c $(SDL) $(DEBUG)
+window src_c/window.c $(SDL) $(DEBUG)

buildconfig/stubs/gen_stubs.py

@@ -51,6 +51,7 @@
     "_debug",
     "system",
     "geometry",
+    "window",
 ]
 
 # pygame classes that are autoimported into main namespace are kept in this dict
@@ -69,6 +70,7 @@
     "mixer": ["Channel"],
     "time": ["Clock"],
     "joystick": ["Joystick"],
+    "window": ["Window"],
     "base": ["__version__"],  # need an explicit import
     # uncomment below line if Circle is added to the base namespace later
     # "geometry": ["Circle"], 

buildconfig/stubs/pygame/__init__.pyi

@@ -38,6 +38,7 @@ from pygame import (
     _debug as _debug,
     system as system,
     geometry as geometry,
+    window as window,
 )
 
 from .rect import Rect as Rect, FRect as FRect
@@ -54,6 +55,7 @@ from .font import Font as Font
 from .mixer import Channel as Channel
 from .time import Clock as Clock
 from .joystick import Joystick as Joystick
+from .window import Window as Window
 from .base import (
     __version__ as __version__,
     BufferError as BufferError,

buildconfig/stubs/pygame/_sdl2/video.pyi

@@ -3,6 +3,7 @@ from typing import Any, Generator, Iterable, Optional, Tuple, Union
 from pygame.color import Color
 from pygame.rect import Rect
 from pygame.surface import Surface
+from pygame.window import Window as Window
 
 from .._common import ColorValue, RectValue, Coordinate
 
@@ -38,10 +39,6 @@ def messagebox(
     escape_button: int = 0,
 ) -> int: ...
 
-from pygame._window import Window as Window
-
-_Window = Window
-
 class Texture:
     def __init__(
         self,

buildconfig/stubs/pygame/_window.pyi renamed to buildconfig/stubs/pygame/window.pyi

@@ -426,7 +426,7 @@ cdef extern from "pygame.h" nogil:
         cdef SDL_Rect r
         cdef object weakreflist
 
-    ctypedef class pygame._window.Window [object pgWindowObject]:
+    ctypedef class pygame.window.Window [object pgWindowObject]:
         cdef SDL_Window *_win
         cdef SDL_bool _is_borrowed
 

src_c/_sdl2/video.c

@@ -252,7 +252,7 @@ pg_display_init(PyObject *self, PyObject *_null)
         return NULL;
     if (!pg_mod_autoinit(IMPPREFIX "event"))
         return NULL;
-    if (!pg_mod_autoinit(IMPPREFIX "_window"))
+    if (!pg_mod_autoinit(IMPPREFIX "window"))
         return NULL;
 
     Py_RETURN_NONE;