Commit: d7f03c3afd90bfaf1d7e3a8ca341c670cbe6271f - zandronum-macos (hg)

This is a fork of Zandronum for Mac Os (Silicon and Intel)

Commit MetaInfo

• Revisión: d7f03c3afd90bfaf1d7e3a8ca341c670cbe6271f (tree)
• Tiempo: 2023-01-23 18:48:43
• Autor: Joshua Surace <doomjoshuaboy@live...>
• Commiter: Joshua Surace

Log Message

SDL Fixes

Cambiar Resumen

• modified: src/sdl/crashcatcher.c
• modified: src/sdl/i_input.cpp
• modified: src/sdl/i_main.cpp
• modified: src/sdl/sdlglvideo.cpp
• modified: src/sdl/sdlglvideo.h

Diferencia incremental

diff -r c1f472a776fa -r d7f03c3afd90 src/sdl/crashcatcher.c
--- a/src/sdl/crashcatcher.c	Mon Jan 23 20:43:01 2023 +1100
+++ b/src/sdl/crashcatcher.c	Mon Jan 23 20:48:43 2023 +1100
@@ -10,6 +10,15 @@
 #include <errno.h>
 #include <limits.h>
 
+// [EP] Header for the timestamp appending to crash log filename.
+#include <time.h>
+
+// Solaris doesn't have SA_ONESHOT
+// According to the Linux header this is the same.
+#ifndef SA_ONESHOT
+#define SA_ONESHOT SA_RESETHAND
+#endif
+
 #ifdef __linux__
 #include <sys/prctl.h>
 #ifndef PR_SET_PTRACER
@@ -137,6 +146,7 @@
 		           "shell echo \"\"\n"
 		           "shell echo \"* Backtrace\"\n"
 		           "thread apply all backtrace full\n"
+		           "gcore\n" // [EP] try to create a core dump ...
 		           "detach\n"
 		           "quit\n", pid);
 		fclose(f);
@@ -170,6 +180,15 @@
 	putchar('\n');
 	fflush(stdout);
 #endif
+	// [BB] Also log the gdb version.
+	FILE *IN = popen ( "gdb --version", "r" );
+	if ( IN )  {
+		char gdbversion[1024];
+		if ( fgets(gdbversion, 1024, IN) )
+			puts(gdbversion);
+
+		pclose(IN);
+	}
 }
 
 
@@ -265,6 +284,9 @@
 	const char *sigdesc = "";
 	int i;
 
+	// [EP/TP] Will contain the new log filename if necessary.
+	char newLogfile[64];
+
 	if(fread(&crash_info, sizeof(crash_info), 1, stdin) != 1)
 	{
 		fprintf(stderr, "!!! Failed to retrieve info from crashed process\n");
@@ -337,6 +359,23 @@
 
 	if(logfile)
 	{
+		// [EP/TP] Append the timestamp and the process id to the crash log filename.
+		time_t timestamp;
+
+		time( &timestamp );
+		char *bufferEnd = newLogfile + sizeof( newLogfile );
+		snprintf( newLogfile, sizeof( newLogfile ), "%s", logfile );
+
+		char *appendPoint = strchr( newLogfile, '.' );
+		if ( appendPoint == NULL )
+			appendPoint = newLogfile + strlen( newLogfile );
+
+		appendPoint += strftime( appendPoint, bufferEnd - appendPoint, "-%m_%d_%Y-%H_%M_%S", localtime( &timestamp ) );
+
+		snprintf( appendPoint, bufferEnd - appendPoint, ".%d.log", (int)crash_info.pid );
+
+		logfile = (const char *)newLogfile;
+
 		/* Create crash log file and redirect shell output to it */
 		if(freopen(logfile, "wa", stdout) != stdout)
 		{
@@ -365,6 +404,7 @@
 		kill(crash_info.pid, SIGKILL);
 	}
 
+#ifndef SERVER_ONLY // [BB] The Linux server doesn't have a GUI, so don't bother it with a window.
 	if(logfile)
 	{
 		const char *str;
@@ -379,6 +419,7 @@
 
 		system(buf);
 	}
+#endif
 	exit(0);
 }
 

diff -r c1f472a776fa -r d7f03c3afd90 src/sdl/i_input.cpp
--- a/src/sdl/i_input.cpp	Mon Jan 23 20:43:01 2023 +1100
+++ b/src/sdl/i_input.cpp	Mon Jan 23 20:48:43 2023 +1100
@@ -256,32 +256,32 @@
 
 static void I_CheckNativeMouse ()
 {
-    bool focus = SDL_GetKeyboardFocus() != NULL;
-    bool fs = screen->IsFullscreen();
-    
-    bool wantNative = !focus || (!use_mouse || GUICapture || paused || demoplayback || !inGame());
+	bool focus = SDL_GetKeyboardFocus() != NULL;
+	bool fs = screen->IsFullscreen();
+	
+	bool wantNative = !focus || (!use_mouse || GUICapture || paused || demoplayback || !inGame());
 
-    if (wantNative != NativeMouse)
-    {
-        NativeMouse = wantNative;
-        SDL_ShowCursor (wantNative);
-        if (wantNative)
-            I_ReleaseMouseCapture ();
-        else
-            I_SetMouseCapture ();
-    }
+	if (wantNative != NativeMouse)
+	{
+		NativeMouse = wantNative;
+		SDL_ShowCursor (wantNative);
+		if (wantNative)
+			I_ReleaseMouseCapture ();
+		else
+			I_SetMouseCapture ();
+	}
 }
 
 void MessagePump (const SDL_Event &sev)
 {
-    static int lastx = 0, lasty = 0;
-    int x, y;
-    event_t event = { 0,0,0,0,0,0,0 };
-    
-    switch (sev.type)
-    {
-    case SDL_QUIT:
-        exit (0);
+	static int lastx = 0, lasty = 0;
+	int x, y;
+	event_t event = { 0,0,0,0,0,0,0 };
+	
+	switch (sev.type)
+	{
+	case SDL_QUIT:
+		exit (0);
 
             
     case SDL_WINDOWEVENT:
@@ -293,211 +293,219 @@
                 break;
         }
         break;
-            
-
-    case SDL_MOUSEBUTTONDOWN:
-    case SDL_MOUSEBUTTONUP:
-    case SDL_MOUSEMOTION:
-        if (!GUICapture || sev.button.button == 4 || sev.button.button == 5)
-        {
-            if(sev.type != SDL_MOUSEMOTION)
-            {
-                event.type = sev.type == SDL_MOUSEBUTTONDOWN ? EV_KeyDown : EV_KeyUp;
-                /* These button mappings work with my Gentoo system using the
-                * evdev driver and a Logitech MX510 mouse. Whether or not they
-                * carry over to other Linux systems, I have no idea, but I sure
-                * hope so. (Though buttons 11 and 12 are kind of useless, since
-                * they also trigger buttons 4 and 5.)
-                */
-                switch (sev.button.button)
-                {
-                case SDL_BUTTON_LEFT:    event.data1 = KEY_MOUSE1;        break;
-                case SDL_BUTTON_MIDDLE:    event.data1 = KEY_MOUSE3;        break;
-                case SDL_BUTTON_RIGHT:    event.data1 = KEY_MOUSE2;        break;
-                case 8:        event.data1 = KEY_MOUSE4;        break; // For whatever reason my side mouse buttons are here.
-                case 9:        event.data1 = KEY_MOUSE5;        break;
-                case SDL_BUTTON_X1:        event.data1 = KEY_MOUSE6;        break; // And these don't exist
-                case SDL_BUTTON_X2:        event.data1 = KEY_MOUSE7;        break;
-                case 6:        event.data1 = KEY_MOUSE8;        break;
-                default:    printf("SDL mouse button %s %d\n",
-                    sev.type == SDL_MOUSEBUTTONDOWN ? "down" : "up", sev.button.button);    break;
-                }
-                if (event.data1 != 0)
-                {
-                    D_PostEvent(&event);
-                }
-            }
-        }
-        else if (sev.type == SDL_MOUSEMOTION || (sev.button.button >= 1 && sev.button.button <= 3))
-        {
-            int x, y;
-            SDL_GetMouseState (&x, &y);
-
-            event.data1 = x;
-            event.data2 = y;
-
-            screen->ScaleCoordsFromWindow(event.data1, event.data2);
-            
-            event.type = EV_GUI_Event;
-            if(sev.type == SDL_MOUSEMOTION)
-                event.subtype = EV_GUI_MouseMove;
-            else
-            {
-                event.subtype = sev.type == SDL_MOUSEBUTTONDOWN ? EV_GUI_LButtonDown : EV_GUI_LButtonUp;
-                event.subtype += (sev.button.button - 1) * 3;
-            }
-            D_PostEvent(&event);
-        }
-        break;
-
-    case SDL_MOUSEWHEEL:
-        if (GUICapture)
-        {
-            event.type = EV_GUI_Event;
-            event.subtype = sev.wheel.y > 0 ? EV_GUI_WheelUp : EV_GUI_WheelDown;
-            D_PostEvent (&event);
-        }
-        else
-        {
-            event.type = EV_KeyDown;
-            event.data1 = sev.wheel.y > 0 ? KEY_MWHEELUP : KEY_MWHEELDOWN;
-            D_PostEvent (&event);
-            event.type = EV_KeyUp;
-            D_PostEvent (&event);
-        }
-        break;
-
-    case SDL_KEYDOWN:
-    case SDL_KEYUP:
-        if (!GUICapture)
-        {
-            event.type = sev.type == SDL_KEYDOWN ? EV_KeyDown : EV_KeyUp;
-
-            // Try to look up our key mapped key for conversion to DirectInput.
-            // If that fails, then we'll do a lookup against the scan code,
-            // which may not return the right key, but at least the key should
-            // work in the game.
-            if (const BYTE *dik = KeySymToDIK.CheckKey (sev.key.keysym.sym))
-                event.data1 = *dik;
-            else if (const BYTE *dik = KeyScanToDIK.CheckKey (sev.key.keysym.scancode))
-                event.data1 = *dik;
 
-            if (event.data1)
-            {
-                if (sev.key.keysym.sym < 256)
-                {
-                    event.data2 = sev.key.keysym.sym;
-                }
-                D_PostEvent (&event);
-            }
-        }
-        else
-        {
-            event.type = EV_GUI_Event;
-            event.subtype = sev.type == SDL_KEYDOWN ? EV_GUI_KeyDown : EV_GUI_KeyUp;
-            event.data3 = ((sev.key.keysym.mod & KMOD_SHIFT) ? GKM_SHIFT : 0) |
-                          ((sev.key.keysym.mod & KMOD_CTRL) ? GKM_CTRL : 0) |
-                          ((sev.key.keysym.mod & KMOD_ALT) ? GKM_ALT : 0);
-
-            if (event.subtype == EV_GUI_KeyDown)
-            {
-                if (DownState[sev.key.keysym.scancode])
-                {
-                    event.subtype = EV_GUI_KeyRepeat;
-                }
-                DownState[sev.key.keysym.scancode] = 1;
-            }
-            else
-            {
-                DownState[sev.key.keysym.scancode] = 0;
-            }
+	case SDL_MOUSEBUTTONDOWN:
+	case SDL_MOUSEBUTTONUP:
+	case SDL_MOUSEMOTION:
+		if (!GUICapture || sev.button.button == 4 || sev.button.button == 5)
+		{
+			if(sev.type != SDL_MOUSEMOTION)
+			{
+				event.type = sev.type == SDL_MOUSEBUTTONDOWN ? EV_KeyDown : EV_KeyUp;
+				/* These button mappings work with my Gentoo system using the
+				* evdev driver and a Logitech MX510 mouse. Whether or not they
+				* carry over to other Linux systems, I have no idea, but I sure
+				* hope so. (Though buttons 11 and 12 are kind of useless, since
+				* they also trigger buttons 4 and 5.)
+				*/
+				switch (sev.button.button)
+				{
+				case SDL_BUTTON_LEFT:	event.data1 = KEY_MOUSE1;		break;
+				case SDL_BUTTON_MIDDLE:	event.data1 = KEY_MOUSE3;		break;
+				case SDL_BUTTON_RIGHT:	event.data1 = KEY_MOUSE2;		break;
+				case 8:		event.data1 = KEY_MOUSE4;		break; // For whatever reason my side mouse buttons are here.
+				case 9:		event.data1 = KEY_MOUSE5;		break;
+				case SDL_BUTTON_X1:		event.data1 = KEY_MOUSE6;		break; // And these don't exist
+				case SDL_BUTTON_X2:		event.data1 = KEY_MOUSE7;		break;
+				case 6:		event.data1 = KEY_MOUSE8;		break;
+				default:	printf("SDL mouse button %s %d\n",
+					sev.type == SDL_MOUSEBUTTONDOWN ? "down" : "up", sev.button.button);	break;
+				}
+				if (event.data1 != 0)
+				{
+					D_PostEvent(&event);
+				}
+			}
+		}
+		else if (sev.type == SDL_MOUSEMOTION || (sev.button.button >= 1 && sev.button.button <= 3))
+		{
+			int x, y;
+			SDL_GetMouseState (&x, &y);
 
-            switch (sev.key.keysym.sym)
-            {
-            case SDLK_KP_ENTER:    event.data1 = GK_RETURN;    break;
-            case SDLK_PAGEUP:    event.data1 = GK_PGUP;        break;
-            case SDLK_PAGEDOWN:    event.data1 = GK_PGDN;        break;
-            case SDLK_END:        event.data1 = GK_END;        break;
-            case SDLK_HOME:        event.data1 = GK_HOME;        break;
-            case SDLK_LEFT:        event.data1 = GK_LEFT;        break;
-            case SDLK_RIGHT:    event.data1 = GK_RIGHT;        break;
-            case SDLK_UP:        event.data1 = GK_UP;        break;
-            case SDLK_DOWN:        event.data1 = GK_DOWN;        break;
-            case SDLK_DELETE:    event.data1 = GK_DEL;        break;
-            case SDLK_ESCAPE:    event.data1 = GK_ESCAPE;    break;
-            case SDLK_F1:        event.data1 = GK_F1;        break;
-            case SDLK_F2:        event.data1 = GK_F2;        break;
-            case SDLK_F3:        event.data1 = GK_F3;        break;
-            case SDLK_F4:        event.data1 = GK_F4;        break;
-            case SDLK_F5:        event.data1 = GK_F5;        break;
-            case SDLK_F6:        event.data1 = GK_F6;        break;
-            case SDLK_F7:        event.data1 = GK_F7;        break;
-            case SDLK_F8:        event.data1 = GK_F8;        break;
-            case SDLK_F9:        event.data1 = GK_F9;        break;
-            case SDLK_F10:        event.data1 = GK_F10;        break;
-            case SDLK_F11:        event.data1 = GK_F11;        break;
-            case SDLK_F12:        event.data1 = GK_F12;        break;
-            default:
-                if (sev.key.keysym.sym < 256)
-                {
-                    event.data1 = sev.key.keysym.sym;
-                }
-                break;
-            }
-            if (event.data1 < 128)
-            {
-                event.data1 = toupper(event.data1);
-                D_PostEvent (&event);
-            }
-        }
-        break;
+			event.data1 = x;
+			event.data2 = y;
 
-    case SDL_TEXTINPUT:
-        if (GUICapture)
-        {
-            event.type = EV_GUI_Event;
-            event.subtype = EV_GUI_Char;
-            event.data1 = sev.text.text[0];
-            D_PostEvent (&event);
-        }
-        break;
+			screen->ScaleCoordsFromWindow(event.data1, event.data2);
 
-    case SDL_JOYBUTTONDOWN:
-    case SDL_JOYBUTTONUP:
-        if (!GUICapture)
-        {
-            event.type = sev.type == SDL_JOYBUTTONDOWN ? EV_KeyDown : EV_KeyUp;
-            event.data1 = KEY_FIRSTJOYBUTTON + sev.jbutton.button;
-            if(event.data1 != 0)
-                D_PostEvent(&event);
-        }
-        break;
-    }
+			event.type = EV_GUI_Event;
+			if(sev.type == SDL_MOUSEMOTION)
+				event.subtype = EV_GUI_MouseMove;
+			else
+			{
+				event.subtype = sev.type == SDL_MOUSEBUTTONDOWN ? EV_GUI_LButtonDown : EV_GUI_LButtonUp;
+				event.subtype += (sev.button.button - 1) * 3;
+			}
+
+			SDL_Keymod kmod = SDL_GetModState();
+			event.data3 = ((kmod & KMOD_SHIFT) ? GKM_SHIFT : 0) |
+				((kmod & KMOD_CTRL) ? GKM_CTRL : 0) |
+				((kmod & KMOD_ALT) ? GKM_ALT : 0);
+
+			D_PostEvent(&event);
+		}
+		break;
+
+	case SDL_MOUSEWHEEL:
+		if (GUICapture)
+		{
+			event.type = EV_GUI_Event;
+			event.subtype = sev.wheel.y > 0 ? EV_GUI_WheelUp : EV_GUI_WheelDown;
+			SDL_Keymod kmod = SDL_GetModState();
+			event.data3 = ((kmod & KMOD_SHIFT) ? GKM_SHIFT : 0) |
+				((kmod & KMOD_CTRL) ? GKM_CTRL : 0) |
+				((kmod & KMOD_ALT) ? GKM_ALT : 0);
+			D_PostEvent (&event);
+		}
+		else
+		{
+			event.type = EV_KeyDown;
+			event.data1 = sev.wheel.y > 0 ? KEY_MWHEELUP : KEY_MWHEELDOWN;
+			D_PostEvent (&event);
+			event.type = EV_KeyUp;
+			D_PostEvent (&event);
+		}
+		break;
+
+	case SDL_KEYDOWN:
+	case SDL_KEYUP:
+		if (!GUICapture)
+		{
+			if (sev.key.repeat)
+			{
+				break;
+			}
+			
+			event.type = sev.type == SDL_KEYDOWN ? EV_KeyDown : EV_KeyUp;
+
+			// Try to look up our key mapped key for conversion to DirectInput.
+			// If that fails, then we'll do a lookup against the scan code,
+			// which may not return the right key, but at least the key should
+			// work in the game.
+			if (const uint8_t *dik = KeySymToDIK.CheckKey (sev.key.keysym.sym))
+				event.data1 = *dik;
+			else if (const uint8_t *dik = KeyScanToDIK.CheckKey (sev.key.keysym.scancode))
+				event.data1 = *dik;
+
+			if (event.data1)
+			{
+				if (sev.key.keysym.sym < 256)
+				{
+					event.data2 = sev.key.keysym.sym;
+				}
+				D_PostEvent (&event);
+			}
+		}
+		else
+		{
+			event.type = EV_GUI_Event;
+			event.subtype = sev.type == SDL_KEYDOWN ? EV_GUI_KeyDown : EV_GUI_KeyUp;
+			SDL_Keymod kmod = SDL_GetModState();
+			event.data3 = ((kmod & KMOD_SHIFT) ? GKM_SHIFT : 0) |
+				((kmod & KMOD_CTRL) ? GKM_CTRL : 0) |
+				((kmod & KMOD_ALT) ? GKM_ALT : 0);
+
+			if (event.subtype == EV_GUI_KeyDown && sev.key.repeat)
+			{
+				event.subtype = EV_GUI_KeyRepeat;
+			}
+
+			switch (sev.key.keysym.sym)
+			{
+			case SDLK_KP_ENTER:	event.data1 = GK_RETURN;	break;
+			case SDLK_PAGEUP:	event.data1 = GK_PGUP;		break;
+			case SDLK_PAGEDOWN:	event.data1 = GK_PGDN;		break;
+			case SDLK_END:		event.data1 = GK_END;		break;
+			case SDLK_HOME:		event.data1 = GK_HOME;		break;
+			case SDLK_LEFT:		event.data1 = GK_LEFT;		break;
+			case SDLK_RIGHT:	event.data1 = GK_RIGHT;		break;
+			case SDLK_UP:		event.data1 = GK_UP;		break;
+			case SDLK_DOWN:		event.data1 = GK_DOWN;		break;
+			case SDLK_DELETE:	event.data1 = GK_DEL;		break;
+			case SDLK_ESCAPE:	event.data1 = GK_ESCAPE;	break;
+			case SDLK_F1:		event.data1 = GK_F1;		break;
+			case SDLK_F2:		event.data1 = GK_F2;		break;
+			case SDLK_F3:		event.data1 = GK_F3;		break;
+			case SDLK_F4:		event.data1 = GK_F4;		break;
+			case SDLK_F5:		event.data1 = GK_F5;		break;
+			case SDLK_F6:		event.data1 = GK_F6;		break;
+			case SDLK_F7:		event.data1 = GK_F7;		break;
+			case SDLK_F8:		event.data1 = GK_F8;		break;
+			case SDLK_F9:		event.data1 = GK_F9;		break;
+			case SDLK_F10:		event.data1 = GK_F10;		break;
+			case SDLK_F11:		event.data1 = GK_F11;		break;
+			case SDLK_F12:		event.data1 = GK_F12;		break;
+			default:
+				if (sev.key.keysym.sym < 256)
+				{
+					event.data1 = sev.key.keysym.sym;
+				}
+				break;
+			}
+			if (event.data1 < 128)
+			{
+				event.data1 = toupper(event.data1);
+				D_PostEvent (&event);
+			}
+		}
+		break;
+
+	case SDL_TEXTINPUT:
+		if (GUICapture)
+		{
+			event.type = EV_GUI_Event;
+			event.subtype = EV_GUI_Char;
+			event.data1 = sev.text.text[0];
+			event.data2 = !!(SDL_GetModState() & KMOD_ALT);
+			D_PostEvent (&event);
+		}
+		break;
+
+	case SDL_JOYBUTTONDOWN:
+	case SDL_JOYBUTTONUP:
+		if (!GUICapture)
+		{
+			event.type = sev.type == SDL_JOYBUTTONDOWN ? EV_KeyDown : EV_KeyUp;
+			event.data1 = KEY_FIRSTJOYBUTTON + sev.jbutton.button;
+			if(event.data1 != 0)
+				D_PostEvent(&event);
+		}
+		break;
+	}
 }
 
 void I_GetEvent ()
 {
-    SDL_Event sev;
-    
-    while (SDL_PollEvent (&sev))
-    {
-        MessagePump (sev);
-    }
-    if (use_mouse)
-    {
-        MouseRead ();
-    }
+	SDL_Event sev;
+	
+	while (SDL_PollEvent (&sev))
+	{
+		MessagePump (sev);
+	}
+	if (use_mouse)
+	{
+		MouseRead ();
+	}
 }
 
 void I_StartTic ()
 {
-    I_CheckGUICapture ();
-    I_CheckNativeMouse ();
-    I_GetEvent ();
+	I_CheckGUICapture ();
+	I_CheckNativeMouse ();
+	I_GetEvent ();
 }
 
 void I_ProcessJoysticks ();
 void I_StartFrame ()
 {
-    I_ProcessJoysticks();
-}
+	I_ProcessJoysticks();
+}
\ No newline at end of file

diff -r c1f472a776fa -r d7f03c3afd90 src/sdl/i_main.cpp
--- a/src/sdl/i_main.cpp	Mon Jan 23 20:43:01 2023 +1100
+++ b/src/sdl/i_main.cpp	Mon Jan 23 20:48:43 2023 +1100
@@ -68,7 +68,7 @@
 // MACROS ------------------------------------------------------------------
 
 // The maximum number of functions that can be registered with atterm.
-#define MAX_TERMS    64
+#define MAX_TERMS	64
 
 // TYPES -------------------------------------------------------------------
 
@@ -259,9 +259,10 @@
     // Note that the LANG environment variable is overridden by LC_*
     setenv ("LC_NUMERIC", "C", 1);
 
-#ifndef NO_GTK
-    GtkAvailable = gtk_init_check (&argc, &argv);
-#endif
+// [BB] Patch from icculus for SDL 1.2 compatibility.
+// #ifndef NO_GTK
+//	GtkAvailable = gtk_init_check (&argc, &argv);
+// #endif
     
     setlocale (LC_ALL, "C");
 

diff -r c1f472a776fa -r d7f03c3afd90 src/sdl/sdlglvideo.cpp
--- a/src/sdl/sdlglvideo.cpp	Mon Jan 23 20:43:01 2023 +1100
+++ b/src/sdl/sdlglvideo.cpp	Mon Jan 23 20:48:43 2023 +1100
@@ -174,223 +174,218 @@
     PalEntry flashColor;
 //    int flashAmount;
 
-    if (old != NULL)
-    { // Reuse the old framebuffer if its attributes are the same
-        SDLGLFB *fb = static_cast<SDLGLFB *> (old);
-        if (fb->Width == width &&
-            fb->Height == height)
-        {
-            bool fsnow = (SDL_GetWindowFlags (fb->Screen) & SDL_WINDOW_FULLSCREEN_DESKTOP) != 0;
-    
-            if (fsnow != fullscreen)
-            {
-                SDL_SetWindowFullscreen (fb->Screen, fullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0);
-            }
-            return old;
-        }
-//        old->GetFlash (flashColor, flashAmount);
-        delete old;
-    }
-    else
-    {
-        flashColor = 0;
-//        flashAmount = 0;
-    }
-    
-    SDLGLFB *fb = new OpenGLFrameBuffer (0, width, height, 32, 60, fullscreen);
-    retry = 0;
-    
-    // If we could not create the framebuffer, try again with slightly
-    // different parameters in this order:
-    // 1. Try with the closest size
-    // 2. Try in the opposite screen mode with the original size
-    // 3. Try in the opposite screen mode with the closest size
-    // This is a somewhat confusing mass of recursion here.
+	if (old != NULL)
+	{ // Reuse the old framebuffer if its attributes are the same
+		SDLGLFB *fb = static_cast<SDLGLFB *> (old);
+		if (fb->Width == width &&
+			fb->Height == height)
+		{
+			bool fsnow = (SDL_GetWindowFlags (fb->Screen) & SDL_WINDOW_FULLSCREEN) != 0;
+	
+			if (fsnow != fullscreen)
+			{
+				SDL_SetWindowFullscreen(fb->Screen, fullscreen ? SDL_WINDOW_FULLSCREEN : 0);
+			}
+			return old;
+		}
+//		old->GetFlash (flashColor, flashAmount);
+		delete old;
+	}
+	else
+	{
+		flashColor = 0;
+//		flashAmount = 0;
+	}
+	
+	SDLGLFB *fb = new OpenGLFrameBuffer (0, width, height, 32, 60, fullscreen);
+	retry = 0;
+	
+	// If we could not create the framebuffer, try again with slightly
+	// different parameters in this order:
+	// 1. Try with the closest size
+	// 2. Try in the opposite screen mode with the original size
+	// 3. Try in the opposite screen mode with the closest size
+	// This is a somewhat confusing mass of recursion here.
 
-    while (fb == NULL || !fb->IsValid ())
-    {
-        if (fb != NULL)
-        {
-            delete fb;
-        }
-
-        switch (retry)
-        {
-        case 0:
-            owidth = width;
-            oheight = height;
-        case 2:
-            // Try a different resolution. Hopefully that will work.
-            I_ClosestResolution (&width, &height, 8);
-            break;
+	while (fb == NULL || !fb->IsValid ())
+	{
+		if (fb != NULL)
+		{
+			delete fb;
+		}
 
-        case 1:
-            // Try changing fullscreen mode. Maybe that will work.
-            width = owidth;
-            height = oheight;
-            fullscreen = !fullscreen;
-            break;
-
-        default:
-            // I give up!
-            I_FatalError ("Could not create new screen (%d x %d)", owidth, oheight);
+		switch (retry)
+		{
+		case 0:
+			owidth = width;
+			oheight = height;
+		case 2:
+			// Try a different resolution. Hopefully that will work.
+			I_ClosestResolution (&width, &height, 8);
+			break;
 
-            fprintf( stderr, "!!! [SDLGLVideo::CreateFrameBuffer] Got beyond I_FatalError !!!" );
-            return NULL;    //[C] actually this shouldn't be reached; probably should be replaced with an ASSERT
-        }
+		case 1:
+			// Try changing fullscreen mode. Maybe that will work.
+			width = owidth;
+			height = oheight;
+			fullscreen = !fullscreen;
+			break;
 
-        ++retry;
-        fb = static_cast<SDLGLFB *>(CreateFrameBuffer (width, height, fullscreen, NULL));
-    }
+		default:
+			// I give up!
+			I_FatalError ("Could not create new screen (%d x %d)", owidth, oheight);
 
-//    fb->SetFlash (flashColor, flashAmount);
-    return fb;
+			fprintf( stderr, "!!! [SDLGLVideo::CreateFrameBuffer] Got beyond I_FatalError !!!" );
+			return NULL;	//[C] actually this shouldn't be reached; probably should be replaced with an ASSERT
+		}
+
+		++retry;
+		fb = static_cast<SDLGLFB *>(CreateFrameBuffer (width, height, fullscreen, NULL));
+	}
+
+//	fb->SetFlash (flashColor, flashAmount);
+	return fb;
 }
 
-
 void SDLGLVideo::SetWindowedScale (float scale)
 {
 }
 
 bool SDLGLVideo::SetResolution (int width, int height, int bits)
 {
-    // FIXME: Is it possible to do this without completely destroying the old
-    // interface?
+	// FIXME: Is it possible to do this without completely destroying the old
+	// interface?
 #ifndef NO_GL
 
-    if (GLRenderer != NULL) GLRenderer->FlushTextures();
-    I_ShutdownGraphics();
+	if (GLRenderer != NULL) GLRenderer->FlushTextures();
+	I_ShutdownGraphics();
 
-    Video = new SDLGLVideo(0);
-    if (Video == NULL) I_FatalError ("Failed to initialize display");
+	Video = new SDLGLVideo(0);
+	if (Video == NULL) I_FatalError ("Failed to initialize display");
 
 #if (defined(WINDOWS)) || defined(WIN32)
-    bits=32;
+	bits=32;
 #else
-    bits=24;
+	bits=24;
 #endif
-    
-    V_DoModeSetup(width, height, bits);
+	
+	V_DoModeSetup(width, height, bits);
 #endif
-    return true;    // We must return true because the old video context no longer exists.
+	return true;	// We must return true because the old video context no longer exists.
 }
 
 //==========================================================================
 //
-//
+// 
 //
 //==========================================================================
 
 bool SDLGLVideo::SetupPixelFormat(bool allowsoftware, int multisample)
 {
-    SDL_GL_SetAttribute( SDL_GL_RED_SIZE,  8 );
-    SDL_GL_SetAttribute( SDL_GL_GREEN_SIZE,  8 );
-    SDL_GL_SetAttribute( SDL_GL_BLUE_SIZE,  8 );
-    SDL_GL_SetAttribute( SDL_GL_ALPHA_SIZE,  8 );
-    SDL_GL_SetAttribute( SDL_GL_DEPTH_SIZE,  24 );
-    SDL_GL_SetAttribute( SDL_GL_STENCIL_SIZE,  8 );
-    SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER,  1 );
-    if (multisample > 0) {
-        SDL_GL_SetAttribute( SDL_GL_MULTISAMPLEBUFFERS, 1 );
-        SDL_GL_SetAttribute( SDL_GL_MULTISAMPLESAMPLES, multisample );
-    }
+	SDL_GL_SetAttribute( SDL_GL_RED_SIZE,  8 );
+	SDL_GL_SetAttribute( SDL_GL_GREEN_SIZE,  8 );
+	SDL_GL_SetAttribute( SDL_GL_BLUE_SIZE,  8 );
+	SDL_GL_SetAttribute( SDL_GL_ALPHA_SIZE,  8 );
+	SDL_GL_SetAttribute( SDL_GL_DEPTH_SIZE,  24 );
+	SDL_GL_SetAttribute( SDL_GL_STENCIL_SIZE,  8 );
+	SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER,  1 );
+	if (multisample > 0) {
+		SDL_GL_SetAttribute( SDL_GL_MULTISAMPLEBUFFERS, 1 );
+		SDL_GL_SetAttribute( SDL_GL_MULTISAMPLESAMPLES, multisample );
+	}
     return true;
 }
 
 //==========================================================================
 //
-//
+// 
 //
 //==========================================================================
 
 bool SDLGLVideo::InitHardware (bool allowsoftware, int multisample)
 {
-    if (!SetupPixelFormat(allowsoftware, multisample))
-    {
-        Printf ("R_OPENGL: Reverting to software mode...\n");
-        return false;
-    }
-    return true;
+	if (!SetupPixelFormat(allowsoftware, multisample))
+	{
+		Printf ("R_OPENGL: Reverting to software mode...\n");
+		return false;
+	}
+	return true;
 }
 
 
 // FrameBuffer implementation -----------------------------------------------
 
 SDLGLFB::SDLGLFB (void *, int width, int height, int, int, bool fullscreen)
-    : DFrameBuffer (width, height)
+	: DFrameBuffer (width, height)
 {
-    static int localmultisample=-1;
-
-    if (localmultisample<0) localmultisample=gl_vid_multisample;
-
-    int i;
-    
-    m_Lock=0;
+	int i;
+	
+	m_Lock=0;
 
-    UpdatePending = false;
-    
-    if (!static_cast<SDLGLVideo*>(Video)->InitHardware(false, localmultisample))
-    {
-        vid_renderer = 0;
-        return;
-    }
+	UpdatePending = false;
+	
+	if (!static_cast<SDLGLVideo*>(Video)->InitHardware(false, 0))
+	{
+		vid_renderer = 0;
+		return;
+	}
 
-    FString caption;
-    caption.Format(GAMESIG " %s (%s)", GetVersionString(), GetGitTime());
-    Screen = SDL_CreateWindow (caption,
-        SDL_WINDOWPOS_UNDEFINED_DISPLAY(vid_adapter), SDL_WINDOWPOS_UNDEFINED_DISPLAY(vid_adapter),
-        width, height, (fullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0)|SDL_WINDOW_OPENGL);
+	FString caption;
+	caption.Format(GAMESIG " %s (%s)", GetVersionString(), GetGitTime());
+	Screen = SDL_CreateWindow (caption,
+		SDL_WINDOWPOS_UNDEFINED_DISPLAY(vid_adapter), SDL_WINDOWPOS_UNDEFINED_DISPLAY(vid_adapter),
+		width, height, (fullscreen ? SDL_WINDOW_FULLSCREEN : 0)|SDL_WINDOW_OPENGL);
 
-    if (Screen == NULL)
-        return;
+	if (Screen == NULL)
+		return;
 
-    GLContext = SDL_GL_CreateContext(Screen);
-    if (GLContext == NULL)
-        return;
+	GLContext = SDL_GL_CreateContext(Screen);
+	if (GLContext == NULL)
+		return;
 
-    m_supportsGamma = -1 != SDL_GetWindowGammaRamp(Screen, m_origGamma[0], m_origGamma[1], m_origGamma[2]);
+	m_supportsGamma = -1 != SDL_GetWindowGammaRamp(Screen, m_origGamma[0], m_origGamma[1], m_origGamma[2]);
 }
 
 SDLGLFB::~SDLGLFB ()
 {
-    if (Screen)
-    {
+	if (Screen)
+	{
         if (m_supportsGamma)
         {
             SDL_SetWindowGammaRamp(Screen, m_origGamma[0], m_origGamma[1], m_origGamma[2]);
         }
 
-        if (GLContext)
-        {
-            SDL_GL_DeleteContext(GLContext);
-        }
+		if (GLContext)
+		{
+			SDL_GL_DeleteContext(GLContext);
+		}
 
-        SDL_DestroyWindow(Screen);
-    }
+		SDL_DestroyWindow(Screen);
+	}
 }
 
 
 
 
-void SDLGLFB::InitializeState()
+void SDLGLFB::InitializeState() 
 {
 }
 
 bool SDLGLFB::CanUpdate ()
 {
-    if (m_Lock != 1)
-    {
-        if (m_Lock > 0)
-        {
-            UpdatePending = true;
-            --m_Lock;
-        }
-        return false;
-    }
-    return true;
+	if (m_Lock != 1)
+	{
+		if (m_Lock > 0)
+		{
+			UpdatePending = true;
+			--m_Lock;
+		}
+		return false;
+	}
+	return true;
 }
 
-void SDLGLFB::SetGammaTable(WORD *tbl)
+void SDLGLFB::SetGammaTable(uint16_t *tbl)
 {
     SDL_SetWindowGammaRamp(Screen, &tbl[0], &tbl[256], &tbl[512]);
 }
@@ -426,20 +421,30 @@
 
 bool SDLGLFB::IsFullscreen ()
 {
-    return (SDL_GetWindowFlags (Screen) & SDL_WINDOW_FULLSCREEN_DESKTOP) != 0;
+	return (SDL_GetWindowFlags (Screen) & SDL_WINDOW_FULLSCREEN) != 0;
 }
 
 
 bool SDLGLFB::IsValid ()
 {
-    return DFrameBuffer::IsValid() && Screen != NULL;
+	return DFrameBuffer::IsValid() && Screen != NULL;
 }
 
 void SDLGLFB::SetVSync( bool vsync )
 {
 #if defined (__APPLE__)
-    const GLint value = vsync ? 1 : 0;
-    CGLSetParameter( CGLGetCurrentContext(), kCGLCPSwapInterval, &value );
+	const GLint value = vsync ? 1 : 0;
+	CGLSetParameter( CGLGetCurrentContext(), kCGLCPSwapInterval, &value );
+#else
+	if (vsync)
+	{
+		if (SDL_GL_SetSwapInterval(-1) == -1)
+			SDL_GL_SetSwapInterval(1);
+	}
+	else
+	{
+		SDL_GL_SetSwapInterval(0);
+	}
 #endif
 }
 
@@ -449,8 +454,27 @@
 
 void SDLGLFB::SwapBuffers()
 {
-    SDL_GL_SwapWindow (Screen);
+#ifndef __APPLE__
+	if (vid_maxfps && !cl_capfps)
+	{
+		SEMAPHORE_WAIT(FPSLimitSemaphore)
+	}
+#endif
+
+	SDL_GL_SwapWindow (Screen);
 }
 
+int SDLGLFB::GetClientWidth()
+{
+	int width = 0;
+	SDL_GL_GetDrawableSize(Screen, &width, nullptr);
+	return width;
+}
 
-#endif
+int SDLGLFB::GetClientHeight()
+{
+	int height = 0;
+	SDL_GL_GetDrawableSize(Screen, nullptr, &height);
+	return height;
+}
+#endif //NO_GL
\ No newline at end of file

diff -r c1f472a776fa -r d7f03c3afd90 src/sdl/sdlglvideo.h
--- a/src/sdl/sdlglvideo.h	Mon Jan 23 20:43:01 2023 +1100
+++ b/src/sdl/sdlglvideo.h	Mon Jan 23 20:48:43 2023 +1100
@@ -58,8 +58,8 @@
 
     friend class SDLGLVideo;
 
-//[C]
-    int GetTrueHeight() { return GetHeight();}
+	int GetClientWidth();
+	int GetClientHeight();
 
 protected:
     bool CanUpdate();