mirror of
https://github.com/gui-cs/Terminal.Gui.git
synced 2025-12-26 15:57:56 +01:00
* Initial plan * Refactor Application.Mouse - Create IMouse interface and Mouse implementation Co-authored-by: tig <585482+tig@users.noreply.github.com> * Add enhanced documentation for Application.Mouse property Co-authored-by: tig <585482+tig@users.noreply.github.com> * Add parallelizable unit tests for IMouse interface Co-authored-by: tig <585482+tig@users.noreply.github.com> * Refactor Application.Mouse for decoupling and parallelism Co-authored-by: tig <585482+tig@users.noreply.github.com> * Move HandleMouseGrab method to IMouseGrabHandler interface Co-authored-by: tig <585482+tig@users.noreply.github.com> * Add parallelizable tests for IMouse and IMouseGrabHandler interfaces Co-authored-by: tig <585482+tig@users.noreply.github.com> * Add MouseEventRoutingTests - 27 parallelizable tests for View mouse event handling Co-authored-by: tig <585482+tig@users.noreply.github.com> * Fix terminology: Replace parent/child with superView/subView in MouseEventRoutingTests Co-authored-by: tig <585482+tig@users.noreply.github.com> * Fix coding standards: Use explicit types and target-typed new() in test files Co-authored-by: tig <585482+tig@users.noreply.github.com> * Update coding standards documentation with explicit var and target-typed new() guidance Co-authored-by: tig <585482+tig@users.noreply.github.com> * Refactor Application classes and improve maintainability Refactored `Sixel` property to be immutable, enhancing thread safety. Cleaned up `ApplicationImpl` by removing redundant fields, restructuring methods (`CreateDriver`, `CreateSubcomponents`), and improving exception handling. Updated `Run<T>` and `Shutdown` methods for consistency. Standardized logging/debugging messages and fixed formatting issues. Reorganized `IApplication` interface, added detailed XML documentation, and grouped related methods logically. Performed general code cleanup, including fixing typos, improving readability, and removing legacy/unnecessary code to reduce technical debt. * Code cleanup * Remove unreferenced LayoutAndDraw method from ApplicationImpl * Code cleanup and TODOs - Updated namespaces to reflect the new structure. - Added `Driver`, `Force16Colors`, and `ForceDriver` properties. - Introduced `Sixel` collection for sixel image management. - Added lifecycle methods: `GetDriverTypes`, `Shutdown`, and events. - Refactored `Init` to support legacy and modern drivers. - Improved driver event handling and screen abstraction. - Updated `Run` method to align with the application lifecycle. - Simplified `IConsoleDriver` documentation. - Removed redundant methods and improved code readability. * Refactor LayoutAndDraw logic for better encapsulation Refactored `Application.Run` to delegate `LayoutAndDraw` to `ApplicationImpl.Instance.LayoutAndDraw`, improving separation of concerns. Renamed `forceDraw` to `forceRedraw` for clarity and moved `LayoutAndDraw` implementation to `ApplicationImpl`. Added a new `LayoutAndDraw` method in `ApplicationImpl` to handle layout and drawing, including managing `TopLevels`, handling active popovers, and refreshing the screen. Updated the `IApplication` interface to reflect the new method and improved its documentation. Implemented `RequestStop` in `ApplicationImpl` and fixed formatting inconsistencies in `Run<T>`. Added TODOs for future refactoring to encapsulate `Top` and `TopLevels` into an `IViewHierarchy` and move certain properties to `IApplication`. * Refactor ApplicationImpl to enhance mouse and keyboard support Added a new `Mouse` property to the `ApplicationImpl` class, replacing its previous declaration, to improve mouse functionality. Updated `MouseGrabHandler` to initialize with a default instance of `MouseGrabHandler`. Added comments to ensure the preservation of existing keyboard settings (`QuitKey`, `ArrangeKey`, `NextTabKey`) for backward compatibility. These changes enhance clarity, functionality, and maintainability of the class. * Merge IMouseGrabHandler into IMouse - consolidate mouse handling into single interface Co-authored-by: tig <585482+tig@users.noreply.github.com> * Rename Mouse to MouseImpl and Keyboard to KeyboardImpl for consistency Co-authored-by: tig <585482+tig@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: tig <585482+tig@users.noreply.github.com> Co-authored-by: Tig <tig@users.noreply.github.com>
This commit is contained in:
Copilot
GitHub
@@ -309,7 +309,7 @@ public class ApplicationTests
|
||||
|
||||
// Public Properties
|
||||
Assert.Null (Application.Top);
|
||||
Assert.Null (Application.MouseGrabHandler.MouseGrabView);
|
||||
Assert.Null (Application.Mouse.MouseGrabView);
|
||||
|
||||
// Don't check Application.ForceDriver
|
||||
// Assert.Empty (Application.ForceDriver);
|
||||
@@ -574,7 +574,7 @@ public class ApplicationTests
|
||||
Assert.Null (Application.Top);
|
||||
RunState rs = Application.Begin (new ());
|
||||
Assert.Equal (Application.Top, rs.Toplevel);
|
||||
Assert.Null (Application.MouseGrabHandler.MouseGrabView); // public
|
||||
Assert.Null (Application.Mouse.MouseGrabView); // public
|
||||
Application.Top!.Dispose ();
|
||||
}
|
||||
|
||||
@@ -932,7 +932,7 @@ public class ApplicationTests
|
||||
Assert.Equal (new (0, 0), w.Frame.Location);
|
||||
|
||||
Application.RaiseMouseEvent (new () { Flags = MouseFlags.Button1Pressed });
|
||||
Assert.Equal (w.Border, Application.MouseGrabHandler.MouseGrabView);
|
||||
Assert.Equal (w.Border, Application.Mouse.MouseGrabView);
|
||||
Assert.Equal (new (0, 0), w.Frame.Location);
|
||||
|
||||
// Move down and to the right.
|
||||
|
||||
@@ -260,39 +260,39 @@ public class ApplicationMouseTests
|
||||
// if (iterations == 0)
|
||||
// {
|
||||
// Assert.True (tf.HasFocus);
|
||||
// Assert.Null (Application.MouseGrabHandler.MouseGrabView);
|
||||
// Assert.Null (Application.Mouse.MouseGrabView);
|
||||
|
||||
// Application.RaiseMouseEvent (new () { ScreenPosition = new (5, 5), Flags = MouseFlags.ReportMousePosition });
|
||||
|
||||
// Assert.Equal (sv, Application.MouseGrabHandler.MouseGrabView);
|
||||
// Assert.Equal (sv, Application.Mouse.MouseGrabView);
|
||||
|
||||
// MessageBox.Query ("Title", "Test", "Ok");
|
||||
|
||||
// Assert.Null (Application.MouseGrabHandler.MouseGrabView);
|
||||
// Assert.Null (Application.Mouse.MouseGrabView);
|
||||
// }
|
||||
// else if (iterations == 1)
|
||||
// {
|
||||
// // Application.MouseGrabHandler.MouseGrabView is null because
|
||||
// // Application.Mouse.MouseGrabView is null because
|
||||
// // another toplevel (Dialog) was opened
|
||||
// Assert.Null (Application.MouseGrabHandler.MouseGrabView);
|
||||
// Assert.Null (Application.Mouse.MouseGrabView);
|
||||
|
||||
// Application.RaiseMouseEvent (new () { ScreenPosition = new (5, 5), Flags = MouseFlags.ReportMousePosition });
|
||||
|
||||
// Assert.Null (Application.MouseGrabHandler.MouseGrabView);
|
||||
// Assert.Null (Application.Mouse.MouseGrabView);
|
||||
|
||||
// Application.RaiseMouseEvent (new () { ScreenPosition = new (40, 12), Flags = MouseFlags.ReportMousePosition });
|
||||
|
||||
// Assert.Null (Application.MouseGrabHandler.MouseGrabView);
|
||||
// Assert.Null (Application.Mouse.MouseGrabView);
|
||||
|
||||
// Application.RaiseMouseEvent (new () { ScreenPosition = new (0, 0), Flags = MouseFlags.Button1Pressed });
|
||||
|
||||
// Assert.Null (Application.MouseGrabHandler.MouseGrabView);
|
||||
// Assert.Null (Application.Mouse.MouseGrabView);
|
||||
|
||||
// Application.RequestStop ();
|
||||
// }
|
||||
// else if (iterations == 2)
|
||||
// {
|
||||
// Assert.Null (Application.MouseGrabHandler.MouseGrabView);
|
||||
// Assert.Null (Application.Mouse.MouseGrabView);
|
||||
|
||||
// Application.RequestStop ();
|
||||
// }
|
||||
@@ -313,33 +313,33 @@ public class ApplicationMouseTests
|
||||
var view2 = new View { Id = "view2" };
|
||||
var view3 = new View { Id = "view3" };
|
||||
|
||||
Application.MouseGrabHandler.GrabbedMouse += Application_GrabbedMouse;
|
||||
Application.MouseGrabHandler.UnGrabbedMouse += Application_UnGrabbedMouse;
|
||||
Application.Mouse.GrabbedMouse += Application_GrabbedMouse;
|
||||
Application.Mouse.UnGrabbedMouse += Application_UnGrabbedMouse;
|
||||
|
||||
Application.MouseGrabHandler.GrabMouse (view1);
|
||||
Application.Mouse.GrabMouse (view1);
|
||||
Assert.Equal (0, count);
|
||||
Assert.Equal (grabView, view1);
|
||||
Assert.Equal (view1, Application.MouseGrabHandler.MouseGrabView);
|
||||
Assert.Equal (view1, Application.Mouse.MouseGrabView);
|
||||
|
||||
Application.MouseGrabHandler.UngrabMouse ();
|
||||
Application.Mouse.UngrabMouse ();
|
||||
Assert.Equal (1, count);
|
||||
Assert.Equal (grabView, view1);
|
||||
Assert.Null (Application.MouseGrabHandler.MouseGrabView);
|
||||
Assert.Null (Application.Mouse.MouseGrabView);
|
||||
|
||||
Application.MouseGrabHandler.GrabbedMouse += Application_GrabbedMouse;
|
||||
Application.MouseGrabHandler.UnGrabbedMouse += Application_UnGrabbedMouse;
|
||||
Application.Mouse.GrabbedMouse += Application_GrabbedMouse;
|
||||
Application.Mouse.UnGrabbedMouse += Application_UnGrabbedMouse;
|
||||
|
||||
Application.MouseGrabHandler.GrabMouse (view2);
|
||||
Application.Mouse.GrabMouse (view2);
|
||||
Assert.Equal (1, count);
|
||||
Assert.Equal (grabView, view2);
|
||||
Assert.Equal (view2, Application.MouseGrabHandler.MouseGrabView);
|
||||
Assert.Equal (view2, Application.Mouse.MouseGrabView);
|
||||
|
||||
Application.MouseGrabHandler.UngrabMouse ();
|
||||
Application.Mouse.UngrabMouse ();
|
||||
Assert.Equal (2, count);
|
||||
Assert.Equal (grabView, view2);
|
||||
Assert.Equal (view3, Application.MouseGrabHandler.MouseGrabView);
|
||||
Application.MouseGrabHandler.UngrabMouse ();
|
||||
Assert.Null (Application.MouseGrabHandler.MouseGrabView);
|
||||
Assert.Equal (view3, Application.Mouse.MouseGrabView);
|
||||
Application.Mouse.UngrabMouse ();
|
||||
Assert.Null (Application.Mouse.MouseGrabView);
|
||||
|
||||
void Application_GrabbedMouse (object sender, ViewEventArgs e)
|
||||
{
|
||||
@@ -354,7 +354,7 @@ public class ApplicationMouseTests
|
||||
grabView = view2;
|
||||
}
|
||||
|
||||
Application.MouseGrabHandler.GrabbedMouse -= Application_GrabbedMouse;
|
||||
Application.Mouse.GrabbedMouse -= Application_GrabbedMouse;
|
||||
}
|
||||
|
||||
void Application_UnGrabbedMouse (object sender, ViewEventArgs e)
|
||||
@@ -375,10 +375,10 @@ public class ApplicationMouseTests
|
||||
if (count > 1)
|
||||
{
|
||||
// It's possible to grab another view after the previous was ungrabbed
|
||||
Application.MouseGrabHandler.GrabMouse (view3);
|
||||
Application.Mouse.GrabMouse (view3);
|
||||
}
|
||||
|
||||
Application.MouseGrabHandler.UnGrabbedMouse -= Application_UnGrabbedMouse;
|
||||
Application.Mouse.UnGrabbedMouse -= Application_UnGrabbedMouse;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -393,18 +393,18 @@ public class ApplicationMouseTests
|
||||
top.Add (view);
|
||||
Application.Begin (top);
|
||||
|
||||
Assert.Null (Application.MouseGrabHandler.MouseGrabView);
|
||||
Application.MouseGrabHandler.GrabMouse (view);
|
||||
Assert.Equal (view, Application.MouseGrabHandler.MouseGrabView);
|
||||
Assert.Null (Application.Mouse.MouseGrabView);
|
||||
Application.Mouse.GrabMouse (view);
|
||||
Assert.Equal (view, Application.Mouse.MouseGrabView);
|
||||
top.Remove (view);
|
||||
Application.MouseGrabHandler.UngrabMouse ();
|
||||
Application.Mouse.UngrabMouse ();
|
||||
view.Dispose ();
|
||||
#if DEBUG_IDISPOSABLE
|
||||
Assert.True (view.WasDisposed);
|
||||
#endif
|
||||
|
||||
Application.RaiseMouseEvent (new () { ScreenPosition = new (0, 0), Flags = MouseFlags.Button1Pressed });
|
||||
Assert.Null (Application.MouseGrabHandler.MouseGrabView);
|
||||
Assert.Null (Application.Mouse.MouseGrabView);
|
||||
Assert.Equal (0, count);
|
||||
top.Dispose ();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user