Merge pull request #2617 from Starbuck5/cleanup-window-for-sdl3

Remove Window API that will be questionable in SDL3

Author: Starbuck5

buildconfig/stubs/pygame/window.pyi

@@ -45,8 +45,6 @@ class Window:
     @property
     def id(self) -> int: ...
     @property
-    def display_index(self) -> int: ...
-    @property
     def mouse_rect(self) -> Optional[Rect]: ...
     @mouse_rect.setter
     def mouse_rect(self, value: Optional[RectValue]) -> None: ...

docs/reST/ref/window.rst

@@ -44,15 +44,6 @@
                               (unrelated to INPUT_GRABBED).
    :param bool always_on_top: Create a window that is always on top
                               (X11 only).
-   :param bool skip_taskbar: Create a window that should not be added to the
-                             taskbar (X11 only).
-   :param bool utility: Create a window that should be treated as a utility
-                        window (X11 only).
-   :param bool tooltip: Create a window that should be treated as a tooltip
-                        (X11 only).
-   :param bool popup_menu: Create a window that should be treated as a popup menu 
-                           (X11 only).
-
 
    .. versionadded:: 2.4.0
 
@@ -237,11 +228,6 @@
       | :sl:`Get or set the window opacity, between 0.0 (fully transparent) and 1.0 (fully opaque)`
       | :sg:`opacity -> float`
 
-   .. attribute:: display_index
-
-      | :sl:`Get the index of the display that owns the window (**read-only**)`
-      | :sg:`get_display_index -> int`
-
    .. classmethod:: from_display_module
 
       | :sl:`Create a Window object using window data from display module`

src_c/doc/window_doc.h

@@ -15,7 +15,6 @@
 #define DOC_WINDOW_MAXIMUMSIZE "maximum_size -> (int, int)\nGet or set the maximum size of the window's client area"
 #define DOC_WINDOW_POSITION "position -> (int, int) or WINDOWPOS_CENTERED or WINDOWPOS_UNDEFINED\nGet or set the window position in screen coordinates"
 #define DOC_WINDOW_OPACITY "opacity -> float\nGet or set the window opacity, between 0.0 (fully transparent) and 1.0 (fully opaque)"
-#define DOC_WINDOW_DISPLAYINDEX "get_display_index -> int\nGet the index of the display that owns the window (**read-only**)"
 #define DOC_WINDOW_FROMDISPLAYMODULE "from_display_module() -> Window\nCreate a Window object using window data from display module"
 #define DOC_WINDOW_GETSURFACE "get_surface() -> Surface\nGet the window surface"
 #define DOC_WINDOW_FLIP "flip() -> None\nUpdate the display surface to the window."

src_c/window.c

@@ -712,16 +712,6 @@ window_get_opacity(pgWindowObject *self, void *v)
     return PyFloat_FromDouble((double)opacity);
 }
 
-static PyObject *
-window_get_display_index(pgWindowObject *self, PyObject *_null)
-{
-    int index = SDL_GetWindowDisplayIndex(self->_win);
-    if (index < 0) {
-        return RAISE(pgExc_SDLError, SDL_GetError());
-    }
-    return PyLong_FromLong(index);
-}
-
 static void
 window_dealloc(pgWindowObject *self, PyObject *_null)
 {
@@ -870,22 +860,6 @@ window_init(pgWindowObject *self, PyObject *args, PyObject *kwargs)
                     if (_value_bool)
                         flags |= SDL_WINDOW_ALWAYS_ON_TOP;
                 }
-                else if (!strcmp(_key_str, "skip_taskbar")) {
-                    if (_value_bool)
-                        flags |= SDL_WINDOW_SKIP_TASKBAR;
-                }
-                else if (!strcmp(_key_str, "utility")) {
-                    if (_value_bool)
-                        flags |= SDL_WINDOW_UTILITY;
-                }
-                else if (!strcmp(_key_str, "tooltip")) {
-                    if (_value_bool)
-                        flags |= SDL_WINDOW_TOOLTIP;
-                }
-                else if (!strcmp(_key_str, "popup_menu")) {
-                    if (_value_bool)
-                        flags |= SDL_WINDOW_POPUP_MENU;
-                }
                 else if (!strcmp(_key_str, "vulkan")) {
                     if (_value_bool)
                         flags |= SDL_WINDOW_VULKAN;
@@ -1076,8 +1050,6 @@ static PyGetSetDef _window_getset[] = {
      DOC_WINDOW_POSITION, NULL},
     {"opacity", (getter)window_get_opacity, (setter)window_set_opacity,
      DOC_WINDOW_OPACITY, NULL},
-    {"display_index", (getter)window_get_display_index, NULL,
-     DOC_WINDOW_DISPLAYINDEX, NULL},
     {"id", (getter)window_get_window_id, NULL, DOC_WINDOW_ID, NULL},
     {NULL, 0, NULL, NULL, NULL} /* Sentinel */
 };