Mercurial > sdl-ios-xcode
diff src/video/windib/SDL_dibvideo.c @ 833:31fa08b36380
Added support for SDL_VIDEO_WINDOW_POS and SDL_VIDEO_CENTERED on Windows
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Mon, 16 Feb 2004 21:09:24 +0000 |
parents | ed57c876700d |
children | f72cc0c7305f |
line wrap: on
line diff
--- a/src/video/windib/SDL_dibvideo.c Mon Feb 16 21:06:10 2004 +0000 +++ b/src/video/windib/SDL_dibvideo.c Mon Feb 16 21:09:24 2004 +0000 @@ -463,12 +463,8 @@ HDC hdc; RECT bounds; int x, y; - BOOL was_visible; Uint32 Rmask, Gmask, Bmask; - /* See whether or not we should center the window */ - was_visible = IsWindowVisible(SDL_Window); - /* Clean up any GL context that may be hanging around */ if ( current->flags & SDL_OPENGL ) { WIN_GL_ShutDown(this); @@ -599,7 +595,7 @@ } /* DJM: Don't piss of anyone who has setup his own window */ - if (!SDL_windowid) + if ( SDL_windowid == NULL ) SetWindowLong(SDL_Window, GWL_STYLE, style); /* Delete the old bitmap if necessary */ @@ -678,24 +674,47 @@ if ( SDL_windowid == NULL ) { HWND top; UINT swp_flags; + const char *window = getenv("SDL_VIDEO_WINDOW_POS"); + const char *center = getenv("SDL_VIDEO_CENTERED"); + + if ( !SDL_windowX && !SDL_windowY ) { + if ( window ) { + if ( sscanf(window, "%d,%d", &x, &y) == 2 ) { + SDL_windowX = x; + SDL_windowY = y; + } + if ( strcmp(window, "center") == 0 ) { + center = window; + window = NULL; + } + } + } + swp_flags = (SWP_NOCOPYBITS | SWP_SHOWWINDOW); SDL_resizing = 1; - bounds.left = 0; - bounds.top = 0; - bounds.right = video->w; - bounds.bottom = video->h; + bounds.left = SDL_windowX; + bounds.top = SDL_windowY; + bounds.right = SDL_windowX+video->w; + bounds.bottom = SDL_windowY+video->h; AdjustWindowRectEx(&bounds, GetWindowLong(SDL_Window, GWL_STYLE), FALSE, 0); width = bounds.right-bounds.left; height = bounds.bottom-bounds.top; - x = (GetSystemMetrics(SM_CXSCREEN)-width)/2; - y = (GetSystemMetrics(SM_CYSCREEN)-height)/2; + if ( (flags & SDL_FULLSCREEN) ) { + x = (GetSystemMetrics(SM_CXSCREEN)-width)/2; + y = (GetSystemMetrics(SM_CYSCREEN)-height)/2; + } else if ( SDL_windowX || SDL_windowY || window ) { + x = bounds.left; + y = bounds.top; + } else if ( center ) { + x = (GetSystemMetrics(SM_CXSCREEN)-width)/2; + y = (GetSystemMetrics(SM_CYSCREEN)-height)/2; + } else { + x = y = -1; + swp_flags |= SWP_NOMOVE; + } if ( y < 0 ) { /* Cover up title bar for more client area */ y -= GetSystemMetrics(SM_CYCAPTION)/2; } - swp_flags = (SWP_NOCOPYBITS | SWP_FRAMECHANGED | SWP_SHOWWINDOW); - if ( was_visible && !(flags & SDL_FULLSCREEN) ) { - swp_flags |= SWP_NOMOVE; - } if ( flags & SDL_FULLSCREEN ) { top = HWND_TOPMOST; } else {