CPU -> Hide cursor. (Windows);

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@83295 e17a0e51-4ae3-4d35-97c3-1a29b211df97

5 files changed, 40 insertions, 20 deletions

diff --git a/win32/gui/ConfigurePlugins.c b/win32/gui/ConfigurePlugins.c
index ac578a2b..7c740e25 100755
--- a/win32/gui/ConfigurePlugins.c
+++ b/win32/gui/ConfigurePlugins.c
@@ -82,6 +82,7 @@ int LoadConfig() {
 	QueryKeyV("RCntFix",  Conf->RCntFix);
 	QueryKeyV("VSyncWA",  Conf->VSyncWA);
 	QueryKeyV("Widescreen",  Conf->Widescreen);
+	QueryKeyV("HideCursor",  Conf->HideCursor);
 
 	QueryKeyV("Cpu",      Conf->Cpu);
 	QueryKeyV("PsxType",  Conf->PsxType);
@@ -135,6 +136,7 @@ void SaveConfig() {
 	SetKeyV("RCntFix", Conf->RCntFix);
 	SetKeyV("VSyncWA", Conf->VSyncWA);
 	SetKeyV("Widescreen", Conf->Widescreen);
+	SetKeyV("HideCursor", Conf->HideCursor);
 
 	SetKeyV("Cpu",     Conf->Cpu);
 	SetKeyV("PsxType", Conf->PsxType);
diff --git a/win32/gui/WndMain.c b/win32/gui/WndMain.c
index 171b9d9a..04bfbcd5 100755
--- a/win32/gui/WndMain.c
+++ b/win32/gui/WndMain.c
@@ -260,9 +260,12 @@ void RestoreWindow() {
 	AccBreak = 1;
 	DestroyWindow(gApp.hWnd);
 	CreateMainWindow(SW_SHOWNORMAL);
-	ShowCursor(TRUE);
-	SetCursor(LoadCursor(gApp.hInstance, IDC_ARROW));
-	ShowCursor(TRUE);
+	
+	if(Config.HideCursor)
+		ShowCursor(TRUE);
+	
+	//SetCursor(LoadCursor(gApp.hInstance, IDC_ARROW));
+	//ShowCursor(TRUE);
 
 	if (!UseGui) PostMessage(gApp.hWnd, WM_COMMAND, ID_FILE_EXIT, 0);
 }
@@ -479,7 +482,8 @@ LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) {
 						SysMessage(_("Could not load CD-ROM!"));
 						return TRUE;
 					}
-					ShowCursor(FALSE);
+					if(Config.HideCursor)
+						ShowCursor(FALSE);
 					Running = 1;
 					psxCpu->Execute();
 					return TRUE;
@@ -497,7 +501,8 @@ LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) {
 						RestoreWindow();
 						return TRUE;
 					}
-					ShowCursor(FALSE);
+					if(Config.HideCursor)
+						ShowCursor(FALSE);
 					SysReset();
 					CdromId[0] = '\0';
 					CdromLabel[0] = '\0';
@@ -531,7 +536,8 @@ LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) {
 						SysMessage(_("Could not load CD-ROM!"));
 						return TRUE;
 					}
-					ShowCursor(FALSE);
+					if(Config.HideCursor)
+						ShowCursor(FALSE);
 					Running = 1;
 					psxCpu->Execute();
 					return TRUE;
@@ -602,7 +608,8 @@ LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) {
 						RestoreWindow();
 						return TRUE;
 					}
-					ShowCursor(FALSE);
+					if(Config.HideCursor)
+						ShowCursor(FALSE);
 					Running = 1;
 					psxCpu->Execute();
 					return TRUE;
@@ -610,7 +617,8 @@ LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) {
 				case ID_EMULATOR_RUN:
 					SetMenu(hWnd, NULL);
 					OpenPlugins(hWnd);
-					ShowCursor(FALSE);
+					if(Config.HideCursor)
+						ShowCursor(FALSE);
 					Running = 1;
 					CheatSearchBackupMemory();
 					psxCpu->Execute();
@@ -625,7 +633,8 @@ LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) {
 					SysReset();
 					
 					LoadCdrom();
-					ShowCursor(FALSE);
+					if(Config.HideCursor)
+						ShowCursor(FALSE);
 					Running = 1;
 					psxCpu->Execute();
 					return TRUE;
@@ -647,7 +656,8 @@ LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) {
 						RestoreWindow();
 						return TRUE;
 					}
-					ShowCursor(FALSE);
+					if(Config.HideCursor)
+						ShowCursor(FALSE);
 					Running = 1;
 					SetCdOpenCaseTime(time(NULL) + 2);
 					CheatSearchBackupMemory();
@@ -1327,6 +1337,7 @@ BOOL CALLBACK ConfigureCpuDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lPar
 			Button_SetText(GetDlgItem(hW,IDC_RCNTFIX), _("Parasite Eve 2, Vandal Hearts 1/2 Fix"));
 			Button_SetText(GetDlgItem(hW,IDC_VSYNCWA), _("InuYasha Sengoku Battle Fix"));
 			Button_SetText(GetDlgItem(hW,IDC_WIDESCREEN), _("Widescreen (GTE Hack)"));
+			Button_SetText(GetDlgItem(hW,IDC_HIDECURSOR), _("Hide cursor"));
 
 			Static_SetText(GetDlgItem(hW,IDC_MISCOPT), _("Options"));
 			Static_SetText(GetDlgItem(hW,IDC_SELPSX),  _("Psx System Type"));
@@ -1344,6 +1355,7 @@ BOOL CALLBACK ConfigureCpuDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lPar
 	   		Button_SetCheck(GetDlgItem(hW,IDC_RCNTFIX), Config.RCntFix);
 	   		Button_SetCheck(GetDlgItem(hW,IDC_VSYNCWA), Config.VSyncWA);
 			Button_SetCheck(GetDlgItem(hW,IDC_WIDESCREEN), Config.Widescreen);
+			Button_SetCheck(GetDlgItem(hW,IDC_HIDECURSOR), Config.HideCursor);
 	   		ComboBox_AddString(GetDlgItem(hW,IDC_PSXTYPES), "NTSC");
 	   		ComboBox_AddString(GetDlgItem(hW,IDC_PSXTYPES), "PAL");
 	   		ComboBox_SetCurSel(GetDlgItem(hW,IDC_PSXTYPES),Config.PsxType);
@@ -1388,6 +1400,7 @@ BOOL CALLBACK ConfigureCpuDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lPar
 					Config.RCntFix = Button_GetCheck(GetDlgItem(hW,IDC_RCNTFIX));
 					Config.VSyncWA = Button_GetCheck(GetDlgItem(hW,IDC_VSYNCWA));
 					Config.Widescreen = Button_GetCheck(GetDlgItem(hW,IDC_WIDESCREEN));
+					Config.HideCursor = Button_GetCheck(GetDlgItem(hW,IDC_HIDECURSOR));
 					tmp = Config.Debug;
 					Config.Debug   = Button_GetCheck(GetDlgItem(hW,IDC_DEBUG));
 					if (tmp != Config.Debug) {
@@ -1665,6 +1678,7 @@ void CreateMainMenu() {
 #ifdef ENABLE_NLS
 	ADDSUBMENUS(0, 1, _("&Language"));
 
+	// wtf?
 	if (langs != langs) free(langs);
 	langs = (_langs*)malloc(sizeof(_langs));
 	strcpy(langs[0].lang, "English");
diff --git a/win32/gui/plugin.c b/win32/gui/plugin.c
index 35b14acf..12cad204 100755
--- a/win32/gui/plugin.c
+++ b/win32/gui/plugin.c
@@ -297,7 +297,9 @@ int _OpenPlugins(HWND hWnd) {
 #endif
 	
 	SetCurrentDirectory(PcsxrDir);
-	ShowCursor(FALSE);
+	
+	if(Config.HideCursor)
+		ShowCursor(FALSE);
 	return 0;
 }
 
diff --git a/win32/pcsxr.rc b/win32/pcsxr.rc
index b3e33556..6de545fb 100755
--- a/win32/pcsxr.rc
+++ b/win32/pcsxr.rc
@@ -103,14 +103,14 @@ BEGIN
     GROUPBOX        "",IDC_STATIC,43,100,234,79

 END

 

-IDD_CPUCONF DIALOG 0, 0, 232, 264

+IDD_CPUCONF DIALOGEX 0, 0, 232, 281

 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU

 CAPTION "Cpu Config"

-FONT 8, "MS Sans Serif"

+FONT 8, "MS Sans Serif", 0, 0, 0x0

 BEGIN

-    DEFPUSHBUTTON   "OK",IDOK,51,241,50,14

-    PUSHBUTTON      "Cancel",IDCANCEL,120,241,50,14

-    GROUPBOX        "Misc Options",IDC_MISCOPT,5,5,220,192

+    DEFPUSHBUTTON   "OK",IDOK,51,258,50,14

+    PUSHBUTTON      "Cancel",IDCANCEL,120,258,50,14

+    GROUPBOX        "Misc Options",IDC_MISCOPT,5,5,220,206

     CONTROL         "Disable Xa Decoding",IDC_XA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,15,205,10

     CONTROL         "Sio Irq Always Enabled",IDC_SIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,30,205,10

     CONTROL         "Spu Irq Always Enabled",IDC_SPUIRQ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,45,205,10

@@ -124,9 +124,10 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,150,205,10

     CONTROL         "InuYasha Sengoku Battle Fix",IDC_VSYNCWA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,165,205,10

     CONTROL         "Widescreen (GTE Hack)",IDC_WIDESCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,180,205,10

-    GROUPBOX        "Select Psx System Type",IDC_SELPSX,5,200,220,35

-    CONTROL         "Autodetect",IDC_PSXAUTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,214,80,10

-    COMBOBOX        IDC_PSXTYPES,105,214,53,50,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP

+    GROUPBOX        "Select Psx System Type",IDC_SELPSX,5,216,220,35

+    CONTROL         "Autodetect",IDC_PSXAUTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,230,80,10

+    COMBOBOX        IDC_PSXTYPES,105,230,53,50,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP

+    CONTROL         "Hide cursor",IDC_HIDECURSOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,195,205,10

 END

 

 IDD_NETPLAY DIALOG 0, 0, 165, 95

@@ -290,7 +291,7 @@ BEGIN
         LEFTMARGIN, 7

         RIGHTMARGIN, 225

         TOPMARGIN, 7

-        BOTTOMMARGIN, 168

+        BOTTOMMARGIN, 272

     END

 

     IDD_NETPLAY, DIALOG

diff --git a/win32/resource.h b/win32/resource.h
index 7b375208..e9b980ea 100755
--- a/win32/resource.h
+++ b/win32/resource.h
@@ -303,6 +303,7 @@
 #define IDC_LABEL_VALUE                 1262

 #define IDC_LABEL_DATABASE              1263

 #define IDC_WIDESCREEN                  1264

+#define IDC_HIDECURSOR                  1265

 #define ID_FILE_EXIT                    40001

 #define ID_HELP_ABOUT                   40002

 #define ID_FILE_RUN_CD                  40003