anna
/
XivCommon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore(context): disable inventory submenus

This commit is contained in:
Anna 2021-06-24 19:40:06 -04:00
parent 5a32413c67
commit 819e15ed49
Signed by: anna
GPG Key ID: 0B391D8F06FCD9E0
3 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
XivCommon/Functions/ContextMenu/ContextMenu.cs
View File

@ -205,11 +205,12 @@ namespace XivCommon.Functions.ContextMenu {
return;
}
if (scanner.TryScanText(Signatures.SetUpInventoryContextSubMenu, out var setUpInvSubPtr, "Context Menu (set up inventory submenu)")) {
this._setUpInventoryContextSubMenu = Marshal.GetDelegateForFunctionPointer<SetUpInventoryContextSubMenuDelegate>(setUpInvSubPtr);
} else {
return;
}
// TODO: uncomment when inv submenus
// if (scanner.TryScanText(Signatures.SetUpInventoryContextSubMenu, out var setUpInvSubPtr, "Context Menu (set up inventory submenu)")) {
// this._setUpInventoryContextSubMenu = Marshal.GetDelegateForFunctionPointer<SetUpInventoryContextSubMenuDelegate>(setUpInvSubPtr);
// } else {
// return;
// }
if (scanner.TryScanText(Signatures.SomeOpenAddonThing, out var thingPtr, "Context Menu (some OpenAddon thing)")) {
this.SomeOpenAddonThingHook = new Hook<SomeOpenAddonThingDelegate>(thingPtr, new SomeOpenAddonThingDelegate(this.SomeOpenAddonThingDetour));
@ -246,10 +247,11 @@ namespace XivCommon.Functions.ContextMenu {
this.ContextMenuEvent66Hook.Enable();
}
if (scanner.TryScanText(Signatures.InventoryContextMenuEvent30, out var event30Ptr, "Context Menu (inv event 30)")) {
this.InventoryContextMenuEvent30Hook = new Hook<InventoryContextMenuEvent30Delegate>(event30Ptr, new InventoryContextMenuEvent30Delegate(this.InventoryContextMenuEvent30Detour));
this.InventoryContextMenuEvent30Hook.Enable();
}
// TODO: uncomment when inv submenus
// if (scanner.TryScanText(Signatures.InventoryContextMenuEvent30, out var event30Ptr, "Context Menu (inv event 30)")) {
// this.InventoryContextMenuEvent30Hook = new Hook<InventoryContextMenuEvent30Delegate>(event30Ptr, new InventoryContextMenuEvent30Delegate(this.InventoryContextMenuEvent30Detour));
// this.InventoryContextMenuEvent30Hook.Enable();
// }
}
/// <inheritdoc />
@ -443,8 +445,9 @@ namespace XivCommon.Functions.ContextMenu {
// set up the agent to take the appropriate action for this item
*(menuActions + offset + i) = item switch {
NativeContextMenuItem nativeItem => nativeItem.InternalAction,
ContextSubMenuItem => ContextSubId,
InventoryContextSubMenuItem => InventoryContextSubId,
NormalContextSubMenuItem => ContextSubId,
// TODO: uncomment when inv submenus
// InventoryContextSubMenuItem => InventoryContextSubId,
_ => inventory ? InventoryNoopContextId : NoopContextId,
};
@ -476,6 +479,10 @@ namespace XivCommon.Functions.ContextMenu {
/// <returns>true on error</returns>
private bool PopulateItems(IntPtr addon, IntPtr agent, ContextMenuOpenEventDelegate? normalAction, InventoryContextMenuOpenEventDelegate? inventoryAction, IReadOnlyCollection<NativeContextMenuItem>? nativeItems = null) {
var (agentType, _) = this.GetContextMenuAgent(agent);
if (agentType == AgentType.Unknown) {
return true;
}
var inventory = agentType == AgentType.Inventory;
var parentAddonName = this.GetParentAddonName(addon);
@ -549,7 +556,7 @@ namespace XivCommon.Functions.ContextMenu {
case NormalContextMenuItem custom:
custom.Agent = agent;
break;
case ContextSubMenuItem custom:
case NormalContextSubMenuItem custom:
custom.Agent = agent;
break;
}
@ -583,7 +590,7 @@ namespace XivCommon.Functions.ContextMenu {
ClientLanguage.French => custom.NameFrench,
_ => custom.NameEnglish,
},
ContextSubMenuItem custom => this.Language switch {
NormalContextSubMenuItem custom => this.Language switch {
ClientLanguage.Japanese => custom.NameJapanese,
ClientLanguage.English => custom.NameEnglish,
ClientLanguage.German => custom.NameGerman,
@ -613,7 +620,7 @@ namespace XivCommon.Functions.ContextMenu {
var item = this.Items[index];
switch (item) {
case ContextSubMenuItem sub: {
case NormalContextSubMenuItem sub: {
this.SubMenuItem = sub;
break;
}
@ -723,7 +730,7 @@ namespace XivCommon.Functions.ContextMenu {
var size = *(ushort*) secondaryArgsPtr;
var addon = this.GetAddonFromAgent(agent);
var normalAction = (this.SubMenuItem as ContextSubMenuItem)?.Action;
var normalAction = (this.SubMenuItem as NormalContextSubMenuItem)?.Action;
var inventoryAction = (this.SubMenuItem as InventoryContextSubMenuItem)?.Action;
if (this.PopulateItems(addon, agent, normalAction, inventoryAction)) {
return true;

4
XivCommon/Functions/ContextMenu/Inventory/InventoryContextSubMenuItem.cs
View File

@ -1,4 +1,5 @@
using Dalamud.Game.Text.SeStringHandling;
using System;
using Dalamud.Game.Text.SeStringHandling;
namespace XivCommon.Functions.ContextMenu.Inventory {
/// <summary>
@ -10,6 +11,7 @@ namespace XivCommon.Functions.ContextMenu.Inventory {
/// </summary>
/// <param name="name">the English name of the item, copied to other languages</param>
/// <param name="action">the action to perform on click</param>
[Obsolete("Inventory context submenus do not work yet", true)]
public InventoryContextSubMenuItem(SeString name, ContextMenu.InventoryContextMenuOpenEventDelegate action) : base(name, action) {
}
}

4
XivCommon/Functions/ContextMenu/ContextSubMenuItem.cs → XivCommon/Functions/ContextMenu/NormalContextSubMenuItem.cs
View File

@ -4,13 +4,13 @@ namespace XivCommon.Functions.ContextMenu {
/// <summary>
/// A custom context menu item that will open a submenu
/// </summary>
public class ContextSubMenuItem : CustomContextMenuItem<ContextMenu.ContextMenuOpenEventDelegate> {
public class NormalContextSubMenuItem : CustomContextMenuItem<ContextMenu.ContextMenuOpenEventDelegate> {
/// <summary>
/// Create a new custom context menu item that will open a submenu.
/// </summary>
/// <param name="name">the English name of the item, copied to other languages</param>
/// <param name="action">the action to perform on click</param>
public ContextSubMenuItem(SeString name, ContextMenu.ContextMenuOpenEventDelegate action) : base(name, action) {
public NormalContextSubMenuItem(SeString name, ContextMenu.ContextMenuOpenEventDelegate action) : base(name, action) {
this.IsSubMenu = true;
}
}