limited

Author: yunline

buildconfig/stubs/pygame/display.pyi

@@ -31,7 +31,6 @@ def set_mode(
     depth: int = 0,
     display: int = 0,
     vsync: int = 0,
-    hwnd: int = 0,
 ) -> Surface: ...
 def get_surface() -> Surface: ...
 def flip() -> None: ...

docs/reST/ref/display.rst

@@ -113,7 +113,7 @@ required).
 .. function:: set_mode
 
    | :sl:`Initialize a window or screen for display`
-   | :sg:`set_mode(size=(0, 0), flags=0, depth=0, display=0, vsync=0, hwnd=0) -> Surface`
+   | :sg:`set_mode(size=(0, 0), flags=0, depth=0, display=0, vsync=0) -> Surface`
 
    This function will create a display Surface. The arguments passed in are
    requests for a display type. The actual created display will be the best
@@ -189,13 +189,6 @@ required).
 
    .. versionadded:: 2.0.0 ``vsync``
 
-   The ``hwnd`` argument is an integer contains the window id (or handle) of
-   a foreign window. By setting this parameter, pygame display can be embedded
-   into the foreign window. Be aware that there can be many strange side effects
-   when running in an embedded display.
-
-   .. versionadded:: 2.1.4 ``hwnd``
-
    Basic example:
 
    ::

src_c/display.c

@@ -815,10 +815,6 @@ pg_set_mode(PyObject *self, PyObject *arg, PyObject *kwds)
 
     _DisplayState *state = DISPLAY_MOD_STATE(self);
     SDL_Window *win = pg_GetDefaultWindow();
-#if !SDL_VERSION_ATLEAST(2, 0, 22)
-    SDL_Window *dummy = NULL;
-    char dummy_id_str[64];
-#endif
     pgSurfaceObject *surface = pg_GetDefaultWindowSurface();
     SDL_Surface *surf = NULL;
     SDL_Surface *newownedsurf = NULL;
@@ -835,14 +831,13 @@ pg_set_mode(PyObject *self, PyObject *arg, PyObject *kwds)
     char *title = state->title;
     char *scale_env, *winid_env;
 
-    char *keywords[] = {"size",  "flags", "depth", "display",
-                        "vsync", "hwnd",  NULL};
+    char *keywords[] = {"size", "flags", "depth", "display", "vsync", NULL};
 
     scale_env = SDL_getenv("PYGAME_FORCE_SCALE");
     winid_env = SDL_getenv("SDL_WINDOWID");
 
-    if (!PyArg_ParseTupleAndKeywords(arg, kwds, "|OiiiiK", keywords, &size,
-                                     &flags, &depth, &display, &vsync, &hwnd))
+    if (!PyArg_ParseTupleAndKeywords(arg, kwds, "|Oiiii", keywords, &size,
+                                     &flags, &depth, &display, &vsync))
         return NULL;
 
     if (hwnd == 0 && winid_env != NULL) {
@@ -1087,30 +1082,7 @@ pg_set_mode(PyObject *self, PyObject *arg, PyObject *kwds)
             if (!win) {
                 /*open window*/
                 if (hwnd != 0) {
-                    if (flags & PGS_OPENGL) {
-#if SDL_VERSION_ATLEAST(2, 0, 22)
-                        SDL_SetHint(SDL_HINT_VIDEO_FOREIGN_WINDOW_OPENGL, "1");
-                        win = SDL_CreateWindowFrom((void *)hwnd);
-                        SDL_SetHint(SDL_HINT_VIDEO_FOREIGN_WINDOW_OPENGL, "0");
-#else
-                        // Create window with SDL_CreateWindowFrom() and OpenGL
-                        // See https://gamedev.stackexchange.com/a/119903
-                        dummy = SDL_CreateWindow(
-                            "OpenGL Dummy", 0, 0, 1, 1,
-                            SDL_WINDOW_OPENGL | SDL_WINDOW_HIDDEN);
-                        sprintf(dummy_id_str, "%p", dummy);
-                        SDL_SetHint(SDL_HINT_VIDEO_WINDOW_SHARE_PIXEL_FORMAT,
-                                    dummy_id_str);
-
-                        win = SDL_CreateWindowFrom((void *)hwnd);
-
-                        SDL_SetHint(SDL_HINT_VIDEO_WINDOW_SHARE_PIXEL_FORMAT,
-                                    "");
-#endif
-                    }
-                    else {
-                        win = SDL_CreateWindowFrom((void *)hwnd);
-                    }
+                    win = SDL_CreateWindowFrom((void *)hwnd);
                 }
                 else {
                     win = SDL_CreateWindow(title, x, y, w_1, h_1, sdl_flags);

src_c/doc/display_doc.h

@@ -3,7 +3,7 @@
 #define DOC_PYGAMEDISPLAYINIT "init() -> None\nInitialize the display module"
 #define DOC_PYGAMEDISPLAYQUIT "quit() -> None\nUninitialize the display module"
 #define DOC_PYGAMEDISPLAYGETINIT "get_init() -> bool\nReturns True if the display module has been initialized"
-#define DOC_PYGAMEDISPLAYSETMODE "set_mode(size=(0, 0), flags=0, depth=0, display=0, vsync=0, hwnd=0) -> Surface\nInitialize a window or screen for display"
+#define DOC_PYGAMEDISPLAYSETMODE "set_mode(size=(0, 0), flags=0, depth=0, display=0, vsync=0) -> Surface\nInitialize a window or screen for display"
 #define DOC_PYGAMEDISPLAYGETSURFACE "get_surface() -> Surface\nGet a reference to the currently set display surface"
 #define DOC_PYGAMEDISPLAYFLIP "flip() -> None\nUpdate the full display Surface to the screen"
 #define DOC_PYGAMEDISPLAYUPDATE "update(rectangle=None) -> None\nupdate(rectangle_list) -> None\nUpdate portions of the screen for software displays"
@@ -50,7 +50,7 @@ pygame.display.get_init
 Returns True if the display module has been initialized
 
 pygame.display.set_mode
- set_mode(size=(0, 0), flags=0, depth=0, display=0, vsync=0, hwnd=0) -> Surface
+ set_mode(size=(0, 0), flags=0, depth=0, display=0, vsync=0) -> Surface
 Initialize a window or screen for display
 
 pygame.display.get_surface