benilla's layer now uses only the 1.12 API and the 1.12 Lua forms, and the host hooks it used are gone from the VM. - **The VM calls handlers as 1.12.1 does.** A handler body is compiled as the chunk itself, so `self` in it is an ordinary global (`0x704c70`). A handler is called with no arguments (`0x705199`). The loader reads no `function=` attribute. - **`GetBinding`/`GetNumBindings` answer the 1.12 list** (`0x4b7f60`): `HEADER_*` section rows, plus every key bound to a command, with no category column. The stock `KeyBindingFrame` now shows its section headers and both key columns. - **The Key Bindings page captures keys through its own window**, as `Blizzard_BindingUI` does: the frame's `OnKeyDown` for keys, clicks for mouse buttons, and the wheel. It takes the `Benilla` prefix, so loading the stock binding addon no longer breaks it. The UI pointer feed now hands frames mouse buttons 4 and 5. - **`/errors` keeps its log by chaining the Lua error handler**, and the stock ScriptErrors dialog is unchanged. Load failures that never raise now print one chat line each at world entry. - **Slash commands:** `/reload` and `/errors` are `SlashCmdList` rows in the layer. `/convertraid` is gone; 1.12.1 has no such command. The dev commands are host rows in dev builds only, so a player build answers them with the unknown-command line once. - **Naming:** every global the layer defines is `Benilla`-prefixed. `BenillaBindCapture`, `KeyBindings_OnHostKey`, the three script-error globals and `SubmitChatInput` are removed. Verified: - New tests for each rule and each removed surface; 16 mutations each fail a test. - Region dumps of the Options window (general page, Key Bindings, armed) are identical before and after. - `scripts/gates.sh` and `scripts/smoke.sh` are green. - A live run bound a key, a Shift chord and the middle button through the page, and opened `/errors`. Built on macOS; no platform seam touched. Fixes #539 Fixes #544 Fixes #407 Part of #171 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
84 lines
3.7 KiB
XML
84 lines
3.7 KiB
XML
<!--
|
|
Adapters over the stock ContainerFrame.xml and .lua; loaded after them, so these win.
|
|
Deviation: our keyring is a container (id -2), not inventory slots as in the reference, so its
|
|
tooltip comes from `SetBagItem`; the stock fork (ContainerFrame.lua:615-620) reads the slots.
|
|
A full keyring prints an empty error line as the reference does: `PutKeyInKeyRing` reads
|
|
`NO_EMPTY_KEYRING_SLOTS`, which 1.12 does not ship.
|
|
-->
|
|
<Ui xmlns="http://www.blizzard.com/wow/ui/">
|
|
<Script><![CDATA[
|
|
-- The stock body, captured before it is shadowed; nil when no client data was sourced.
|
|
local refItemButtonOnEnter = ContainerFrameItemButton_OnEnter
|
|
|
|
-- The stock name, redefined: the stock item buttons call it, and our keyring slot needs
|
|
-- the bag-slot tooltip.
|
|
function ContainerFrameItemButton_OnEnter(button)
|
|
if not button then
|
|
button = this
|
|
end
|
|
if not button then return end
|
|
|
|
-- The stock bag-slot path, not its inventory-slot keyring detour.
|
|
if button:GetParent():GetID() == KEYRING_CONTAINER then
|
|
if (button:GetRight() or 0) >= (GetScreenWidth() / 2) then
|
|
GameTooltip:SetOwner(button, "ANCHOR_LEFT")
|
|
else
|
|
GameTooltip:SetOwner(button, "ANCHOR_RIGHT")
|
|
end
|
|
GameTooltip:SetBagItem(KEYRING_CONTAINER, button:GetID())
|
|
ResetCursor()
|
|
return
|
|
end
|
|
|
|
if not refItemButtonOnEnter then
|
|
message("benilla: Interface\\FrameXML\\ContainerFrame.lua was not sourced from the "
|
|
.. "game data, so bag-slot tooltips cannot work. Check the client data path.")
|
|
return
|
|
end
|
|
refItemButtonOnEnter(button)
|
|
end
|
|
|
|
-- ══ The three bag verbs benilla answers differently ═══════════════════════════════════
|
|
-- Deviation: `OpenBackpack` opens every equipped bag, not only the backpack, so the vendor,
|
|
-- bank, mail and trade windows that call it bring up every bag to sell or deposit from.
|
|
-- The was-open memory is keyed by bag id: `ContainerFrame1..12` are recycled across bags.
|
|
BENILLA_BAG_WAS_OPEN = {}
|
|
|
|
-- Ignores the was-open memory and covers the bank bags, as ContainerFrame.lua:702-707 does.
|
|
function BenillaCloseAllBags()
|
|
for bagId = 0, (NUM_CONTAINER_FRAMES or -1) do
|
|
CloseBag(bagId)
|
|
end
|
|
end
|
|
|
|
-- The reference's `backpackWasOpen`, one entry per bag: CloseBackpack leaves those open.
|
|
function BenillaOpenBackpack()
|
|
for bagId = 0, (NUM_BAG_FRAMES or -1) do
|
|
-- OpenBag's own test, repeated so the memory agrees with it.
|
|
if bagId == 0 or GetContainerNumSlots(bagId) > 0 then
|
|
if IsBagOpen(bagId) then
|
|
BENILLA_BAG_WAS_OPEN[bagId] = 1
|
|
else
|
|
BENILLA_BAG_WAS_OPEN[bagId] = nil
|
|
OpenBag(bagId)
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
function BenillaCloseBackpack()
|
|
for bagId = 0, (NUM_BAG_FRAMES or -1) do
|
|
if not BENILLA_BAG_WAS_OPEN[bagId] then
|
|
CloseBag(bagId)
|
|
end
|
|
end
|
|
end
|
|
|
|
-- The stock names, redefined after the stock ContainerFrame.lua has loaded, so its callers
|
|
-- (the vendor, bank, mail and trade windows) reach these.
|
|
OpenBackpack = BenillaOpenBackpack
|
|
CloseBackpack = BenillaCloseBackpack
|
|
CloseAllBags = BenillaCloseAllBags
|
|
]]></Script>
|
|
</Ui>
|