- in headless mode avoid init of sdl's video surface so that we stay in console window (no graphics window shown)

2025-08-20 15:11:20 +02:00 · 2011-09-27 07:01:08 +00:00
parent c68aa74fcf
commit 9caff9dac3
7 changed files with 169 additions and 132 deletions
--- a/source/shared_lib/sources/platform/sdl/gl_wrap.cpp
+++ b/source/shared_lib/sources/platform/sdl/gl_wrap.cpp
@@ -113,50 +113,52 @@ void PlatformContextGl::init(int colorBits, int depthBits, int stencilBits,bool
 		screen = NULL;
 	}

-	screen = SDL_SetVideoMode(resW, resH, colorBits, flags);
-	if(screen == 0) {
-		std::ostringstream msg;
-		msg << "Couldn't set video mode "
-			<< resW << "x" << resH << " (" << colorBits
-			<< "bpp " << stencilBits << " stencil "
-			<< depthBits << " depth-buffer). SDL Error is: " << SDL_GetError();
-
-		if(SystemFlags::getSystemSettingType(SystemFlags::debugError).enabled) SystemFlags::OutputDebug(SystemFlags::debugError,"In [%s::%s Line: %d] error [%s]\n",__FILE__,__FUNCTION__,__LINE__,msg.str().c_str());
-		if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] error [%s]\n",__FILE__,__FUNCTION__,__LINE__,msg.str().c_str());
-
-		for(int i = 32; i >= 8; i-=8) {
-			// try different color bits
-			screen = SDL_SetVideoMode(resW, resH, i, flags);
-			if(screen != 0) {
-				break;
-			}
-		}
-
+	if(Window::getMasterserverMode() == false) {
+		screen = SDL_SetVideoMode(resW, resH, colorBits, flags);
 		if(screen == 0) {
+			std::ostringstream msg;
+			msg << "Couldn't set video mode "
+				<< resW << "x" << resH << " (" << colorBits
+				<< "bpp " << stencilBits << " stencil "
+				<< depthBits << " depth-buffer). SDL Error is: " << SDL_GetError();
+
+			if(SystemFlags::getSystemSettingType(SystemFlags::debugError).enabled) SystemFlags::OutputDebug(SystemFlags::debugError,"In [%s::%s Line: %d] error [%s]\n",__FILE__,__FUNCTION__,__LINE__,msg.str().c_str());
+			if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] error [%s]\n",__FILE__,__FUNCTION__,__LINE__,msg.str().c_str());
+
 			for(int i = 32; i >= 8; i-=8) {
-				// try to revert to 800x600
-				screen = SDL_SetVideoMode(800, 600, i, flags);
+				// try different color bits
+				screen = SDL_SetVideoMode(resW, resH, i, flags);
 				if(screen != 0) {
 					break;
 				}
 			}
-		}
-		if(screen == 0) {
-			for(int i = 32; i >= 8; i-=8) {
-				// try to revert to 640x480
-				screen = SDL_SetVideoMode(640, 480, i, flags);
-				if(screen != 0) {
-					break;
+
+			if(screen == 0) {
+				for(int i = 32; i >= 8; i-=8) {
+					// try to revert to 800x600
+					screen = SDL_SetVideoMode(800, 600, i, flags);
+					if(screen != 0) {
+						break;
+					}
 				}
 			}
+			if(screen == 0) {
+				for(int i = 32; i >= 8; i-=8) {
+					// try to revert to 640x480
+					screen = SDL_SetVideoMode(640, 480, i, flags);
+					if(screen != 0) {
+						break;
+					}
+				}
+			}
+
+			if(screen == 0) {
+				throw std::runtime_error(msg.str());
+			}
 		}

-		if(screen == 0) {
-			throw std::runtime_error(msg.str());
-		}
+		SDL_WM_GrabInput(SDL_GRAB_OFF);
 	}
-
-	SDL_WM_GrabInput(SDL_GRAB_OFF);
 }

 void PlatformContextGl::end() {
@@ -185,7 +187,9 @@ void PlatformContextGl::makeCurrent() {
 }

 void PlatformContextGl::swapBuffers() {
-	SDL_GL_SwapBuffers();
+	if(Window::getMasterserverMode() == false) {
+		SDL_GL_SwapBuffers();
+	}
 }
 	
 	
--- a/source/shared_lib/sources/platform/sdl/window.cpp
+++ b/source/shared_lib/sources/platform/sdl/window.cpp
@@ -60,6 +60,8 @@ int Window::lastShowMouseState = 0;

 bool Window::tryVSynch = false;

+bool Window::masterserverMode = false;
+
 // ========== PUBLIC ==========

 Window::Window()  {
@@ -356,39 +358,41 @@ void Window::setupGraphicsScreen(int depthBits, int stencilBits, bool hardware_a
 	if(stencilBits >= 0)
 		newStencilBits = stencilBits;

-	if(fullscreen_anti_aliasing == true) {
-		SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS,1);
-		SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 2);
-	}
-	if(hardware_acceleration == true) {
-		SDL_GL_SetAttribute(SDL_GL_ACCELERATED_VISUAL, 1);
-	}
-	SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
-	SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 1);
-	SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 1);
-	SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 1);
-	SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, newStencilBits);
-	SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, newDepthBits);
+	if(Window::masterserverMode == false) {
+		if(fullscreen_anti_aliasing == true) {
+			SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS,1);
+			SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 2);
+		}
+		if(hardware_acceleration == true) {
+			SDL_GL_SetAttribute(SDL_GL_ACCELERATED_VISUAL, 1);
+		}
+		SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+		SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 1);
+		SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 1);
+		SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 1);
+		SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, newStencilBits);
+		SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, newDepthBits);

-	//const SDL_VideoInfo *info = SDL_GetVideoInfo();
-#ifdef SDL_GL_SWAP_CONTROL
-    if(Window::tryVSynch == true) {
-    	/* we want vsync for smooth scrolling */
-    	SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, 1);
-    }
-#endif
+		//const SDL_VideoInfo *info = SDL_GetVideoInfo();
+	#ifdef SDL_GL_SWAP_CONTROL
+		if(Window::tryVSynch == true) {
+			/* we want vsync for smooth scrolling */
+			SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, 1);
+		}
+	#endif

-	// setup LOD bias factor
-	//const float lodBias = std::max(std::min( configHandler->Get("TextureLODBias", 0.0f) , 4.0f), -4.0f);
-	const float lodBias = max(min(0.0f,4.0f),-4.0f);
-	//if(SystemFlags::VERBOSE_MODE_ENABLED) printf ("\n\n\n\n\n$$$$ In [%s::%s Line: %d] lodBias = %f\n\n",__FILE__,__FUNCTION__,__LINE__,lodBias);
-#ifdef USE_STREFLOP
-	if (streflop::fabs(lodBias) > 0.01f) {
-#else
-	if (fabs(lodBias) > 0.01f) {
-#endif
-		glTexEnvf(GL_TEXTURE_FILTER_CONTROL,GL_TEXTURE_LOD_BIAS, lodBias );
-	}
+		// setup LOD bias factor
+		//const float lodBias = std::max(std::min( configHandler->Get("TextureLODBias", 0.0f) , 4.0f), -4.0f);
+		const float lodBias = max(min(0.0f,4.0f),-4.0f);
+		//if(SystemFlags::VERBOSE_MODE_ENABLED) printf ("\n\n\n\n\n$$$$ In [%s::%s Line: %d] lodBias = %f\n\n",__FILE__,__FUNCTION__,__LINE__,lodBias);
+	#ifdef USE_STREFLOP
+		if (streflop::fabs(lodBias) > 0.01f) {
+	#else
+		if (fabs(lodBias) > 0.01f) {
+	#endif
+			glTexEnvf(GL_TEXTURE_FILTER_CONTROL,GL_TEXTURE_LOD_BIAS, lodBias );
+		}
+		}
 }

 #ifdef WIN32
@@ -416,59 +420,61 @@ void Window::toggleFullscreen() {
 	Use 0 for Height, Width, and Color Depth to keep the current values. */

 	if(Window::allowAltEnterFullscreenToggle == true) {
-		SDL_Surface *cur_surface = SDL_GetVideoSurface();
-		if(cur_surface != NULL) {
-			Window::isFullScreen = !((cur_surface->flags & SDL_FULLSCREEN) == SDL_FULLSCREEN);
-		}
+		if(this->masterserverMode == false) {
+			SDL_Surface *cur_surface = SDL_GetVideoSurface();
+			if(cur_surface != NULL) {
+				Window::isFullScreen = !((cur_surface->flags & SDL_FULLSCREEN) == SDL_FULLSCREEN);
+			}

-		SDL_Surface *sf = SDL_GetVideoSurface();
-		SDL_Surface **surface = &sf;
-		uint32 *flags = NULL;
-		//void *pixels = NULL;
-		//SDL_Color *palette = NULL;
-		SDL_Rect clip;
-		//int ncolors = 0;
-		Uint32 tmpflags = 0;
-		int w = 0;
-		int h = 0;
-		int bpp = 0;
+			SDL_Surface *sf = SDL_GetVideoSurface();
+			SDL_Surface **surface = &sf;
+			uint32 *flags = NULL;
+			//void *pixels = NULL;
+			//SDL_Color *palette = NULL;
+			SDL_Rect clip;
+			//int ncolors = 0;
+			Uint32 tmpflags = 0;
+			int w = 0;
+			int h = 0;
+			int bpp = 0;

-		if ( (!surface) || (!(*surface)) )  // don't bother if there's no surface.
-			return;
+			if ( (!surface) || (!(*surface)) )  // don't bother if there's no surface.
+				return;

-		if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s %d]\n",__FILE__,__FUNCTION__,__LINE__);
-
-		tmpflags = (*surface)->flags;
-		w = (*surface)->w;
-		h = (*surface)->h;
-		bpp = (*surface)->format->BitsPerPixel;
-
-		if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s %d]\n w = %d, h = %d, bpp = %d",__FILE__,__FUNCTION__,__LINE__,w,h,bpp);
-
-		if (flags == NULL)  // use the surface's flags.
-			flags = &tmpflags;
-
-		//
-		if ( *flags & SDL_FULLSCREEN )
-			*flags &= ~SDL_FULLSCREEN;
-		//
-		else
-			*flags |= SDL_FULLSCREEN;
-
-		SDL_GetClipRect(*surface, &clip);
-
-		if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s %d]\n",__FILE__,__FUNCTION__,__LINE__);
-
-		*surface = SDL_SetVideoMode(w, h, bpp, (*flags));
-
-		if (*surface == NULL) {
 			if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s %d]\n",__FILE__,__FUNCTION__,__LINE__);
-			*surface = SDL_SetVideoMode(w, h, bpp, tmpflags);
-		} // if

-		if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s %d]\n",__FILE__,__FUNCTION__,__LINE__);
+			tmpflags = (*surface)->flags;
+			w = (*surface)->w;
+			h = (*surface)->h;
+			bpp = (*surface)->format->BitsPerPixel;

-		SDL_SetClipRect(*surface, &clip);
+			if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s %d]\n w = %d, h = %d, bpp = %d",__FILE__,__FUNCTION__,__LINE__,w,h,bpp);
+
+			if (flags == NULL)  // use the surface's flags.
+				flags = &tmpflags;
+
+			//
+			if ( *flags & SDL_FULLSCREEN )
+				*flags &= ~SDL_FULLSCREEN;
+			//
+			else
+				*flags |= SDL_FULLSCREEN;
+
+			SDL_GetClipRect(*surface, &clip);
+
+			if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s %d]\n",__FILE__,__FUNCTION__,__LINE__);
+
+			*surface = SDL_SetVideoMode(w, h, bpp, (*flags));
+
+			if (*surface == NULL) {
+				if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s %d]\n",__FILE__,__FUNCTION__,__LINE__);
+				*surface = SDL_SetVideoMode(w, h, bpp, tmpflags);
+			} // if
+
+			if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s %d]\n",__FILE__,__FUNCTION__,__LINE__);
+
+			SDL_SetClipRect(*surface, &clip);
+		}
 	}
 	else {
 		HWND handle = GetSDLWindow();
@@ -489,10 +495,13 @@ void Window::toggleFullscreen() {
 #else
 	if(Window::allowAltEnterFullscreenToggle == true) {
 		if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s %d]\n",__FILE__,__FUNCTION__,__LINE__);
-		SDL_Surface *cur_surface = SDL_GetVideoSurface();
-		if(cur_surface != NULL) {
-			if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s %d]\n",__FILE__,__FUNCTION__,__LINE__);
-			SDL_WM_ToggleFullScreen(cur_surface);
+
+		if(Window::masterserverMode == false) {
+			SDL_Surface *cur_surface = SDL_GetVideoSurface();
+			if(cur_surface != NULL) {
+				if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s %d]\n",__FILE__,__FUNCTION__,__LINE__);
+				SDL_WM_ToggleFullScreen(cur_surface);
+			}
 		}
 		if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s %d]\n",__FILE__,__FUNCTION__,__LINE__);
 	}