From ebb2fd2bb45314b2e7b344afab0cde6db87512f0 Mon Sep 17 00:00:00 2001 From: Bluefissure Date: Sun, 14 Aug 2022 10:34:55 -0500 Subject: [PATCH] upgrade to current api --- .gitignore | 352 ++++++++++++++++++++++++++++++++++++- IMEPlugin/IMEPlugin.csproj | 7 + IMEPlugin/Plugin.cs | 68 ++++--- IMEPlugin/PluginUI.cs | 7 +- IMEPlugin/app.config | 11 ++ IMEPlugin/packages.config | 4 + 6 files changed, 415 insertions(+), 34 deletions(-) create mode 100644 IMEPlugin/app.config create mode 100644 IMEPlugin/packages.config diff --git a/.gitignore b/.gitignore index 7990fe7..2f1229f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,350 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory .vs/ -obj/ -bin/ -*.user \ No newline at end of file +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ \ No newline at end of file diff --git a/IMEPlugin/IMEPlugin.csproj b/IMEPlugin/IMEPlugin.csproj index bfc8aca..fa4119b 100644 --- a/IMEPlugin/IMEPlugin.csproj +++ b/IMEPlugin/IMEPlugin.csproj @@ -45,6 +45,9 @@ + + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + @@ -67,5 +70,9 @@ false + + + + \ No newline at end of file diff --git a/IMEPlugin/Plugin.cs b/IMEPlugin/Plugin.cs index b086c45..e36a38d 100644 --- a/IMEPlugin/Plugin.cs +++ b/IMEPlugin/Plugin.cs @@ -8,21 +8,31 @@ using System.Threading; using IMEPlugin.Win32_Utils; using System.Collections.Generic; +using Dalamud.Game; +using Dalamud.IoC; +using Dalamud.Logging; +using Dalamud.Game.ClientState.Conditions; +using Dalamud.Game.Network; using static IMEPlugin.Win32_Utils.Imm; namespace IMEPlugin { - public unsafe class Plugin : IDalamudPlugin + public unsafe class IMEPlugin : IDalamudPlugin { public string Name => "IMEPlugin"; public List ImmCand = new List(); public string ImmComp = ""; - private PluginUI ui; + private PluginUI Gui { get; set; } + + + [PluginService] public DalamudPluginInterface PluginInterface { get; set; } + [PluginService] public Condition Conditions { get; set; } + [PluginService] public SigScanner SigScanner { get; set; } + [PluginService] public CommandManager CommandManager { get; set; } + [PluginService] public GameNetwork GameNetwork { get; set; } private const string commandName = "/ime"; - private DalamudPluginInterface pi; - private Thread thread; private bool threadRunning = false; delegate long WndProcDelegate(IntPtr hWnd, uint msg, ulong wParam, long lParam); @@ -33,13 +43,11 @@ public unsafe class Plugin : IDalamudPlugin private IntPtr ImmFunc; private delegate char ImmFuncDelegate(Int64 a1, char a2, byte a3); private Hook ImmFuncHook; - - public void Initialize(DalamudPluginInterface pluginInterface) + public IMEPlugin() { - this.pi = pluginInterface; - this._hWnd = this.pi.UiBuilder.WindowHandlePtr; + this._hWnd = PluginInterface.UiBuilder.WindowHandlePtr; - this.ImmFunc = this.pi.TargetModuleScanner.ScanText("E8 ?? ?? ?? ?? 84 C0 75 10 48 83 FF 09"); + this.ImmFunc = SigScanner.ScanText("E8 ?? ?? ?? ?? 84 C0 75 10 48 83 FF 09"); this.ImmFuncHook = new Hook( ImmFunc, @@ -52,14 +60,11 @@ public void Initialize(DalamudPluginInterface pluginInterface) InitializeWndProc(); - this.thread = new Thread(new ThreadStart(this.Loop)); - this.thread.Start(); this.threadRunning = true; - this.ui = new PluginUI(this); - this.pi.UiBuilder.OnBuildUi += DrawUI; - this.pi.CommandManager.AddHandler(commandName, new CommandInfo(OnCommand) + Gui = new PluginUI(this); + CommandManager.AddHandler(commandName, new CommandInfo(OnCommand) { HelpMessage = "Shows the IME panel" }); @@ -67,7 +72,7 @@ public void Initialize(DalamudPluginInterface pluginInterface) private void OnCommand(string command, string args) { - this.ui.Visible = !this.ui.Visible; + Gui.Visible = !Gui.Visible; } #region WndProc @@ -91,7 +96,7 @@ private long WndProcDetour(IntPtr hWnd, uint msg, ulong wParam, long lParam) switch ((IMECommand)wParam) { case IMECommand.IMN_CHANGECANDIDATE: - this.ui.Visible = true; + Gui.Visible = true; if (hWnd == IntPtr.Zero) return 0; var hIMC = Imm.ImmGetContext(hWnd); @@ -137,11 +142,11 @@ private long WndProcDetour(IntPtr hWnd, uint msg, ulong wParam, long lParam) } break; case IMECommand.IMN_OPENCANDIDATE: - this.ui.Visible = true; + Gui.Visible = true; this.ImmCand.Clear(); break; case IMECommand.IMN_CLOSECANDIDATE: - this.ui.Visible = false; + Gui.Visible = false; this.ImmCand.Clear(); break; default: @@ -164,7 +169,7 @@ private long WndProcDetour(IntPtr hWnd, uint msg, ulong wParam, long lParam) io.AddInputCharactersUTF8(lpstr); this.ImmComp = ""; this.ImmCand.Clear(); - this.ui.Visible = false; + Gui.Visible = false; } if (((long)(IMEComposition.GCS_COMPSTR | IMEComposition.GCS_COMPATTR | IMEComposition.GCS_COMPCLAUSE | IMEComposition.GCS_COMPREADATTR | IMEComposition.GCS_COMPREADCLAUSE | IMEComposition.GCS_COMPREADSTR) & lParam) > 0) @@ -181,7 +186,7 @@ private long WndProcDetour(IntPtr hWnd, uint msg, ulong wParam, long lParam) string lpstr = Encoding.Unicode.GetString(bytes); this.ImmComp = lpstr; if(lpstr == "") - this.ui.Visible = false; + Gui.Visible = false; } break; @@ -196,16 +201,24 @@ private long WndProcDetour(IntPtr hWnd, uint msg, ulong wParam, long lParam) private char ImmFuncDetour(Int64 a1, char a2, byte a3) { - char ret = this.ImmFuncHook.Original(a1, a2, a3); - return (char)0; + try + { + char ret = this.ImmFuncHook.Original(a1, a2, a3); + if (ImGui.GetIO().WantTextInput) + { + return (char)0; + } + return ret; + } catch { + PluginLog.Information("[IME Plugin] Please don't crash in hook."); + } + return this.ImmFuncHook.Original(a1, a2, a3); } public void Dispose() { - this.ui.Dispose(); - this.threadRunning = false; - this.thread.Abort(); + Gui.Dispose(); if (_oldWndProcPtr != IntPtr.Zero) { @@ -215,8 +228,7 @@ public void Dispose() this.ImmFuncHook.Disable(); - this.pi.CommandManager.RemoveHandler(commandName); - this.pi.Dispose(); + CommandManager.RemoveHandler(commandName); } @@ -243,7 +255,7 @@ public void Loop() } private void DrawUI() { - this.ui.Draw(); + Gui.Draw(); } } diff --git a/IMEPlugin/PluginUI.cs b/IMEPlugin/PluginUI.cs index 2790c4b..c0939a5 100644 --- a/IMEPlugin/PluginUI.cs +++ b/IMEPlugin/PluginUI.cs @@ -6,7 +6,7 @@ namespace IMEPlugin { class PluginUI : IDisposable { - private Plugin _plugin; + private IMEPlugin _plugin; private bool visible = false; public bool Visible @@ -21,9 +21,10 @@ public bool SettingsVisible get { return this.settingsVisible; } set { this.settingsVisible = value; } } - public PluginUI(Plugin plugin) + public PluginUI(IMEPlugin plugin) { this._plugin = plugin; + plugin.PluginInterface.UiBuilder.Draw += Draw; } public void Dispose() @@ -43,7 +44,7 @@ public void DrawMainWindow() } ImGui.SetNextWindowSize(new Vector2(100, 200), ImGuiCond.FirstUseEver); - if (ImGui.Begin("IME Plugin", ref this.visible, ImGuiWindowFlags.NoTitleBar | ImGuiWindowFlags.NoFocusOnAppearing)) + if (ImGui.Begin("IME Plugin Legacy", ref this.visible, ImGuiWindowFlags.NoTitleBar | ImGuiWindowFlags.NoFocusOnAppearing)) { ImGui.Text(_plugin.ImmComp); ImGui.Separator(); diff --git a/IMEPlugin/app.config b/IMEPlugin/app.config new file mode 100644 index 0000000..254c62f --- /dev/null +++ b/IMEPlugin/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/IMEPlugin/packages.config b/IMEPlugin/packages.config new file mode 100644 index 0000000..8038b42 --- /dev/null +++ b/IMEPlugin/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file