JonKazama-Hellion/HellionChat
1
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 28 Activity

- Fixed hotkey behaviour in vanilla inputs

Browse Source 
- Changed behaviour of tab switching
This commit is contained in:
Infi
2024-04-21 00:29:07 +02:00
parent 6215b5b20f
commit 366e121783
4 changed files with 98 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChatTwo.Tests/ChatTwo.Tests.csproj
+35 -5
View File
@@ -17,10 +17,40 @@
<ProjectReference Include="..\ChatTwo\ChatTwo.csproj" />
</ItemGroup>
<ItemGroup>
<Reference Include="Dalamud">
<HintPath>..\..\AppData\Roaming\XIVLauncher\addon\Hooks\dev\Dalamud.dll</HintPath>
</Reference>
</ItemGroup>
<PropertyGroup>
<DalamudLibPath>$(AppData)\XIVLauncher\addon\Hooks\dev</DalamudLibPath>
</PropertyGroup>
<PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))'">
<DalamudLibPath>$(DALAMUD_HOME)</DalamudLibPath>
</PropertyGroup>
<PropertyGroup Condition="'$(IsCI)' == 'true'">
<DalamudLibPath>$(HOME)/dalamud</DalamudLibPath>
</PropertyGroup>
<ItemGroup>
<Reference Include="Dalamud">
<HintPath>$(DalamudLibPath)\Dalamud.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="FFXIVClientStructs">
<HintPath>$(DalamudLibPath)\FFXIVClientStructs.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="ImGui.NET">
<HintPath>$(DalamudLibPath)\ImGui.NET.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="Lumina">
<HintPath>$(DalamudLibPath)\Lumina.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="Lumina.Excel">
<HintPath>$(DalamudLibPath)\Lumina.Excel.dll</HintPath>
<Private>false</Private>
</Reference>
</ItemGroup>
</Project>
ChatTwo/Configuration.cs
+3
View File
@@ -198,6 +198,9 @@ internal class Tab
[NonSerialized]
public HashSet<Guid> TrackedMessageIds = new();
[NonSerialized]
public InputChannel? PreviousChannel;
~Tab() { MessagesMutex.Dispose(); }
internal bool Contains(Message message) {
ChatTwo/GameFunctions/Chat.cs
+38 -34
View File
@@ -162,6 +162,7 @@ internal sealed unsafe class Chat : IDisposable
internal bool UsesTellTempChannel { get; set; }
internal InputChannel? PreviousChannel { get; private set; }
private bool DirectChat;
private long LastRefresh;
internal Chat(Plugin plugin)
@@ -372,10 +373,10 @@ internal sealed unsafe class Chat : IDisposable
if (LastRefresh + 5 * 1000 < Environment.TickCount64)
{
UpdateKeybinds();
DirectChat = Plugin.GameConfig.TryGet(UiControlOption.DirectChat, out bool option) && option;
LastRefresh = Environment.TickCount64;
}
var modifierState = (ModifierFlag) 0;
foreach (var modifier in Enum.GetValues<ModifierFlag>())
{
@@ -390,6 +391,18 @@ internal sealed unsafe class Chat : IDisposable
if (!Keybinds.TryGetValue(toIntercept, out var keybind))
continue;
// Vanilla input has focus, so we ignore Ready Chat and Ready Command keybind
if (toIntercept is "CMD_CHAT" or "CMD_COMMAND")
{
// Vanilla text input has focus
if (RaptureAtkModule.Instance()->AtkModule.IsTextInputActive())
continue;
// Direct chat option is selected
if (DirectChat)
continue;
}
void Intercept(VirtualKey key, ModifierFlag modifier)
{
if (!Plugin.KeyState.IsVirtualKeyValid(key))
@@ -450,38 +463,32 @@ internal sealed unsafe class Chat : IDisposable
if (eventId != 0x31 || value == null || value->UInt is not (0x05 or 0x0C))
return ChatLogRefreshHook!.Original(log, eventId, value);
if (Plugin.GameConfig.TryGet(UiControlOption.DirectChat, out bool option) && option)
if (DirectChat && CurrentCharacter != null)
{
if (CurrentCharacter != null)
// FIXME: this whole system sucks
// FIXME v2: I hate everything about this, but it works
Plugin.Framework.RunOnTick(() =>
{
// FIXME: this whole system sucks
// FIXME v2: I hate everything about this, but it works
Plugin.Framework.RunOnTick(() =>
string? input = null;
var utf8Bytes = MemoryHelper.ReadRaw((nint) CurrentCharacter, 2);
var chars = Encoding.UTF8.GetString(utf8Bytes).ToCharArray();
if (chars.Length == 0)
return;
var c = chars[0];
if (c != '\0' && !char.IsControl(c))
input = c.ToString();
try
{
string? input = null;
var utf8Bytes = MemoryHelper.ReadRaw((nint) CurrentCharacter, 2);
var chars = Encoding.UTF8.GetString(utf8Bytes).ToCharArray();
if (chars.Length == 0)
return;
var c = chars[0];
if (c != '\0' && !char.IsControl(c))
input = c.ToString();
try
{
var args = new ChatActivatedArgs(new ChannelSwitchInfo(null)) {
Input = input,
};
Activated?.Invoke(args);
}
catch (Exception ex)
{
Plugin.Log.Error(ex, "Error in chat Activated event");
}
});
}
Activated?.Invoke(new ChatActivatedArgs(new ChannelSwitchInfo(null)) { Input = input, });
}
catch (Exception ex)
{
Plugin.Log.Error(ex, "Error in chat Activated event");
}
});
}
string? addIfNotPresent = null;
@@ -496,10 +503,7 @@ internal sealed unsafe class Chat : IDisposable
try
{
var args = new ChatActivatedArgs(new ChannelSwitchInfo(null)) {
AddIfNotPresent = addIfNotPresent,
};
Activated?.Invoke(args);
Activated?.Invoke(new ChatActivatedArgs(new ChannelSwitchInfo(null)) { AddIfNotPresent = addIfNotPresent, });
}
catch (Exception ex)
{
ChatTwo/Ui/ChatLogWindow.cs
+19 -6
View File
@@ -387,6 +387,21 @@ public sealed class ChatLogWindow : Window, IUiComponent
}
}
private void TabChannelSwitch(Tab tab)
{
// Save the previous channel to restore it later
var current = CurrentTab;
if (current is { Channel: null })
current.PreviousChannel = Plugin.Functions.Chat.Channel.channel;
// Channel will be null if PreviousChannel is used
var channel = tab.Channel ?? tab.PreviousChannel;
// Channel being null it doesn't have a default, and we never selected this channel before
if (channel != null)
SetChannel(tab.Channel ?? tab.PreviousChannel);
}
private bool CutsceneActive => Plugin.Condition[ConditionFlag.OccupiedInCutSceneEvent] || Plugin.Condition[ConditionFlag.WatchingCutscene78];
private bool GposeActive => Plugin.Condition[ConditionFlag.WatchingCutscene];
@@ -1036,12 +1051,11 @@ public sealed class ChatLogWindow : Window, IUiComponent
currentTab = tabI;
var switchedTab = LastTab != tabI;
if (switchedTab)
TabChannelSwitch(tab);
LastTab = tabI;
tab.Unread = 0;
if (switchedTab && tab.Channel.HasValue)
SetChannel(tab.Channel.Value);
DrawMessageLog(tab, PayloadHandler, GetRemainingHeightForMessageLog(), switchedTab);
ImGui.EndTabItem();
@@ -1083,10 +1097,9 @@ public sealed class ChatLogWindow : Window, IUiComponent
currentTab = tabI;
switchedTab = LastTab != tabI;
if (switchedTab)
TabChannelSwitch(tab);
LastTab = tabI;
if (switchedTab && tab.Channel.HasValue)
SetChannel(tab.Channel.Value);
}
}