Fullscreen mode code refactoring (fixes issues)

release/macos/protracker.ini

@@ -41,7 +41,7 @@
 ; 1X = 320x255 (no scaling)
 ; 2X = 640x510
 ; 3X = 960x765
-; 4x = 1280x1020
+; 4X = 1280x1020
 ; ...and so on up to 16X
 ; (width = 320*x, height = 255*x)
 ;
@@ -57,26 +57,15 @@ FULLSCREEN=FALSE
 ; Syntax: NEAREST, LINEAR, BEST
 ; Default value: NEAREST
 ; Comment: Setting it to LINEAR or BEST will smooth out the pixels
-; and make them less grainy.
+; and make them less grainy. It will result in a blurry image, though.
 ;
 PIXELFILTER=NEAREST
 
-; Integer scaling of pixels
-; Syntax: TRUE or FALSE
-; Default value: TRUE
-; Comment: If the image is not completely stretched out vertically
-; in fullscreen mode, disabling this option will make it do so.
-; The aspect ratio will be maintained. However, the pixels might not
-; look perfect. This is best used together with PIXELFILTER=LINEAR
-; (or BEST). The image will look blurry though...
-;
-INTEGERSCALING=TRUE
-
 ; Make fullscreen mode completely stretch out the image to fit the whole screen
 ; Syntax: TRUE or FALSE
 ; Default value: FALSE
 ; Comment: Setting this to TRUE will in most cases ruin the aspect
-; ratio of the image. Please look at the INTEGERSCALING option as well.
+; ratio of the image.
 ;
 FULLSCREENSTRETCH=FALSE
 

release/other/protracker.ini

@@ -41,7 +41,7 @@
 ; 1X = 320x255 (no scaling)
 ; 2X = 640x510
 ; 3X = 960x765
-; 4x = 1280x1020
+; 4X = 1280x1020
 ; ...and so on up to 16X
 ; (width = 320*x, height = 255*x)
 ;
@@ -57,26 +57,15 @@ FULLSCREEN=FALSE
 ; Syntax: NEAREST, LINEAR, BEST
 ; Default value: NEAREST
 ; Comment: Setting it to LINEAR or BEST will smooth out the pixels
-; and make them less grainy.
+; and make them less grainy. It will result in a blurry image, though.
 ;
 PIXELFILTER=NEAREST
 
-; Integer scaling of pixels
-; Syntax: TRUE or FALSE
-; Default value: TRUE
-; Comment: If the image is not completely stretched out vertically
-; in fullscreen mode, disabling this option will make it do so.
-; The aspect ratio will be maintained. However, the pixels might not
-; look perfect. This is best used together with PIXELFILTER=LINEAR
-; (or BEST). The image will look blurry though...
-;
-INTEGERSCALING=TRUE
-
 ; Make fullscreen mode completely stretch out the image to fit the whole screen
 ; Syntax: TRUE or FALSE
 ; Default value: FALSE
 ; Comment: Setting this to TRUE will in most cases ruin the aspect
-; ratio of the image. Please look at the INTEGERSCALING option as well.
+; ratio of the image.
 ;
 FULLSCREENSTRETCH=FALSE
 

release/win32/protracker.ini

@@ -41,7 +41,7 @@
 ; 1X = 320x255 (no scaling)
 ; 2X = 640x510
 ; 3X = 960x765
-; 4x = 1280x1020
+; 4X = 1280x1020
 ; ...and so on up to 16X
 ; (width = 320*x, height = 255*x)
 ;
@@ -57,26 +57,15 @@ FULLSCREEN=FALSE
 ; Syntax: NEAREST, LINEAR, BEST
 ; Default value: NEAREST
 ; Comment: Setting it to LINEAR or BEST will smooth out the pixels
-; and make them less grainy.
+; and make them less grainy. It will result in a blurry image, though.
 ;
 PIXELFILTER=NEAREST
 
-; Integer scaling of pixels
-; Syntax: TRUE or FALSE
-; Default value: TRUE
-; Comment: If the image is not completely stretched out vertically
-; in fullscreen mode, disabling this option will make it do so.
-; The aspect ratio will be maintained. However, the pixels might not
-; look perfect. This is best used together with PIXELFILTER=LINEAR
-; (or BEST). The image will look blurry though...
-;
-INTEGERSCALING=TRUE
-
 ; Make fullscreen mode completely stretch out the image to fit the whole screen
 ; Syntax: TRUE or FALSE
 ; Default value: FALSE
 ; Comment: Setting this to TRUE will in most cases ruin the aspect
-; ratio of the image. Please look at the INTEGERSCALING option as well.
+; ratio of the image.
 ;
 FULLSCREENSTRETCH=FALSE
 

release/win64/protracker.ini

@@ -41,7 +41,7 @@
 ; 1X = 320x255 (no scaling)
 ; 2X = 640x510
 ; 3X = 960x765
-; 4x = 1280x1020
+; 4X = 1280x1020
 ; ...and so on up to 16X
 ; (width = 320*x, height = 255*x)
 ;
@@ -57,26 +57,15 @@ FULLSCREEN=FALSE
 ; Syntax: NEAREST, LINEAR, BEST
 ; Default value: NEAREST
 ; Comment: Setting it to LINEAR or BEST will smooth out the pixels
-; and make them less grainy.
+; and make them less grainy. It will result in a blurry image, though.
 ;
 PIXELFILTER=NEAREST
 
-; Integer scaling of pixels
-; Syntax: TRUE or FALSE
-; Default value: TRUE
-; Comment: If the image is not completely stretched out vertically
-; in fullscreen mode, disabling this option will make it do so.
-; The aspect ratio will be maintained. However, the pixels might not
-; look perfect. This is best used together with PIXELFILTER=LINEAR
-; (or BEST). The image will look blurry though...
-;
-INTEGERSCALING=TRUE
-
 ; Make fullscreen mode completely stretch out the image to fit the whole screen
 ; Syntax: TRUE or FALSE
 ; Default value: FALSE
 ; Comment: Setting this to TRUE will in most cases ruin the aspect
-; ratio of the image. Please look at the INTEGERSCALING option as well.
+; ratio of the image.
 ;
 FULLSCREENSTRETCH=FALSE
 

src/pt2_askbox.c

@@ -307,6 +307,7 @@ uint32_t askBox(uint32_t dialogType, const char *statusText)
  {
  SDL_Event event;
 
+ beginFPSCounter();
  sinkVisualizerBars();
  updateChannelSyncBuffer();
  readMouseXY();
@@ -408,13 +409,22 @@ uint32_t askBox(uint32_t dialogType, const char *statusText)
  }
  else if (event.type == SDL_MOUSEBUTTONUP)
  {
+#if defined __APPLE__ && defined __aarch64__
+ armMacGhostMouseCursorFix();
+#endif
  mouse.buttonWaitCounter = 0;
  mouse.buttonWaiting = false;
  buttonToRepeat = -1;
 
  if (event.button.button == SDL_BUTTON_LEFT)
  mouse.leftButtonPressed = false;
  }
+#if defined __APPLE__ && defined __aarch64__
+ else if (event.type == SDL_MOUSEMOTION)
+ {
+ armMacGhostMouseCursorFix();
+ }
+#endif
  }
 
  if (!mouse.buttonWaiting && buttonToRepeat > -1)
@@ -437,6 +447,7 @@ uint32_t askBox(uint32_t dialogType, const char *statusText)
  updateMouseCounters();
  renderFrame2();
  flipFrame();
+ endFPSCounter();
  }
 
  mouse.leftButtonPressed = false;

src/pt2_header.h

@@ -14,7 +14,7 @@
 #include "pt2_unicode.h"
 #include "pt2_palette.h"
 
-#define PROG_VER_STR "1.66"
+#define PROG_VER_STR "1.67"
 
 #ifdef _WIN32
 #define DIR_DELIMITER '\\'

src/pt2_keyboard.c

@@ -184,11 +184,6 @@ void keyDownHandler(SDL_Scancode scancode, SDL_Keycode keycode)
  if (scancode == SDL_SCANCODE_F11 && !keyb.leftAltPressed)
  {
  toggleFullscreen();
-
- // prevent fullscreen toggle from firing twice on certain SDL2 Linux ports
-#ifdef __unix__
- SDL_Delay(100);
-#endif
  return;
  }
 
@@ -2071,12 +2066,23 @@ void keyDownHandler(SDL_Scancode scancode, SDL_Keycode keycode)
  }
  else if (keyb.leftCtrlPressed)
  {
- toggleLEDFilter();
+ if (keyb.shiftPressed)
+ {
+ resetFPSCounter();
 
- if (audio.ledFilterEnabled)
- displayMsg("LED FILTER ON");
+ video.debug ^= 1;
+ if (!video.debug)
+ displayMainScreen();
+ }
  else
- displayMsg("LED FILTER OFF");
+ {
+ toggleLEDFilter();
+
+ if (audio.ledFilterEnabled)
+ displayMsg("LED FILTER ON");
+ else
+ displayMsg("LED FILTER OFF");
+ }
  }
  else if (keyb.leftAltPressed)
  {

src/pt2_main.c

@@ -350,6 +350,7 @@ int main(int argc, char *argv[])
  // XXX: if you change anything in the main loop, make sure it goes in the askBox()(pt2_askbox.c) loop too, if needed
  while (editor.programRunning)
  {
+ beginFPSCounter();
  handleThreadedAskBox();
  sinkVisualizerBars();
  updateChannelSyncBuffer();
@@ -364,6 +365,7 @@ int main(int argc, char *argv[])
 
  renderFrame();
  flipFrame();
+ endFPSCounter();
  }
 
  cleanUp();
@@ -448,6 +450,9 @@ static void handleInput(void)
  }
  else if (event.type == SDL_MOUSEBUTTONUP)
  {
+#if defined __APPLE__ && defined __aarch64__
+ armMacGhostMouseCursorFix();
+#endif
  mouseButtonUpHandler(event.button.button);
 
  if (ui.introTextShown)
@@ -463,6 +468,12 @@ static void handleInput(void)
  if (ui.sampleMarkingPos == -1 && !ui.forceSampleDrag && !ui.forceVolDrag && !ui.forceSampleEdit)
  mouseButtonDownHandler(event.button.button);
  }
+#if defined __APPLE__ && defined __aarch64__
+ else if (event.type == SDL_MOUSEMOTION)
+ {
+ armMacGhostMouseCursorFix();
+ }
+#endif
 
  if (ui.throwExit)
  {