ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix ime (#1750)

Browse source
This commit is contained in:
srkizer 2024-03-28 02:08:34 +09:00 • committed by GitHub
parent b9ae368401
commit a53a77541d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 33 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Dalamud/Interface/Internal/DalamudIme.cs
View file

@ -11,6 +11,7 @@ using System.Runtime.InteropServices;
using System.Text; using System.Text;
using System.Text.Unicode; using System.Text.Unicode;
using Dalamud.Game;
using Dalamud.Game.Text; using Dalamud.Game.Text;
using Dalamud.Hooking.WndProcHook; using Dalamud.Hooking.WndProcHook;
using Dalamud.Interface.GameFonts; using Dalamud.Interface.GameFonts;
@ -110,6 +111,7 @@ internal sealed unsafe class DalamudIme : IInternalDisposableService
/// <summary>Undo range for modifying the buffer while composition is in progress.</summary> /// <summary>Undo range for modifying the buffer while composition is in progress.</summary>
private (int Start, int End, int Cursor)? temporaryUndoSelection; private (int Start, int End, int Cursor)? temporaryUndoSelection;
private bool hadWantTextInput;
private bool updateInputLanguage = true; private bool updateInputLanguage = true;
private bool updateImeStatusAgain; private bool updateImeStatusAgain;
@ -262,20 +264,37 @@ internal sealed unsafe class DalamudIme : IInternalDisposableService
if (!ImGuiHelpers.IsImGuiInitialized) if (!ImGuiHelpers.IsImGuiInitialized)
{ {
this.updateInputLanguage = true; this.updateInputLanguage = true;
this.temporaryUndoSelection = null;
return; return;
} }
// Are we not the target of text input? // Are we not the target of text input?
if (!ImGui.GetIO().WantTextInput) if (!ImGui.GetIO().WantTextInput)
{ {
if (this.hadWantTextInput)
{
// Force the cancellation of whatever was being input.
var hImc2 = ImmGetContext(args.Hwnd);
if (hImc2 != 0)
{
ImmNotifyIME(hImc2, NI.NI_COMPOSITIONSTR, CPS_CANCEL, 0);
ImmReleaseContext(args.Hwnd, hImc2);
}
}
this.hadWantTextInput = false;
this.updateInputLanguage = true; this.updateInputLanguage = true;
this.temporaryUndoSelection = null;
return; return;
} }
this.hadWantTextInput = true;
var hImc = ImmGetContext(args.Hwnd); var hImc = ImmGetContext(args.Hwnd);
if (hImc == nint.Zero) if (hImc == nint.Zero)
{ {
this.updateInputLanguage = true; this.updateInputLanguage = true;
this.temporaryUndoSelection = null;
return; return;
} }
@ -338,9 +357,11 @@ internal sealed unsafe class DalamudIme : IInternalDisposableService
this.updateInputLanguage = false; this.updateInputLanguage = false;
} }
// Microsoft Korean IME and Google Japanese IME drop notifying us of a candidate list change.
// As the candidate list update is already there on the next WndProc call, update the candidate list again
// here.
if (this.updateImeStatusAgain) if (this.updateImeStatusAgain)
{ {
this.ReplaceCompositionString(hImc, false);
this.UpdateCandidates(hImc); this.UpdateCandidates(hImc);
this.updateImeStatusAgain = false; this.updateImeStatusAgain = false;
} }
@ -410,7 +431,8 @@ internal sealed unsafe class DalamudIme : IInternalDisposableService
or VK.VK_RIGHT or VK.VK_RIGHT
or VK.VK_DOWN or VK.VK_DOWN
or VK.VK_RETURN: or VK.VK_RETURN:
if (this.candidateStrings.Count != 0) // If key inputs that usually result in focus change, cancel the input process.
if (!string.IsNullOrEmpty(ImmGetCompositionString(hImc, GCS.GCS_COMPSTR)))
{ {
this.ClearState(hImc); this.ClearState(hImc);
args.WParam = VK.VK_PROCESSKEY; args.WParam = VK.VK_PROCESSKEY;
@ -428,7 +450,15 @@ internal sealed unsafe class DalamudIme : IInternalDisposableService
case WM.WM_RBUTTONDOWN: case WM.WM_RBUTTONDOWN:
case WM.WM_MBUTTONDOWN: case WM.WM_MBUTTONDOWN:
case WM.WM_XBUTTONDOWN: case WM.WM_XBUTTONDOWN:
ImmNotifyIME(hImc, NI.NI_COMPOSITIONSTR, CPS_COMPLETE, 0); // If mouse click happened while IME composition was in progress, force complete the input process.
if (!string.IsNullOrEmpty(ImmGetCompositionString(hImc, GCS.GCS_COMPSTR)))
{
ImmNotifyIME(hImc, NI.NI_COMPOSITIONSTR, CPS_COMPLETE, 0);
// Disable further handling of mouse button down event, or something would lock up the cursor.
args.SuppressWithValue(1);
}
break; break;
} }
} }