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>
225 lines
5.7 KiB
C#
225 lines
5.7 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using Terminal.Gui;
|
|
using static Terminal.Gui.SpinnerStyle;
|
|
|
|
namespace UICatalog.Scenarios {
|
|
|
|
[ScenarioMetadata (Name: "Line Drawing", Description: "Demonstrates LineCanvas.")]
|
|
[ScenarioCategory ("Controls")]
|
|
[ScenarioCategory ("Drawing")]
|
|
public class LineDrawing : Scenario {
|
|
|
|
public override void Setup ()
|
|
{
|
|
var canvas = new DrawingArea {
|
|
X = 0,
|
|
Y = 0,
|
|
Width = Dim.Fill (),
|
|
Height = Dim.Fill ()
|
|
};
|
|
|
|
var tools = new ToolsView () {
|
|
Title = "Tools",
|
|
X = Pos.Right (canvas) - 20,
|
|
Y = 2
|
|
};
|
|
|
|
tools.ColorChanged += (c) => canvas.SetColor (c);
|
|
tools.SetStyle += (b) => canvas.LineStyle = b;
|
|
tools.AddLayer += () => canvas.AddLayer ();
|
|
|
|
Win.Add (canvas);
|
|
Win.Add (tools);
|
|
|
|
Win.KeyDown += (s,e) => { e.Handled = canvas.OnKeyDown (e); };
|
|
}
|
|
|
|
class ToolsView : Window {
|
|
public event Action<Color> ColorChanged;
|
|
public event Action<LineStyle> SetStyle;
|
|
public event Action AddLayer;
|
|
|
|
private RadioGroup _stylePicker;
|
|
private ColorPicker _colorPicker;
|
|
private Button _addLayerBtn;
|
|
|
|
public ToolsView ()
|
|
{
|
|
BorderStyle = LineStyle.Dotted;
|
|
Border.Thickness = new Thickness (1, 2, 1, 1);
|
|
Initialized += ToolsView_Initialized;
|
|
}
|
|
|
|
private void ToolsView_Initialized (object sender, EventArgs e)
|
|
{
|
|
LayoutSubviews ();
|
|
Width = Math.Max (_colorPicker.Frame.Width, _stylePicker.Frame.Width) + GetFramesThickness ().Horizontal;
|
|
Height = _colorPicker.Frame.Height + _stylePicker.Frame.Height + _addLayerBtn.Frame.Height + GetFramesThickness ().Vertical;
|
|
SuperView.LayoutSubviews ();
|
|
}
|
|
|
|
public override void BeginInit ()
|
|
{
|
|
base.BeginInit ();
|
|
|
|
_colorPicker = new ColorPicker () {
|
|
X = 0,
|
|
Y = 0,
|
|
BoxHeight = 1,
|
|
BoxWidth = 2
|
|
};
|
|
|
|
_colorPicker.ColorChanged += (s, a) => ColorChanged?.Invoke (a.Color);
|
|
|
|
_stylePicker = new RadioGroup (Enum.GetNames (typeof (LineStyle)).ToArray ()) {
|
|
X = 0,
|
|
Y = Pos.Bottom (_colorPicker)
|
|
};
|
|
_stylePicker.SelectedItemChanged += (s, a) => {
|
|
SetStyle?.Invoke ((LineStyle)a.SelectedItem);
|
|
};
|
|
_stylePicker.SelectedItem = 1;
|
|
|
|
_addLayerBtn = new Button () {
|
|
Text = "New Layer",
|
|
X = Pos.Center (),
|
|
Y = Pos.Bottom (_stylePicker),
|
|
};
|
|
|
|
_addLayerBtn.Clicked += (s, a) => AddLayer?.Invoke ();
|
|
Add (_colorPicker, _stylePicker, _addLayerBtn);
|
|
}
|
|
}
|
|
|
|
class DrawingArea : View {
|
|
List<LineCanvas> _layers = new List<LineCanvas> ();
|
|
LineCanvas _currentLayer;
|
|
Color _currentColor = new Color (Color.White);
|
|
StraightLine _currentLine = null;
|
|
|
|
public LineStyle LineStyle { get; set; }
|
|
|
|
public DrawingArea ()
|
|
{
|
|
AddLayer ();
|
|
}
|
|
|
|
Stack<StraightLine> undoHistory = new ();
|
|
|
|
//// BUGBUG: Why is this not handled by a key binding???
|
|
public override bool OnKeyDown (Key e)
|
|
{
|
|
// BUGBUG: These should be implemented with key bindings
|
|
if (e.KeyCode == (KeyCode.Z | KeyCode.CtrlMask)) {
|
|
var pop = _currentLayer.RemoveLastLine ();
|
|
if(pop != null) {
|
|
undoHistory.Push (pop);
|
|
SetNeedsDisplay ();
|
|
return true;
|
|
}
|
|
}
|
|
|
|
if (e.KeyCode == (KeyCode.Y | KeyCode.CtrlMask)) {
|
|
if (undoHistory.Any()) {
|
|
var pop = undoHistory.Pop ();
|
|
_currentLayer.AddLine(pop);
|
|
SetNeedsDisplay ();
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
internal void AddLayer ()
|
|
{
|
|
_currentLayer = new LineCanvas ();
|
|
_layers.Add (_currentLayer);
|
|
}
|
|
|
|
public override void OnDrawContentComplete (Rect contentArea)
|
|
{
|
|
base.OnDrawContentComplete (contentArea);
|
|
foreach (var canvas in _layers) {
|
|
|
|
foreach (var c in canvas.GetCellMap ()) {
|
|
Driver.SetAttribute (c.Value.Attribute ?? ColorScheme.Normal);
|
|
// TODO: #2616 - Support combining sequences that don't normalize
|
|
this.AddRune (c.Key.X, c.Key.Y, c.Value.Rune);
|
|
}
|
|
}
|
|
}
|
|
|
|
public override bool OnMouseEvent (MouseEvent mouseEvent)
|
|
{
|
|
if (mouseEvent.Flags.HasFlag (MouseFlags.Button1Pressed)) {
|
|
if (_currentLine == null) {
|
|
// Mouse pressed down
|
|
_currentLine = new StraightLine (
|
|
new Point (mouseEvent.X, mouseEvent.Y),
|
|
0, Orientation.Vertical, LineStyle, new Attribute (_currentColor, GetNormalColor ().Background));
|
|
|
|
_currentLayer.AddLine (_currentLine);
|
|
} else {
|
|
// Mouse dragged
|
|
var start = _currentLine.Start;
|
|
var end = new Point (mouseEvent.X, mouseEvent.Y);
|
|
var orientation = Orientation.Vertical;
|
|
var length = end.Y - start.Y;
|
|
|
|
// if line is wider than it is tall switch to horizontal
|
|
if (Math.Abs (start.X - end.X) > Math.Abs (start.Y - end.Y)) {
|
|
orientation = Orientation.Horizontal;
|
|
length = end.X - start.X;
|
|
}
|
|
|
|
if (length > 0) {
|
|
length++;
|
|
} else {
|
|
length--;
|
|
}
|
|
_currentLine.Length = length;
|
|
_currentLine.Orientation = orientation;
|
|
_currentLayer.ClearCache ();
|
|
SetNeedsDisplay ();
|
|
}
|
|
} else {
|
|
|
|
// Mouse released
|
|
if (_currentLine != null) {
|
|
|
|
if(_currentLine.Length == 0) {
|
|
_currentLine.Length = 1;
|
|
}
|
|
|
|
if(_currentLine.Style == LineStyle.None) {
|
|
|
|
// Treat none as eraser
|
|
var idx = _layers.IndexOf (_currentLayer);
|
|
_layers.Remove (_currentLayer);
|
|
|
|
_currentLayer = new LineCanvas(
|
|
_currentLayer.Lines.Exclude (_currentLine.Start, _currentLine.Length, _currentLine.Orientation)
|
|
);
|
|
|
|
_layers.Insert (idx, _currentLayer);
|
|
}
|
|
|
|
_currentLine = null;
|
|
undoHistory.Clear ();
|
|
SetNeedsDisplay ();
|
|
}
|
|
}
|
|
|
|
return base.OnMouseEvent (mouseEvent);
|
|
}
|
|
|
|
internal void SetColor (Color c)
|
|
{
|
|
_currentColor = c;
|
|
}
|
|
}
|
|
}
|
|
}
|