mirror of
https://github.com/gui-cs/Terminal.Gui.git
synced 2026-01-02 01:03:29 +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>
182 lines
4.9 KiB
C#
182 lines
4.9 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.ComponentModel;
|
|
using System.Threading;
|
|
using Terminal.Gui;
|
|
|
|
namespace UICatalog.Scenarios {
|
|
[ScenarioMetadata (Name: "Single BackgroundWorker", Description: "A single BackgroundWorker threading opening another Toplevel")]
|
|
[ScenarioCategory ("Threading")]
|
|
[ScenarioCategory ("Top Level Windows")]
|
|
public class SingleBackgroundWorker : Scenario {
|
|
public override void Run ()
|
|
{
|
|
Application.Top.Dispose ();
|
|
|
|
Application.Run<MainApp> ();
|
|
|
|
Application.Top.Dispose ();
|
|
}
|
|
|
|
public class MainApp : Toplevel {
|
|
private BackgroundWorker worker;
|
|
private List<string> log = new List<string> ();
|
|
private DateTime? startStaging;
|
|
private ListView listLog;
|
|
|
|
public MainApp ()
|
|
{
|
|
var menu = new MenuBar (new MenuBarItem [] {
|
|
new MenuBarItem ("_Options", new MenuItem [] {
|
|
new MenuItem ("_Run Worker", "", () => RunWorker(), null, null, KeyCode.CtrlMask | KeyCode.R),
|
|
null,
|
|
new MenuItem ("_Quit", "", () => Application.RequestStop(), null, null, KeyCode.CtrlMask | KeyCode.Q)
|
|
})
|
|
});
|
|
Add (menu);
|
|
|
|
var statusBar = new StatusBar (new [] {
|
|
new StatusItem(Application.QuitKey, $"{Application.QuitKey} to Quit", () => Application.RequestStop()),
|
|
new StatusItem(KeyCode.CtrlMask | KeyCode.P, "~^R~ Run Worker", () => RunWorker())
|
|
});
|
|
Add (statusBar);
|
|
|
|
var top = new Toplevel ();
|
|
|
|
top.Add (new Label ("Worker Log") {
|
|
X = Pos.Center (),
|
|
Y = 0
|
|
});
|
|
|
|
listLog = new ListView (log) {
|
|
X = 0,
|
|
Y = 2,
|
|
Width = Dim.Fill (),
|
|
Height = Dim.Fill ()
|
|
};
|
|
top.Add (listLog);
|
|
Add (top);
|
|
}
|
|
|
|
private void RunWorker ()
|
|
{
|
|
worker = new BackgroundWorker () { WorkerSupportsCancellation = true };
|
|
|
|
var cancel = new Button ("Cancel Worker");
|
|
cancel.Clicked += (s,e) => {
|
|
if (worker == null) {
|
|
log.Add ($"Worker is not running at {DateTime.Now}!");
|
|
listLog.SetNeedsDisplay ();
|
|
return;
|
|
}
|
|
|
|
log.Add ($"Worker {startStaging}.{startStaging:fff} is canceling at {DateTime.Now}!");
|
|
listLog.SetNeedsDisplay ();
|
|
worker.CancelAsync ();
|
|
};
|
|
|
|
startStaging = DateTime.Now;
|
|
log.Add ($"Worker is started at {startStaging}.{startStaging:fff}");
|
|
listLog.SetNeedsDisplay ();
|
|
|
|
var md = new Dialog (cancel) { Title = $"Running Worker started at {startStaging}.{startStaging:fff}" };
|
|
md.Add (new Label ("Wait for worker to finish...") {
|
|
X = Pos.Center (),
|
|
Y = Pos.Center ()
|
|
});
|
|
|
|
worker.DoWork += (s, e) => {
|
|
var stageResult = new List<string> ();
|
|
for (int i = 0; i < 500; i++) {
|
|
stageResult.Add ($"Worker {i} started at {DateTime.Now}");
|
|
e.Result = stageResult;
|
|
Thread.Sleep (1);
|
|
if (worker.CancellationPending) {
|
|
e.Cancel = true;
|
|
return;
|
|
}
|
|
}
|
|
};
|
|
|
|
worker.RunWorkerCompleted += (s, e) => {
|
|
if (md.IsCurrentTop) {
|
|
//Close the dialog
|
|
Application.RequestStop ();
|
|
}
|
|
|
|
if (e.Error != null) {
|
|
// Failed
|
|
log.Add ($"Exception occurred {e.Error.Message} on Worker {startStaging}.{startStaging:fff} at {DateTime.Now}");
|
|
listLog.SetNeedsDisplay ();
|
|
} else if (e.Cancelled) {
|
|
// Canceled
|
|
log.Add ($"Worker {startStaging}.{startStaging:fff} was canceled at {DateTime.Now}!");
|
|
listLog.SetNeedsDisplay ();
|
|
} else {
|
|
// Passed
|
|
log.Add ($"Worker {startStaging}.{startStaging:fff} was completed at {DateTime.Now}.");
|
|
listLog.SetNeedsDisplay ();
|
|
Application.Refresh ();
|
|
var builderUI = new StagingUIController (startStaging, e.Result as List<string>);
|
|
builderUI.Load ();
|
|
}
|
|
worker = null;
|
|
};
|
|
worker.RunWorkerAsync ();
|
|
Application.Run (md);
|
|
}
|
|
}
|
|
|
|
public class StagingUIController : Window {
|
|
Toplevel top;
|
|
|
|
public StagingUIController (DateTime? start, List<string> list)
|
|
{
|
|
top = new Toplevel (Application.Top.Frame);
|
|
top.KeyDown += (s,e) => {
|
|
// Prevents Ctrl+Q from closing this.
|
|
// Only Ctrl+C is allowed.
|
|
if (e == Application.QuitKey) {
|
|
e.Handled = true;
|
|
}
|
|
};
|
|
|
|
bool Close ()
|
|
{
|
|
var n = MessageBox.Query (50, 7, "Close Window.", "Are you sure you want to close this window?", "Yes", "No");
|
|
return n == 0;
|
|
}
|
|
|
|
var menu = new MenuBar (new MenuBarItem [] {
|
|
new MenuBarItem ("_Stage", new MenuItem [] {
|
|
new MenuItem ("_Close", "", () => { if (Close()) { Application.RequestStop(); } }, null, null, KeyCode.CtrlMask | KeyCode.C)
|
|
})
|
|
});
|
|
top.Add (menu);
|
|
|
|
var statusBar = new StatusBar (new [] {
|
|
new StatusItem(KeyCode.CtrlMask | KeyCode.C, "~^C~ Close", () => { if (Close()) { Application.RequestStop(); } }),
|
|
});
|
|
top.Add (statusBar);
|
|
|
|
Title = $"Worker started at {start}.{start:fff}";
|
|
ColorScheme = Colors.Base;
|
|
|
|
Add (new ListView (list) {
|
|
X = 0,
|
|
Y = 0,
|
|
Width = Dim.Fill (),
|
|
Height = Dim.Fill ()
|
|
});
|
|
|
|
top.Add (this);
|
|
}
|
|
|
|
public void Load ()
|
|
{
|
|
Application.Run (top);
|
|
}
|
|
}
|
|
}
|
|
}
|