mirror of
https://github.com/gui-cs/Terminal.Gui.git
synced 2026-01-01 16:59:35 +01:00
* 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 commit88a00658db. * 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 commit59dcec111b. * 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 fix1b415e5* 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>
This commit is contained in:
@@ -929,20 +929,20 @@ namespace Terminal.Gui {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Finds the hotkey and its location in text.
|
||||
/// Finds the HotKey and its location in text.
|
||||
/// </summary>
|
||||
/// <param name="text">The text to look in.</param>
|
||||
/// <param name="hotKeySpecifier">The hotkey specifier (e.g. '_') to look for.</param>
|
||||
/// <param name="firstUpperCase">If <c>true</c> the legacy behavior of identifying the first upper case character as the hotkey will be enabled.
|
||||
/// <param name="hotKeySpecifier">The HotKey specifier (e.g. '_') to look for.</param>
|
||||
/// <param name="firstUpperCase">If <c>true</c> the legacy behavior of identifying the first upper case character as the HotKey will be enabled.
|
||||
/// Regardless of the value of this parameter, <c>hotKeySpecifier</c> takes precedence.</param>
|
||||
/// <param name="hotPos">Outputs the Rune index into <c>text</c>.</param>
|
||||
/// <param name="hotKey">Outputs the hotKey.</param>
|
||||
/// <returns><c>true</c> if a hotkey was found; <c>false</c> otherwise.</returns>
|
||||
/// <param name="hotKey">Outputs the hotKey. <see cref="Key.Empty"/> if not found.</param>
|
||||
/// <returns><c>true</c> if a HotKey was found; <c>false</c> otherwise.</returns>
|
||||
public static bool FindHotKey (string text, Rune hotKeySpecifier, bool firstUpperCase, out int hotPos, out Key hotKey)
|
||||
{
|
||||
if (string.IsNullOrEmpty (text) || hotKeySpecifier == (Rune)0xFFFF) {
|
||||
hotPos = -1;
|
||||
hotKey = Key.Unknown;
|
||||
hotKey = KeyCode.Null;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -983,14 +983,18 @@ namespace Terminal.Gui {
|
||||
if (hot_key != (Rune)0 && hot_pos != -1) {
|
||||
hotPos = hot_pos;
|
||||
|
||||
if (Rune.IsValid (hot_key.Value) && char.IsLetterOrDigit ((char)hot_key.Value)) {
|
||||
hotKey = (Key)char.ToUpperInvariant ((char)hot_key.Value);
|
||||
var newHotKey = (KeyCode)hot_key.Value;
|
||||
if (newHotKey != KeyCode.Unknown && newHotKey != KeyCode.Null && !(newHotKey == KeyCode.Space || Rune.IsControl (hot_key))) {
|
||||
if ((newHotKey & ~KeyCode.Space) is >= KeyCode.A and <= KeyCode.Z) {
|
||||
newHotKey &= ~KeyCode.Space;
|
||||
}
|
||||
hotKey = newHotKey;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
hotPos = -1;
|
||||
hotKey = Key.Unknown;
|
||||
hotKey = KeyCode.Null;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -1047,7 +1051,7 @@ namespace Terminal.Gui {
|
||||
TextAlignment _textAlignment;
|
||||
VerticalTextAlignment _textVerticalAlignment;
|
||||
TextDirection _textDirection;
|
||||
Key _hotKey;
|
||||
Key _hotKey = new Key ();
|
||||
int _hotKeyPos = -1;
|
||||
Size _size;
|
||||
private bool _autoSize;
|
||||
@@ -1225,17 +1229,17 @@ namespace Terminal.Gui {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The specifier character for the hotkey (e.g. '_'). Set to '\xffff' to disable hotkey support for this View instance. The default is '\xffff'.
|
||||
/// The specifier character for the hot key (e.g. '_'). Set to '\xffff' to disable hot key support for this View instance. The default is '\xffff'.
|
||||
/// </summary>
|
||||
public Rune HotKeySpecifier { get; set; } = (Rune)0xFFFF;
|
||||
|
||||
/// <summary>
|
||||
/// The position in the text of the hotkey. The hotkey will be rendered using the hot color.
|
||||
/// The position in the text of the hot key. The hot key will be rendered using the hot color.
|
||||
/// </summary>
|
||||
public int HotKeyPos { get => _hotKeyPos; internal set => _hotKeyPos = value; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets the hotkey. Will be an upper case letter or digit.
|
||||
/// Gets or sets the hot key. Must be be an upper case letter or digit. Fires the <see cref="HotKeyChanged"/> event.
|
||||
/// </summary>
|
||||
public Key HotKey {
|
||||
get => _hotKey;
|
||||
@@ -1287,10 +1291,10 @@ namespace Terminal.Gui {
|
||||
NeedsFormat = false;
|
||||
return _lines;
|
||||
}
|
||||
|
||||
|
||||
if (NeedsFormat) {
|
||||
var shown_text = _text;
|
||||
if (FindHotKey (_text, HotKeySpecifier, true, out _hotKeyPos, out Key newHotKey)) {
|
||||
if (FindHotKey (_text, HotKeySpecifier, true, out _hotKeyPos, out var newHotKey)) {
|
||||
HotKey = newHotKey;
|
||||
shown_text = RemoveHotKeySpecifier (Text, _hotKeyPos, HotKeySpecifier);
|
||||
shown_text = ReplaceHotKeyWithTag (shown_text, _hotKeyPos);
|
||||
|
||||
Reference in New Issue
Block a user