From f662ef162572e41115b5a499851e26d6b6cf5e0c Mon Sep 17 00:00:00 2001
From: Sour <mesenemu@gmail.com>
Date: Tue, 8 Feb 2022 22:19:15 -0500
Subject: [PATCH] Debugger: Added debug log window

---
 NewUI/Config/Debugger/DebugLogConfig.cs       |  4 +-
 NewUI/Debugger/Utilities/ContextMenuAction.cs |  3 +
 NewUI/Debugger/Windows/DebugLogWindow.axaml   | 33 ++++++++
 .../Debugger/Windows/DebugLogWindow.axaml.cs  | 75 +++++++++++++++++++
 NewUI/Localization/resources.en.xml           | 12 ++-
 NewUI/NewUI.csproj                            |  3 +
 NewUI/ViewModels/MainMenuViewModel.cs         |  6 ++
 NewUI/Windows/LogWindow.axaml                 | 23 +++---
 8 files changed, 144 insertions(+), 15 deletions(-)
 create mode 100644 NewUI/Debugger/Windows/DebugLogWindow.axaml
 create mode 100644 NewUI/Debugger/Windows/DebugLogWindow.axaml.cs

diff --git a/NewUI/Config/Debugger/DebugLogConfig.cs b/NewUI/Config/Debugger/DebugLogConfig.cs
index 6ffc71cd..2a1d4089 100644
--- a/NewUI/Config/Debugger/DebugLogConfig.cs
+++ b/NewUI/Config/Debugger/DebugLogConfig.cs
@@ -2,9 +2,7 @@
 
 namespace Mesen.Config
 {
-	public class DebugLogConfig
+	public class DebugLogConfig : BaseWindowConfig<DebugLogConfig>
 	{
-		public Size WindowSize = new Size(0, 0);
-		public Point WindowLocation;
 	}
 }
\ No newline at end of file
diff --git a/NewUI/Debugger/Utilities/ContextMenuAction.cs b/NewUI/Debugger/Utilities/ContextMenuAction.cs
index f0b86744..cffdc1df 100644
--- a/NewUI/Debugger/Utilities/ContextMenuAction.cs
+++ b/NewUI/Debugger/Utilities/ContextMenuAction.cs
@@ -411,6 +411,9 @@ namespace Mesen.Debugger.Utilities
 
 		[IconFile("Chip")]
 		OpenAssembler,
+		
+		[IconFile("LogWindow")]
+		OpenDebugLog,
 
 		[IconFile("Speed")]
 		OpenProfiler,
diff --git a/NewUI/Debugger/Windows/DebugLogWindow.axaml b/NewUI/Debugger/Windows/DebugLogWindow.axaml
new file mode 100644
index 00000000..db9270a5
--- /dev/null
+++ b/NewUI/Debugger/Windows/DebugLogWindow.axaml
@@ -0,0 +1,33 @@
+<Window
+	xmlns="https://github.com/avaloniaui"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:m="clr-namespace:Mesen"
+	xmlns:vm="using:Mesen.ViewModels"
+	xmlns:l="using:Mesen.Localization"
+	xmlns:v="using:Mesen.Views"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="400"
+	x:Class="Mesen.Debugger.Windows.DebugLogWindow"
+	Width="400" Height="400"
+	Icon="/Assets/LogWindow.png"
+	Title="{l:Translate wndTitle}"
+	Name="root"
+>
+	<DockPanel>
+		<StackPanel DockPanel.Dock="Bottom" HorizontalAlignment="Right" Margin="2">
+			<Button Width="70" HorizontalContentAlignment="Center" IsCancel="True" Click="Ok_OnClick" Content="{l:Translate btnClose}" />
+		</StackPanel>
+		
+		<TextBox
+			Name="txtLog"
+			Height="NaN"
+			IsReadOnly="True"
+			AcceptsReturn="True"
+			ScrollViewer.AllowAutoHide="False"
+			ScrollViewer.HorizontalScrollBarVisibility="Auto"
+			ScrollViewer.VerticalScrollBarVisibility="Auto"
+			Text="{CompiledBinding LogContent, ElementName=root}"
+		/>
+	</DockPanel>
+</Window>
diff --git a/NewUI/Debugger/Windows/DebugLogWindow.axaml.cs b/NewUI/Debugger/Windows/DebugLogWindow.axaml.cs
new file mode 100644
index 00000000..fe50cae7
--- /dev/null
+++ b/NewUI/Debugger/Windows/DebugLogWindow.axaml.cs
@@ -0,0 +1,75 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+using Avalonia.Threading;
+using System;
+using System.ComponentModel;
+using Avalonia.Data;
+using Mesen.Interop;
+using Mesen.Config;
+
+namespace Mesen.Debugger.Windows
+{
+	public class DebugLogWindow : Window
+	{
+		private DispatcherTimer _timer;
+
+		public static readonly StyledProperty<string> LogContentProperty = AvaloniaProperty.Register<DebugLogWindow, string>(nameof(LogContent), "", defaultBindingMode: BindingMode.OneWayToSource);
+
+		public string LogContent
+		{
+			get { return GetValue(LogContentProperty); }
+			set { SetValue(LogContentProperty, value); }
+		}
+
+		public DebugLogWindow()
+		{
+			InitializeComponent();
+			_timer = new DispatcherTimer(TimeSpan.FromMilliseconds(100), DispatcherPriority.Normal, (s, e) => UpdateLog());
+
+			ConfigManager.Config.Debug.DebugLog.LoadWindowSettings(this);
+		}
+
+		private void InitializeComponent()
+		{
+			AvaloniaXamlLoader.Load(this);
+		}
+
+		private void UpdateLog()
+		{
+			string newLog = DebugApi.GetLog();
+			if(newLog != LogContent) {
+				LogContent = newLog;
+				this.FindControl<TextBox>("txtLog").CaretIndex = Int32.MaxValue;
+			}
+		}
+
+		protected override void OnOpened(EventArgs e)
+		{
+			base.OnOpened(e);
+
+			if(Design.IsDesignMode) {
+				return;
+			}
+
+			_timer.Start();
+		}
+
+		private void Ok_OnClick(object sender, RoutedEventArgs e)
+		{
+			Close();
+		}
+
+		protected override void OnClosing(CancelEventArgs e)
+		{
+			base.OnClosing(e);
+			if(Design.IsDesignMode) {
+				return;
+			}
+			_timer.Stop();
+			ConfigManager.Config.Debug.DebugLog.SaveWindowSettings(this);
+			DataContext = null;
+		}
+	}
+}
\ No newline at end of file
diff --git a/NewUI/Localization/resources.en.xml b/NewUI/Localization/resources.en.xml
index f7dace64..a18a49b1 100644
--- a/NewUI/Localization/resources.en.xml
+++ b/NewUI/Localization/resources.en.xml
@@ -768,7 +768,17 @@
 			<Control ID="btnRun">Run</Control>
 			<Control ID="btnStop">Stop</Control>
 		</Form>
-
+		
+		<Form ID="LogWindow">
+			<Control ID="wndTitle">Log Window</Control>
+			<Control ID="btnClose">Close</Control>
+		</Form>
+		
+		<Form ID="DebugLogWindow">
+			<Control ID="wndTitle">Debug Log</Control>
+			<Control ID="btnClose">Close</Control>
+		</Form>
+		
 		<Form ID="TraceLoggerWindow">
 			<Control ID="wndTitle">Trace Logger</Control>
 			<Control ID="lblFormat">Format: </Control>
diff --git a/NewUI/NewUI.csproj b/NewUI/NewUI.csproj
index e7fa6ecb..0251334e 100644
--- a/NewUI/NewUI.csproj
+++ b/NewUI/NewUI.csproj
@@ -267,6 +267,9 @@
     <Compile Update="Debugger\Windows\BreakInWindow.axaml.cs">
       <DependentUpon>BreakInWindow.axaml</DependentUpon>
     </Compile>
+    <Compile Update="Debugger\Windows\DebugLogWindow.axaml.cs">
+      <DependentUpon>DebugLogWindow.axaml</DependentUpon>
+    </Compile>
     <Compile Update="Debugger\Windows\RegisterViewerWindow.axaml.cs">
       <DependentUpon>RegisterViewerWindow.axaml</DependentUpon>
     </Compile>
diff --git a/NewUI/ViewModels/MainMenuViewModel.cs b/NewUI/ViewModels/MainMenuViewModel.cs
index 826508c8..4072c6d7 100644
--- a/NewUI/ViewModels/MainMenuViewModel.cs
+++ b/NewUI/ViewModels/MainMenuViewModel.cs
@@ -802,6 +802,12 @@ namespace Mesen.ViewModels
 					IsEnabled = () => IsGameRunning,
 					OnClick = () => DebugWindowManager.OpenDebugWindow(() => new AssemblerWindow(new AssemblerWindowViewModel(MainWindow.RomInfo.ConsoleType.GetMainCpuType())))
 				},
+				new ContextMenuAction() {
+					ActionType = ActionType.OpenDebugLog,
+					Shortcut = () => ConfigManager.Config.Debug.Shortcuts.Get(DebuggerShortcut.OpenDebugLog),
+					IsEnabled = () => IsGameRunning,
+					OnClick = () => DebugWindowManager.OpenDebugWindow(() => new DebugLogWindow())
+				},
 				new ContextMenuAction() {
 					ActionType = ActionType.OpenProfiler,
 					Shortcut = () => ConfigManager.Config.Debug.Shortcuts.Get(DebuggerShortcut.OpenProfiler),
diff --git a/NewUI/Windows/LogWindow.axaml b/NewUI/Windows/LogWindow.axaml
index 70143dd1..d7d7147f 100644
--- a/NewUI/Windows/LogWindow.axaml
+++ b/NewUI/Windows/LogWindow.axaml
@@ -5,28 +5,29 @@
 	xmlns:m="clr-namespace:Mesen"
 	xmlns:vm="using:Mesen.ViewModels"
 	xmlns:v="using:Mesen.Views"
+	xmlns:l="using:Mesen.Localization"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	mc:Ignorable="d" d:DesignWidth="620" d:DesignHeight="500"
+	mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="400"
 	x:Class="Mesen.Windows.LogWindow"
-	Width="620" Height="500"
-	Icon="/Assets/Icon.ico"
-	Title="Log Window"
+	Width="400" Height="400"
+	Icon="/Assets/LogWindow.png"
+	Title="{l:Translate wndTitle}"
 	Name="root"
 >
-	<DockPanel DataContext="{Binding ElementName=root}">
-		<StackPanel DockPanel.Dock="Bottom" HorizontalAlignment="Right" Margin="5 3">
-			<Button Width="70" HorizontalContentAlignment="Center" IsCancel="True" Click="Ok_OnClick">Close</Button>
+	<DockPanel>
+		<StackPanel DockPanel.Dock="Bottom" HorizontalAlignment="Right" Margin="2">
+			<Button Width="70" HorizontalContentAlignment="Center" IsCancel="True" Click="Ok_OnClick" Content="{l:Translate btnClose}" />
 		</StackPanel>
+		
 		<TextBox
 			Name="txtLog"
-			MaxHeight="10000"
 			Height="NaN"
 			IsReadOnly="True"
-			TextWrapping="Wrap"
 			AcceptsReturn="True"
-			VerticalContentAlignment="Top"
+			ScrollViewer.AllowAutoHide="False"
+			ScrollViewer.HorizontalScrollBarVisibility="Auto"
 			ScrollViewer.VerticalScrollBarVisibility="Auto"
-			Text="{Binding LogContent}"
+			Text="{CompiledBinding LogContent, ElementName=root}"
 		/>
 	</DockPanel>
 </Window>