Misc. fixes (#121)

* Fix C64 keyboard joytstick config bug.

* Cleanup.

src/apps/Highbyte.DotNet6502.App.SadConsole/ConfigUI/C64ConfigUIConsole.cs

@@ -244,12 +244,6 @@ Label CreateLabel(string text, int col, int row, string? name = null)
             Controls.Add(labelTemp);
             return labelTemp;
         }
-        Label CreateLabelValue(string text, int col, int row, string? name = null)
-        {
-            var labelTemp = new Label(text) { Position = new Point(col, row), TextColor = Controls.GetThemeColors().Title, Name = name };
-            Controls.Add(labelTemp);
-            return labelTemp;
-        }
 
         // Force OnIsDirtyChanged event which will set control states (see SetControlStates)
         OnIsDirtyChanged();
@@ -272,7 +266,7 @@ private void ShowROMFilePickerDialog(string romName)
         {
             if (window.DialogResult)
             {
-                C64SystemConfig.SetROM(romName, Path.GetFileName(window.SelectedFile.FullName));
+                C64SystemConfig.SetROM(romName, Path.GetFileName(window.SelectedFile!.FullName));
                 IsDirty = true;
             }
         };
@@ -308,15 +302,15 @@ private void SetControlStates()
         romDirectoryTextBox!.IsDirty = true;
 
         var kernalROMTextBox = Controls["kernalROMTextBox"] as TextBox;
-        kernalROMTextBox!.Text = C64SystemConfig.ROMs.SingleOrDefault(x => x.Name == C64SystemConfig.KERNAL_ROM_NAME).File;
+        kernalROMTextBox!.Text = C64SystemConfig.ROMs.Single(x => x.Name == C64SystemConfig.KERNAL_ROM_NAME).File!;
         kernalROMTextBox!.IsDirty = true;
 
         var basicROMTextBox = Controls["basicROMTextBox"] as TextBox;
-        basicROMTextBox!.Text = C64SystemConfig.ROMs.SingleOrDefault(x => x.Name == C64SystemConfig.BASIC_ROM_NAME).File;
+        basicROMTextBox!.Text = C64SystemConfig.ROMs.Single(x => x.Name == C64SystemConfig.BASIC_ROM_NAME).File!;
         basicROMTextBox!.IsDirty = true;
 
         var chargenROMTextBox = Controls["chargenROMTextBox"] as TextBox;
-        chargenROMTextBox!.Text = C64SystemConfig.ROMs.SingleOrDefault(x => x.Name == C64SystemConfig.CHARGEN_ROM_NAME).File;
+        chargenROMTextBox!.Text = C64SystemConfig.ROMs.Single(x => x.Name == C64SystemConfig.CHARGEN_ROM_NAME).File!;
         chargenROMTextBox!.IsDirty = true;
 
         var codingAssistantTestButton = Controls["codingAssistantTestButton"] as Button;

src/apps/Highbyte.DotNet6502.App.SadConsole/ConfigUI/C64MenuConsole.cs

@@ -76,7 +76,7 @@ private void DrawUIItems()
             Name = "c64CopyBasicSourceCodeButton",
             Position = (1, c64SaveBasicButton.Bounds.MaxExtentY + 2),
         };
-        c64CopyBasicSourceCodeButton.Click += C64CopyBasicSourceCodeButton_Click;
+        c64CopyBasicSourceCodeButton.Click += C64CopyBasicSourceCodeButton_Click!;
         Controls.Add(c64CopyBasicSourceCodeButton);
 
         // Paste
@@ -85,7 +85,7 @@ private void DrawUIItems()
             Name = "c64PasteTextButton",
             Position = (c64CopyBasicSourceCodeButton.Bounds.MaxExtentX + 9, c64CopyBasicSourceCodeButton.Position.Y),
         };
-        c64PasteTextButton.Click += C64PasteTextButton_Click;
+        c64PasteTextButton.Click += C64PasteTextButton_Click!;
         Controls.Add(c64PasteTextButton);
 
         // Paste
@@ -106,20 +106,14 @@ private void DrawUIItems()
             Name = "c64ConfigButton",
             Position = (1, c64aiBasicAssistantCheckbox.Bounds.MaxExtentY + 2),
         };
-        c64ConfigButton.Click += C64ConfigButton_Click;
+        c64ConfigButton.Click += C64ConfigButton_Click!;
         Controls.Add(c64ConfigButton);
 
 
         var validationMessageValueLabel = CreateLabelValue(new string(' ', 20), 1, c64ConfigButton.Bounds.MaxExtentY + 2, "validationMessageValueLabel");
         validationMessageValueLabel.TextColor = Controls.GetThemeColors().Red;
 
         // Helper function to create a label and add it to the console
-        Label CreateLabel(string text, int col, int row, string? name = null)
-        {
-            var labelTemp = new Label(text) { Position = new Point(col, row), Name = name };
-            Controls.Add(labelTemp);
-            return labelTemp;
-        }
         Label CreateLabelValue(string text, int col, int row, string? name = null)
         {
             var labelTemp = new Label(text) { Position = new Point(col, row), TextColor = Controls.GetThemeColors().Title, Name = name };
@@ -148,9 +142,9 @@ private void C64LoadBasicButton_Click(object? sender, EventArgs e)
             {
                 try
                 {
-                    var fileName = window.SelectedFile.FullName;
+                    var fileName = window.SelectedFile!.FullName;
                     BinaryLoader.Load(
-                        _sadConsoleHostApp.CurrentRunningSystem.Mem,
+                        _sadConsoleHostApp.CurrentRunningSystem!.Mem,
                         fileName,
                         out ushort loadedAtAddress,
                         out ushort fileLength);
@@ -200,7 +194,7 @@ private void C64SaveBasicButton_Click(object? sender, EventArgs e)
                     var fileName = window.SelectedFile.FullName;
                     // TODO: Does FilePickerConsole check if file already exists and ask for overwrite? Or do this here?
                     ushort startAddressValue = C64.BASIC_LOAD_ADDRESS;
-                    var endAddressValue = ((C64)_sadConsoleHostApp.CurrentRunningSystem).GetBasicProgramEndAddress();
+                    var endAddressValue = ((C64)_sadConsoleHostApp.CurrentRunningSystem!).GetBasicProgramEndAddress();
                     BinarySaver.Save(
                         _sadConsoleHostApp.CurrentRunningSystem.Mem,
                         fileName,
@@ -300,10 +294,11 @@ private void SetControlStates()
         validationMessageValueLabel!.IsVisible = !isOk;
     }
 
-    public async Task ToggleBasicAIAssistant()
+    public Task ToggleBasicAIAssistant()
     {
         var c64aiBasicAssistantCheckbox = Controls["c64aiBasicAssistantCheckbox"] as CheckBox;
         c64aiBasicAssistantCheckbox.IsSelected = !c64aiBasicAssistantCheckbox.IsSelected;
+        return Task.CompletedTask;
     }
 
     private async Task SetBasicAIAssistant(bool enabled)

src/apps/Highbyte.DotNet6502.App.SadConsole/FilePickerConsole.cs

@@ -1,5 +1,4 @@
 using System.Diagnostics;
-using System.IO;
 using SadConsole.UI;
 using SadConsole.UI.Controls;
 
@@ -166,7 +165,7 @@ private void FileListBox_SelectedItemChanged(object? sender, ListBox.SelectedIte
                     _selectedDirectory = new DirectoryInfo(fileListBox.CurrentFolder);
                     if (_filePickerMode == FilePickerMode.OpenFile || _filePickerMode == FilePickerMode.SaveFile)
                     {
-                        if (_selectedFile != null && _selectedDirectory.FullName != _selectedFile.Directory.FullName)
+                        if (_selectedFile != null && _selectedDirectory.FullName != _selectedFile.Directory!.FullName)
                             _selectedFile = new FileInfo(Path.Combine(_selectedDirectory.FullName, _selectedFile.Name));
                     }
                     else
@@ -176,8 +175,8 @@ private void FileListBox_SelectedItemChanged(object? sender, ListBox.SelectedIte
                         //selectedItemTextBox.IsDirty = true;
                     }
                 }
-
             }
+
             if (e.Item is DirectoryInfo directoryInfo)
             {
                 //Debug.WriteLine($"DirectoryInfo: {directoryInfo.FullName}");
@@ -203,7 +202,7 @@ private void FileListBox_SelectedItemChanged(object? sender, ListBox.SelectedIte
                     return;
 
                 _selectedFile = fileInfo;
-                _selectedDirectory = fileInfo.Directory;
+                _selectedDirectory = fileInfo.Directory!;
 
                 selectedItemTextBox.Text = _selectedFile.Name;
                 selectedItemTextBox.IsDirty = true;

src/apps/Highbyte.DotNet6502.App.SadConsole/InfoConsole.cs

@@ -137,7 +137,7 @@ Label CreateLabel(string text, int col, int row, string? name = null)
         // System debug info panel
         Panel debugInfoPanel = new Panel(10, 10);
         {
-            var labelTitleLength = 25;
+            var labelTitleLength = 28;
             _debugInfoLabels = new List<Label>();
             _debugInfoLabelValues = new List<Label>();
 

src/apps/Highbyte.DotNet6502.App.SadConsole/MonitorConsole.cs

@@ -1,6 +1,5 @@
 using Highbyte.DotNet6502.Monitor;
 using SadConsole.Components;
-using SadConsole.UI.Controls;
 using SadRogue.Primitives;
 using Console = SadConsole.Console;
 
@@ -19,9 +18,6 @@ internal class MonitorConsole : Console
     public SadConsoleMonitor Monitor => _monitor;
     private readonly ClassicConsoleKeyboardHandler _keyboardHandlerObject;
 
-    private Label _processorStatusLabel;
-    private List<Label> _sysInfoLabels;
-
     /// <summary>
     /// Console to display the monitor
     /// </summary>

src/apps/Highbyte.DotNet6502.App.SadConsole/MonitorStatusConsole.cs

@@ -1,4 +1,3 @@
-using Highbyte.DotNet6502.Systems;
 using Highbyte.DotNet6502.Utils;
 using SadConsole.UI;
 using SadRogue.Primitives;
@@ -13,10 +12,8 @@ internal class MonitorStatusConsole : ControlsConsole
 
     private readonly SadConsoleHostApp _sadConsoleHostApp;
 
-    public event EventHandler<bool>? MonitorStateChange;
-
     private const int NUMBER_OF_SYS_INFO_ROWS = USABLE_HEIGHT - 1;  // 1 row for CPU state
-    private string _emptyRow = new string(' ', USABLE_WIDTH);
+    private readonly string _emptyRow = new string(' ', USABLE_WIDTH);
 
 
     /// <summary>

src/apps/Highbyte.DotNet6502.App.SadConsole/SadConsoleHostApp.cs

@@ -182,7 +182,7 @@ private IScreenObject CreateMainSadConsoleScreen(GameHost gameHost)
                 // Position monitor to the right of the emulator console
                 _monitorConsole.UsePixelPositioning = true;
                 // Note: _sadConsoleEmulatorConsole has already changed to UsePixelPositioning = true, so its Position.X is in pixels (not Width though).
-                var emulatorMaxX = _sadConsoleEmulatorConsole.Position.X + ((int)(_sadConsoleEmulatorConsole.Width * _sadConsoleEmulatorConsole.Font.GlyphWidth * CommonHostSystemConfig.DefaultFontSize.GetFontSizeScaleFactor()));
+                var emulatorMaxX = _sadConsoleEmulatorConsole!.Position.X + ((int)(_sadConsoleEmulatorConsole.Width * _sadConsoleEmulatorConsole.Font.GlyphWidth * CommonHostSystemConfig.DefaultFontSize.GetFontSizeScaleFactor()));
                 var infoConsoleMax = _infoConsole != null && _infoConsole.IsVisible ? _infoConsole.Position.X + _infoConsole.WidthPixels : 0;
                 _monitorConsole.Position = new Point(Math.Max(emulatorMaxX, infoConsoleMax), 0);
 
@@ -195,7 +195,7 @@ private IScreenObject CreateMainSadConsoleScreen(GameHost gameHost)
             }
             else
             {
-                _sadConsoleEmulatorConsole.IsFocused = true;
+                _sadConsoleEmulatorConsole!.IsFocused = true;
                 _sadConsoleEmulatorConsole.UseKeyboard = false;
             }
 
@@ -205,9 +205,9 @@ private IScreenObject CreateMainSadConsoleScreen(GameHost gameHost)
         _sadConsoleScreen.Children.Add(_monitorConsole);
 
         // Logo
-        int logoWidthAndHeight = 256; // Pixels
         _logoDrawImage = new DrawImage("Resources/Images/logo-256.png");
         _logoDrawImage.PositionMode = DrawImage.PositionModes.Pixels;
+        //int logoWidthAndHeight = 256; // Pixels
         //var logoX = (MenuConsole.CONSOLE_WIDTH * _menuConsole.Font.GlyphWidth) + ((StartupScreenWidth - MenuConsole.CONSOLE_WIDTH) * _menuConsole.Font.GlyphWidth - logoWidthAndHeight) / 2;
         //var logoY = ((MenuConsole.CONSOLE_HEIGHT * _menuConsole.Font.GlyphHeight) - logoWidthAndHeight) / 2;
         var logoX = (MenuConsole.CONSOLE_WIDTH * _menuConsole.Font.GlyphWidth) + 10;
@@ -236,7 +236,7 @@ public override void OnAfterSelectSystem()
         // Clear any old system specific menu console
         if (_systemMenuConsole != null)
         {
-            if (_sadConsoleScreen.Children.Contains(_systemMenuConsole))
+            if (_sadConsoleScreen!.Children.Contains(_systemMenuConsole))
                 _sadConsoleScreen.Children.Remove(_systemMenuConsole);
             _systemMenuConsole.Dispose();
             _systemMenuConsole = null;
@@ -246,7 +246,7 @@ public override void OnAfterSelectSystem()
         {
             _systemMenuConsole = new C64MenuConsole(this, _loggerFactory, _configuration);
             _systemMenuConsole.Position = (MENU_POSITION_X, _menuConsole.Height);
-            _sadConsoleScreen.Children.Add(_systemMenuConsole);
+            _sadConsoleScreen!.Children.Add(_systemMenuConsole);
         }
 
         _infoConsole.ShowSelectedSystemInfoHelp();
@@ -273,9 +273,9 @@ public override bool OnBeforeStart(ISystem systemAboutToBeStarted)
         }
         _sadConsoleEmulatorConsole = EmulatorConsole.Create(systemAboutToBeStarted, font, CommonHostSystemConfig.DefaultFontSize, SadConsoleUISettings.CreateEmulatorConsoleDrawBoxBorderParameters(font.SolidGlyphIndex));
         _sadConsoleEmulatorConsole.UsePixelPositioning = true;
-        _sadConsoleEmulatorConsole.Position = new Point((_menuConsole.Position.X * _menuConsole.Font.GlyphWidth) + (_menuConsole.Width * _menuConsole.Font.GlyphWidth), 0);
+        _sadConsoleEmulatorConsole.Position = new Point((_menuConsole!.Position.X * _menuConsole.Font.GlyphWidth) + (_menuConsole.Width * _menuConsole.Font.GlyphWidth), 0);
         _sadConsoleEmulatorConsole.IsFocused = true;
-        _sadConsoleScreen.Children.Add(_sadConsoleEmulatorConsole);
+        _sadConsoleScreen!.Children.Add(_sadConsoleEmulatorConsole);
 
         // Resize main window to fit menu, emulator, and other consoles
         Game.Instance.ResizeWindow(CalculateWindowWidthPixels(), CalculateWindowHeightPixels());
@@ -309,7 +309,7 @@ public override void OnAfterStart(EmulatorState emulatorStateBeforeStart)
     public override void OnBeforeStop()
     {
         // Disable monitor if it is visible
-        if (_monitorConsole.IsVisible)
+        if (_monitorConsole!.IsVisible)
             DisableMonitor();
         // Clear stats in info console if it is visible (logs will still be shown)
         if (_infoConsole.IsVisible)
@@ -320,7 +320,7 @@ public override void OnAfterStop()
         // Remove the console containing the running system
         if (_sadConsoleEmulatorConsole != null)
         {
-            if (_sadConsoleScreen.Children.Contains(_sadConsoleEmulatorConsole))
+            if (_sadConsoleScreen!.Children.Contains(_sadConsoleEmulatorConsole))
                 _sadConsoleScreen.Children.Remove(_sadConsoleEmulatorConsole);
             _sadConsoleEmulatorConsole.Dispose();
             _sadConsoleEmulatorConsole = null;
@@ -346,7 +346,7 @@ public override void OnAfterClose()
     private void UpdateSadConsole(object? sender, GameHost gameHost)
     {
         // Handle UI-specific keyboard inputs such as toggle monitor, info, etc.
-        HandleUIKeyboardInput();
+        HandleUIKeyboardInput().Wait();
 
         // RunEmulatorOneFrame() will first handle input, then emulator in run for one frame.
         RunEmulatorOneFrame();
@@ -586,10 +586,10 @@ public void SetEmulatorConsoleFocus()
     private async Task HandleUIKeyboardInput()
     {
         var keyboard = GameHost.Instance.Keyboard;
-        //if (keyboard.IsKeyPressed(Keys.F10))
+        //if (keyboard.IsKeyReleased(Keys.F10))
         //    ToggleLogs();
 
-        if (keyboard.IsKeyPressed(Keys.F11))
+        if (keyboard.IsKeyReleased(Keys.F11))
         {
             keyboard.Clear();
             ToggleInfo();

src/apps/Highbyte.DotNet6502.App.SadConsole/SystemSetup/C64HostConfig.cs

@@ -8,7 +8,7 @@ public class C64HostConfig : SadConsoleHostSystemConfigBase
 {
     public const string ConfigSectionName = "Highbyte.DotNet6502.C64.SadConsole";
 
-    public C64SystemConfig SystemConfig
+    public new C64SystemConfig SystemConfig
     {
         get { return (C64SystemConfig)base.SystemConfig; }
         set { base.SystemConfig = value; }

src/apps/Highbyte.DotNet6502.App.SadConsole/SystemSetup/C64Setup.cs

@@ -63,6 +63,8 @@ public Task<ISystem> BuildSystem(string configurationVariant, IHostSystemConfig
             C64Model = configurationVariant,
             Vic2Model = C64ModelInventory.C64Models[configurationVariant].Vic2Models.First().Name, // NTSC, NTSC_old, PAL
             AudioEnabled = c64HostSystemConfig.SystemConfig.AudioEnabled,
+            KeyboardJoystickEnabled = c64HostSystemConfig.SystemConfig.KeyboardJoystickEnabled,
+            KeyboardJoystick = c64HostSystemConfig.SystemConfig.KeyboardJoystick,
             ROMs = c64HostSystemConfig.SystemConfig.ROMs,
             ROMDirectory = c64HostSystemConfig.SystemConfig.ROMDirectory,
         };

src/apps/Highbyte.DotNet6502.App.SadConsole/SystemSetup/GenericComputerHostConfig.cs

@@ -7,7 +7,7 @@ public class GenericComputerHostConfig : SadConsoleHostSystemConfigBase
 {
     public const string ConfigSectionName = "Highbyte.DotNet6502.GenericComputer.SadConsole";
 
-    public GenericComputerSystemConfig SystemConfig
+    public new GenericComputerSystemConfig SystemConfig
     {
         get { return (GenericComputerSystemConfig)base.SystemConfig; }
         set { base.SystemConfig = value; }

src/apps/Highbyte.DotNet6502.App.SilkNetNative/SilkNetHostApp.cs

@@ -452,7 +452,7 @@ private SilkNetImGuiStatsPanel CreateStatsUI()
 
     private SilkNetImGuiDebugPanel CreateDebugUI()
     {
-        return new SilkNetImGuiDebugPanel(GetDebugInfo);
+        return new SilkNetImGuiDebugPanel(() => CurrentRunningSystem!.DebugInfo);
     }
 
     private SilkNetImGuiLogsPanel CreateLogsUI(DotNet6502InMemLogStore logStore, DotNet6502InMemLoggerConfiguration logConfig)

src/apps/Highbyte.DotNet6502.App.SilkNetNative/SystemSetup/C64Setup.cs

@@ -50,6 +50,8 @@ public Task<ISystem> BuildSystem(string configurationVariant, IHostSystemConfig
             C64Model = configurationVariant,
             Vic2Model = C64ModelInventory.C64Models[configurationVariant].Vic2Models.First().Name, // NTSC, NTSC_old, PAL
             AudioEnabled = c64HostSystemConfig.SystemConfig.AudioEnabled,
+            KeyboardJoystickEnabled = c64HostSystemConfig.SystemConfig.KeyboardJoystickEnabled,
+            KeyboardJoystick = c64HostSystemConfig.SystemConfig.KeyboardJoystick,
             ROMs = c64HostSystemConfig.SystemConfig.ROMs,
             ROMDirectory = c64HostSystemConfig.SystemConfig.ROMDirectory,
         };

src/apps/Highbyte.DotNet6502.App.WASM/Emulator/SystemSetup/C64Setup.cs

@@ -97,6 +97,8 @@ public Task<ISystem> BuildSystem(string configurationVariant, IHostSystemConfig
             C64Model = configurationVariant,
             Vic2Model = C64ModelInventory.C64Models[configurationVariant].Vic2Models.First().Name, // NTSC, NTSC_old, PAL
             AudioEnabled = c64HostSystemConfig.SystemConfig.AudioEnabled,
+            KeyboardJoystickEnabled = c64HostSystemConfig.SystemConfig.KeyboardJoystickEnabled,
+            KeyboardJoystick = c64HostSystemConfig.SystemConfig.KeyboardJoystick,
             ROMs = c64HostSystemConfig.SystemConfig.ROMs,
             ROMDirectory = c64HostSystemConfig.SystemConfig.ROMDirectory,
         };
@@ -206,7 +208,7 @@ public static async Task<ICodeSuggestion> GetCodeSuggestionImplementation(C64Hos
             if (c64HostConfig.CodeSuggestionBackendType == CodeSuggestionBackendTypeEnum.OpenAI)
             {
                 var openAIApiConfig = await GetOpenAIConfig(localStorageService);
-                codeSuggestion = OpenAICodeSuggestion.CreateOpenAICodeSuggestionForOpenAI(openAIApiConfig, C64BasicCodingAssistant.CODE_COMPLETION_LANGUAGE_DESCRIPTION, C64BasicCodingAssistant.CODE_COMPLETION_ADDITIONAL_SYSTEM_INSTRUCTION);
+                codeSuggestion = OpenAICodeSuggestion.CreateOpenAICodeSuggestion(openAIApiConfig, C64BasicCodingAssistant.CODE_COMPLETION_LANGUAGE_DESCRIPTION, C64BasicCodingAssistant.CODE_COMPLETION_ADDITIONAL_SYSTEM_INSTRUCTION);
             }
             else if (c64HostConfig.CodeSuggestionBackendType == CodeSuggestionBackendTypeEnum.OpenAISelfHostedCodeLlama)
             {