client: add r_noborder mode

Author: snappas

cmake/WolfBuildClient.cmake

@@ -106,7 +106,7 @@ endif()
 endfunction()
 
 if(WOLF_64BITS)
-	#setup_client(wolfmp_gl_x64 FALSE)
+	setup_client(wolfmp_gl_x64 FALSE)
 	setup_client(wolfmp_vk_x64 TRUE)
 else()
 	setup_client(wolfmp_gl_x86 FALSE)

src/renderer_gl/tr_init.c

@@ -199,6 +199,8 @@ int max_polys;
 cvar_t  *r_maxpolyverts;
 int max_polyverts;
 
+cvar_t	*r_noborder;
+
 
 void ( APIENTRY * qglMultiTexCoord2fARB )( GLenum texture, GLfloat s, GLfloat t );
 void ( APIENTRY * qglActiveTextureARB )( GLenum texture );
@@ -1102,6 +1104,8 @@ void R_Register( void ) {
 	r_maxpolys = ri.Cvar_Get( "r_maxpolys", va( "%d", MAX_POLYS ), 0 );
 	r_maxpolyverts = ri.Cvar_Get( "r_maxpolyverts", va( "%d", MAX_POLYVERTS ), 0 );
 
+	r_noborder = ri.Cvar_Get("r_noborder", "0", CVAR_ARCHIVE | CVAR_LATCH);
+
 	r_highQualityVideo = ri.Cvar_Get( "r_highQualityVideo", "1", CVAR_ARCHIVE );
 	// make sure all the commands added here are also
 	// removed in R_Shutdown

src/renderer_gl/tr_local.h

@@ -1151,6 +1151,8 @@ extern cvar_t   *r_wolffog;
 // done
 
 extern cvar_t  *r_highQualityVideo;
+
+extern cvar_t *r_noborder;
 //====================================================================
 
 float R_NoiseGet4f( float x, float y, float z, float t );

src/renderer_vk/tr_init.c

@@ -178,6 +178,8 @@ cvar_t *r_sleepThreshold;
 cvar_t *r_msaa;
 cvar_t *r_alphaboost;
 
+cvar_t	*r_noborder;
+
 //-------------------------------------------------------------------------------
 // Ridah, mesh compression
 float r_anormals[NUMMDCVERTEXNORMALS][3] = {
@@ -862,6 +864,8 @@ void R_Register( void ) {
 	r_msaa = ri.Cvar_Get("r_msaa", "8", CVAR_ARCHIVE | CVAR_LATCH);
 	r_alphaboost = ri.Cvar_Get("r_alphaboost", "1.0", CVAR_ARCHIVE);
 
+	r_noborder = ri.Cvar_Get("r_noborder", "0", CVAR_ARCHIVE | CVAR_LATCH);
+
 	// make sure all the commands added here are also
 	// removed in R_Shutdown
 	ri.Cmd_AddCommand( "imagelist", R_ImageList_f );

src/renderer_vk/tr_local.h

@@ -1205,6 +1205,8 @@ extern cvar_t	*r_sleepThreshold;		// time cushion in us for a call to Sleep(1+)
 
 extern cvar_t *r_msaa;
 extern cvar_t *r_alphaboost;
+
+extern cvar_t *r_noborder;
 //====================================================================
 
 float R_NoiseGet4f( float x, float y, float z, float t );

src/win32/win_glimp.c

@@ -524,7 +524,7 @@ static qboolean GLW_InitDriver( const char *drivername, int colorbits ) {
 static qboolean GLW_CreateWindow( const char *drivername, int width, int height, int colorbits, qboolean cdsFullscreen ) {
 	RECT r;
 	cvar_t          *vid_xpos, *vid_ypos;
-	int stylebits;
+	unsigned long stylebits = WS_VISIBLE | WS_CLIPCHILDREN;
 	int x, y, w, h;
 	int exstyle;
 
@@ -572,7 +572,13 @@ static qboolean GLW_CreateWindow( const char *drivername, int width, int height,
 		} else
 		{
 			exstyle = 0;
-			stylebits = WINDOW_STYLE | WS_SYSMENU;
+			g_wv.noborder = r_noborder->integer;
+			if (g_wv.noborder){
+				stylebits |= WS_POPUP;
+			}else{
+				stylebits |= (WS_BORDER | WS_OVERLAPPED | WS_CAPTION | WS_MINIMIZEBOX);
+			}
+			stylebits |=  WS_VISIBLE | WS_SYSMENU;
 			AdjustWindowRect( &r, stylebits, FALSE );
 		}
 

src/win32/win_local.h

@@ -120,7 +120,7 @@ typedef struct
 
 	qbool		inputInitialized;
 	qbool		duringCreateWindow;	// qtrue during the call to CreateWindow
-
+	qbool       noborder;
 } WinVars_t;
 
 extern WinVars_t g_wv;

src/win32/win_vkimp.c

@@ -126,7 +126,13 @@ static qbool VKW_CreateWindow()
 		}
 		else
 		{
-			style |= WS_OVERLAPPED | WS_BORDER | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX;
+			g_wv.noborder = r_noborder->integer;
+			if (g_wv.noborder){
+				style |= WS_POPUP;
+			}else{
+				style |= WS_BORDER | WS_OVERLAPPED | WS_CAPTION | WS_MINIMIZEBOX;
+			}
+			style |=  WS_VISIBLE | WS_SYSMENU;
 			AdjustWindowRect( &r, style, FALSE );
 		}
 

src/win32/win_wndproc.c

@@ -374,6 +374,43 @@ LRESULT CALLBACK MainWndProc(
 	}
 	break;
 
+	case WM_WINDOWPOSCHANGING:
+		if (g_wv.noborder)
+		{
+			WINDOWPOS* pos = (LPWINDOWPOS)lParam;
+			const int threshold = 10;
+			HMONITOR hMonitor;
+			MONITORINFO mi;
+			const RECT* r;
+			RECT rr;
+
+			rr.left = pos->x;
+			rr.right = pos->x + pos->cx;
+			rr.top = pos->y;
+			rr.bottom = pos->y + pos->cy;
+			hMonitor = MonitorFromRect(&rr, MONITOR_DEFAULTTOPRIMARY);
+
+			if (hMonitor)
+			{
+				mi.cbSize = sizeof(mi);
+				GetMonitorInfo(hMonitor, &mi);
+				r = &mi.rcWork;
+
+				if (pos->x >= (r->left - threshold) && pos->x <= (r->left + threshold))
+					pos->x = r->left;
+				else if ((pos->x + pos->cx) >= (r->right - threshold) && (pos->x + pos->cx) <= (r->right + threshold))
+					pos->x = (r->right - pos->cx);
+
+				if (pos->y >= (r->top - threshold) && pos->y <= (r->top + threshold))
+					pos->y = r->top;
+				else if ((pos->y + pos->cy) >= (r->bottom - threshold) && (pos->y + pos->cy) <= (r->bottom + threshold))
+					pos->y = (r->bottom - pos->cy);
+
+				return 0;
+			}
+		}
+		break;
+
 	case WM_MOVE:
 	{
 		int xPos, yPos;
@@ -468,6 +505,13 @@ LRESULT CALLBACK MainWndProc(
 	case WM_CHAR:
 		Sys_QueEvent( g_wv.sysMsgTime, SE_CHAR, wParam, 0, 0, NULL );
 		break;
+
+	case WM_NCHITTEST:
+		if (g_wv.noborder && GetKeyState(VK_CONTROL) & (1 << 15))
+		{
+			return HTCAPTION;
+		}
+		break;
 	}
 
 	return DefWindowProc( hWnd, uMsg, wParam, lParam );