Pushed v1.01 code

- Hardware mouse ("HWMOUSE" in config) now has the same colors and shape
  as the original PT cursor. This mode is now the new config default.
- MacOS: Pass NDEBUG to clang preprocessor defines, to prevent debug code
  from being compiled in release mode.

.gitignore

@@ -13,3 +13,6 @@ pt_pal_editor/vs2019_project/pt_pal_editor/Release/pt_pal_editor.vcxproj.FileLis
 vs2019_project/.vs/pt2-clone/v16/.suo
 *.cache
 *.ipch
+.DS_Store
+vs2019_project/pt2-clone/Release/pt2-clone.vcxproj.FileListAbsolute.txt
+vs2019_project/pt2-clone/x64/Debug/pt2-clone.vcxproj.FileListAbsolute.txt

make-linux.sh

@@ -3,7 +3,7 @@
 rm release/other/pt2-clone &> /dev/null
 
 echo Compiling, please wait...
-gcc src/gfx/*.c src/*.c -lSDL2 -lm -Wall -Wno-unused-result -Wc++-compat -Wshadow -Winit-self -Wextra -Wunused -Wunreachable-code -Wredundant-decls -Wswitch-default -march=native -mtune=native -O3 -o release/other/pt2-clone
+gcc -DNDEBUG src/gfx/*.c src/*.c -lSDL2 -lm -Wall -Wno-unused-result -Wc++-compat -Wshadow -Winit-self -Wextra -Wunused -Wunreachable-code -Wredundant-decls -Wswitch-default -march=native -mtune=native -O3 -o release/other/pt2-clone
 rm src/gfx/*.o src/*.o &> /dev/null
 
 echo Done! The executable is in the folder named \'release/other\'.

make-macos.sh

@@ -8,7 +8,7 @@ else
 
     rm release/macos/pt2-clone-macos.app/Contents/MacOS/pt2-clone &> /dev/null
 
-    clang -mmacosx-version-min=10.6 -arch x86_64 -mmmx -mfpmath=sse -msse2 -I/Library/Frameworks/SDL2.framework/Headers -F/Library/Frameworks src/gfx/*.c src/*.c -O3 -lm -Wall -Winit-self -Wextra -Wunused -Wredundant-decls -Wswitch-default -framework SDL2 -framework Cocoa -lm -o release/macos/pt2-clone-macos.app/Contents/MacOS/pt2-clone-macos
+    clang -mmacosx-version-min=10.6 -arch x86_64 -mmmx -mfpmath=sse -msse2 -I/Library/Frameworks/SDL2.framework/Headers -F/Library/Frameworks -g0 -DNDEBUG src/gfx/*.c src/*.c -O3 -lm -Wall -Winit-self -Wextra -Wunused -Wredundant-decls -Wswitch-default -framework SDL2 -framework Cocoa -lm -o release/macos/pt2-clone-macos.app/Contents/MacOS/pt2-clone-macos
     strip release/macos/pt2-clone-macos.app/Contents/MacOS/pt2-clone-macos
     install_name_tool -change @rpath/SDL2.framework/Versions/A/SDL2 @executable_path/../Frameworks/SDL2.framework/Versions/A/SDL2 release/macos/pt2-clone-macos.app/Contents/MacOS/pt2-clone-macos
 

pt_pal_editor/release/macos/pt_pal_editor-osx.app/Contents/MacOS/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

pt_pal_editor/release/other/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

release/macos/protracker.ini

@@ -38,13 +38,11 @@ VSYNCOFF=FALSE
 
 ; Use hardware mouse
 ;        Syntax: TRUE or FALSE
-; Default value: FALSE
+; Default value: TRUE
 ;       Comment: Disables software mouse and uses the mouse in your OS.
 ;         This can feel more comfortable for some users because of less latency.
-;         However, the OS mouse cursor can be too small depending on VIDEOSCALE,
-;         and it will not be colored (which tells the current tracker state).
 ;
-HWMOUSE=FALSE
+HWMOUSE=TRUE
 
 ; Make fullscreen mode stretch out the image (will often look bad)
 ;        Syntax: TRUE or FALSE

release/macos/pt2-clone-macos.app/Contents/MacOS/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

release/other/protracker.ini

@@ -38,13 +38,11 @@ VSYNCOFF=FALSE
 
 ; Use hardware mouse
 ;        Syntax: TRUE or FALSE
-; Default value: FALSE
+; Default value: TRUE
 ;       Comment: Disables software mouse and uses the mouse in your OS.
 ;         This can feel more comfortable for some users because of less latency.
-;         However, the OS mouse cursor can be too small depending on VIDEOSCALE,
-;         and it will not be colored (which tells the current tracker state).
 ;
-HWMOUSE=FALSE
+HWMOUSE=TRUE
 
 ; Make fullscreen mode stretch out the image (will often look bad)
 ;        Syntax: TRUE or FALSE

release/win32/protracker.ini

@@ -38,13 +38,11 @@ VSYNCOFF=FALSE
 
 ; Use hardware mouse
 ;        Syntax: TRUE or FALSE
-; Default value: FALSE
+; Default value: TRUE
 ;       Comment: Disables software mouse and uses the mouse in your OS.
 ;         This can feel more comfortable for some users because of less latency.
-;         However, the OS mouse cursor can be too small depending on VIDEOSCALE,
-;         and it will not be colored (which tells the current tracker state).
 ;
-HWMOUSE=FALSE
+HWMOUSE=TRUE
 
 ; Make fullscreen mode stretch out the image (will often look bad)
 ;        Syntax: TRUE or FALSE

release/win64/protracker.ini

@@ -38,13 +38,11 @@ VSYNCOFF=FALSE
 
 ; Use hardware mouse
 ;        Syntax: TRUE or FALSE
-; Default value: FALSE
+; Default value: TRUE
 ;       Comment: Disables software mouse and uses the mouse in your OS.
 ;         This can feel more comfortable for some users because of less latency.
-;         However, the OS mouse cursor can be too small depending on VIDEOSCALE,
-;         and it will not be colored (which tells the current tracker state).
 ;
-HWMOUSE=FALSE
+HWMOUSE=TRUE
 
 ; Make fullscreen mode stretch out the image (will often look bad)
 ;        Syntax: TRUE or FALSE

src/gfx/pt2_gfx_pointer.c

@@ -1,9 +1,9 @@
 #include <stdint.h>
 #include "../pt2_palette.h"
 
-// This graphical table has to be in the palette kind of data
-// because it changes color according to status. Easier this
-// way.
+/* This graphical table has to be in the palette kind of data
+ * because it changes color according to status. Easier this
+ * way. */
 
 const uint8_t mousePointerBMP[256] =
 {

src/pt2_audio.c

@@ -1070,7 +1070,7 @@ bool renderToWav(char *fileName, bool checkIfFileExist)
 
 	editor.blockMarkFlag = false;
 
-	pointerSetMode(POINTER_MODE_READ_DIR, NO_CARRY);
+	pointerSetMode(POINTER_MODE_MSG2, NO_CARRY);
 	setStatusMessage("RENDERING MOD...", NO_CARRY);
 
 	editor.ui.disableVisualizer = true;

src/pt2_diskop.c

@@ -333,7 +333,7 @@ void handleEntryJumping(char jumpToChar) // SHIFT+character
 	editor.errorMsgBlock = true;
 	editor.errorMsgCounter = 0;
 
-	pointerErrorMode();
+	setErrPointer();
 }
 
 bool diskOpEntryIsEmpty(int32_t fileIndex)
@@ -644,9 +644,6 @@ static bool diskOpFillBuffer(void)
 
 	freeDiskOpEntryMem();
 
-	if (!editor.errorMsgActive)
-		pointerSetMode(POINTER_MODE_READ_DIR, NO_CARRY);
-
 	// fill disk op. buffer (type, size, path, file name, date changed)
 
 	// read first file
@@ -703,12 +700,6 @@ static bool diskOpFillBuffer(void)
 			statusOutOfMemory();
 	}
 
-	if (!editor.errorMsgActive)
-	{
-		pointerSetPreviousMode();
-		diskOpShowSelectText();
-	}
-
 	return true;
 }
 
@@ -949,7 +940,7 @@ void diskOpLoadFile(uint32_t fileEntryRow, bool songModifiedCheck)
 					editor.errorMsgCounter = 0;
 
 					// status/error message is set in the mod loader
-					pointerErrorMode();
+					setErrPointer();
 				}
 			}
 			else if (editor.diskop.mode == DISKOP_MODE_SMP)

src/pt2_edit.c

@@ -153,13 +153,10 @@ void exitGetTextLine(bool updateValue)
 				modEntry->head.moduleTitle[i] = (char)tolower(modEntry->head.moduleTitle[i]);
 		}
 
-		if (editor.ui.editObject != PTB_DO_DATAPATH) // special case for disk op. right mouse button
-		{
-			pointerSetPreviousMode();
+		pointerSetPreviousMode();
 
-			if (!editor.mixFlag)
-				updateWindowTitle(MOD_IS_MODIFIED);
-		}
+		if (!editor.mixFlag)
+			updateWindowTitle(MOD_IS_MODIFIED);
 	}
 	else
 	{

src/pt2_header.h

@@ -13,7 +13,7 @@
 #include <stdint.h>
 #include "pt2_unicode.h"
 
-#define PROG_VER_STR "1.00"
+#define PROG_VER_STR "1.01"
 
 #ifdef _WIN32
 #define DIR_DELIMITER '\\'
@@ -399,7 +399,7 @@ struct editor_t
 		uint8_t numLen, numBits;
 
 		// render/update flags
-		bool refreshMousePointer, updateStatusText, updatePatternData;
+		bool updateStatusText, updatePatternData;
 		bool updateSongName, updateMod2WavDialog, mod2WavFinished;
 
 		// edit op. #2
@@ -438,7 +438,8 @@ struct editor_t
 		uint16_t *numPtr16, tmpDisp16, *dstOffset, dstPos, textLength, editTextPos;
 		uint16_t dstOffsetEnd, lastSampleOffset;
 		int32_t askTempData, renderX, renderY, renderW, renderH, displayW, displayH;
-		uint32_t xScaleMul, yScaleMul;
+		uint32_t xScale, yScale;
+		double dMouseXMul, dMouseYMul;
 		SDL_PixelFormat *pixelFormat;
 #ifdef _WIN32
 		HWND hWnd;

src/pt2_keyboard.c

@@ -3670,7 +3670,7 @@ bool handleGeneralModes(SDL_Keycode keycode, SDL_Scancode scancode)
 
 				handleAskNo();
 
-				pointerSetMode(POINTER_MODE_READ_DIR, NO_CARRY);
+				pointerSetMode(POINTER_MODE_MSG2, NO_CARRY);
 				setStatusMessage("RENDERING MOD...", NO_CARRY);
 			}
 		}
@@ -3921,7 +3921,7 @@ bool handleGeneralModes(SDL_Keycode keycode, SDL_Scancode scancode)
 				editor.errorMsgBlock = true;
 				editor.errorMsgCounter = 0;
 
-				pointerErrorMode();
+				setErrPointer();
 			}
 			break;
 

src/pt2_modloader.c

@@ -16,7 +16,7 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include "pt2_palette.h"
+#include "pt2_mouse.h"
 #include "pt2_header.h"
 #include "pt2_sampler.h"
 #include "pt2_textout.h"
@@ -26,7 +26,7 @@
 #include "pt2_unicode.h"
 #include "pt2_modloader.h"
 #include "pt2_sampleloader.h"
-
+#
 typedef struct mem_t
 {
 	bool _eof;
@@ -1161,7 +1161,7 @@ void loadModFromArg(char *arg)
 		editor.errorMsgCounter = 0;
 
 		// status/error message is set in the mod loader
-		pointerErrorMode();
+		setErrPointer();
 	}
 
 	free(filenameU);
@@ -1205,8 +1205,6 @@ void loadDroppedFile(char *fullPath, uint32_t fullPathLen, bool autoPlay, bool s
 
 	// don't allow drag n' drop if the tracker is busy
 	if (editor.ui.pointerMode == POINTER_MODE_MSG1 ||
-		editor.ui.pointerMode == POINTER_MODE_LOAD ||
-		editor.ui.pointerMode == POINTER_MODE_READ_DIR ||
 		editor.diskop.isFilling || editor.isWAVRendering ||
 		editor.ui.samplerFiltersBoxShown || editor.ui.samplerVolBoxShown)
 	{
@@ -1328,7 +1326,7 @@ void loadDroppedFile(char *fullPath, uint32_t fullPathLen, bool autoPlay, bool s
 			editor.errorMsgActive = true;
 			editor.errorMsgBlock = true;
 			editor.errorMsgCounter = 0;
-			pointerErrorMode(); // status/error message is set in the mod loader
+			setErrPointer(); // status/error message is set in the mod loader
 		}
 	}
 	else