ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-21 23:37:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Prevent Tab key from breaking input

Browse source
This commit is contained in:
Soreepeong 2023-12-08 02:39:11 +09:00
parent e089949a72
commit f03552a2ab
1 changed files with 38 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -55,12 +55,12 @@ internal sealed unsafe class DalamudIme : IDisposable, IServiceType
return textState.CursorAnim % 1.2f <= 0.8f; return textState.CursorAnim % 1.2f <= 0.8f;
} }
} }
/// <summary> /// <summary>
/// Gets the cursor position, in screen coordinates. /// Gets the cursor position, in screen coordinates.
/// </summary> /// </summary>
internal Vector2 CursorPos { get; private set; } internal Vector2 CursorPos { get; private set; }
/// <summary> /// <summary>
/// Gets the associated viewport. /// Gets the associated viewport.
/// </summary> /// </summary>
@ -101,7 +101,7 @@ internal sealed unsafe class DalamudIme : IDisposable, IServiceType
/// </summary> /// </summary>
internal bool ShowPartialConversion => this.PartialConversionFrom != 0 || internal bool ShowPartialConversion => this.PartialConversionFrom != 0 ||
this.PartialConversionTo != this.ImmComp.Length; this.PartialConversionTo != this.ImmComp.Length;
/// <summary> /// <summary>
/// Gets the input mode icon from <see cref="SeIconChar"/>. /// Gets the input mode icon from <see cref="SeIconChar"/>.
/// </summary> /// </summary>
@ -139,15 +139,17 @@ internal sealed unsafe class DalamudIme : IDisposable, IServiceType
switch (args.Message) switch (args.Message)
{ {
case WM.WM_IME_NOTIFY when (nint)args.WParam is IMN.IMN_OPENCANDIDATE or IMN.IMN_CLOSECANDIDATE or IMN.IMN_CHANGECANDIDATE: case WM.WM_IME_NOTIFY
when (nint)args.WParam is IMN.IMN_OPENCANDIDATE or IMN.IMN_CLOSECANDIDATE
or IMN.IMN_CHANGECANDIDATE:
this.UpdateImeWindowStatus(hImc); this.UpdateImeWindowStatus(hImc);
args.SuppressAndReturn(0); args.SuppressAndReturn(0);
break; break;
case WM.WM_IME_STARTCOMPOSITION: case WM.WM_IME_STARTCOMPOSITION:
args.SuppressAndReturn(0); args.SuppressAndReturn(0);
break; break;
case WM.WM_IME_COMPOSITION: case WM.WM_IME_COMPOSITION:
if (invalidTarget) if (invalidTarget)
ImmNotifyIME(hImc, NI.NI_COMPOSITIONSTR, CPS_CANCEL, 0); ImmNotifyIME(hImc, NI.NI_COMPOSITIONSTR, CPS_CANCEL, 0);
@ -162,12 +164,12 @@ internal sealed unsafe class DalamudIme : IDisposable, IServiceType
// Log.Verbose($"{nameof(WM.WM_IME_ENDCOMPOSITION)}({(nint)args.WParam:X}, {(nint)args.LParam:X}): {this.ImmComp}"); // Log.Verbose($"{nameof(WM.WM_IME_ENDCOMPOSITION)}({(nint)args.WParam:X}, {(nint)args.LParam:X}): {this.ImmComp}");
args.SuppressAndReturn(0); args.SuppressAndReturn(0);
break; break;
case WM.WM_IME_CONTROL: case WM.WM_IME_CONTROL:
// Log.Verbose($"{nameof(WM.WM_IME_CONTROL)}({(nint)args.WParam:X}, {(nint)args.LParam:X}): {this.ImmComp}"); // Log.Verbose($"{nameof(WM.WM_IME_CONTROL)}({(nint)args.WParam:X}, {(nint)args.LParam:X}): {this.ImmComp}");
args.SuppressAndReturn(0); args.SuppressAndReturn(0);
break; break;
case WM.WM_IME_REQUEST: case WM.WM_IME_REQUEST:
// Log.Verbose($"{nameof(WM.WM_IME_REQUEST)}({(nint)args.WParam:X}, {(nint)args.LParam:X}): {this.ImmComp}"); // Log.Verbose($"{nameof(WM.WM_IME_REQUEST)}({(nint)args.WParam:X}, {(nint)args.LParam:X}): {this.ImmComp}");
args.SuppressAndReturn(0); args.SuppressAndReturn(0);
@ -180,11 +182,31 @@ internal sealed unsafe class DalamudIme : IDisposable, IServiceType
// Log.Verbose($"{nameof(WM.WM_IME_SETCONTEXT)}({(nint)args.WParam:X}, {(nint)args.LParam:X}): {this.ImmComp}"); // Log.Verbose($"{nameof(WM.WM_IME_SETCONTEXT)}({(nint)args.WParam:X}, {(nint)args.LParam:X}): {this.ImmComp}");
args.SuppressWithDefault(); args.SuppressWithDefault();
break; break;
case WM.WM_IME_NOTIFY: case WM.WM_IME_NOTIFY:
// Log.Verbose($"{nameof(WM.WM_IME_NOTIFY)}({(nint)args.WParam:X}): {this.ImmComp}"); // Log.Verbose($"{nameof(WM.WM_IME_NOTIFY)}({(nint)args.WParam:X}): {this.ImmComp}");
break; break;
case WM.WM_KEYDOWN when (int)args.WParam is
VK.VK_TAB
or VK.VK_PRIOR
or VK.VK_NEXT
or VK.VK_END
or VK.VK_HOME
or VK.VK_LEFT
or VK.VK_UP
or VK.VK_RIGHT
or VK.VK_DOWN
or VK.VK_RETURN:
if (this.ImmCand.Count != 0)
{
TextState.Stb.SelectStart = TextState.Stb.Cursor = TextState.Stb.SelectEnd;
ImmNotifyIME(hImc, NI.NI_COMPOSITIONSTR, CPS_CANCEL, 0);
args.WParam = VK.VK_PROCESSKEY;
}
break;
case WM.WM_LBUTTONDOWN: case WM.WM_LBUTTONDOWN:
case WM.WM_RBUTTONDOWN: case WM.WM_RBUTTONDOWN:
case WM.WM_MBUTTONDOWN: case WM.WM_MBUTTONDOWN:
@ -192,7 +214,7 @@ internal sealed unsafe class DalamudIme : IDisposable, IServiceType
ImmNotifyIME(hImc, NI.NI_COMPOSITIONSTR, CPS_COMPLETE, 0); ImmNotifyIME(hImc, NI.NI_COMPOSITIONSTR, CPS_COMPLETE, 0);
break; break;
} }
this.UpdateInputLanguage(hImc); this.UpdateInputLanguage(hImc);
} }
finally finally
@ -220,7 +242,7 @@ internal sealed unsafe class DalamudIme : IDisposable, IServiceType
ImmGetConversionStatus(hImc, &conv, &sent); ImmGetConversionStatus(hImc, &conv, &sent);
var lang = GetKeyboardLayout(0); var lang = GetKeyboardLayout(0);
var open = ImmGetOpenStatus(hImc) != false; var open = ImmGetOpenStatus(hImc) != false;
// Log.Verbose($"{nameof(this.UpdateInputLanguage)}: conv={conv:X} sent={sent:X} open={open} lang={lang:X}"); // Log.Verbose($"{nameof(this.UpdateInputLanguage)}: conv={conv:X} sent={sent:X} open={open} lang={lang:X}");
var native = (conv & 1) != 0; var native = (conv & 1) != 0;
@ -285,8 +307,8 @@ internal sealed unsafe class DalamudIme : IDisposable, IServiceType
(s, e) = (e, s); (s, e) = (e, s);
var newString = finalCommit var newString = finalCommit
? ImmGetCompositionString(hImc, GCS.GCS_RESULTSTR) ? ImmGetCompositionString(hImc, GCS.GCS_RESULTSTR)
: ImmGetCompositionString(hImc, GCS.GCS_COMPSTR); : ImmGetCompositionString(hImc, GCS.GCS_COMPSTR);
if (s != e) if (s != e)
textState.DeleteChars(s, e - s); textState.DeleteChars(s, e - s);
@ -303,13 +325,13 @@ internal sealed unsafe class DalamudIme : IDisposable, IServiceType
finalCommit finalCommit
? 0 ? 0
: ImmGetCompositionStringW(hImc, GCS.GCS_CURSORPOS, null, 0); : ImmGetCompositionStringW(hImc, GCS.GCS_CURSORPOS, null, 0);
if (finalCommit) if (finalCommit)
{ {
this.ClearState(hImc); this.ClearState(hImc);
return; return;
} }
if ((comp & GCS.GCS_COMPATTR) != 0) if ((comp & GCS.GCS_COMPATTR) != 0)
{ {
var attrLength = ImmGetCompositionStringW(hImc, GCS.GCS_COMPATTR, null, 0); var attrLength = ImmGetCompositionStringW(hImc, GCS.GCS_COMPATTR, null, 0);
@ -349,7 +371,7 @@ internal sealed unsafe class DalamudIme : IDisposable, IServiceType
ref var textState = ref TextState; ref var textState = ref TextState;
textState.Stb.Cursor = textState.Stb.SelectStart = textState.Stb.SelectEnd; textState.Stb.Cursor = textState.Stb.SelectStart = textState.Stb.SelectEnd;
Log.Information($"{nameof(this.ClearState)}"); Log.Information($"{nameof(this.ClearState)}");
} }