From e719f790344cfbcbeed6487943698237a907f0e8 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@users.sf.net>
Date: Sun, 25 May 2008 03:53:48 +0000
Subject: [PATCH] Memory watch - recent files works now as does "load last file
 on startup"

---
 src/drivers/win/memwatch.cpp |  68 ++++++++++++++++++++++++++++++++++-
 src/drivers/win/res.rc       | Bin 151598 -> 151430 bytes
 src/drivers/win/resource.h   |   3 +-
 3 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/src/drivers/win/memwatch.cpp b/src/drivers/win/memwatch.cpp
index edbf6139..bc744c5d 100644
--- a/src/drivers/win/memwatch.cpp
+++ b/src/drivers/win/memwatch.cpp
@@ -581,6 +581,8 @@ static void LoadMemWatch()
 			MemwAddRecentDirectory(tmpdir);
 
 		FILE *fp=FCEUD_UTF8fopen(memwLastFilename,"r");
+			MemwAddRecentFile(memwLastFilename);
+
 		for(i=0;i<24;i++)
 		{
 			fscanf(fp, "%s ", watchfcontents); //Reads contents of newly opened file
@@ -613,6 +615,53 @@ static void LoadMemWatch()
 fileChanged = false;
 }
 
+// Loads a recent file given the recent files array number(0-4) 
+void OpenMemwatchRecentFile(int memwRFileNumber)
+{
+	int rnum=memwRFileNumber;
+		if (rnum > MEMW_MAX_NUMBER_OF_RECENT_FILES) return; //just in case
+	
+	char* x = memw_recent_files[rnum];
+	char watchfcontents[2048];
+
+	FILE *fp=FCEUD_UTF8fopen(x,"r");
+	
+	if (rnum != 0) //Change order of recent files if not most recent
+		MemwAddRecentFile(x);
+
+	int i,j;
+	for(i=0;i<24;i++)
+		{
+			fscanf(fp, "%s ", watchfcontents); //Reads contents of newly opened file
+			for(j = 0; j < 16; j++)
+				addresses[i][j] = watchfcontents[j];
+			fscanf(fp, "%s\n", watchfcontents);
+			for(j = 0; j < 24; j++)
+				labels[i][j] = watchfcontents[j];
+
+			//Replace dummy strings with empty strings
+			if(addresses[i][0] == '|')
+			{
+				addresses[i][0] = 0;
+			}
+			if(labels[i][0] == '|')
+			{
+				labels[i][0] = 0;
+			}
+			PutInSpaces(i);
+
+			addresses[i][15] = 0;
+			labels[i][23] = 0; //just in case
+
+			SetDlgItemText(hwndMemWatch,1002+i*3,(LPTSTR) "---");
+			SetDlgItemText(hwndMemWatch,1001+i*3,(LPTSTR) addresses[i]);
+			SetDlgItemText(hwndMemWatch,1000+i*3,(LPTSTR) labels[i]);
+	}
+		fclose(fp);
+
+fileChanged = false;
+}
+
 void CloseMemoryWatch()
 {
 			SaveStrings();
@@ -625,7 +674,7 @@ void CloseMemoryWatch()
 						SaveMemWatch();
 					}
 			}
-	//Save MemwLastFile, window x,y, MemWatchLoadOnStart, LoadFileonStart, RecentMemwDirs		
+		
 	DestroyWindow(hwndMemWatch);
 	hwndMemWatch=0;
 
@@ -723,6 +772,22 @@ static BOOL CALLBACK MemWatchCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 		//Menu Items
 		switch(wParam)
 		{	
+		case 600: //First item in recent menu
+			OpenMemwatchRecentFile(0);
+			break;
+		case 601: //2nd item in recent menu
+			OpenMemwatchRecentFile(1);
+			break;
+		case 602: //3rd item in recent menu
+			OpenMemwatchRecentFile(2);
+			break;
+		case 603: //4th item in recent menu
+			OpenMemwatchRecentFile(3);
+			break;
+		case 604: //5th item in recent menu
+			OpenMemwatchRecentFile(4);
+			break;
+		
 		case MEMW_FILE_CLOSE:  
 			CloseMemoryWatch();
 			break;
@@ -863,6 +928,7 @@ void CreateMemWatch()
 			SetDlgItemText(hwndMemWatch,1000+i*3,(LPTSTR) labels[i]);
 		}
 	}
+if (MemWatchLoadFileOnStart) OpenMemwatchRecentFile(0);
 }
 void AddMemWatch(char memaddress[32])
 {
diff --git a/src/drivers/win/res.rc b/src/drivers/win/res.rc
index 735c1ba396a4eb0fc70c889132d38c1ae970dbfa..49168073283903aaf1a7986a771758dce4472ec3 100644
GIT binary patch
delta 85
zcmZ3tfU|8rXG06)7N#D#$rBXW_}v&h8GIOA8R8j&fTZ*Eg<6cl)8C0Pg>C;K$K=Aq
p>dTPIkUQO4k;!~=02j-2J0&K8={<@}a?|HYGf8Z(QDWMp3jhuM7ij<h

delta 86
zcmZph&$(^^XG06)7N#CKPBR8mAT(w$o&HdaDS11WJd+F4^bkcRv&jLfT+{m$ne?W=
p6JrYDbYw_k$Y&^JD48xO&t%K)!Qjf^!w@hz+vxB11xifMbN~R}7svnr

diff --git a/src/drivers/win/resource.h b/src/drivers/win/resource.h
index 461205dd..1cf6573e 100644
--- a/src/drivers/win/resource.h
+++ b/src/drivers/win/resource.h
@@ -323,6 +323,7 @@
 #define ID_RECENT_                      40115
 #define ID_RECENT_1                     40116
 #define ID_FILE_RECENT                  40117
+#define ID_FILE_RECENT40118             40118
 #define MENU_LOG_SOUND                  40120
 #define MW_ValueLabel2                  65423
 #define MW_ValueLabel1                  65426
@@ -335,7 +336,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        108
-#define _APS_NEXT_COMMAND_VALUE         40118
+#define _APS_NEXT_COMMAND_VALUE         40119
 #define _APS_NEXT_CONTROL_VALUE         1130
 #define _APS_NEXT_SYMED_VALUE           101
 #endif