Files
Terminal.Gui/UICatalog/KeyBindingsDialog.cs
Tig dcb3b359ad Fixes #2926 - Refactor KeyEvent and KeyEventEventArgs to simplify (#2927)
* Adds basic MainLoop unit tests

* Remove WinChange action from Curses

* Remove WinChange action from Curses

* Remove ProcessInput action from Windows MainLoop

* Simplified MainLoop/ConsoleDriver by making MainLoop internal and moving impt fns to Application

* Modernized Terminal resize events

* Modernized Terminal resize events

* Removed un used property

* for _isWindowsTerminal devenv->wininit; not sure what changed

* Modernized mouse/keyboard events (Action->EventHandler)

* Updated OnMouseEvent API docs

* Using WT_SESSION to detect WT

* removes hacky GetParentProcess

* Updates to fix #2634 (clear last line)

* removes hacky GetParentProcess2

* Addressed mac resize issue

* Addressed mac resize issue

* Removes ConsoleDriver.PrepareToRun, has Init return MainLoop

* Removes unneeded Attribute methods

* Removed GetProcesssName

* Removed GetProcesssName

* Refactored KeyEvent and KeyEventEventArgs into a single class

* Revert "Refactored KeyEvent and KeyEventEventArgs into a single class"

This reverts commit 88a00658db.

* Fixed key repeat issue; reverted stupidity on 1049/1047 confusion

* Updated CSI API Docs

* merge

* Rearranged Event.cs to Keyboard.cs and Mouse.cs

* Renamed KeyEventEventArgs KeyEventArgs

* temp renamed KeyEvent OldKeyEvent

* Merged KeyEvent into KeyEventArgs

* Renamed Application.ProcessKey members

* Renamed Application.ProcessKey members

* Renamed Application.ProcessKey members

* Added Responder.KeyPressed

* Removed unused references

* Fixed arg naming

* InvokeKeybindings->InvokeKeyBindings

* InvokeKeybindings->InvokeKeyBindings

* Fixed unit tests fail

* More progress on refactoring key input; still broken and probably wrong

* Moved OnKeyPressed out of Responder and made ProcessKeyPrssed non-virtual

* Updated API docs

* Moved key handling from Responder to View

* Updated API docs

* Updated HotKey API docs

* Updated shortcut API docs

* Fixed responder unit tests

* Removed Shortcut from View as it is not used

* Removed unneeded OnHotKey override from Button

* Fixed BackTab logic

* Button now uses Key Bindings exclusively

* Button now uses Key Bindings exclusively

* Updated keyboard.md docs

* Fixed unit tests to account for Toplevel handling default button

* Added View.InvokeCommand API

* Modernized RadioGroup

* Removed ColdKey

* Modernized (partially) StatusBar

* Worked around FileDialog issue with Ctrl-F

* Fixed driver unit test; view must be focused to reciev key pressed

* Application code cleanup

* Start on updaing menu

* Menu now mostly works

* Menu Select refinement

* Fixed known menu bugs!

* Enabled HotKey to cause focus- experimental

* Fixes #3022 & adds unit test to prove it

* Actually Fixes #3022 & adds unit test to prove it

* Working through hotkey issues

* Misc fixes

* removed hot/cold key stuff from Keys scenario

* Fixed scenarios

* Simplified shortcut string handling

* Modernized Checkbox

* Modernized TileView

* Updated API docs

* Updated API docs

* attempting to publish v2 docs

* Revert "attempting to publish v2 docs"

This reverts commit 59dcec111b.

* Playing with api docs

* Removed Key.BackTab

* Removed Caps/Scroll/Numlock

* Partial removal of keymodifiers - unit tests pass

* Partial removal of keymodifiers - broke netdriver somewhere

* WindowsDriver & added KeyEventArgsTests

* Fixing menu shortcut/hotkeys - broke Menu.cs into separate files

* Fixed MenuBar!

* Finished modernizing Menu/MenuBar

* Removed Key.a-z. Broke lots of stuff

* checkout@v4

* progress on key mapping and formatting

* VK tests are still failing

* Fixed some unit tests

* Added Hotkey and Keybinding unit tests

* fixed unit test

* All unit tests pass again...

* Fixed broken unit tests

* KeyEventArgs.KeyValue -> AsRune

* Fixed bugs. Still some broken

* Added KeyEventArgs.IsAlpha. Added KeyEventArgs.cast ops. Fixed bugs. Unit tests pass

* Fixed WindowsDriver

* Oops.

* Refactoring based on bdisp's help. Not complete!

* removed calling into subviews from OnKeyBindings

* removed calling into subviews from OnKeyBindings

* Improved View KeyEvent unit tests

* More hotkey unit tests

* BIg change - Got rid of KeyPress w/in Application/Drivers

* Unit tests now pass again

* Refreshed API docs

* Better HotKey logic. More progress. Getting close.

* Fixed handling of shifted chars like ö

* Minor code cleanup

* Minor code cleanup2

* Why is build Action failing?

* Why is build Action failing??

* upgraded to .net8 to try to fix weird CI/CD build errors

* upgraded to .net8 to try to fix weird CI/CD build errors2

* Disabling TextViewTests to diagnose build errors

* reenable TextViewTests to diagnose build errors

* Arrrrrrg

* Merged v2_develop

* Fixed uppercase accented keys in WindowsDriver

* Fixed key binding api docs

* Experimental impl of CommandScope.SubViews for MenuBar

* Removed dead code from application.cs

* Removed dead code from application.cs

* Removed dead code from ConsoleDriver.cs

* Cleaned up some key binding stuff

* Disabled Alt to activate menu for now

* Updated label commands

* Fixed menu bugs. Upgraded menu unit tests

* Fixed unit tests

* Working on NetDriver

* fixed netdriver

* Fixed issues called out by @bdisp CR

* fixed CursesDriver

* added todo to netdriver

* Cherry picked treeview test fix 1b415e5

* Fix NetDriver.

* CommandScope->KeyBindingScope

* Address some tznind feedback

* Refactored KeyBindings big time!

* Added key consts to KeyEventArgs and renamed Key to ConsoleDriverKey

* Fixed some API docs

* Moved ConsoleDriverKey to ConsoleDriver.cs

* Renamed Key->ConsoleDriverKey

* Renamed Key->ConsoleDriverKey

* Renamed Key->ConsoleDriverKey

* renamed file I forgot to rename before

* Updated name and API docs of KeyEventArgs.isAlpha

* Fixed issues with OnKeyUp not doing the right thing.

* Fixed MainLoop.Running never being used

* Fixed MainLoop.Running never being used - unit tests

* Claned up BUGBUG comments

* Disabled a unit test to see why ci/cd tests are failing

* Removed defunct commented code

* Removed more defunct commented code

* Re-eanbled unit test; jsut removing one test case...

* Disabled more...

* Renambed Global->Applicaton and updated scope API docs

* Disabled more unit tests...

* Removed dead code

* Disabled more unit tests...2

* Disabled more unit tests...3

* Renambed Global->Applicaton and updated scope API docs 2

* Added more KeyBinding scope tests

* Added more KeyBinding scope tests2

* ConsoleDriverKey too long. Key too ambiguous. Settled on KeyCode. (Partialy because eventually I want to intro a class named Key).

* KeyEventArgs improvements. cast to Rune must be explicit as it's lossy

* Fixed warnings

* Renamed KeyEventArgs to Key... progress on fixing broken stuff that resulted

* Fix ConsoleKeyMapping bugs.

* Fix NetDriver issue from converting a lower case to a upper case.

* Started migration to Key from KeyCode - e.g. made HotKeys all consistent.

* Fixed build warnings

* Added key defns to Key

* KeyBindings now uses Key vs. KeyCode

* Verified by tweaking UICatalog

* Fixed treeview test ... again

* Renamed ProcessKeyDown/Up to NewKeyDown/Up and OnKeyPressed to OnProcessKeyDown to make things more clear

* Added test AllViews_KeyDown_All_EventsFire unit tests and fixed a few Views that were wrong

* fixed stupid KeyUp event bug

* If key not handled, return false for datefield

* dotnet test --no-restore --verbosity diag

* dotnet test --blame

* run tests on windows

* Fix TestVKPacket unit test and move it to ConsoleKeyMappingTests.cs file.

* Remove unnecessary commented code.

* Tweaked unit tests and removed Key.BareKey

* Fixed little details and updated api docs

* updated api docs

* AddKeyBindingsForHotKey: KeyCode->Key

* Cleaned up more old KeyCode usages. Added TODOs

---------

Co-authored-by: BDisp <bd.bdisp@gmail.com>
2023-12-16 12:04:23 -07:00

211 lines
5.2 KiB
C#

using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Terminal.Gui;
namespace UICatalog {
class KeyBindingsDialog : Dialog {
// TODO: Update to use Key instead of KeyCode
static Dictionary<Command,KeyCode> CurrentBindings = new Dictionary<Command,KeyCode>();
private Command[] commands;
private ListView commandsListView;
private Label keyLabel;
/// <summary>
/// Tracks views as they are created in UICatalog so that their keybindings can
/// be managed.
/// </summary>
private class ViewTracker {
public static ViewTracker Instance;
/// <summary>
/// All views seen so far and a bool to indicate if we have applied keybindings to them
/// </summary>
Dictionary<View, bool> knownViews = new Dictionary<View, bool> ();
private object lockKnownViews = new object ();
private Dictionary<Command, KeyCode> keybindings;
public ViewTracker (View top)
{
RecordView (top);
// Refresh known windows
Application.AddTimeout (TimeSpan.FromMilliseconds (100), () => {
lock (lockKnownViews) {
RecordView (Application.Top);
ApplyKeyBindingsToAllKnownViews ();
}
return true;
});
}
private void RecordView (View view)
{
if (!knownViews.ContainsKey (view)) {
knownViews.Add (view, false);
}
// may already have subviews that were added to it
// before we got to it
foreach (var sub in view.Subviews) {
RecordView (sub);
}
// TODO: BUG: Based on my new understanding of Added event I think this is wrong
// (and always was wrong). Parents don't get to be told when new views are added
// to them
view.Added += (s,e)=>RecordView(e.Child);
}
internal static void Initialize ()
{
Instance = new ViewTracker (Application.Top);
}
internal void StartUsingNewKeyMap (Dictionary<Command, KeyCode> currentBindings)
{
lock (lockKnownViews) {
// change our knowledge of what keys to bind
this.keybindings = currentBindings;
// Mark that we have not applied the key bindings yet to any views
foreach (var view in knownViews.Keys) {
knownViews [view] = false;
}
}
}
private void ApplyKeyBindingsToAllKnownViews ()
{
if(keybindings == null) {
return;
}
// Key is the view Value is whether we have already done it
foreach (var viewDone in knownViews) {
var view = viewDone.Key;
var done = viewDone.Value;
if (done) {
// we have already applied keybindings to this view
continue;
}
var supported = new HashSet<Command>(view.GetSupportedCommands ());
foreach (var kvp in keybindings) {
// if the view supports the keybinding
if(supported.Contains(kvp.Key))
{
// if the key was bound to any other commands clear that
view.KeyBindings.Remove (kvp.Value);
view.KeyBindings.Add (kvp.Value,kvp.Key);
}
// mark that we have done this view so don't need to set keybindings again on it
knownViews [view] = true;
}
}
}
}
public KeyBindingsDialog () : base()
{
Title = "Keybindings";
//Height = 50;
//Width = 10;
if (ViewTracker.Instance == null) {
ViewTracker.Initialize ();
}
// known commands that views can support
commands = Enum.GetValues (typeof (Command)).Cast<Command>().ToArray();
commandsListView = new ListView (commands) {
Width = Dim.Percent (50),
Height = Dim.Percent (100) - 1,
};
Add (commandsListView);
keyLabel = new Label () {
Text = "Key: None",
Width = Dim.Fill(),
X = Pos.Percent(50),
Y = 0
};
Add (keyLabel);
var btnChange = new Button ("Ch_ange") {
X = Pos.Percent (50),
Y = 1,
};
Add (btnChange);
btnChange.Clicked += RemapKey;
var close = new Button ("Ok");
close.Clicked += (s,e) => {
Application.RequestStop ();
ViewTracker.Instance.StartUsingNewKeyMap (CurrentBindings);
};
AddButton (close);
var cancel = new Button ("Cancel");
cancel.Clicked += (s,e)=>Application.RequestStop();
AddButton (cancel);
// Register event handler as the last thing in constructor to prevent early calls
// before it is even shown (e.g. OnEnter)
commandsListView.SelectedItemChanged += CommandsListView_SelectedItemChanged;
// Setup to show first ListView entry
SetTextBoxToShowBinding (commands.First());
}
private void RemapKey (object sender, EventArgs e)
{
var cmd = commands [commandsListView.SelectedItem];
KeyCode? key = null;
// prompt user to hit a key
var dlg = new Dialog () { Title = "Enter Key" };
dlg.KeyDown += (s, k) => {
key = k.KeyCode;
Application.RequestStop ();
};
Application.Run (dlg);
if(key.HasValue) {
CurrentBindings [cmd] = key.Value;
SetTextBoxToShowBinding (cmd);
}
}
private void SetTextBoxToShowBinding (Command cmd)
{
if (CurrentBindings.ContainsKey (cmd)) {
keyLabel.Text = "Key: " + CurrentBindings [cmd].ToString ();
} else {
keyLabel.Text = "Key: None";
}
SetNeedsDisplay ();
}
private void CommandsListView_SelectedItemChanged (object sender, ListViewItemEventArgs obj)
{
SetTextBoxToShowBinding ((Command)obj.Value);
}
}
}