From 2b9adac338352a32758231df9c80a653d15383de Mon Sep 17 00:00:00 2001
From: michaelangel007 <michaelangel007@sharedcraft.com>
Date: Tue, 19 May 2020 08:37:15 -0700
Subject: [PATCH] Debugger: 2.9.1.0 Bookmarks now have their own indicator

---
 docs/Debugger_Changelog.txt          |   7 +++++
 resource/Debug_Font.bmp              | Bin 21560 -> 43130 bytes
 source/Debugger/Debug.cpp            |   2 +-
 source/Debugger/Debugger_Display.cpp |  41 +++++++++++++++------------
 4 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/docs/Debugger_Changelog.txt b/docs/Debugger_Changelog.txt
index 631c4e14..b2ca5a72 100644
--- a/docs/Debugger_Changelog.txt
+++ b/docs/Debugger_Changelog.txt
@@ -1,4 +1,11 @@
 /*
+
+
+2.9.1.0 Added: Bookmarks now have their own indicator (a number with a box around it) and replace the ":" seperator. Updated Debug_Font.bmp
+
+.18 Fixed: Resetting bookmarks wasn't setting the total bookmarks back to zero.
+.17 Fixed: If all bookmarks were used then setting a new one wouldn't update an existing one to the new address.
+.16 Fixed: Replacing an existing bookmark incorrectly increased the total bookmark count.
 .15 Cleanup: HELP CALC examples and See also.
 .14 Fixed: HELP JSR wasn't color-coding syntax.
 .13 Added: PROFILE LIST now shows how many clock cycles were executed.
diff --git a/resource/Debug_Font.bmp b/resource/Debug_Font.bmp
index 95baedb50d5bb927a7163c3cac20b758b9593922..bff94b660801a8de6b48cacb1ffeef5bc46564df 100644
GIT binary patch
delta 2098
zcmd^<!AiqG5QeitrJ)N#q2NIb-b6eILdBCHB6x_1f=}TgcR^e51?s#&j=cxOV;`X}
zAoLMD_fn_(n<2Z2-4e~og&neAX6E020(l>+`E=v(JnoMJv-%wOc_+LFyj8Hx5v$t?
zf^H`pMUN^=qlf<)D2?XN6MJDiHk&jEV_WK%N;GT_myXazA~fWPho<0N1M=+a>D$*L
zU+h9G<ZMw7Vj$dPRXKcBDy>y-#^RLQzPOEZ2O-YIAXtPT<#Og8D8Bruxdm@#U0)av
zx0f#qDaQiRJWza9HZ5CNr>W1ENI4eDYD~%yju2%6I3j-u#TO7qNd>8_Ukz<voa>}>
zW00bn$#OG)g3>`Q>t>2Cyr`{IEN5Tle+W^LmfpgdGzI_o4?l`tC~5EUCc06Y2A3fn
s9h~y{+VE*Bq}fT2xu!F%vzfZTecf%*+fI)@k2fiaHKi9JeOzsQ0b`53s{jB1

delta 102
zcmex$foaDIMja<#ix37dFawerKwJRC4nWMvAOR#97?^<aLfjxcxv@cSazV`Gi4HuI
p8)k7%HmI`%a{Yi<aq@*o&dCqDMS<cxlkF3DHa`dr3u0nm003W&8hZc$

diff --git a/source/Debugger/Debug.cpp b/source/Debugger/Debug.cpp
index 587e0071..4e78252b 100644
--- a/source/Debugger/Debug.cpp
+++ b/source/Debugger/Debug.cpp
@@ -50,7 +50,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #define ALLOW_INPUT_LOWERCASE 1
 
 	// See /docs/Debugger_Changelog.txt for full details
-	const int DEBUGGER_VERSION = MAKE_VERSION(2,9,0,15);
+	const int DEBUGGER_VERSION = MAKE_VERSION(2,9,1,0);
 
 
 // Public _________________________________________________________________________________________
diff --git a/source/Debugger/Debugger_Display.cpp b/source/Debugger/Debugger_Display.cpp
index 261bb49d..cd16dc73 100644
--- a/source/Debugger/Debugger_Display.cpp
+++ b/source/Debugger/Debugger_Display.cpp
@@ -622,7 +622,7 @@ void DebuggerSetColorBG( COLORREF nRGB, bool bTransparent )
 
 // @param glyph Specifies a native glyph from the 16x16 chars Apple Font Texture.
 //===========================================================================
-void PrintGlyph( const int x, const int y, const char glyph )
+void PrintGlyph( const int x, const int y, const int glyph )
 {	
 	HDC hDstDC = GetDebuggerMemDC();
 
@@ -1935,7 +1935,7 @@ WORD DrawDisassemblyLine ( int iLine, const WORD nBaseAddress )
 	bool bBreakpointEnable;
 	GetBreakpointInfo( nBaseAddress, bBreakpointActive, bBreakpointEnable );
 	bool bAddressAtPC = (nBaseAddress == regs.pc);
-	bool bAddressIsBookmark = Bookmark_Find( nBaseAddress );
+	int  bAddressIsBookmark = Bookmark_Find( nBaseAddress );
 
 	DebugColors_e iBackground = BG_DISASM_1;
 	DebugColors_e iForeground = FG_DISASM_MNEMONIC; // FG_DISASM_TEXT;
@@ -2005,16 +2005,8 @@ WORD DrawDisassemblyLine ( int iLine, const WORD nBaseAddress )
 		}
 	}
 
-	if (bAddressIsBookmark)
-	{
-		DebuggerSetColorBG( DebuggerGetColor( BG_DISASM_BOOKMARK ) );
-		DebuggerSetColorFG( DebuggerGetColor( FG_DISASM_BOOKMARK ) );
-	}
-	else
-	{
-		DebuggerSetColorBG( DebuggerGetColor( iBackground ) );
-		DebuggerSetColorFG( DebuggerGetColor( iForeground ) );
-	}
+	DebuggerSetColorBG( DebuggerGetColor( iBackground ) );
+	DebuggerSetColorFG( DebuggerGetColor( iForeground ) );
 
 	// Address
 	if (! bCursorLine)
@@ -2030,18 +2022,31 @@ WORD DrawDisassemblyLine ( int iLine, const WORD nBaseAddress )
 		PrintTextCursorX( (LPCTSTR) line.sAddress, linerect );
 	}
 
-	if (bAddressIsBookmark)
-	{
-		DebuggerSetColorBG( DebuggerGetColor( iBackground ) );
-		DebuggerSetColorFG( DebuggerGetColor( iForeground ) );
-	}
 
 	// Address Seperator		
 	if (! bCursorLine)
 		DebuggerSetColorFG( DebuggerGetColor( FG_DISASM_OPERATOR ) );
 
 	if (g_bConfigDisasmAddressColon)
-		PrintTextCursorX( ":", linerect );
+	{
+		if (bAddressIsBookmark)
+		{
+			DebuggerSetColorBG( DebuggerGetColor( BG_DISASM_BOOKMARK ) );
+			DebuggerSetColorFG( DebuggerGetColor( FG_DISASM_BOOKMARK ) );
+
+			// Can't use PrintTextCursorX() as that clamps chars > 0x7F to Mouse Text
+			//    char bookmark_text[2] = { 0x7F + bAddressIsBookmark, 0 };
+			//    PrintTextCursorX( bookmark_text, linerect );
+			FillRect( GetDebuggerMemDC(), &linerect, g_hConsoleBrushBG );
+			PrintGlyph( linerect.left, linerect.top, 0x7F + bAddressIsBookmark ); // Glyphs 0x80 .. 0x89 = Unicode U+24EA, U+2460 .. U+2468
+			linerect.left += g_aFontConfig[ FONT_DISASM_DEFAULT ]._nFontWidthAvg;
+
+			DebuggerSetColorBG( DebuggerGetColor( iBackground ) );
+			DebuggerSetColorFG( DebuggerGetColor( iForeground ) );
+		}
+		else
+			PrintTextCursorX( ":", linerect );
+	}
 	else
 		PrintTextCursorX( " ", linerect ); // bugfix, not showing "addr:" doesn't alternate color lines