X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=f71aacbdfbf3ffac0001deb2bb9e58100fd3b13c;hb=68d1418be737276c8214780106399c0dae588d1c;hp=abde1cc7b311b5bb60b7f1562f79c55b181de9ab;hpb=7ecf99096c7c23909ada034e05d971464f66552f;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index abde1cc7..f71aacbd 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -4172,7 +4172,9 @@ boolean Request(char *text, unsigned int req_state)
 	      break;
 
 	    case KSYM_Escape:
+#if defined(TARGET_SDL2)
 	    case KSYM_Back:
+#endif
 	      result = 0;
 	      break;
 
@@ -8988,11 +8990,37 @@ void ToggleFullscreenIfNeeded()
   boolean change_fullscreen_mode = (video.fullscreen_enabled &&
 				    !strEqual(setup.fullscreen_mode,
 					      video.fullscreen_mode_current));
+  boolean change_window_scaling_percent = (!video.fullscreen_enabled &&
+					   setup.window_scaling_percent !=
+					   video.window_scaling_percent);
+
+  if (change_window_scaling_percent && video.fullscreen_enabled)
+    return;
+
+  if (!change_window_scaling_percent && !video.fullscreen_available)
+    return;
+
+#if defined(TARGET_SDL2)
+  if (change_window_scaling_percent)
+  {
+    SDLSetWindowScaling(setup.window_scaling_percent);
+
+    return;
+  }
+  else if (change_fullscreen)
+  {
+    SDLSetWindowFullscreen(setup.fullscreen);
+
+    /* set setup value according to successfully changed fullscreen mode */
+    setup.fullscreen = video.fullscreen_enabled;
 
-  if (!video.fullscreen_available)
     return;
+  }
+#endif
 
-  if (change_fullscreen || change_fullscreen_mode)
+  if (change_fullscreen ||
+      change_fullscreen_mode ||
+      change_window_scaling_percent)
   {
     Bitmap *tmp_backbuffer = CreateBitmap(WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH);
 
@@ -9005,9 +9033,16 @@ void ToggleFullscreenIfNeeded()
       video.fullscreen_enabled = FALSE;		/* force new fullscreen mode */
     }
 
+    if (change_window_scaling_percent)
+    {
+      /* keep window mode, but change window scaling */
+      video.fullscreen_enabled = TRUE;		/* force new window scaling */
+    }
+
     /* toggle fullscreen */
     ChangeVideoModeIfNeeded(setup.fullscreen);
 
+    /* set setup value according to successfully changed fullscreen mode */
     setup.fullscreen = video.fullscreen_enabled;
 
     /* restore backbuffer content from temporary backbuffer backup bitmap */