ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-30 20:33:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use RentedSeStringBuilder more

Browse source
This commit is contained in:
Haselnussbomber 2025-12-19 17:34:42 +01:00
parent 5e4ad4a694
commit a3d930b8e2
No known key found for this signature in database
GPG key ID: BB905BB49E7295D1
13 changed files with 275 additions and 367 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Dalamud/Game/Gui/ChatGui.cs
View file

@ -26,7 +26,6 @@ using Lumina.Text;
using Lumina.Text.Payloads; using Lumina.Text.Payloads;
using Lumina.Text.ReadOnly; using Lumina.Text.ReadOnly;
using LSeStringBuilder = Lumina.Text.SeStringBuilder;
using SeString = Dalamud.Game.Text.SeStringHandling.SeString; using SeString = Dalamud.Game.Text.SeStringHandling.SeString;
using SeStringBuilder = Dalamud.Game.Text.SeStringHandling.SeStringBuilder; using SeStringBuilder = Dalamud.Game.Text.SeStringHandling.SeStringBuilder;
@ -207,21 +206,21 @@ internal sealed unsafe class ChatGui : IInternalDisposableService, IChatGui
if (this.chatQueue.Count == 0) if (this.chatQueue.Count == 0)
return; return;
var sb = LSeStringBuilder.SharedPool.Get(); using var rssb = new RentedSeStringBuilder();
Span<byte> namebuf = stackalloc byte[256]; Span<byte> namebuf = stackalloc byte[256];
using var sender = new Utf8String(); using var sender = new Utf8String();
using var message = new Utf8String(); using var message = new Utf8String();
while (this.chatQueue.TryDequeue(out var chat)) while (this.chatQueue.TryDequeue(out var chat))
{ {
sb.Clear(); rssb.Builder.Clear();
foreach (var c in UtfEnumerator.From(chat.MessageBytes, UtfEnumeratorFlags.Utf8SeString)) foreach (var c in UtfEnumerator.From(chat.MessageBytes, UtfEnumeratorFlags.Utf8SeString))
{ {
if (c.IsSeStringPayload) if (c.IsSeStringPayload)
sb.Append((ReadOnlySeStringSpan)chat.MessageBytes.AsSpan(c.ByteOffset, c.ByteLength)); rssb.Builder.Append((ReadOnlySeStringSpan)chat.MessageBytes.AsSpan(c.ByteOffset, c.ByteLength));
else if (c.Value.IntValue == 0x202F) else if (c.Value.IntValue == 0x202F)
sb.BeginMacro(MacroCode.NonBreakingSpace).EndMacro(); rssb.Builder.BeginMacro(MacroCode.NonBreakingSpace).EndMacro();
else else
sb.Append(c); rssb.Builder.Append(c);
} }
if (chat.NameBytes.Length + 1 < namebuf.Length) if (chat.NameBytes.Length + 1 < namebuf.Length)
@ -235,7 +234,7 @@ internal sealed unsafe class ChatGui : IInternalDisposableService, IChatGui
sender.SetString(chat.NameBytes.NullTerminate()); sender.SetString(chat.NameBytes.NullTerminate());
} }
message.SetString(sb.GetViewAsSpan()); message.SetString(rssb.Builder.GetViewAsSpan());
var targetChannel = chat.Type ?? this.configuration.GeneralChatType; var targetChannel = chat.Type ?? this.configuration.GeneralChatType;
@ -247,8 +246,6 @@ internal sealed unsafe class ChatGui : IInternalDisposableService, IChatGui
chat.Timestamp, chat.Timestamp,
(byte)(chat.Silent ? 1 : 0)); (byte)(chat.Silent ? 1 : 0));
} }
LSeStringBuilder.SharedPool.Return(sb);
} }
/// <summary> /// <summary>
@ -326,29 +323,28 @@ internal sealed unsafe class ChatGui : IInternalDisposableService, IChatGui
private void PrintTagged(ReadOnlySpan<byte> message, XivChatType channel, string? tag, ushort? color) private void PrintTagged(ReadOnlySpan<byte> message, XivChatType channel, string? tag, ushort? color)
{ {
var sb = LSeStringBuilder.SharedPool.Get(); using var rssb = new RentedSeStringBuilder();
if (!tag.IsNullOrEmpty()) if (!tag.IsNullOrEmpty())
{ {
if (color is not null) if (color is not null)
{ {
sb.PushColorType(color.Value); rssb.Builder
sb.Append($"[{tag}] "); .PushColorType(color.Value)
sb.PopColorType(); .Append($"[{tag}] ")
.PopColorType();
} }
else else
{ {
sb.Append($"[{tag}] "); rssb.Builder.Append($"[{tag}] ");
} }
} }
this.Print(new XivChatEntry this.Print(new XivChatEntry
{ {
MessageBytes = sb.Append((ReadOnlySeStringSpan)message).ToArray(), MessageBytes = rssb.Builder.Append((ReadOnlySeStringSpan)message).ToArray(),
Type = channel, Type = channel,
}); });
LSeStringBuilder.SharedPool.Return(sb);
} }
private void InventoryItemCopyDetour(InventoryItem* thisPtr, InventoryItem* otherPtr) private void InventoryItemCopyDetour(InventoryItem* thisPtr, InventoryItem* otherPtr)
@ -457,7 +453,8 @@ internal sealed unsafe class ChatGui : IInternalDisposableService, IChatGui
Log.Verbose($"InteractableLinkClicked: {Payload.EmbeddedInfoType.DalamudLink}"); Log.Verbose($"InteractableLinkClicked: {Payload.EmbeddedInfoType.DalamudLink}");
var sb = LSeStringBuilder.SharedPool.Get(); using var rssb = new RentedSeStringBuilder();
try try
{ {
var seStringSpan = new ReadOnlySeStringSpan(linkData->Payload); var seStringSpan = new ReadOnlySeStringSpan(linkData->Payload);
@ -465,7 +462,7 @@ internal sealed unsafe class ChatGui : IInternalDisposableService, IChatGui
// read until link terminator // read until link terminator
foreach (var payload in seStringSpan) foreach (var payload in seStringSpan)
{ {
sb.Append(payload); rssb.Builder.Append(payload);
if (payload.Type == ReadOnlySePayloadType.Macro && if (payload.Type == ReadOnlySePayloadType.Macro &&
payload.MacroCode == MacroCode.Link && payload.MacroCode == MacroCode.Link &&
@ -477,7 +474,7 @@ internal sealed unsafe class ChatGui : IInternalDisposableService, IChatGui
} }
} }
var seStr = SeString.Parse(sb.ToArray()); var seStr = SeString.Parse(rssb.Builder.ToArray());
if (seStr.Payloads.Count == 0 || seStr.Payloads[0] is not DalamudLinkPayload link) if (seStr.Payloads.Count == 0 || seStr.Payloads[0] is not DalamudLinkPayload link)
return; return;
@ -495,10 +492,6 @@ internal sealed unsafe class ChatGui : IInternalDisposableService, IChatGui
{ {
Log.Error(ex, "Exception in HandleLinkClickDetour"); Log.Error(ex, "Exception in HandleLinkClickDetour");
} }
finally
{
LSeStringBuilder.SharedPool.Return(sb);
}
} }
} }

8
Dalamud/Game/Internal/DalamudCompletion.cs
View file

@ -11,8 +11,6 @@ using FFXIVClientStructs.FFXIV.Client.UI;
using FFXIVClientStructs.FFXIV.Component.Completion; using FFXIVClientStructs.FFXIV.Component.Completion;
using FFXIVClientStructs.FFXIV.Component.GUI; using FFXIVClientStructs.FFXIV.Component.GUI;
using Lumina.Text;
namespace Dalamud.Game.Internal; namespace Dalamud.Game.Internal;
/// <summary> /// <summary>
@ -253,16 +251,14 @@ internal sealed unsafe class DalamudCompletion : IInternalDisposableService
{ {
public EntryStrings(string command) public EntryStrings(string command)
{ {
var rssb = SeStringBuilder.SharedPool.Get(); using var rssb = new RentedSeStringBuilder();
this.Display = Utf8String.FromSequence(rssb this.Display = Utf8String.FromSequence(rssb.Builder
.PushColorType(539) .PushColorType(539)
.Append(command) .Append(command)
.PopColorType() .PopColorType()
.GetViewAsSpan()); .GetViewAsSpan());
SeStringBuilder.SharedPool.Return(rssb);
this.Match = Utf8String.FromString(command); this.Match = Utf8String.FromString(command);
} }

289
Dalamud/Game/Text/Evaluator/SeStringEvaluator.cs
View file

@ -102,16 +102,15 @@ internal class SeStringEvaluator : IServiceType, ISeStringEvaluator
// TODO: remove culture info toggling after supporting CultureInfo for SeStringBuilder.Append, // TODO: remove culture info toggling after supporting CultureInfo for SeStringBuilder.Append,
// and then remove try...finally block (discard builder from the pool on exception) // and then remove try...finally block (discard builder from the pool on exception)
var previousCulture = CultureInfo.CurrentCulture; var previousCulture = CultureInfo.CurrentCulture;
var builder = SeStringBuilder.SharedPool.Get(); using var rssb = new RentedSeStringBuilder();
try try
{ {
CultureInfo.CurrentCulture = Localization.GetCultureInfoFromLangCode(lang.ToCode()); CultureInfo.CurrentCulture = Localization.GetCultureInfoFromLangCode(lang.ToCode());
return this.EvaluateAndAppendTo(builder, str, localParameters, lang).ToReadOnlySeString(); return this.EvaluateAndAppendTo(rssb.Builder, str, localParameters, lang).ToReadOnlySeString();
} }
finally finally
{ {
CultureInfo.CurrentCulture = previousCulture; CultureInfo.CurrentCulture = previousCulture;
SeStringBuilder.SharedPool.Return(builder);
} }
} }
@ -930,7 +929,8 @@ internal class SeStringEvaluator : IServiceType, ISeStringEvaluator
itemId += 1000000; itemId += 1000000;
} }
var sb = SeStringBuilder.SharedPool.Get(); using var rssb = new RentedSeStringBuilder();
var sb = rssb.Builder;
sb.Append(this.EvaluateFromAddon(6, [rarity], context.Language)); sb.Append(this.EvaluateFromAddon(6, [rarity], context.Language));
@ -956,7 +956,6 @@ internal class SeStringEvaluator : IServiceType, ISeStringEvaluator
sb.PopLink(); sb.PopLink();
text = sb.ToReadOnlySeString(); text = sb.ToReadOnlySeString();
SeStringBuilder.SharedPool.Return(sb);
} }
private void CreateSheetLink(in SeStringContext context, string resolvedSheetName, ReadOnlySeString text, uint eRowIdValue, uint eColParamValue) private void CreateSheetLink(in SeStringContext context, string resolvedSheetName, ReadOnlySeString text, uint eRowIdValue, uint eColParamValue)
@ -1028,40 +1027,33 @@ internal class SeStringEvaluator : IServiceType, ISeStringEvaluator
if (!payload.TryGetExpression(out var eStr)) if (!payload.TryGetExpression(out var eStr))
return false; return false;
var builder = SeStringBuilder.SharedPool.Get(); using var rssb = new RentedSeStringBuilder();
try var headContext = new SeStringContext(rssb.Builder, context.LocalParameters, context.Language);
if (!this.ResolveStringExpression(headContext, eStr))
return false;
var str = rssb.Builder.ToReadOnlySeString();
var pIdx = 0;
foreach (var p in str)
{ {
var headContext = new SeStringContext(builder, context.LocalParameters, context.Language); pIdx++;
if (!this.ResolveStringExpression(headContext, eStr)) if (p.Type == ReadOnlySePayloadType.Invalid)
return false; continue;
var str = builder.ToReadOnlySeString(); if (pIdx == 1 && p.Type == ReadOnlySePayloadType.Text)
var pIdx = 0;
foreach (var p in str)
{ {
pIdx++; context.Builder.Append(Encoding.UTF8.GetString(p.Body.ToArray()).ToUpper(context.CultureInfo));
continue;
if (p.Type == ReadOnlySePayloadType.Invalid)
continue;
if (pIdx == 1 && p.Type == ReadOnlySePayloadType.Text)
{
context.Builder.Append(Encoding.UTF8.GetString(p.Body.ToArray()).ToUpper(context.CultureInfo));
continue;
}
context.Builder.Append(p);
} }
return true; context.Builder.Append(p);
}
finally
{
SeStringBuilder.SharedPool.Return(builder);
} }
return true;
} }
private bool TryResolveHead(in SeStringContext context, in ReadOnlySePayloadSpan payload) private bool TryResolveHead(in SeStringContext context, in ReadOnlySePayloadSpan payload)
@ -1069,40 +1061,33 @@ internal class SeStringEvaluator : IServiceType, ISeStringEvaluator
if (!payload.TryGetExpression(out var eStr)) if (!payload.TryGetExpression(out var eStr))
return false; return false;
var builder = SeStringBuilder.SharedPool.Get(); using var rssb = new RentedSeStringBuilder();
try var headContext = new SeStringContext(rssb.Builder, context.LocalParameters, context.Language);
if (!this.ResolveStringExpression(headContext, eStr))
return false;
var str = rssb.Builder.ToReadOnlySeString();
var pIdx = 0;
foreach (var p in str)
{ {
var headContext = new SeStringContext(builder, context.LocalParameters, context.Language); pIdx++;
if (!this.ResolveStringExpression(headContext, eStr)) if (p.Type == ReadOnlySePayloadType.Invalid)
return false; continue;
var str = builder.ToReadOnlySeString(); if (pIdx == 1 && p.Type == ReadOnlySePayloadType.Text)
var pIdx = 0;
foreach (var p in str)
{ {
pIdx++; context.Builder.Append(Encoding.UTF8.GetString(p.Body.Span).FirstCharToUpper(context.CultureInfo));
continue;
if (p.Type == ReadOnlySePayloadType.Invalid)
continue;
if (pIdx == 1 && p.Type == ReadOnlySePayloadType.Text)
{
context.Builder.Append(Encoding.UTF8.GetString(p.Body.Span).FirstCharToUpper(context.CultureInfo));
continue;
}
context.Builder.Append(p);
} }
return true; context.Builder.Append(p);
}
finally
{
SeStringBuilder.SharedPool.Return(builder);
} }
return true;
} }
private bool TryResolveSplit(in SeStringContext context, in ReadOnlySePayloadSpan payload) private bool TryResolveSplit(in SeStringContext context, in ReadOnlySePayloadSpan payload)
@ -1113,32 +1098,25 @@ internal class SeStringEvaluator : IServiceType, ISeStringEvaluator
if (!eSeparator.TryGetString(out var eSeparatorVal) || !eIndex.TryGetUInt(out var eIndexVal) || eIndexVal <= 0) if (!eSeparator.TryGetString(out var eSeparatorVal) || !eIndex.TryGetUInt(out var eIndexVal) || eIndexVal <= 0)
return false; return false;
var builder = SeStringBuilder.SharedPool.Get(); using var rssb = new RentedSeStringBuilder();
try var headContext = new SeStringContext(rssb.Builder, context.LocalParameters, context.Language);
{
var headContext = new SeStringContext(builder, context.LocalParameters, context.Language);
if (!this.ResolveStringExpression(headContext, eText))
return false;
var separator = eSeparatorVal.ExtractText();
if (separator.Length < 1)
return false;
var splitted = builder.ToReadOnlySeString().ExtractText().Split(separator[0]);
if (eIndexVal <= splitted.Length)
{
context.Builder.Append(splitted[eIndexVal - 1]);
return true;
}
if (!this.ResolveStringExpression(headContext, eText))
return false; return false;
}
finally var separator = eSeparatorVal.ExtractText();
if (separator.Length < 1)
return false;
var splitted = rssb.Builder.ToReadOnlySeString().ExtractText().Split(separator[0]);
if (eIndexVal <= splitted.Length)
{ {
SeStringBuilder.SharedPool.Return(builder); context.Builder.Append(splitted[eIndexVal - 1]);
return true;
} }
return false;
} }
private bool TryResolveHeadAll(in SeStringContext context, in ReadOnlySePayloadSpan payload) private bool TryResolveHeadAll(in SeStringContext context, in ReadOnlySePayloadSpan payload)
@ -1146,37 +1124,30 @@ internal class SeStringEvaluator : IServiceType, ISeStringEvaluator
if (!payload.TryGetExpression(out var eStr)) if (!payload.TryGetExpression(out var eStr))
return false; return false;
var builder = SeStringBuilder.SharedPool.Get(); using var rssb = new RentedSeStringBuilder();
try var headContext = new SeStringContext(rssb.Builder, context.LocalParameters, context.Language);
if (!this.ResolveStringExpression(headContext, eStr))
return false;
var str = rssb.Builder.ToReadOnlySeString();
foreach (var p in str)
{ {
var headContext = new SeStringContext(builder, context.LocalParameters, context.Language); if (p.Type == ReadOnlySePayloadType.Invalid)
continue;
if (!this.ResolveStringExpression(headContext, eStr)) if (p.Type == ReadOnlySePayloadType.Text)
return false;
var str = builder.ToReadOnlySeString();
foreach (var p in str)
{ {
if (p.Type == ReadOnlySePayloadType.Invalid) context.Builder.Append(Encoding.UTF8.GetString(p.Body.Span).ToUpper(true, true, false, context.Language));
continue; continue;
if (p.Type == ReadOnlySePayloadType.Text)
{
context.Builder.Append(Encoding.UTF8.GetString(p.Body.Span).ToUpper(true, true, false, context.Language));
continue;
}
context.Builder.Append(p);
} }
return true; context.Builder.Append(p);
}
finally
{
SeStringBuilder.SharedPool.Return(builder);
} }
return true;
} }
private bool TryResolveFixed(in SeStringContext context, in ReadOnlySePayloadSpan payload) private bool TryResolveFixed(in SeStringContext context, in ReadOnlySePayloadSpan payload)
@ -1306,14 +1277,13 @@ internal class SeStringEvaluator : IServiceType, ISeStringEvaluator
if (!this.dataManager.GetExcelSheet<Lumina.Excel.Sheets.Map>().TryGetRow(mapId, out var mapRow)) if (!this.dataManager.GetExcelSheet<Lumina.Excel.Sheets.Map>().TryGetRow(mapId, out var mapRow))
return false; return false;
var sb = SeStringBuilder.SharedPool.Get(); using var rssb = new RentedSeStringBuilder();
sb.Append(placeNameRow.Name); rssb.Builder.Append(placeNameRow.Name);
if (instance is > 0 and <= 9) if (instance is > 0 and <= 9)
sb.Append((char)((char)0xE0B0 + (char)instance)); rssb.Builder.Append((char)((char)0xE0B0 + (char)instance));
var placeNameWithInstance = sb.ToReadOnlySeString(); var placeNameWithInstance = rssb.Builder.ToReadOnlySeString();
SeStringBuilder.SharedPool.Return(sb);
var mapPosX = ConvertRawToMapPosX(mapRow, rawX / 1000f); var mapPosX = ConvertRawToMapPosX(mapRow, rawX / 1000f);
var mapPosY = ConvertRawToMapPosY(mapRow, rawY / 1000f); var mapPosY = ConvertRawToMapPosY(mapRow, rawY / 1000f);
@ -1462,23 +1432,22 @@ internal class SeStringEvaluator : IServiceType, ISeStringEvaluator
statusDescription = statusRow.Description.AsSpan(); statusDescription = statusRow.Description.AsSpan();
} }
var sb = SeStringBuilder.SharedPool.Get(); using var rssb = new RentedSeStringBuilder();
switch (statusRow.StatusCategory) switch (statusRow.StatusCategory)
{ {
case 1: case 1:
sb.Append(this.EvaluateFromAddon(376, default, context.Language)); rssb.Builder.Append(this.EvaluateFromAddon(376, default, context.Language));
break; break;
case 2: case 2:
sb.Append(this.EvaluateFromAddon(377, default, context.Language)); rssb.Builder.Append(this.EvaluateFromAddon(377, default, context.Language));
break; break;
} }
sb.Append(statusName); rssb.Builder.Append(statusName);
var linkText = sb.ToReadOnlySeString(); var linkText = rssb.Builder.ToReadOnlySeString();
SeStringBuilder.SharedPool.Return(sb);
context.Builder context.Builder
.BeginMacro(MacroCode.Link) .BeginMacro(MacroCode.Link)
@ -1733,38 +1702,31 @@ internal class SeStringEvaluator : IServiceType, ISeStringEvaluator
if (!payload.TryGetExpression(out var eStr)) if (!payload.TryGetExpression(out var eStr))
return false; return false;
var builder = SeStringBuilder.SharedPool.Get(); using var rssb = new RentedSeStringBuilder();
try var headContext = new SeStringContext(rssb.Builder, context.LocalParameters, context.Language);
if (!this.ResolveStringExpression(headContext, eStr))
return false;
var str = rssb.Builder.ToReadOnlySeString();
foreach (var p in str)
{ {
var headContext = new SeStringContext(builder, context.LocalParameters, context.Language); if (p.Type == ReadOnlySePayloadType.Invalid)
continue;
if (!this.ResolveStringExpression(headContext, eStr)) if (p.Type == ReadOnlySePayloadType.Text)
return false;
var str = builder.ToReadOnlySeString();
foreach (var p in str)
{ {
if (p.Type == ReadOnlySePayloadType.Invalid) context.Builder.Append(Encoding.UTF8.GetString(p.Body.ToArray()).ToLower(context.CultureInfo));
continue;
if (p.Type == ReadOnlySePayloadType.Text) continue;
{
context.Builder.Append(Encoding.UTF8.GetString(p.Body.ToArray()).ToLower(context.CultureInfo));
continue;
}
context.Builder.Append(p);
} }
return true; context.Builder.Append(p);
}
finally
{
SeStringBuilder.SharedPool.Return(builder);
} }
return true;
} }
private bool TryResolveNoun(ClientLanguage language, in SeStringContext context, in ReadOnlySePayloadSpan payload) private bool TryResolveNoun(ClientLanguage language, in SeStringContext context, in ReadOnlySePayloadSpan payload)
@ -1834,40 +1796,33 @@ internal class SeStringEvaluator : IServiceType, ISeStringEvaluator
if (!payload.TryGetExpression(out var eStr)) if (!payload.TryGetExpression(out var eStr))
return false; return false;
var builder = SeStringBuilder.SharedPool.Get(); using var rssb = new RentedSeStringBuilder();
try var headContext = new SeStringContext(rssb.Builder, context.LocalParameters, context.Language);
if (!this.ResolveStringExpression(headContext, eStr))
return false;
var str = rssb.Builder.ToReadOnlySeString();
var pIdx = 0;
foreach (var p in str)
{ {
var headContext = new SeStringContext(builder, context.LocalParameters, context.Language); pIdx++;
if (!this.ResolveStringExpression(headContext, eStr)) if (p.Type == ReadOnlySePayloadType.Invalid)
return false; continue;
var str = builder.ToReadOnlySeString(); if (pIdx == 1 && p.Type == ReadOnlySePayloadType.Text)
var pIdx = 0;
foreach (var p in str)
{ {
pIdx++; context.Builder.Append(Encoding.UTF8.GetString(p.Body.Span).FirstCharToLower(context.CultureInfo));
continue;
if (p.Type == ReadOnlySePayloadType.Invalid)
continue;
if (pIdx == 1 && p.Type == ReadOnlySePayloadType.Text)
{
context.Builder.Append(Encoding.UTF8.GetString(p.Body.Span).FirstCharToLower(context.CultureInfo));
continue;
}
context.Builder.Append(p);
} }
return true; context.Builder.Append(p);
}
finally
{
SeStringBuilder.SharedPool.Return(builder);
} }
return true;
} }
private bool TryResolveColorType(in SeStringContext context, in ReadOnlySePayloadSpan payload) private bool TryResolveColorType(in SeStringContext context, in ReadOnlySePayloadSpan payload)
@ -2132,19 +2087,19 @@ internal class SeStringEvaluator : IServiceType, ISeStringEvaluator
if (operand1.TryGetString(out var strval1) && operand2.TryGetString(out var strval2)) if (operand1.TryGetString(out var strval1) && operand2.TryGetString(out var strval2))
{ {
using var rssb1 = new RentedSeStringBuilder();
using var rssb2 = new RentedSeStringBuilder();
var resolvedStr1 = this.EvaluateAndAppendTo( var resolvedStr1 = this.EvaluateAndAppendTo(
SeStringBuilder.SharedPool.Get(), rssb1.Builder,
strval1, strval1,
context.LocalParameters, context.LocalParameters,
context.Language); context.Language);
var resolvedStr2 = this.EvaluateAndAppendTo( var resolvedStr2 = this.EvaluateAndAppendTo(
SeStringBuilder.SharedPool.Get(), rssb2.Builder,
strval2, strval2,
context.LocalParameters, context.LocalParameters,
context.Language); context.Language);
var equals = resolvedStr1.GetViewAsSpan().SequenceEqual(resolvedStr2.GetViewAsSpan()); var equals = resolvedStr1.GetViewAsSpan().SequenceEqual(resolvedStr2.GetViewAsSpan());
SeStringBuilder.SharedPool.Return(resolvedStr1);
SeStringBuilder.SharedPool.Return(resolvedStr2);
if ((ExpressionType)exprType == ExpressionType.Equal) if ((ExpressionType)exprType == ExpressionType.Equal)
value = equals ? 1u : 0u; value = equals ? 1u : 0u;

105
Dalamud/Game/Text/Noun/NounProcessor.cs
View file

@ -9,7 +9,6 @@ using Dalamud.Utility;
using Lumina.Excel; using Lumina.Excel;
using Lumina.Text.ReadOnly; using Lumina.Text.ReadOnly;
using LSeStringBuilder = Lumina.Text.SeStringBuilder;
using LSheets = Lumina.Excel.Sheets; using LSheets = Lumina.Excel.Sheets;
namespace Dalamud.Game.Text.Noun; namespace Dalamud.Game.Text.Noun;
@ -147,30 +146,28 @@ internal class NounProcessor : IServiceType
var attributiveSheet = this.dataManager.Excel.GetSheet<RawRow>(nounParams.Language.ToLumina(), nameof(LSheets.Attributive)); var attributiveSheet = this.dataManager.Excel.GetSheet<RawRow>(nounParams.Language.ToLumina(), nameof(LSheets.Attributive));
var builder = LSeStringBuilder.SharedPool.Get(); using var rssb = new RentedSeStringBuilder();
// Ko-So-A-Do // Ko-So-A-Do
var ksad = attributiveSheet.GetRow((uint)nounParams.ArticleType).ReadStringColumn(nounParams.Quantity > 1 ? 1 : 0); var ksad = attributiveSheet.GetRow((uint)nounParams.ArticleType).ReadStringColumn(nounParams.Quantity > 1 ? 1 : 0);
if (!ksad.IsEmpty) if (!ksad.IsEmpty)
{ {
builder.Append(ksad); rssb.Builder.Append(ksad);
if (nounParams.Quantity > 1) if (nounParams.Quantity > 1)
{ {
builder.ReplaceText("[n]"u8, ReadOnlySeString.FromText(nounParams.Quantity.ToString())); rssb.Builder.ReplaceText("[n]"u8, ReadOnlySeString.FromText(nounParams.Quantity.ToString()));
} }
} }
if (!nounParams.LinkMarker.IsEmpty) if (!nounParams.LinkMarker.IsEmpty)
builder.Append(nounParams.LinkMarker); rssb.Builder.Append(nounParams.LinkMarker);
var text = row.ReadStringColumn(nounParams.ColumnOffset); var text = row.ReadStringColumn(nounParams.ColumnOffset);
if (!text.IsEmpty) if (!text.IsEmpty)
builder.Append(text); rssb.Builder.Append(text);
var ross = builder.ToReadOnlySeString(); return rssb.Builder.ToReadOnlySeString();
LSeStringBuilder.SharedPool.Return(builder);
return ross;
} }
/// <summary> /// <summary>
@ -200,7 +197,7 @@ internal class NounProcessor : IServiceType
var attributiveSheet = this.dataManager.Excel.GetSheet<RawRow>(nounParams.Language.ToLumina(), nameof(LSheets.Attributive)); var attributiveSheet = this.dataManager.Excel.GetSheet<RawRow>(nounParams.Language.ToLumina(), nameof(LSheets.Attributive));
var builder = LSeStringBuilder.SharedPool.Get(); using var rssb = new RentedSeStringBuilder();
var isProperNounColumn = nounParams.ColumnOffset + ArticleColumnIdx; var isProperNounColumn = nounParams.ColumnOffset + ArticleColumnIdx;
var isProperNoun = isProperNounColumn >= 0 ? row.ReadInt8Column(isProperNounColumn) : ~isProperNounColumn; var isProperNoun = isProperNounColumn >= 0 ? row.ReadInt8Column(isProperNounColumn) : ~isProperNounColumn;
@ -216,21 +213,19 @@ internal class NounProcessor : IServiceType
var article = attributiveSheet.GetRow((uint)nounParams.ArticleType) var article = attributiveSheet.GetRow((uint)nounParams.ArticleType)
.ReadStringColumn(articleColumn + grammaticalNumberColumnOffset); .ReadStringColumn(articleColumn + grammaticalNumberColumnOffset);
if (!article.IsEmpty) if (!article.IsEmpty)
builder.Append(article); rssb.Builder.Append(article);
if (!nounParams.LinkMarker.IsEmpty) if (!nounParams.LinkMarker.IsEmpty)
builder.Append(nounParams.LinkMarker); rssb.Builder.Append(nounParams.LinkMarker);
} }
var text = row.ReadStringColumn(nounParams.ColumnOffset + (nounParams.Quantity == 1 ? SingularColumnIdx : PluralColumnIdx)); var text = row.ReadStringColumn(nounParams.ColumnOffset + (nounParams.Quantity == 1 ? SingularColumnIdx : PluralColumnIdx));
if (!text.IsEmpty) if (!text.IsEmpty)
builder.Append(text); rssb.Builder.Append(text);
builder.ReplaceText("[n]"u8, ReadOnlySeString.FromText(nounParams.Quantity.ToString())); rssb.Builder.ReplaceText("[n]"u8, ReadOnlySeString.FromText(nounParams.Quantity.ToString()));
var ross = builder.ToReadOnlySeString(); return rssb.Builder.ToReadOnlySeString();
LSeStringBuilder.SharedPool.Return(builder);
return ross;
} }
/// <summary> /// <summary>
@ -262,17 +257,13 @@ internal class NounProcessor : IServiceType
var attributiveSheet = this.dataManager.Excel.GetSheet<RawRow>(nounParams.Language.ToLumina(), nameof(LSheets.Attributive)); var attributiveSheet = this.dataManager.Excel.GetSheet<RawRow>(nounParams.Language.ToLumina(), nameof(LSheets.Attributive));
var builder = LSeStringBuilder.SharedPool.Get(); using var rssb = new RentedSeStringBuilder();
ReadOnlySeString ross;
if (nounParams.IsActionSheet) if (nounParams.IsActionSheet)
{ {
builder.Append(row.ReadStringColumn(nounParams.GrammaticalCase)); rssb.Builder.Append(row.ReadStringColumn(nounParams.GrammaticalCase));
builder.ReplaceText("[n]"u8, ReadOnlySeString.FromText(nounParams.Quantity.ToString())); rssb.Builder.ReplaceText("[n]"u8, ReadOnlySeString.FromText(nounParams.Quantity.ToString()));
return rssb.Builder.ToReadOnlySeString();
ross = builder.ToReadOnlySeString();
LSeStringBuilder.SharedPool.Return(builder);
return ross;
} }
var genderIndexColumn = nounParams.ColumnOffset + PronounColumnIdx; var genderIndexColumn = nounParams.ColumnOffset + PronounColumnIdx;
@ -302,35 +293,32 @@ internal class NounProcessor : IServiceType
var grammaticalGender = attributiveSheet.GetRow((uint)nounParams.ArticleType) var grammaticalGender = attributiveSheet.GetRow((uint)nounParams.ArticleType)
.ReadStringColumn(caseColumnOffset + genderIndex); // Genus .ReadStringColumn(caseColumnOffset + genderIndex); // Genus
if (!grammaticalGender.IsEmpty) if (!grammaticalGender.IsEmpty)
builder.Append(grammaticalGender); rssb.Builder.Append(grammaticalGender);
} }
if (!nounParams.LinkMarker.IsEmpty) if (!nounParams.LinkMarker.IsEmpty)
builder.Append(nounParams.LinkMarker); rssb.Builder.Append(nounParams.LinkMarker);
builder.Append(text); rssb.Builder.Append(text);
var plural = attributiveSheet.GetRow((uint)(caseRowOffset + 26)) var plural = attributiveSheet.GetRow((uint)(caseRowOffset + 26))
.ReadStringColumn(caseColumnOffset + genderIndex); .ReadStringColumn(caseColumnOffset + genderIndex);
if (builder.ContainsText("[p]"u8)) if (rssb.Builder.ContainsText("[p]"u8))
builder.ReplaceText("[p]"u8, plural); rssb.Builder.ReplaceText("[p]"u8, plural);
else else
builder.Append(plural); rssb.Builder.Append(plural);
if (hasT) if (hasT)
{ {
var article = var article =
attributiveSheet.GetRow(39).ReadStringColumn(caseColumnOffset + genderIndex); // Definiter Artikel attributiveSheet.GetRow(39).ReadStringColumn(caseColumnOffset + genderIndex); // Definiter Artikel
builder.ReplaceText("[t]"u8, article); rssb.Builder.ReplaceText("[t]"u8, article);
} }
} }
var pa = attributiveSheet.GetRow(24).ReadStringColumn(caseColumnOffset + genderIndex); rssb.Builder.ReplaceText("[pa]"u8, attributiveSheet.GetRow(24).ReadStringColumn(caseColumnOffset + genderIndex));
builder.ReplaceText("[pa]"u8, pa);
RawRow declensionRow; var declensionRow = (GermanArticleType)nounParams.ArticleType switch
declensionRow = (GermanArticleType)nounParams.ArticleType switch
{ {
// Schwache Flexion eines Adjektivs?! // Schwache Flexion eines Adjektivs?!
GermanArticleType.Possessive or GermanArticleType.Demonstrative => attributiveSheet.GetRow(25), GermanArticleType.Possessive or GermanArticleType.Demonstrative => attributiveSheet.GetRow(25),
@ -347,14 +335,10 @@ internal class NounProcessor : IServiceType
_ => attributiveSheet.GetRow(26), _ => attributiveSheet.GetRow(26),
}; };
var declension = declensionRow.ReadStringColumn(caseColumnOffset + genderIndex); rssb.Builder.ReplaceText("[a]"u8, declensionRow.ReadStringColumn(caseColumnOffset + genderIndex));
builder.ReplaceText("[a]"u8, declension); rssb.Builder.ReplaceText("[n]"u8, ReadOnlySeString.FromText(nounParams.Quantity.ToString()));
builder.ReplaceText("[n]"u8, ReadOnlySeString.FromText(nounParams.Quantity.ToString())); return rssb.Builder.ToReadOnlySeString();
ross = builder.ToReadOnlySeString();
LSeStringBuilder.SharedPool.Return(builder);
return ross;
} }
/// <summary> /// <summary>
@ -385,8 +369,7 @@ internal class NounProcessor : IServiceType
var attributiveSheet = this.dataManager.Excel.GetSheet<RawRow>(nounParams.Language.ToLumina(), nameof(LSheets.Attributive)); var attributiveSheet = this.dataManager.Excel.GetSheet<RawRow>(nounParams.Language.ToLumina(), nameof(LSheets.Attributive));
var builder = LSeStringBuilder.SharedPool.Get(); using var rssb = new RentedSeStringBuilder();
ReadOnlySeString ross;
var startsWithVowelColumn = nounParams.ColumnOffset + StartsWithVowelColumnIdx; var startsWithVowelColumn = nounParams.ColumnOffset + StartsWithVowelColumnIdx;
var startsWithVowel = startsWithVowelColumn >= 0 var startsWithVowel = startsWithVowelColumn >= 0
@ -405,21 +388,19 @@ internal class NounProcessor : IServiceType
{ {
var v21 = attributiveSheet.GetRow((uint)nounParams.ArticleType).ReadStringColumn(v20); var v21 = attributiveSheet.GetRow((uint)nounParams.ArticleType).ReadStringColumn(v20);
if (!v21.IsEmpty) if (!v21.IsEmpty)
builder.Append(v21); rssb.Builder.Append(v21);
if (!nounParams.LinkMarker.IsEmpty) if (!nounParams.LinkMarker.IsEmpty)
builder.Append(nounParams.LinkMarker); rssb.Builder.Append(nounParams.LinkMarker);
var text = row.ReadStringColumn(nounParams.ColumnOffset + (nounParams.Quantity <= 1 ? SingularColumnIdx : PluralColumnIdx)); var text = row.ReadStringColumn(nounParams.ColumnOffset + (nounParams.Quantity <= 1 ? SingularColumnIdx : PluralColumnIdx));
if (!text.IsEmpty) if (!text.IsEmpty)
builder.Append(text); rssb.Builder.Append(text);
if (nounParams.Quantity <= 1) if (nounParams.Quantity <= 1)
builder.ReplaceText("[n]"u8, ReadOnlySeString.FromText(nounParams.Quantity.ToString())); rssb.Builder.ReplaceText("[n]"u8, ReadOnlySeString.FromText(nounParams.Quantity.ToString()));
ross = builder.ToReadOnlySeString(); return rssb.Builder.ToReadOnlySeString();
LSeStringBuilder.SharedPool.Return(builder);
return ross;
} }
var v17 = row.ReadInt8Column(nounParams.ColumnOffset + Unknown5ColumnIdx); var v17 = row.ReadInt8Column(nounParams.ColumnOffset + Unknown5ColumnIdx);
@ -428,34 +409,32 @@ internal class NounProcessor : IServiceType
var v29 = attributiveSheet.GetRow((uint)nounParams.ArticleType).ReadStringColumn(v20 + 2); var v29 = attributiveSheet.GetRow((uint)nounParams.ArticleType).ReadStringColumn(v20 + 2);
if (!v29.IsEmpty) if (!v29.IsEmpty)
{ {
builder.Append(v29); rssb.Builder.Append(v29);
if (!nounParams.LinkMarker.IsEmpty) if (!nounParams.LinkMarker.IsEmpty)
builder.Append(nounParams.LinkMarker); rssb.Builder.Append(nounParams.LinkMarker);
var text = row.ReadStringColumn(nounParams.ColumnOffset + PluralColumnIdx); var text = row.ReadStringColumn(nounParams.ColumnOffset + PluralColumnIdx);
if (!text.IsEmpty) if (!text.IsEmpty)
builder.Append(text); rssb.Builder.Append(text);
} }
} }
else else
{ {
var v27 = attributiveSheet.GetRow((uint)nounParams.ArticleType).ReadStringColumn(v20 + (v17 != 0 ? 1 : 3)); var v27 = attributiveSheet.GetRow((uint)nounParams.ArticleType).ReadStringColumn(v20 + (v17 != 0 ? 1 : 3));
if (!v27.IsEmpty) if (!v27.IsEmpty)
builder.Append(v27); rssb.Builder.Append(v27);
if (!nounParams.LinkMarker.IsEmpty) if (!nounParams.LinkMarker.IsEmpty)
builder.Append(nounParams.LinkMarker); rssb.Builder.Append(nounParams.LinkMarker);
var text = row.ReadStringColumn(nounParams.ColumnOffset + SingularColumnIdx); var text = row.ReadStringColumn(nounParams.ColumnOffset + SingularColumnIdx);
if (!text.IsEmpty) if (!text.IsEmpty)
builder.Append(text); rssb.Builder.Append(text);
} }
builder.ReplaceText("[n]"u8, ReadOnlySeString.FromText(nounParams.Quantity.ToString())); rssb.Builder.ReplaceText("[n]"u8, ReadOnlySeString.FromText(nounParams.Quantity.ToString()));
ross = builder.ToReadOnlySeString(); return rssb.Builder.ToReadOnlySeString();
LSeStringBuilder.SharedPool.Return(builder);
return ross;
} }
} }

16
Dalamud/Game/Text/SeStringHandling/Payloads/AutoTranslatePayload.cs
View file

@ -1,6 +1,7 @@
using System.IO; using System.IO;
using Dalamud.Game.Text.Evaluator; using Dalamud.Game.Text.Evaluator;
using Dalamud.Utility;
using Lumina.Text.Payloads; using Lumina.Text.Payloads;
using Lumina.Text.ReadOnly; using Lumina.Text.ReadOnly;
@ -32,13 +33,14 @@ public class AutoTranslatePayload : Payload, ITextProvider
this.Group = group; this.Group = group;
this.Key = key; this.Key = key;
var ssb = Lumina.Text.SeStringBuilder.SharedPool.Get(); using var rssb = new RentedSeStringBuilder();
this.payload = ssb.BeginMacro(MacroCode.Fixed)
.AppendUIntExpression(group - 1) this.payload = rssb.Builder
.AppendUIntExpression(key) .BeginMacro(MacroCode.Fixed)
.EndMacro() .AppendUIntExpression(group - 1)
.ToReadOnlySeString(); .AppendUIntExpression(key)
Lumina.Text.SeStringBuilder.SharedPool.Return(ssb); .EndMacro()
.ToReadOnlySeString();
} }
/// <summary> /// <summary>

27
Dalamud/Game/Text/SeStringHandling/Payloads/DalamudLinkPayload.cs
View file

@ -1,5 +1,7 @@
using System.IO; using System.IO;
using Dalamud.Utility;
using Lumina.Text.Payloads; using Lumina.Text.Payloads;
using Lumina.Text.ReadOnly; using Lumina.Text.ReadOnly;
@ -37,19 +39,18 @@ public class DalamudLinkPayload : Payload
/// <inheritdoc/> /// <inheritdoc/>
protected override byte[] EncodeImpl() protected override byte[] EncodeImpl()
{ {
var ssb = Lumina.Text.SeStringBuilder.SharedPool.Get(); using var rssb = new RentedSeStringBuilder();
var res = ssb.BeginMacro(MacroCode.Link) return rssb.Builder
.AppendIntExpression((int)EmbeddedInfoType.DalamudLink - 1) .BeginMacro(MacroCode.Link)
.AppendUIntExpression(this.CommandId) .AppendIntExpression((int)EmbeddedInfoType.DalamudLink - 1)
.AppendIntExpression(this.Extra1) .AppendUIntExpression(this.CommandId)
.AppendIntExpression(this.Extra2) .AppendIntExpression(this.Extra1)
.BeginStringExpression() .AppendIntExpression(this.Extra2)
.Append(JsonConvert.SerializeObject(new[] { this.Plugin, this.ExtraString })) .BeginStringExpression()
.EndExpression() .Append(JsonConvert.SerializeObject(new[] { this.Plugin, this.ExtraString }))
.EndMacro() .EndExpression()
.ToArray(); .EndMacro()
Lumina.Text.SeStringBuilder.SharedPool.Return(ssb); .ToArray();
return res;
} }
/// <inheritdoc/> /// <inheritdoc/>

17
Dalamud/Game/Text/SeStringHandling/Payloads/PlayerPayload.cs
View file

@ -1,8 +1,7 @@
using System.Collections.Generic;
using System.IO; using System.IO;
using System.Text;
using Dalamud.Data; using Dalamud.Data;
using Dalamud.Utility;
using Lumina.Excel; using Lumina.Excel;
using Lumina.Excel.Sheets; using Lumina.Excel.Sheets;
@ -87,14 +86,12 @@ public class PlayerPayload : Payload
/// <inheritdoc/> /// <inheritdoc/>
protected override byte[] EncodeImpl() protected override byte[] EncodeImpl()
{ {
var ssb = Lumina.Text.SeStringBuilder.SharedPool.Get(); using var rssb = new RentedSeStringBuilder();
var res = ssb return rssb.Builder
.PushLinkCharacter(this.playerName, this.serverId) .PushLinkCharacter(this.playerName, this.serverId)
.Append(this.playerName) .Append(this.playerName)
.PopLink() .PopLink()
.ToArray(); .ToArray();
Lumina.Text.SeStringBuilder.SharedPool.Return(ssb);
return res;
} }
/// <inheritdoc/> /// <inheritdoc/>

6
Dalamud/Game/Text/SeStringHandling/SeString.cs
View file

@ -198,8 +198,9 @@ public class SeString
var textColor = ItemUtil.GetItemRarityColorType(rawId); var textColor = ItemUtil.GetItemRarityColorType(rawId);
var textEdgeColor = textColor + 1u; var textEdgeColor = textColor + 1u;
var sb = LSeStringBuilder.SharedPool.Get(); using var rssb = new RentedSeStringBuilder();
var itemLink = sb
var itemLink = rssb.Builder
.PushColorType(textColor) .PushColorType(textColor)
.PushEdgeColorType(textEdgeColor) .PushEdgeColorType(textEdgeColor)
.PushLinkItem(rawId, copyName) .PushLinkItem(rawId, copyName)
@ -208,7 +209,6 @@ public class SeString
.PopEdgeColorType() .PopEdgeColorType()
.PopColorType() .PopColorType()
.ToReadOnlySeString(); .ToReadOnlySeString();
LSeStringBuilder.SharedPool.Return(sb);
return SeString.Parse(seStringEvaluator.EvaluateFromAddon(371, [itemLink], clientState.ClientLanguage)); return SeString.Parse(seStringEvaluator.EvaluateFromAddon(371, [itemLink], clientState.ClientLanguage));
} }

33
Dalamud/Interface/Internal/Windows/Data/Widgets/SeStringCreatorWidget.cs
View file

@ -29,8 +29,6 @@ using Lumina.Text.Expressions;
using Lumina.Text.Payloads; using Lumina.Text.Payloads;
using Lumina.Text.ReadOnly; using Lumina.Text.ReadOnly;
using LSeStringBuilder = Lumina.Text.SeStringBuilder;
namespace Dalamud.Interface.Internal.Windows.Data.Widgets; namespace Dalamud.Interface.Internal.Windows.Data.Widgets;
/// <summary> /// <summary>
@ -474,25 +472,25 @@ internal class SeStringCreatorWidget : IDataWindowWidget
if (ImGui.Button("Print Evaluated"u8)) if (ImGui.Button("Print Evaluated"u8))
{ {
var sb = new LSeStringBuilder(); using var rssb = new RentedSeStringBuilder();
foreach (var entry in this.entries) foreach (var entry in this.entries)
{ {
switch (entry.Type) switch (entry.Type)
{ {
case TextEntryType.String: case TextEntryType.String:
sb.Append(entry.Message); rssb.Builder.Append(entry.Message);
break; break;
case TextEntryType.Macro: case TextEntryType.Macro:
case TextEntryType.Fixed: case TextEntryType.Fixed:
sb.AppendMacroString(entry.Message); rssb.Builder.AppendMacroString(entry.Message);
break; break;
} }
} }
var evaluated = Service<SeStringEvaluator>.Get().Evaluate( var evaluated = Service<SeStringEvaluator>.Get().Evaluate(
sb.ToReadOnlySeString(), rssb.Builder.ToReadOnlySeString(),
this.localParameters, this.localParameters,
this.language); this.language);
@ -505,24 +503,24 @@ internal class SeStringCreatorWidget : IDataWindowWidget
if (ImGui.Button("Copy MacroString"u8)) if (ImGui.Button("Copy MacroString"u8))
{ {
var sb = new LSeStringBuilder(); using var rssb = new RentedSeStringBuilder();
foreach (var entry in this.entries) foreach (var entry in this.entries)
{ {
switch (entry.Type) switch (entry.Type)
{ {
case TextEntryType.String: case TextEntryType.String:
sb.Append(entry.Message); rssb.Builder.Append(entry.Message);
break; break;
case TextEntryType.Macro: case TextEntryType.Macro:
case TextEntryType.Fixed: case TextEntryType.Fixed:
sb.AppendMacroString(entry.Message); rssb.Builder.AppendMacroString(entry.Message);
break; break;
} }
} }
ImGui.SetClipboardText(sb.ToReadOnlySeString().ToMacroString()); ImGui.SetClipboardText(rssb.Builder.ToReadOnlySeString().ToMacroString());
} }
ImGui.SameLine(); ImGui.SameLine();
@ -802,24 +800,24 @@ internal class SeStringCreatorWidget : IDataWindowWidget
private unsafe void UpdateInputString(bool resetLocalParameters = true) private unsafe void UpdateInputString(bool resetLocalParameters = true)
{ {
var sb = new LSeStringBuilder(); using var rssb = new RentedSeStringBuilder();
foreach (var entry in this.entries) foreach (var entry in this.entries)
{ {
switch (entry.Type) switch (entry.Type)
{ {
case TextEntryType.String: case TextEntryType.String:
sb.Append(entry.Message); rssb.Builder.Append(entry.Message);
break; break;
case TextEntryType.Macro: case TextEntryType.Macro:
case TextEntryType.Fixed: case TextEntryType.Fixed:
sb.AppendMacroString(entry.Message); rssb.Builder.AppendMacroString(entry.Message);
break; break;
} }
} }
this.input = sb.ToReadOnlySeString(); this.input = rssb.Builder.ToReadOnlySeString();
if (resetLocalParameters) if (resetLocalParameters)
this.localParameters = null; this.localParameters = null;
@ -998,10 +996,9 @@ internal class SeStringCreatorWidget : IDataWindowWidget
} }
} }
var builder = LSeStringBuilder.SharedPool.Get(); using var rssb = new RentedSeStringBuilder();
builder.AppendIcon(iconId); rssb.Builder.AppendIcon(iconId);
ImGuiHelpers.SeStringWrapped(builder.ToArray()); ImGuiHelpers.SeStringWrapped(rssb.Builder.ToArray());
LSeStringBuilder.SharedPool.Return(builder);
ImGui.SameLine(); ImGui.SameLine();
} }

26
Dalamud/Interface/Internal/Windows/SelfTest/Steps/GamepadStateSelfTestStep.cs
View file

@ -3,9 +3,9 @@ using System.Linq;
using Dalamud.Game.ClientState.GamePad; using Dalamud.Game.ClientState.GamePad;
using Dalamud.Interface.Utility; using Dalamud.Interface.Utility;
using Dalamud.Plugin.SelfTest; using Dalamud.Plugin.SelfTest;
using Lumina.Text.Payloads; using Dalamud.Utility;
using LSeStringBuilder = Lumina.Text.SeStringBuilder; using Lumina.Text.Payloads;
namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps; namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps;
@ -29,25 +29,25 @@ internal class GamepadStateSelfTestStep : ISelfTestStep
(GamepadButtons.L1, 12), (GamepadButtons.L1, 12),
}; };
var builder = LSeStringBuilder.SharedPool.Get(); using var rssb = new RentedSeStringBuilder();
builder.Append("Hold down "); rssb.Builder.Append("Hold down ");
for (var i = 0; i < buttons.Length; i++) for (var i = 0; i < buttons.Length; i++)
{ {
var (button, iconId) = buttons[i]; var (button, iconId) = buttons[i];
builder.BeginMacro(MacroCode.Icon).AppendUIntExpression(iconId).EndMacro(); rssb.Builder
builder.PushColorRgba(gamepadState.Raw(button) == 1 ? 0x0000FF00u : 0x000000FF); .BeginMacro(MacroCode.Icon)
builder.Append(button.ToString()); .AppendUIntExpression(iconId)
builder.PopColor(); .EndMacro()
.PushColorRgba(gamepadState.Raw(button) == 1 ? 0x0000FF00u : 0x000000FF)
builder.Append(i < buttons.Length - 1 ? ", " : "."); .Append(button.ToString())
.PopColor()
.Append(i < buttons.Length - 1 ? ", " : ".");
} }
ImGuiHelpers.SeStringWrapped(builder.ToReadOnlySeString()); ImGuiHelpers.SeStringWrapped(rssb.Builder.ToReadOnlySeString());
LSeStringBuilder.SharedPool.Return(builder);
if (buttons.All(tuple => gamepadState.Raw(tuple.Button) == 1)) if (buttons.All(tuple => gamepadState.Raw(tuple.Button) == 1))
{ {

25
Dalamud/Interface/Internal/Windows/TitleScreenMenuWindow.cs
View file

@ -26,8 +26,6 @@ using FFXIVClientStructs.FFXIV.Component.GUI;
using Lumina.Text.ReadOnly; using Lumina.Text.ReadOnly;
using Serilog; using Serilog;
using LSeStringBuilder = Lumina.Text.SeStringBuilder;
namespace Dalamud.Interface.Internal.Windows; namespace Dalamud.Interface.Internal.Windows;
/// <summary> /// <summary>
@ -498,20 +496,23 @@ internal class TitleScreenMenuWindow : Window, IDisposable
return; return;
this.lastLoadedPluginCount = count; this.lastLoadedPluginCount = count;
var lssb = LSeStringBuilder.SharedPool.Get(); using var rssb = new RentedSeStringBuilder();
lssb.Append(new ReadOnlySeStringSpan(addon->AtkValues[1].String.Value)).Append("\n\n");
lssb.PushEdgeColorType(701).PushColorType(539)
.Append(SeIconChar.BoxedLetterD.ToIconChar())
.PopColorType().PopEdgeColorType();
lssb.Append($" Dalamud: {Versioning.GetScmVersion()}");
lssb.Append($" - {count} {(count != 1 ? "plugins" : "plugin")} loaded"); rssb.Builder
.Append(new ReadOnlySeStringSpan(addon->AtkValues[1].String.Value))
.Append("\n\n")
.PushEdgeColorType(701)
.PushColorType(539)
.Append(SeIconChar.BoxedLetterD.ToIconChar())
.PopColorType()
.PopEdgeColorType()
.Append($" Dalamud: {Versioning.GetScmVersion()}")
.Append($" - {count} {(count != 1 ? "plugins" : "plugin")} loaded");
if (pm?.SafeMode is true) if (pm?.SafeMode is true)
lssb.PushColorType(17).Append(" [SAFE MODE]").PopColorType(); rssb.Builder.PushColorType(17).Append(" [SAFE MODE]").PopColorType();
textNode->SetText(lssb.GetViewAsSpan()); textNode->SetText(rssb.Builder.GetViewAsSpan());
LSeStringBuilder.SharedPool.Return(lssb);
} }
private void TitleScreenMenuEntryListChange() => this.privateAtlas.BuildFontsAsync(); private void TitleScreenMenuEntryListChange() => this.privateAtlas.BuildFontsAsync();

13
Dalamud/Utility/ItemUtil.cs
View file

@ -5,7 +5,6 @@ using Dalamud.Game;
using Dalamud.Game.Text; using Dalamud.Game.Text;
using Lumina.Excel.Sheets; using Lumina.Excel.Sheets;
using Lumina.Text;
using Lumina.Text.ReadOnly; using Lumina.Text.ReadOnly;
namespace Dalamud.Utility; namespace Dalamud.Utility;
@ -150,23 +149,21 @@ public static class ItemUtil
if (!includeIcon || kind is not (ItemKind.Hq or ItemKind.Collectible)) if (!includeIcon || kind is not (ItemKind.Hq or ItemKind.Collectible))
return item.Name; return item.Name;
var builder = SeStringBuilder.SharedPool.Get(); using var rssb = new RentedSeStringBuilder();
builder.Append(item.Name); rssb.Builder.Append(item.Name);
switch (kind) switch (kind)
{ {
case ItemKind.Hq: case ItemKind.Hq:
builder.Append($" {(char)SeIconChar.HighQuality}"); rssb.Builder.Append($" {(char)SeIconChar.HighQuality}");
break; break;
case ItemKind.Collectible: case ItemKind.Collectible:
builder.Append($" {(char)SeIconChar.Collectible}"); rssb.Builder.Append($" {(char)SeIconChar.Collectible}");
break; break;
} }
var itemName = builder.ToReadOnlySeString(); return rssb.Builder.ToReadOnlySeString();
SeStringBuilder.SharedPool.Return(builder);
return itemName;
} }
/// <summary> /// <summary>

36
Dalamud/Utility/SeStringExtensions.cs
View file

@ -1,7 +1,3 @@
using System.Linq;
using InteropGenerator.Runtime;
using Lumina.Text.Parse; using Lumina.Text.Parse;
using Lumina.Text.ReadOnly; using Lumina.Text.ReadOnly;
@ -49,11 +45,9 @@ public static class SeStringExtensions
/// <returns><c>this</c> for method chaining.</returns> /// <returns><c>this</c> for method chaining.</returns>
public static DSeStringBuilder AppendMacroString(this DSeStringBuilder ssb, ReadOnlySpan<byte> macroString) public static DSeStringBuilder AppendMacroString(this DSeStringBuilder ssb, ReadOnlySpan<byte> macroString)
{ {
var lssb = LSeStringBuilder.SharedPool.Get(); using var rssb = new RentedSeStringBuilder();
lssb.AppendMacroString(macroString, new() { ExceptionMode = MacroStringParseExceptionMode.EmbedError }); rssb.Builder.AppendMacroString(macroString, new() { ExceptionMode = MacroStringParseExceptionMode.EmbedError });
ssb.Append(DSeString.Parse(lssb.ToReadOnlySeString().Data.Span)); return ssb.Append(DSeString.Parse(rssb.Builder.ToReadOnlySeString().Data.Span));
LSeStringBuilder.SharedPool.Return(lssb);
return ssb;
} }
/// <summary>Compiles and appends a macro string.</summary> /// <summary>Compiles and appends a macro string.</summary>
@ -62,11 +56,9 @@ public static class SeStringExtensions
/// <returns><c>this</c> for method chaining.</returns> /// <returns><c>this</c> for method chaining.</returns>
public static DSeStringBuilder AppendMacroString(this DSeStringBuilder ssb, ReadOnlySpan<char> macroString) public static DSeStringBuilder AppendMacroString(this DSeStringBuilder ssb, ReadOnlySpan<char> macroString)
{ {
var lssb = LSeStringBuilder.SharedPool.Get(); using var rssb = new RentedSeStringBuilder();
lssb.AppendMacroString(macroString, new() { ExceptionMode = MacroStringParseExceptionMode.EmbedError }); rssb.Builder.AppendMacroString(macroString, new() { ExceptionMode = MacroStringParseExceptionMode.EmbedError });
ssb.Append(DSeString.Parse(lssb.ToReadOnlySeString().Data.Span)); return ssb.Append(DSeString.Parse(rssb.Builder.ToReadOnlySeString().Data.Span));
LSeStringBuilder.SharedPool.Return(lssb);
return ssb;
} }
/// <summary> /// <summary>
@ -163,7 +155,7 @@ public static class SeStringExtensions
if (ross.IsEmpty) if (ross.IsEmpty)
return ross; return ross;
var sb = LSeStringBuilder.SharedPool.Get(); using var rssb = new RentedSeStringBuilder();
foreach (var payload in ross) foreach (var payload in ross)
{ {
@ -172,25 +164,25 @@ public static class SeStringExtensions
if (payload.Type != ReadOnlySePayloadType.Text) if (payload.Type != ReadOnlySePayloadType.Text)
{ {
sb.Append(payload); rssb.Builder.Append(payload);
continue; continue;
} }
var index = payload.Body.Span.IndexOf(toFind); var index = payload.Body.Span.IndexOf(toFind);
if (index == -1) if (index == -1)
{ {
sb.Append(payload); rssb.Builder.Append(payload);
continue; continue;
} }
var lastIndex = 0; var lastIndex = 0;
while (index != -1) while (index != -1)
{ {
sb.Append(payload.Body.Span[lastIndex..index]); rssb.Builder.Append(payload.Body.Span[lastIndex..index]);
if (!replacement.IsEmpty) if (!replacement.IsEmpty)
{ {
sb.Append(replacement); rssb.Builder.Append(replacement);
} }
lastIndex = index + toFind.Length; lastIndex = index + toFind.Length;
@ -200,12 +192,10 @@ public static class SeStringExtensions
index += lastIndex; index += lastIndex;
} }
sb.Append(payload.Body.Span[lastIndex..]); rssb.Builder.Append(payload.Body.Span[lastIndex..]);
} }
var output = sb.ToReadOnlySeString(); return rssb.Builder.ToReadOnlySeString();
LSeStringBuilder.SharedPool.Return(sb);
return output;
} }
/// <summary> /// <summary>