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

Auto-enable fonts depending on the character input

Browse source
This commit is contained in:
Soreepeong 2023-12-10 22:32:28 +09:00
parent 806ecc0faf
commit b910ebc014
2 changed files with 123 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,8 +5,10 @@ using System.Numerics;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Text;
using System.Text.Unicode;
using Dalamud.Game.Text;
using Dalamud.Interface.GameFonts;
using Dalamud.Interface.Utility;
using Dalamud.Logging.Internal;
@ -26,6 +28,26 @@ internal sealed unsafe class DalamudIme : IDisposable, IServiceType
{
private static readonly ModuleLog Log = new("IME");
private static readonly UnicodeRange[] HanRange =
{
UnicodeRanges.CjkRadicalsSupplement,
UnicodeRanges.CjkSymbolsandPunctuation,
UnicodeRanges.CjkUnifiedIdeographsExtensionA,
UnicodeRanges.CjkUnifiedIdeographs,
UnicodeRanges.CjkCompatibilityIdeographs,
UnicodeRanges.CjkCompatibilityForms,
// No more; Extension B~ are outside BMP range
};
private static readonly UnicodeRange[] HangulRange =
{
UnicodeRanges.HangulJamo,
UnicodeRanges.HangulSyllables,
UnicodeRanges.HangulCompatibilityJamo,
UnicodeRanges.HangulJamoExtendedA,
UnicodeRanges.HangulJamoExtendedB,
};
private readonly ImGuiSetPlatformImeDataDelegate setPlatformImeDataDelegate;
[ServiceManager.ServiceConstructor]
@ -38,6 +60,16 @@ internal sealed unsafe class DalamudIme : IDisposable, IServiceType
private delegate void ImGuiSetPlatformImeDataDelegate(ImGuiViewportPtr viewport, ImGuiPlatformImeDataPtr data);
/// <summary>
/// Gets a value indicating whether Han(Chinese) input has been detected.
/// </summary>
public bool EncounteredHan { get; private set; }
/// <summary>
/// Gets a value indicating whether Hangul(Korean) input has been detected.
/// </summary>
public bool EncounteredHangul { get; private set; }
/// <summary>
/// Gets a value indicating whether to display the cursor in input text. This also deals with blinking.
/// </summary>
@ -116,6 +148,39 @@ internal sealed unsafe class DalamudIme : IDisposable, IServiceType
GC.SuppressFinalize(this);
}
/// <summary>
/// Looks for the characters inside <paramref name="str"/> and enables fonts accordingly.
/// </summary>
/// <param name="str">The string.</param>
public void ReflectCharacterEncounters(string str)
{
foreach (var chr in str)
{
if (HanRange.Any(x => x.FirstCodePoint <= chr && chr < x.FirstCodePoint + x.Length))
{
if (Service<GameFontManager>.Get()
.GetFdtReader(GameFontFamilyAndSize.Axis12)
?.FindGlyph(chr) is null)
{
if (!this.EncounteredHan)
{
this.EncounteredHan = true;
Service<InterfaceManager>.Get().RebuildFonts();
}
}
}
if (HangulRange.Any(x => x.FirstCodePoint <= chr && chr < x.FirstCodePoint + x.Length))
{
if (!this.EncounteredHangul)
{
this.EncounteredHangul = true;
Service<InterfaceManager>.Get().RebuildFonts();
}
}
}
}
/// <summary>
/// Processes window messages.
/// </summary>
@ -308,6 +373,8 @@ internal sealed unsafe class DalamudIme : IDisposable, IServiceType
? ImmGetCompositionString(hImc, GCS.GCS_RESULTSTR)
: ImmGetCompositionString(hImc, GCS.GCS_COMPSTR);
this.ReflectCharacterEncounters(newString);
if (s != e)
textState.DeleteChars(s, e - s);
textState.InsertChars(s, newString);
@ -402,6 +469,7 @@ internal sealed unsafe class DalamudIme : IDisposable, IServiceType
(int)Math.Min(candlist.dwCount - candlist.dwPageStart, candlist.dwPageSize)))
{
this.ImmCand.Add(new((char*)(pStorage + candlist.dwOffset[i])));
this.ReflectCharacterEncounters(this.ImmCand[^1]);
}
}

56
Dalamud/Interface/Internal/InterfaceManager.cs
View file

@ -6,6 +6,7 @@ using System.Linq;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Text;
using System.Text.Unicode;
using System.Threading;
using Dalamud.Configuration.Internal;
@ -786,10 +787,22 @@ internal class InterfaceManager : IDisposable, IServiceType
var fontPathKr = Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "NotoSansCJKkr-Regular.otf");
if (!File.Exists(fontPathKr))
fontPathKr = Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "NotoSansKR-Regular.otf");
if (!File.Exists(fontPathKr))
fontPathKr = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), "Fonts", "malgun.ttf");
if (!File.Exists(fontPathKr))
fontPathKr = null;
Log.Verbose("[FONT] fontPathKr = {0}", fontPathKr);
var fontPathChs = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), "Fonts", "msyh.ttc");
if (!File.Exists(fontPathChs))
fontPathChs = null;
Log.Verbose("[FONT] fontPathChs = {0}", fontPathChs);
var fontPathCht = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), "Fonts", "msjh.ttc");
if (!File.Exists(fontPathCht))
fontPathCht = null;
Log.Verbose("[FONT] fontPathChs = {0}", fontPathCht);
// Default font
Log.Verbose("[FONT] SetupFonts - Default font");
var fontInfo = new TargetFontModification(
@ -817,7 +830,8 @@ internal class InterfaceManager : IDisposable, IServiceType
this.loadedFontInfo[DefaultFont] = fontInfo;
}
if (fontPathKr != null && Service<DalamudConfiguration>.Get().EffectiveLanguage == "ko")
if (fontPathKr != null
&& (Service<DalamudConfiguration>.Get().EffectiveLanguage == "ko" || this.dalamudIme.EncounteredHangul))
{
fontConfig.MergeMode = true;
fontConfig.GlyphRanges = ioFonts.GetGlyphRangesKorean();
@ -826,6 +840,46 @@ internal class InterfaceManager : IDisposable, IServiceType
fontConfig.MergeMode = false;
}
if (fontPathCht != null && Service<DalamudConfiguration>.Get().EffectiveLanguage == "tw")
{
fontConfig.MergeMode = true;
var rangeHandle = GCHandle.Alloc(new ushort[]
{
(ushort)UnicodeRanges.CjkUnifiedIdeographs.FirstCodePoint,
(ushort)(UnicodeRanges.CjkUnifiedIdeographs.FirstCodePoint +
(UnicodeRanges.CjkUnifiedIdeographs.Length - 1)),
(ushort)UnicodeRanges.CjkUnifiedIdeographsExtensionA.FirstCodePoint,
(ushort)(UnicodeRanges.CjkUnifiedIdeographsExtensionA.FirstCodePoint +
(UnicodeRanges.CjkUnifiedIdeographsExtensionA.Length - 1)),
0,
}, GCHandleType.Pinned);
garbageList.Add(rangeHandle);
fontConfig.GlyphRanges = rangeHandle.AddrOfPinnedObject();
fontConfig.PixelSnapH = true;
ioFonts.AddFontFromFileTTF(fontPathCht, fontConfig.SizePixels, fontConfig);
fontConfig.MergeMode = false;
}
else if (fontPathChs != null && (Service<DalamudConfiguration>.Get().EffectiveLanguage == "zh"
|| this.dalamudIme.EncounteredHan))
{
fontConfig.MergeMode = true;
var rangeHandle = GCHandle.Alloc(new ushort[]
{
(ushort)UnicodeRanges.CjkUnifiedIdeographs.FirstCodePoint,
(ushort)(UnicodeRanges.CjkUnifiedIdeographs.FirstCodePoint +
(UnicodeRanges.CjkUnifiedIdeographs.Length - 1)),
(ushort)UnicodeRanges.CjkUnifiedIdeographsExtensionA.FirstCodePoint,
(ushort)(UnicodeRanges.CjkUnifiedIdeographsExtensionA.FirstCodePoint +
(UnicodeRanges.CjkUnifiedIdeographsExtensionA.Length - 1)),
0,
}, GCHandleType.Pinned);
garbageList.Add(rangeHandle);
fontConfig.GlyphRanges = rangeHandle.AddrOfPinnedObject();
fontConfig.PixelSnapH = true;
ioFonts.AddFontFromFileTTF(fontPathChs, fontConfig.SizePixels, fontConfig);
fontConfig.MergeMode = false;
}
// FontAwesome icon font
Log.Verbose("[FONT] SetupFonts - FontAwesome icon font");
{