[gameui] Enable borderless window support

Author: dimhotepus

appframework/VguiMatSysApp.cpp

@@ -268,14 +268,8 @@ void* CVguiMatSysApp::GetAppWindow()
 bool CVguiMatSysApp::SetVideoMode( )
 {
 	MaterialSystem_Config_t config;
-	if ( CommandLine()->CheckParm( "-fullscreen" ) )
-	{
-		config.SetFlag( MATSYS_VIDCFG_FLAGS_WINDOWED, false );
-	}
-	else
-	{
-		config.SetFlag( MATSYS_VIDCFG_FLAGS_WINDOWED, true );
-	}
+	config.SetFlag( MATSYS_VIDCFG_FLAGS_WINDOWED, !CommandLine()->CheckParm( "-fullscreen" ) );
+	config.SetFlag( MATSYS_VIDCFG_FLAGS_BORDERLESS, !!CommandLine()->CheckParm( "-noborder" ) );
 
 	if ( CommandLine()->CheckParm( "-resizing" ) )
 	{

engine/cl_demo.cpp

@@ -1804,7 +1804,7 @@ void CDemoPlayer::WriteTimeDemoResults( void )
 	g_pFileSystem->FPrintf( fileHandle, "%i,", frames );
 	g_pFileSystem->FPrintf( fileHandle, "%i,", width );
 	g_pFileSystem->FPrintf( fileHandle, "%i,", height );
-	g_pFileSystem->FPrintf( fileHandle, "%s,", config.Windowed() ? "windowed" : "fullscreen");
+	g_pFileSystem->FPrintf( fileHandle, "%s,", config.Windowed() ? (config.Borderless() ? "windowed borderless" : "windowed") : "fullscreen");
 	g_pFileSystem->FPrintf( fileHandle, "%s,", mat_vsync.GetBool() ? "on" : "off" );
 	g_pFileSystem->FPrintf( fileHandle, "%d,", mat_antialias.GetInt() );
 	g_pFileSystem->FPrintf( fileHandle, "%d,", mat_forceaniso.GetInt() );

engine/ivideomode.h

@@ -36,13 +36,13 @@ abstract_class IVideoMode
 	virtual void			DrawStartupGraphic() = 0;
 
 	// Creates the game window, plays the startup movie, starts up the material system
-	virtual bool			CreateGameWindow( int nWidth, int nHeight, bool bWindowed ) = 0;
+	virtual bool			CreateGameWindow( int nWidth, int nHeight, bool bWindowed, bool bBorderless ) = 0;
 
 	// Sets the game window in editor mode
 	virtual void			SetGameWindow( void *hWnd ) = 0;
 
 	// Sets the video mode, and re-sizes the window
-	virtual bool			SetMode( int nWidth, int nHeight, bool bWindowed ) = 0;
+	virtual bool			SetMode( int nWidth, int nHeight, bool bWindowed, bool bBorderless ) = 0;
 
 	// Returns the fullscreen modes for the adapter the game was started on
 	virtual int				GetModeCount( void ) = 0;
@@ -96,6 +96,8 @@ abstract_class IVideoMode
 	virtual bool			TakeSnapshotJPEGToBuffer( CUtlBuffer& buf, int quality ) = 0;
 
 	virtual void			ReadScreenPixels( int x, int y, int w, int h, void *pBuffer, ImageFormat format ) = 0;
+
+	virtual bool			IsBorderlessMode() const = 0;
 };
 
 //-----------------------------------------------------------------------------

engine/matsys_interface.cpp

@@ -409,6 +409,7 @@ static void ReadMaterialSystemConfigFromRegistry( MaterialSystem_Config_t &confi
 	ReadVideoConfigInt( "ScreenWidth", &config.m_VideoMode.m_Width );
 	ReadVideoConfigInt( "ScreenHeight", &config.m_VideoMode.m_Height );
 	config.SetFlag( MATSYS_VIDCFG_FLAGS_WINDOWED, ReadVideoConfigInt( "ScreenWindowed", 0 ) != 0 );
+	config.SetFlag( MATSYS_VIDCFG_FLAGS_BORDERLESS, ReadVideoConfigInt( "ScreenNoBorder", 0 ) != 0 );
 #if defined( USE_SDL ) && !defined( SWDS )
 	// Read the ScreenDisplayIndex and set sdl_displayindex if it's there.
 	static ConVarRef conVar( "sdl_displayindex" );
@@ -540,6 +541,7 @@ static void WriteMaterialSystemConfigToRegistry( const MaterialSystem_Config_t &
 	WriteVideoConfigInt( "ScreenWidth", config.m_VideoMode.m_Width );
 	WriteVideoConfigInt( "ScreenHeight", config.m_VideoMode.m_Height );
 	WriteVideoConfigInt( "ScreenWindowed", config.Windowed() );
+	WriteVideoConfigInt( "ScreenNoBorder", config.Borderless() );
 	WriteVideoConfigInt( "ScreenMSAA", config.m_nAASamples );
 	WriteVideoConfigInt( "ScreenMSAAQuality", config.m_nAAQuality );
 	WriteVideoConfigInt( "MotionBlur", config.m_bMotionBlur ? 1 : 0 );
@@ -600,6 +602,12 @@ static void OverrideMaterialSystemConfigFromCommandLine( MaterialSystem_Config_t
 		config.SetFlag( MATSYS_VIDCFG_FLAGS_WINDOWED, false );
 	}
 
+	// Check window is borderless
+	if ( CommandLine()->FindParm( "-noborder" ) )
+	{
+		config.SetFlag( MATSYS_VIDCFG_FLAGS_BORDERLESS, true );
+	}
+
 	// Get width and height
 	if ( CommandLine()->FindParm( "-width" ) || CommandLine()->FindParm( "-w" ) )
 	{
@@ -859,6 +867,7 @@ void GetMaterialSystemConfigForBenchmarkUpload(KeyValues *dataToUpload)
 	dataToUpload->SetInt( "ShadowDepthTexture", g_pMaterialSystemConfig->ShadowDepthTexture() );
 	dataToUpload->SetInt( "MotionBlur", g_pMaterialSystemConfig->MotionBlur() );
 	dataToUpload->SetInt( "Windowed", (g_pMaterialSystemConfig->m_Flags & MATSYS_VIDCFG_FLAGS_WINDOWED) ? 1 : 0 );
+	dataToUpload->SetInt( "Borderless", (g_pMaterialSystemConfig->m_Flags & MATSYS_VIDCFG_FLAGS_BORDERLESS) ? 1 : 0 );
 	dataToUpload->SetInt( "Trilinear", (g_pMaterialSystemConfig->m_Flags & MATSYS_VIDCFG_FLAGS_FORCE_TRILINEAR) ? 1 : 0 );
 	dataToUpload->SetInt( "ForceHWSync", (g_pMaterialSystemConfig->m_Flags & MATSYS_VIDCFG_FLAGS_FORCE_HWSYNC) ? 1 : 0 );
 	dataToUpload->SetInt( "NoWaitForVSync", (g_pMaterialSystemConfig->m_Flags & MATSYS_VIDCFG_FLAGS_NO_WAIT_FOR_VSYNC) ? 1 : 0 );
@@ -891,6 +900,7 @@ void PrintMaterialSystemConfig( const MaterialSystem_Config_t &config )
 	Warning( "dxSupportLevel: %d\n", config.dxSupportLevel );
 	Warning( "monitorGamma: %f\n", config.m_fMonitorGamma );
 	Warning( "MATSYS_VIDCFG_FLAGS_WINDOWED: %s\n", ( config.m_Flags & MATSYS_VIDCFG_FLAGS_WINDOWED ) ? "true" : "false" );
+	Warning( "MATSYS_VIDCFG_FLAGS_BORDERLESS: %s\n", ( config.m_Flags & MATSYS_VIDCFG_FLAGS_BORDERLESS ) ? "true" : "false" );
 	Warning( "MATSYS_VIDCFG_FLAGS_FORCE_TRILINEAR: %s\n", ( config.m_Flags & MATSYS_VIDCFG_FLAGS_FORCE_TRILINEAR ) ? "true" : "false" );
 	Warning( "MATSYS_VIDCFG_FLAGS_FORCE_HWSYNC: %s\n", ( config.m_Flags & MATSYS_VIDCFG_FLAGS_FORCE_HWSYNC ) ? "true" : "false" );
 	Warning( "MATSYS_VIDCFG_FLAGS_DISABLE_SPECULAR: %s\n", ( config.m_Flags & MATSYS_VIDCFG_FLAGS_DISABLE_SPECULAR ) ? "true" : "false" );
@@ -913,16 +923,22 @@ CON_COMMAND( mat_configcurrent, "show the current video control panel config for
 }
 
 #if !defined(SWDS) && !defined( _X360 )
-CON_COMMAND( mat_setvideomode, "sets the width, height, windowed state of the material system" )
+CON_COMMAND( mat_setvideomode, "sets the width, height, windowed state and optional borderless state of the material system" )
 {
-	if ( args.ArgC() != 4 )
+	if ( args.ArgC() < 4 || args.ArgC() > 5 )
 		return;
 
 	int nWidth = Q_atoi( args[1] );
 	int nHeight = Q_atoi( args[2] );
-	bool bWindowed = Q_atoi( args[3] ) > 0 ? true : false;
+	bool bWindowed = Q_atoi( args[3] ) > 0;
+	bool bBorderless = args.ArgC() == 5 && Q_atoi( args[4] ) > 0;
+
+	if ( !bWindowed && bBorderless )
+	{
+		Warning( "Can't set borderless state when not windowed.\n" );
+	}
 
-	videomode->SetMode( nWidth, nHeight, bWindowed );
+	videomode->SetMode( nWidth, nHeight, bWindowed, bBorderless );
 }
 #endif
 

engine/sys_dll2.cpp

@@ -1670,9 +1670,12 @@ bool CEngineAPI::ModInit( const char *pModName, const char *pGameDir )
 	bool bWindowed = g_pMaterialSystemConfig->Windowed() ||
 		// at init time we never want to start up full screen
 		g_pMaterialSystemConfig->m_nVRModeAdapter != UINT_MAX;
+	bool bBorderless = g_pMaterialSystemConfig->Borderless() ||
+		// at init time we never want to start up full screen
+		g_pMaterialSystemConfig->m_nVRModeAdapter != UINT_MAX;
 
 	return videomode &&
-		   videomode->CreateGameWindow( width, height, bWindowed );
+		   videomode->CreateGameWindow( width, height, bWindowed, bBorderless );
 }
 
 void CEngineAPI::ModShutdown()