Mercurial > sdl-ios-xcode

diff src/video/x11/SDL_x11video.c @ 1545:8d9bb0cf2c2a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added current_w and current_h to the SDL_VideoInfo structure, which is set to the desktop resolution during video intialization, and then set to the current resolution when a video mode is set. SDL_SetVideoMode() now accepts 0 for width or height and will use the current video mode (or the desktop mode if no mode has been set.)
author Sam Lantinga <slouken@libsdl.org>
date Wed, 15 Mar 2006 17:46:41 +0000
parents d910939febfa
children b46bb79cc197
line wrap: on
line diff
--- a/src/video/x11/SDL_x11video.c	Wed Mar 15 15:47:49 2006 +0000
+++ b/src/video/x11/SDL_x11video.c	Wed Mar 15 17:46:41 2006 +0000
@@ -508,6 +508,10 @@
 	if(X11_GetVideoModes(this) < 0)
 	    return -1;
 
+	/* Determine the current screen size */
+	this->info.current_w = DisplayWidth(SDL_Display, SDL_Screen);
+	this->info.current_h = DisplayHeight(SDL_Display, SDL_Screen);
+
 	/* Determine the default screen depth:
 	   Use the default visual (or at least one with the same depth) */
 	SDL_DisplayColormap = DefaultColormap(SDL_Display, SDL_Screen);
@@ -863,8 +867,8 @@
 	/* resize the (possibly new) window manager window */
 	if( !SDL_windowid ) {
 	        X11_SetSizeHints(this, w, h, flags);
-		current_w = w;
-		current_h = h;
+		window_w = w;
+		window_h = h;
 		pXResizeWindow(SDL_Display, WMwindow, w, h);
 	}
 
@@ -985,8 +989,8 @@
 	if ( ! SDL_windowid ) {
 		/* Resize the window manager window */
 		X11_SetSizeHints(this, w, h, flags);
-		current_w = w;
-		current_h = h;
+		window_w = w;
+		window_h = h;
 		pXResizeWindow(SDL_Display, WMwindow, w, h);
 
 		/* Resize the fullscreen and display windows */