Skip to content

Commit

Permalink
Merge pull request #1564 from Soreepeong/fix/ime
Browse files Browse the repository at this point in the history
  • Loading branch information
goaaats authored Dec 17, 2023
2 parents 280a9d6 + 6fefc3b commit b16ba87
Show file tree
Hide file tree
Showing 12 changed files with 1,310 additions and 472 deletions.
3 changes: 1 addition & 2 deletions Dalamud/Dalamud.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
using Dalamud.Common;
using Dalamud.Configuration.Internal;
using Dalamud.Game;
using Dalamud.Game.Gui.Internal;
using Dalamud.Interface.Internal;
using Dalamud.Plugin.Internal;
using Dalamud.Storage;
Expand Down Expand Up @@ -178,7 +177,7 @@ public void DisposePlugins()
// this must be done before unloading interface manager, in order to do rebuild
// the correct cascaded WndProc (IME -> RawDX11Scene -> Game). Otherwise the game
// will not receive any windows messages
Service<DalamudIME>.GetNullable()?.Dispose();
Service<DalamudIme>.GetNullable()?.Dispose();

// this must be done before unloading plugins, or it can cause a race condition
// due to rendering happening on another thread, where a plugin might receive
Expand Down
301 changes: 0 additions & 301 deletions Dalamud/Game/Gui/Internal/DalamudIME.cs

This file was deleted.

32 changes: 27 additions & 5 deletions Dalamud/Game/Text/SeIconChar.cs
Original file line number Diff line number Diff line change
Expand Up @@ -611,29 +611,51 @@ public enum SeIconChar
QuestRepeatable = 0xE0BF,

/// <summary>
/// The IME hiragana icon unicode character.
/// The [あ] character indicating that the Japanese IME is in full-width Hiragana input mode.
/// </summary>
/// <remarks>
/// Half-width Hiragana exists as a Windows API constant, but the feature is unused, or at least unexposed to the end user via the IME.
/// </remarks>
ImeHiragana = 0xE020,

/// <summary>
/// The IME katakana icon unicode character.
/// The [ア] character indicating that the Japanese IME is in full-width Katakana input mode.
/// </summary>
ImeKatakana = 0xE021,

/// <summary>
/// The IME alphanumeric icon unicode character.
/// The [A] character indicating that Japanese or Korean IME is in full-width Latin character input mode.
/// </summary>
ImeAlphanumeric = 0xE022,

/// <summary>
/// The IME katakana half-width icon unicode character.
/// The [_ア] character indicating that the Japanese IME is in half-width Katakana input mode.
/// </summary>
ImeKatakanaHalfWidth = 0xE023,

/// <summary>
/// The IME alphanumeric half-width icon unicode character.
/// The [_A] character indicating that Japanese or Korean IME is in half-width Latin character input mode.
/// </summary>
ImeAlphanumericHalfWidth = 0xE024,

/// <summary>
/// The [가] character indicating that the Korean IME is in Hangul input mode.
/// </summary>
/// <remarks>
/// Use <see cref="ImeAlphanumeric"/> and <see cref="ImeAlphanumericHalfWidth"/> for alphanumeric input mode,
/// toggled via Alt+=.
/// </remarks>
ImeKoreanHangul = 0xE025,

/// <summary>
/// The [中] character indicating that the Chinese IME is in Han character input mode.
/// </summary>
ImeChineseHan = 0xE026,

/// <summary>
/// The [英] character indicating that the Chinese IME is in Latin character input mode.
/// </summary>
ImeChineseLatin = 0xE027,

/// <summary>
/// The instance (1) icon unicode character.
Expand Down
Loading

0 comments on commit b16ba87

Please sign in to comment.