Dependency Injection Rewrite #2352

InfinityGhost · 2022-07-20T03:59:18Z

Notes

Completely rewrote the OpenTabletDriver Daemon and UI projects from scratch using Dependency Injection.
Merged the OpenTabletDriver.Plugin library into the core OpenTabletDriver library.

Issues

Fixes Ignore input outside area does not function #1988

OpenTabletDriver.UX/App.cs

OpenTabletDriver.Daemon/DriverDaemon.cs

OpenTabletDriver.UX/App.cs

OpenTabletDriver.Desktop/Interop/DesktopMacOSServiceCollection.cs

OpenTabletDriver.Configurations/Parsers/Wacom/Wacom64bAuxReportParser.cs

OpenTabletDriver.UX/Controls/ProfilePanel.cs

This fixes OpenTabletDriver#1988

Co-authored-by: X9VoiD <oscar.silvestrexx@gmail.com>

OutputMode: Fix 'Area Clipping' not discarding output correctly

gonX · 2022-08-09T22:29:39Z

Linux lg2m and tested working well enough that a prerelease is viable. Still needs testing on other platforms.

Btw, you can add "Fixes #1988" now

AkiSakurai

Some minor issues collected, it is cumbersome to recreate separated issues, I just leave the comments here.

AkiSakurai · 2022-07-26T15:57:13Z

OpenTabletDriver.UX/MainForm.cs

-            await Driver.Instance.ResetSettings();
-            App.Current.Settings = await Driver.Instance.GetSettings();
+            if (await _rpc.Instance!.GetUpdateInfo() is UpdateInfo updateInfo)
+                _app.ShowWindow<UpdateForm>(updateInfo);


Unhandled exception. MonoMac.Foundation.ObjCException: NSInternalInconsistencyException: NSWindow drag regions should only be invalidated on the Main Thread! at MonoMac.ObjCRuntime.Messaging.IntPtr_objc_msgSendSuper_CGRect_UInt64_UInt64_bool(IntPtr receiver, IntPtr selector, CGRect arg1, UInt64 arg2, UInt64 arg3, Boolean arg4) at MonoMac.ObjCRuntime.Messaging.IntPtr_objc_msgSendSuper_CGRect_UInt64_UInt64_bool(IntPtr receiver, IntPtr selector, CGRect arg1, UInt64 arg2, UInt64 arg3, Boolean arg4) at MonoMac.AppKit.NSWindow..ctor(CGRect contentRect, NSWindowStyle aStyle, NSBackingStore bufferingType, Boolean deferCreation) at Eto.Mac.Forms.EtoWindow..ctor(CGRect rect, NSWindowStyle style, NSBackingStore store, Boolean flag) at Eto.Mac.Forms.FormHandler.CreateControl() at Eto.WidgetHandler`2.get_Control() at Eto.Mac.Forms.MacWindow`3.ConfigureWindow() at Eto.Mac.Forms.FormHandler`1.Initialize() at Eto.WidgetHandler`1.Eto.Widget.IHandler.Initialize() at Eto.Widget.Initialize() at Eto.Forms.Window..ctor() at Eto.Forms.Form..ctor() at OpenTabletDriver.UX.Components.DesktopForm..ctor() at OpenTabletDriver.UX.Windows.UpdateForm..ctor(IDriverDaemon daemon, App app, UpdateInfo update) at System.RuntimeMethodHandle.InvokeMethod(Object target, Span`1& arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) at System.Reflection.RuntimeConstructorInfo.Invoke(BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture) at OpenTabletDriver.Desktop.DependencyInjectionExtensions.CreateInstance(IServiceProvider serviceProvider, Type type, Object[] additionalDependencies) at OpenTabletDriver.Desktop.DependencyInjectionExtensions.CreateInstance[T](IServiceProvider serviceProvider, Object[] additionalDependencies) at OpenTabletDriver.Desktop.DependencyInjectionExtensions.GetOrCreateInstance[T](IServiceProvider serviceProvider, Object[] additionalDependencies) at OpenTabletDriver.UX.App.ShowWindow[TWindow](Object[] deps) at OpenTabletDriver.UX.MainForm.OnConnected() at System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1.AsyncStateMachineBox`1.ExecutionContextCallback(Object s) at System.Threading.ExecutionContext.RunInternal(ExecutionContext executionContext, ContextCallback callback, Object state) at System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1.AsyncStateMachineBox`1.MoveNext(Thread threadPoolThread) at System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1.AsyncStateMachineBox`1.MoveNext() at System.Threading.Tasks.AwaitTaskContinuation.RunOrScheduleAction(IAsyncStateMachineBox box, Boolean allowInlining) at System.Threading.Tasks.Task.RunContinuations(Object continuationObject) at System.Threading.Tasks.Task`1.TrySetResult(TResult result) at System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1.SetExistingTaskResult(Task`1 task, TResult result) at System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1.SetResult(TResult result) at StreamJsonRpc.JsonRpc.InvokeCoreAsync[TResult](RequestId id, String targetName, IReadOnlyList`1 arguments, IReadOnlyList`1 positionalArgumentDeclaredTypes, IReadOnlyDictionary`2 namedArgumentDeclaredTypes, CancellationToken cancellationToken, Boolean isParameterObject) at System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1.AsyncStateMachineBox`1.ExecutionContextCallback(Object s) at System.Threading.ExecutionContext.RunInternal(ExecutionContext executionContext, ContextCallback callback, Object state) at System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1.AsyncStateMachineBox`1.MoveNext(Thread threadPoolThread) at System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1.AsyncStateMachineBox`1.MoveNext() at System.Threading.Tasks.AwaitTaskContinuation.RunOrScheduleAction(IAsyncStateMachineBox box, Boolean allowInlining) at System.Threading.Tasks.Task.RunContinuations(Object continuationObject) at System.Threading.Tasks.Task`1.TrySetResult(TResult result) at System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1.SetExistingTaskResult(Task`1 task, TResult result) at System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1.SetResult(TResult result) at StreamJsonRpc.JsonRpc.InvokeCoreAsync(JsonRpcRequest request, Type expectedResultType, CancellationToken cancellationToken) at System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1.AsyncStateMachineBox`1.ExecutionContextCallback(Object s) at System.Threading.ExecutionContext.RunInternal(ExecutionContext executionContext, ContextCallback callback, Object state) at System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1.AsyncStateMachineBox`1.MoveNext(Thread threadPoolThread) at System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1.AsyncStateMachineBox`1.MoveNext() at System.Threading.Tasks.AwaitTaskContinuation.RunOrScheduleAction(IAsyncStateMachineBox box, Boolean allowInlining) at System.Threading.Tasks.Task.RunContinuations(Object continuationObject) at System.Threading.Tasks.Task`1.TrySetResult(TResult result) at System.Threading.Tasks.TaskCompletionSource`1.SetResult(TResult result) at StreamJsonRpc.JsonRpc.<>c__DisplayClass143_0.<InvokeCoreAsync>b__0(JsonRpcMessage response) at StreamJsonRpc.JsonRpc.HandleRpcAsync(JsonRpcMessage rpc) at System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1.AsyncStateMachineBox`1.ExecutionContextCallback(Object s) at System.Threading.ExecutionContext.RunInternal(ExecutionContext executionContext, ContextCallback callback, Object state) at System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1.AsyncStateMachineBox`1.MoveNext(Thread threadPoolThread) at System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1.AsyncStateMachineBox`1.MoveNext() at Microsoft.VisualStudio.Threading.AwaitExtensions.TaskSchedulerAwaiter.<>c.<UnsafeOnCompleted>b__6_0(Object state) at System.Threading.QueueUserWorkItemCallbackDefaultContext.Execute() at System.Threading.ThreadPoolWorkQueue.Dispatch()

AkiSakurai · 2022-07-26T15:58:36Z

OpenTabletDriver.UX/MainForm.cs

-            if (MessageBox.Show("Reset settings to default?", "Reset to defaults", MessageBoxButtons.OKCancel, MessageBoxType.Question) == DialogResult.Ok)
-                await ResetSettings();
-        }
+            Content = _placeholder;


System.InvalidOperationException: The calling thread cannot access this object because a different thread owns it. at System.Windows.Threading.Dispatcher.VerifyAccess() at Eto.Wpf.Forms.TableLayoutHandler.InitializeSizes() at Eto.Wpf.Forms.TableLayoutHandler.SetupGrid() at Eto.Wpf.Forms.TableLayoutHandler.OnLoad(EventArgs e) at Eto.Forms.Control.OnLoad(EventArgs e) at Eto.Forms.TableLayout.OnLoad(EventArgs e) at Eto.Forms.Control.TriggerLoad(EventArgs e) at Eto.Forms.Container.OnLoad(EventArgs e) at Eto.Forms.TableLayout.OnLoad(EventArgs e) at Eto.Forms.Control.TriggerLoad(EventArgs e) at Eto.Forms.Container.OnLoad(EventArgs e) at Eto.Forms.StackLayout.OnLoad(EventArgs e) at Eto.Forms.Control.TriggerLoad(EventArgs e) at Eto.Forms.Container.OnLoad(EventArgs e) at Eto.Forms.Control.TriggerLoad(EventArgs e) at Eto.Forms.Container.SetParent(Control child, Action assign, Control previousChild) at Eto.Forms.Panel.set_Content(Control value) at OpenTabletDriver.UX.MainForm.OnDisconnected() in

AkiSakurai · 2022-07-26T16:02:35Z

OpenTabletDriver.UX/Windows/UpdateForm.cs

+        private async Task InstallUpdate()
+        {
+            Enabled = false;
+            var executable = Process.GetCurrentProcess().ProcessName;


Process name is truncated on macos.
dotnet/runtime#52860

AkiSakurai · 2022-07-30T11:54:20Z

OpenTabletDriver.UX/Components/LogDataStore.cs

+
+        LogMessage IList<LogMessage>.this[int index]
+        {
+            get => (_filteredMessages as IList<LogMessage>)![index];


Eto (>=2.6.0) added caching for non indexable IEnumerable lookup but forgot to invalidate the cache when IEnumerable is updated. Which brokes the log viewer and causes random segfault.
picoe/Eto#2029

Queue<T> does not implement IList<T>.
Beside, this function is not called by Eto.
Eto calls IList<object>.[] or IList.[] internally, but IList<T> can't be cast to IList<object>.

As a workaround, you can avoid the caching by implement IList or just use FilterCollection so the index function can be picked up by eto.

AkiSakurai · 2022-08-02T13:42:05Z

OpenTabletDriver.UX/Dialogs/AreaConverterDialog.cs

+            };
+
+            IAreaConverter? converter = null;
+


Dialog is too small.

AkiSakurai · 2022-08-21T01:34:08Z

OpenTabletDriver.Desktop/Updater/MacOSUpdater.cs

            Process.Start("chmod", $"+x {subPath}/OpenTabletDriver.UX.MacOS");
            Process.Start("chmod", $"+x {subPath}/OpenTabletDriver.Daemon");
+            Move(subPath, BinaryDirectory);


DownloadDirectory is moved to BinaryDirectory by function Install in superclass before this function is called.

AkiSakurai · 2022-08-21T01:43:47Z

OpenTabletDriver.UX/Windows/ConfigurationEditor.cs

+            var splitter = new Splitter
+            {
+                Panel1MinimumSize = 250,
+                Panel1 = _configsList = new ListBox<TabletConfiguration>(),


Configuration editor is not scrollable now.

Weird that the macOS implementation doesn't have a scrollable built into that

Also happens on linux

InfinityGhost added this to the v0.7.x milestone Jul 20, 2022

InfinityGhost added the priority:high High priority issue/pull request label Jul 20, 2022

InfinityGhost force-pushed the di branch from e4a61c5 to b03f657 Compare July 20, 2022 23:27

Dependency Injection Rewrite

10a3c07

InfinityGhost force-pushed the di branch from b03f657 to 10a3c07 Compare July 20, 2022 23:36

InfinityGhost added 4 commits July 21, 2022 20:23

Add UpdaterWindow

3b39ec6

Reimplement presets

6d40b68

Configuration Editor reimplementation

5916ea3

Reintroduce area conversion

2c0a588

AkiSakurai reviewed Jul 23, 2022

View reviewed changes

InfinityGhost added 7 commits July 23, 2022 13:08

Fix threading issues and typos

fd4f0d4

Add daemon watchdogs

f17efc9

System.CommandLine version sync & fix UX threading on macOS

d658904

Fix OpenTabletDriver.Benchmarks compiling

4221336

Fix test project compilation errors

4a1f7b3

Enable nullable context in all projects

01866c6

QoL improvements and code cleanup

8c321e6

InfinityGhost force-pushed the di branch from 868eec4 to 8c321e6 Compare July 25, 2022 01:25

InfinityGhost added 2 commits July 25, 2022 20:56

Fix PluginSettingsEditor<T> synchronization

2f3d957

Add STAThread attribute on WPF

181d477

Include brush in FormattedText

ac9a2ab

InfinityGhost force-pushed the di branch 2 times, most recently from 72c5543 to 9b5f26d Compare July 26, 2022 03:03

Stability bugfixes

156ab76

InfinityGhost force-pushed the di branch from 9b5f26d to 156ab76 Compare July 27, 2022 02:22

InfinityGhost and others added 3 commits July 26, 2022 22:22

Add preset binding

57356eb

OutputMode: Fix 'Area Clipping' not discarding output correctly

b9fe196

This fixes OpenTabletDriver#1988

OutputMode: Don't emit null reports

e8e47f3

Co-authored-by: X9VoiD <oscar.silvestrexx@gmail.com>

This was referenced Jul 29, 2022

Refactor HandleTabletsChanged in TabletSwitcherPanel to be less redundant #1753

Closed

Overhaul debugger report recording UI #2009

Closed

InfinityGhost added 2 commits July 29, 2022 21:59

Add support for optional dependencies in plugin constructors

3fa5d09

Merge pull request #1 from gonX/gonx-di

4761b67

OutputMode: Fix 'Area Clipping' not discarding output correctly

InfinityGhost added 3 commits August 14, 2022 16:56

Add environment variables for AppData and Configurations

25be7ea

Introduce tray icon with hide to tray behavior

4d726e3

Fix persistent settings bug

b71221f

InfinityGhost marked this pull request as ready for review August 19, 2022 22:25

InfinityGhost added 2 commits August 19, 2022 18:52

Fix unit test failures

f0c2e43

Implement Settings migration

6bab42c

InfinityGhost force-pushed the di branch from e945261 to 6bab42c Compare August 21, 2022 14:43

InfinityGhost added 2 commits August 21, 2022 15:02

Multiple UI QOL improvements

a8a9fc7

Improve native styling

3bf462a

InfinityGhost merged commit edd8b01 into OpenTabletDriver:master Aug 21, 2022

InfinityGhost deleted the di branch August 21, 2022 21:55

AkiSakurai reviewed Aug 22, 2022

View reviewed changes

jamesbt365 mentioned this pull request Aug 27, 2022

It is impossible to disable lock aspect ratio in 0.6.0.x #1957

Closed

jamesbt365 mentioned this pull request Sep 4, 2022

UX Crash when resizing tablet area #2013

Closed

X9VoiD mentioned this pull request Dec 10, 2023

[0.6.x] Aggregate configuration test data #3095

Merged

gonX added the backport-not-needed Feature is already implemented or is not relevant for 0.6.x branch label Oct 2, 2025

Uh oh!

Dependency Injection Rewrite #2352

Dependency Injection Rewrite #2352

Uh oh!

Conversation

InfinityGhost commented Jul 20, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Notes

Issues

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

gonX commented Aug 9, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

AkiSakurai left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

InfinityGhost commented Jul 20, 2022 •

edited

Loading

gonX commented Aug 9, 2022 •

edited

Loading