From 42c30d521ce313be593c52263f2b39fe4c0a9b28 Mon Sep 17 00:00:00 2001
From: Kingcom <sorgts@googlemail.com>
Date: Fri, 30 Aug 2013 20:55:58 +0200
Subject: [PATCH] -new accelerators for the Debugger -copy address on right
 click in memory view -don't change status bar text after activating the
 breakpoint window

---
 Windows/Debugger/CtrlMemView.cpp     |   8 ++++++++
 Windows/Debugger/Debugger_Disasm.cpp |  18 +++++++++++++++++-
 Windows/Debugger/Debugger_Disasm.h   |   1 +
 Windows/ppsspp.rc                    | Bin 41820 -> 42460 bytes
 Windows/resource.h                   | Bin 23142 -> 23412 bytes
 5 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/Windows/Debugger/CtrlMemView.cpp b/Windows/Debugger/CtrlMemView.cpp
index ae48aa4dc2..d09d3c62e5 100644
--- a/Windows/Debugger/CtrlMemView.cpp
+++ b/Windows/Debugger/CtrlMemView.cpp
@@ -436,6 +436,14 @@ void CtrlMemView::onMouseUp(WPARAM wParam, LPARAM lParam, int button)
 				W32Util::CopyTextToClipboard(wnd,temp);
 			}
 			break;
+
+		case ID_MEMVIEW_COPYADDRESS:
+			{
+				char temp[24];
+				sprintf(temp,"0x%08X",curAddress);
+				W32Util::CopyTextToClipboard(wnd,temp);
+			}
+			break;
 		}
 		return;
 	}
diff --git a/Windows/Debugger/Debugger_Disasm.cpp b/Windows/Debugger/Debugger_Disasm.cpp
index 4b1cfea7a1..60f66b0e70 100644
--- a/Windows/Debugger/Debugger_Disasm.cpp
+++ b/Windows/Debugger/Debugger_Disasm.cpp
@@ -74,6 +74,7 @@ CDisasm::CDisasm(HINSTANCE _hInstance, HWND _hParent, DebugInterface *_cpu) : Di
 {
 	cpu = _cpu;
 	lastTicks = CoreTiming::GetTicks();
+	keepStatusBarText = false;
 
 	SetWindowText(m_hDlg, ConvertUTF8ToWString(_cpu->GetName()).c_str());
 #ifdef THEMES
@@ -413,8 +414,21 @@ BOOL CDisasm::DlgProc(UINT message, WPARAM wParam, LPARAM lParam)
 				changeSubWindow(SUBWIN_STACKFRAMES);
 				break;
 
+			case ID_DEBUG_DSIPLAYREGISTERLIST:
+				TabCtrl_SetCurSel(GetDlgItem(m_hDlg, IDC_LEFTTABS),0);
+				ShowWindow(GetDlgItem(m_hDlg, IDC_REGLIST), SW_NORMAL);
+				ShowWindow(GetDlgItem(m_hDlg, IDC_FUNCTIONLIST), SW_HIDE);
+				break;
+				
+			case ID_DEBUG_DSIPLAYFUNCTIONLIST:
+				TabCtrl_SetCurSel(GetDlgItem(m_hDlg, IDC_LEFTTABS),1);
+				ShowWindow(GetDlgItem(m_hDlg, IDC_REGLIST), SW_HIDE);
+				ShowWindow(GetDlgItem(m_hDlg, IDC_FUNCTIONLIST), SW_NORMAL);
+				break;
+
 			case ID_DEBUG_ADDBREAKPOINT:
 				{
+					keepStatusBarText = true;
 					bool isRunning = Core_IsActive();
 					if (isRunning)
 					{
@@ -431,6 +445,7 @@ BOOL CDisasm::DlgProc(UINT message, WPARAM wParam, LPARAM lParam)
 						SetDebugMode(false);
 						Core_EnableStepping(false);
 					}
+					keepStatusBarText = false;
 				}
 				break;
 
@@ -650,7 +665,8 @@ BOOL CDisasm::DlgProc(UINT message, WPARAM wParam, LPARAM lParam)
 		changeSubWindow(SUBWIN_NEXT);
 		break;
 	case WM_DEB_SETSTATUSBARTEXT:
-		SendMessage(statusBarWnd,WM_SETTEXT,0,(LPARAM)ConvertUTF8ToWString((const char *)lParam).c_str());
+		if (!keepStatusBarText)
+			SendMessage(statusBarWnd,WM_SETTEXT,0,(LPARAM)ConvertUTF8ToWString((const char *)lParam).c_str());
 		break;
 	case WM_DEB_GOTOHEXEDIT:
 		{
diff --git a/Windows/Debugger/Debugger_Disasm.h b/Windows/Debugger/Debugger_Disasm.h
index d5425ca2ea..4168a27d5c 100644
--- a/Windows/Debugger/Debugger_Disasm.h
+++ b/Windows/Debugger/Debugger_Disasm.h
@@ -37,6 +37,7 @@ private:
 	CtrlStackTraceView* stackTraceView;
 	std::vector<BreakPoint> displayedBreakPoints_;
 	std::vector<MemCheck> displayedMemChecks_;
+	bool keepStatusBarText;
 
 	BOOL DlgProc(UINT message, WPARAM wParam, LPARAM lParam);
 	void UpdateSize(WORD width, WORD height);
diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc
index 44482d4f84c69452a37fbba8fc41b55cd7fab5d8..8b0b2d84ae7706c464175cecd4c60476ddb1bf3a 100644
GIT binary patch
delta 179
zcmca}jOos4rVR&#CvW3anQS1+!|KT3!r(G_qmSt1L*i1C3q+kJi}4z$yD$VZcrpYq
z_%Jv!L^1?1xH7l{`N0e!Kvob?6vEb-tSBTuc>=%Q<SSf8XnNcjLK*xRoPjz#8T^4P
u3_Y9o37@H)EYr`!m^fLp-*j?cpTOjtew)b?lB_1bo9O`JZx-qE5Cs4?uQ09v

delta 43
zcmV+`0M!57%L3fS0<gdnlPV7+lQ0zylQ0(yv+xy+d6R%?I+JdkK$E_Y7_*#^KoyU0
B5(xkR

diff --git a/Windows/resource.h b/Windows/resource.h
index 553aecf196e61bd286d7d4d80515c2d98586e454..fc4977a54f8462a2b3a629e22ef907a57a1a5fba 100644
GIT binary patch
delta 110
zcmaF1h4ITa#tomOCSQ|K(GO<uWC&pJVQ^%KWC&t#WpD@bgBe1AtRSE$gss2;fkq4_
slMjk(b0g`Q9M7o83KVCsm~3cbJXy&?X>x-k3!~-ah2g53g``950mb$iApigX

delta 20
ccmeyejq%wQ#tomOCYp&%is0F-AQNH_0B7_FRsaA1