diff --git a/crates/benilla-app/assets/ui/ActionBar.xml b/crates/benilla-app/assets/ui/ActionBar.xml
index d27416c2..bd210cb5 100644
--- a/crates/benilla-app/assets/ui/ActionBar.xml
+++ b/crates/benilla-app/assets/ui/ActionBar.xml
@@ -1482,9 +1482,12 @@
does (decision 1636).
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
ActionButton_OnEvent()
diff --git a/crates/benilla-app/assets/ui/CastingBar.xml b/crates/benilla-app/assets/ui/CastingBar.xml
deleted file mode 100644
index 954627a2..00000000
--- a/crates/benilla-app/assets/ui/CastingBar.xml
+++ /dev/null
@@ -1,294 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- CastingBarFrame_OnLoad()
- CastingBarFrame_OnEvent()
- CastingBarFrame_OnUpdate()
-
-
-
-
-
diff --git a/crates/benilla-app/assets/ui/Fonts.xml b/crates/benilla-app/assets/ui/Fonts.xml
deleted file mode 100644
index 1996af64..00000000
--- a/crates/benilla-app/assets/ui/Fonts.xml
+++ /dev/null
@@ -1,397 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/crates/benilla-app/assets/ui/HelpFrame.xml b/crates/benilla-app/assets/ui/HelpFrame.xml
deleted file mode 100644
index 7bdb7415..00000000
--- a/crates/benilla-app/assets/ui/HelpFrame.xml
+++ /dev/null
@@ -1,1017 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- HelpFrameButton_FitToText(HelpFrameHomeIssues)
- HelpFrameButton_FitToText(BenillaHelpFrameHomeUnstick)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ScrollFrame_OnLoad()
- local trough = getglobal(self:GetName() .. "ScrollBarTrough")
- BenillaScrollTrough_Seat(trough, getglobal(self:GetName() .. "ScrollBar"))
- trough:Show()
-
-
-
-
-
-
-
- ScrollingEdit_OnTextChanged()
- ScrollingEdit_OnCursorChanged(arg1, arg2, arg3, arg4)
- HideUIPanel(HelpFrame)
-
-
-
-
-
-
-
-
-
-
-
- self:RegisterEvent("UPDATE_TICKET")
- self:RegisterEvent("GMSURVEY_DISPLAY")
-
- HelpFrameOpenTicket_OnEvent(event)
-
-
-
-
-
-
- HelpFrame_OnLoad(self)
- HelpFrame_OnShow(self)
- HelpFrame_OnEvent()
-
- PlaySound("igCharacterInfoClose")
- if UpdateMicroButtons then UpdateMicroButtons() end
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- if TOOLTIP_DEFAULT_COLOR then
- self:SetBackdropBorderColor(TOOLTIP_DEFAULT_COLOR.r, TOOLTIP_DEFAULT_COLOR.g, TOOLTIP_DEFAULT_COLOR.b)
- end
- if TOOLTIP_DEFAULT_BACKGROUND_COLOR then
- self:SetBackdropColor(TOOLTIP_DEFAULT_BACKGROUND_COLOR.r, TOOLTIP_DEFAULT_BACKGROUND_COLOR.g, TOOLTIP_DEFAULT_BACKGROUND_COLOR.b)
- end
- self:RegisterEvent("UPDATE_TICKET")
- self:RegisterEvent("PLAYER_ENTERING_WORLD")
-
- TicketStatusFrame_OnEvent(self)
- TicketStatus_OnUpdate(arg1)
-
- TicketStatus_OnClick()
-
-
-
diff --git a/crates/benilla-app/assets/ui/OptionsFrame.xml b/crates/benilla-app/assets/ui/OptionsFrame.xml
index 34096572..7aa4871e 100644
--- a/crates/benilla-app/assets/ui/OptionsFrame.xml
+++ b/crates/benilla-app/assets/ui/OptionsFrame.xml
@@ -240,6 +240,39 @@
-- reference at typical resolutions reads nearer two-thirds.
ERA_WINDOW_SCALE = 0.78
+ -- ── UpdateNameplates (ref UIOptionsFrame.lua l.768-780, verbatim) ────────────────────
+ -- Its reference home is `UIOptionsFrame.lua` and this file is our stand-in for that window
+ -- (0950/0992), so the function belongs here rather than beside its caller.
+ --
+ -- **Decision 1878 recorded this as "a missing ENGINE verb, and 1203 says build it or leave
+ -- it loudly absent", and named it the thing blocking the UIParent keystone. It is neither.**
+ -- It is FrameXML — `UIOptionsFrame.lua:768`, absent from wow-re's binding-shape table — and
+ -- every verb it calls is already ours: `ShowNameplates`/`HideNameplates`/
+ -- `ShowFriendNameplates`/`HideFriendNameplates` are the four CVar-backed bindings in
+ -- `script/cvars.rs`, all argc=0 arity=0, matching the reference's shapes.
+ --
+ -- `NAMEPLATES_ON`/`FRIENDNAMEPLATES_ON` are `RegisterForSave` globals the reference drives
+ -- from the keybinding alone (1.12's own options UI has no nameplate row). Nil is a normal
+ -- state for them and the else-branches are the reference's own answer to it, so this needs
+ -- no seeding — which is why the whole thing is twelve lines rather than a build.
+ --
+ -- The reference's odd second arm is kept as it stands: on FRIENDNAMEPLATES_ON it calls
+ -- Show and then Hide, which is a no-op in the real client too. Transcribed, not corrected;
+ -- fixing a reference bug here would be inventing a difference.
+ function UpdateNameplates()
+ if ( NAMEPLATES_ON ) then
+ ShowNameplates()
+ else
+ HideNameplates()
+ end
+ if ( FRIENDNAMEPLATES_ON ) then
+ ShowFriendNameplates()
+ HideFriendNameplates()
+ else
+ HideFriendNameplates()
+ end
+ end
+
function OptionsFrame_UpdateScale()
-- The era panel is registered `checkFit = 1`: the panel manager also shrinks it to
-- fit a small screen (UIPanelUpdateScaleForFit: min over width/height ratios
diff --git a/crates/benilla-app/assets/ui/UIParent.xml b/crates/benilla-app/assets/ui/UIParent.xml
index 572a53de..7d9d9705 100644
--- a/crates/benilla-app/assets/ui/UIParent.xml
+++ b/crates/benilla-app/assets/ui/UIParent.xml
@@ -215,6 +215,40 @@
-- statements on the same event). `MultiActionBar_Update` is existence-guarded because the
-- ~25 per-window harnesses that load this file load no bars; the binding itself is engine
-- level and always installed. Decision 1500.
+ -- ── ITEM_QUALITY_COLORS (ref UIParent.lua l.65-72) ───────────────────────────────
+ -- Its reference home is THIS file. It lived in our own `Fonts.xml` until 1888 put
+ -- that file on the chain — the reference's `Fonts.xml` does not declare it, so the
+ -- table had to come back here or vanish. Every reader is below UIParent.xml in the
+ -- manifest (GameTooltip 169, UnitPopup 203, AuctionFrame 928; UnitPopup's is a
+ -- FILE-SCOPE read inside a table literal, which is the one that makes the order
+ -- load-bearing rather than incidental).
+ -- The item-quality palette — **built from the engine verb, exactly as the reference
+ -- builds it** (ref UIParent.lua l.65-72, verbatim shape; decision 1199):
+ --
+ -- ITEM_QUALITY_COLORS = { }
+ -- for i = -1, 6 do … = GetItemQualityColor(i) end
+ --
+ -- It used to be seven hand-typed rows here. They were CLOSE and not exact — 0.62 where
+ -- the client's byte is 0x9d/255 = 0.6157, 0.64/0.21/0.93 where Epic is
+ -- 0xa3/0x35/0xee — and they carried no `.hex`, which the reference's table has and
+ -- which addons splice straight into a chat link. `GetItemQualityColor` is now a real
+ -- engine binding over wow-5875-re RF-0055's byte-verified table, so the rounding and
+ -- the second source both go.
+ --
+ -- The loop starts at -1 like the reference's, and the -1 row is not a curiosity: it is the
+ -- colour a loot row wears while its item template is uncached, which is the value
+ -- `GetLootSlotInfo` answers there. `GetItemQualityColor`'s clamp is UNSIGNED, so -1 lands
+ -- on Common/white with 7-and-up (decision 1805, correcting 1199's "reads before the
+ -- array").
+ ITEM_QUALITY_COLORS = { }
+ for i = -1, 6 do
+ ITEM_QUALITY_COLORS[i] = { }
+ ITEM_QUALITY_COLORS[i].r,
+ ITEM_QUALITY_COLORS[i].g,
+ ITEM_QUALITY_COLORS[i].b,
+ ITEM_QUALITY_COLORS[i].hex = GetItemQualityColor(i)
+ end
+
-- ── UIParentLoadAddOn (ref UIParent.lua l.638-647, and now our slot for it) ──────
-- It lived in our own BasicControls.xml until 1881 migrated that file to the chain;
-- the reference never put it there, so the move is back to where it belongs.
@@ -285,6 +319,16 @@
end
end
+ -- ref UIParent.lua l.194-196, verbatim — the fifth squatter, and the smallest. Stock
+ -- `HelpFrame.xml` calls it when a GM survey is waiting (its l.1487), and its whole body is
+ -- `UIParentLoadAddOn("Blizzard_GMSurveyUI")` — a verb 1881 already moved here and an addon
+ -- that really is on the player's chain (patch-2.MPQ). So this is the reference's own
+ -- function, not a stand-in: 1889 needed it because the stock help window is on the chain
+ -- now and ours is gone.
+ function GMSurveyFrame_LoadUI()
+ UIParentLoadAddOn("Blizzard_GMSurveyUI")
+ end
+
-- ref UIParent.lua's own `ShowMacroFrame`, moved here from our MacroFrame.xml when 1848
-- retired that file — the third such squatter after `InspectUnit` (1832) and
-- `ToggleTalentFrame` (1833), and by now the expected shape.
diff --git a/crates/benilla-app/assets/ui/benilla.toc b/crates/benilla-app/assets/ui/benilla.toc
index b7edb5fc..4a59df41 100644
--- a/crates/benilla-app/assets/ui/benilla.toc
+++ b/crates/benilla-app/assets/ui/benilla.toc
@@ -38,7 +38,13 @@
# The named virtual Font objects (decision 0084) — must load first so any FontString's
# `inherits="GameFontNormal"` resolves against a registered object.
-Fonts.xml
+# ══ THE FONT REGISTRY — the reference's own, off the player's chain (1751, 1888) ══
+# All 51 `` objects, name for name, plus the colour codes, `CHAT_FONT_HEIGHTS`,
+# `MATERIAL_TEXT_COLOR_TABLE`, `MATERIAL_TITLETEXT_COLOR_TABLE` and `RAID_CLASS_COLORS`.
+# Ours was a transcription differing only in formatting (it inlined ``), plus one
+# addition: `ITEM_QUALITY_COLORS`, whose reference home is `UIParent.lua` and which 1888 moved
+# to our UIParent.xml so it survives this swap.
+Interface\FrameXML\Fonts.xml
# ══ THE STRINGS — the reference's own first line, seated second here (1848) ══
# **Second, not first, and that is deliberate.** Manifest entry 0 is the FONT REGISTRY:
@@ -337,6 +343,19 @@ TalentWipeConfirm.xml
# The shared CooldownFrame_SetTimer (the ref's Cooldown.lua file split) — before its
# consumers (ActionBar's buttons, the multibars, the stance bar, BagFrame's slots).
Cooldown.xml
+# ══ THE ACTION-BUTTON REGIONS — the reference's own, off the player's chain (1751) ══
+# `ActionButtonTemplate`: the REGIONS-ONLY half of the reference's two-level split — icon, count,
+# hotkey, name, border, flash, cooldown and normal texture. It declares NO scripts and calls
+# nothing, so it needs no `.lua` beside it. The handler half is `ActionBarButtonTemplate`, which
+# ActionBar.xml still declares and which inherits this; those handlers stay ours until
+# `ActionButton.lua`'s 21 verbs migrate (we have 10 of them, under the reference's own names).
+#
+# Ours was a transcription of this exact file — the eight `$parent*` child names match to the
+# letter — so the swap is a deletion.
+#
+# **It must come BEFORE ActionBar.xml.** A template is registered by name and the later line
+# wins, so seated below it our transcription would take the name straight back.
+Interface\FrameXML\ActionButtonTemplate.xml
ActionBar.xml
# The four OPTIONAL extra bars (bottom left/right 61-72 / 49-60, vertical right/left
# 25-36 / 37-48), all shipping hidden until the player ticks their row (decision 1500):
@@ -493,9 +512,16 @@ Interface\FrameXML\ColorPickerFrame.xml
# WorldMapRaid1..40 with inherits=, so the virtual Frames have to be registered before it.
WorldMapFrameTemplates.xml
WorldMapFrame.xml
-# The cast bar (decision 0137 phase 1) — the extracted 1.12 CastingBarFrame, driven by
-# the SPELLCAST_* events `crate::ui_cast` fires. Only needs Fonts before it.
-CastingBar.xml
+# ══ THE CAST BAR — the reference's own, off the player's chain (1751) ══
+# `CastingBarFrame` + its Border/Flash/Spark/Text children, driven by the SPELLCAST_* events
+# `crate::ui_cast` fires (decision 0137 phase 1). Our `CastingBar.xml` was a transcription of this
+# very file under a different name — all five frame names identical — so the swap is a deletion.
+#
+# The file SOURCES ITS OWN LUA (`` at its l.3), which is why
+# only the `.xml` is listed here and `every_chain_xml_brings_its_own_lua` is satisfied.
+#
+# It brings `CastingBarFrame_UpdatePosition`, which ours never had. Only needs Fonts before it.
+Interface\FrameXML\CastingBarFrame.xml
# ══ THE MIRROR TIMERS — the reference's own, off the player's chain (1751, window 7) ══
# `MirrorTimer1..3`, `MIRRORTIMER_NUMTIMERS`, `MirrorTimerColors` and the `MirrorTimer_Show` /
# `MirrorTimerFrame_*` family out of `MirrorTimer.lua`. The breath/fatigue bars at top-centre,
@@ -1014,7 +1040,12 @@ ScriptLogFrame.xml
# resolved at call time, so that pair could sit either way round). The one seat that is a REAL
# requirement rather than legibility is **after BuffFrame.xml**: the toast re-anchors
# TemporaryEnchantFrame out of its own way, and that frame is declared there.
-HelpFrame.xml
+#
+# **The reference's own since 1889.** Ours was 1017 lines against the reference's 2088 — the
+# largest shortfall of any window we shipped — so this swap is mostly ARRIVAL, not replacement.
+# The file sources its own `HelpFrame.lua` (its l.3), so only the `.xml` is listed. Its one
+# named need, `GMSurveyFrame_LoadUI`, is now in UIParent.xml where the reference declares it.
+Interface\FrameXML\HelpFrame.xml
# The cinematic frame: the ESC that skips a fly-by, and the SCREENSHOT chord it hands back. It
# draws NOTHING — the letterbox moved to Bevy UI nodes in `crate::cinematic` (decision 1699),
# because the lane this frame paints into is dark for the whole shot.
diff --git a/crates/benilla-app/src/net/apply/combat_log.rs b/crates/benilla-app/src/net/apply/combat_log.rs
index c7e59bc0..1ec69e53 100644
--- a/crates/benilla-app/src/net/apply/combat_log.rs
+++ b/crates/benilla-app/src/net/apply/combat_log.rs
@@ -650,4 +650,8 @@ pub(super) fn exploration_xp(
pub(super) fn level_up(l: LevelUpInfo, chat_log: &mut ChatLog) {
let talent_points = u32::from(l.level >= 10);
chat_log.push_level_up(&l, talent_points);
+ // ...and park the raw tuple for `ui_unit`'s `PLAYER_LEVEL_UP`, whose nine args the reference's
+ // own ChatFrame reads (1884). The Rust lines above stay until that window migrates and can
+ // take over printing them — retiring them first would simply lose the ding.
+ chat_log.push_level_up_gains(&l, talent_points);
}
diff --git a/crates/benilla-app/src/ui_action/feed_tests.rs b/crates/benilla-app/src/ui_action/feed_tests.rs
index 3c39ad7e..022f421d 100644
--- a/crates/benilla-app/src/ui_action/feed_tests.rs
+++ b/crates/benilla-app/src/ui_action/feed_tests.rs
@@ -419,7 +419,10 @@ fn pre_resolved_lines_land_on_the_errors_frame_in_the_arms_colour() {
script.set_screen_size(1024.0, 768.0);
// The errors frame is the reference's own file since 1751 window 14, so this reads both
// stores through the one loader that speaks them.
- for file in ["Fonts.xml", "Interface\\FrameXML\\UIErrorsFrame.xml"] {
+ for file in [
+ "Interface\\FrameXML\\Fonts.xml",
+ "Interface\\FrameXML\\UIErrorsFrame.xml",
+ ] {
crate::ui_script::load_ui_for_test(&script, file);
}
}
diff --git a/crates/benilla-app/src/ui_chat/feed.rs b/crates/benilla-app/src/ui_chat/feed.rs
index a6931e60..f2750c47 100644
--- a/crates/benilla-app/src/ui_chat/feed.rs
+++ b/crates/benilla-app/src/ui_chat/feed.rs
@@ -200,6 +200,14 @@ pub(super) fn text_emote_event(
pub(crate) struct ChatLog {
pending: Vec,
broadcasts: Vec,
+ /// The ding's gain tuple, parked for `ui_unit`'s `PLAYER_LEVEL_UP` fire (decision 1884).
+ ///
+ /// The net layer has no `UiScript` — deliberately — so the gains arrive here, on the same
+ /// net-to-UI channel `broadcasts` uses, and the feed that owns the level edge picks them up.
+ /// They are matched BY LEVEL rather than just drained, because the trigger is a descriptor
+ /// diff and the gains are packet-borne: the two land together today, and matching means a
+ /// stale entry can never attach itself to a later ding if they ever stop doing so.
+ level_up_gains: Vec<(LevelUpInfo, u32)>,
}
impl ChatLog {
@@ -217,6 +225,22 @@ impl ChatLog {
pub(crate) fn take_broadcasts(&mut self) -> Vec {
std::mem::take(&mut self.broadcasts)
}
+
+ /// Park the ding's gains for the `PLAYER_LEVEL_UP` fire (see [`ChatLog::level_up_gains`]).
+ pub(crate) fn push_level_up_gains(&mut self, info: &LevelUpInfo, talent_points: u32) {
+ self.level_up_gains.push((*info, talent_points));
+ }
+
+ /// The parked gains for `level`, removed from the queue. `None` when the level edge came from
+ /// somewhere the packet did not — a GM demotion's descriptor write, or a first observation —
+ /// in which case the caller fires zeros, which is what those gains actually are.
+ pub(crate) fn take_level_up_gains(&mut self, level: u32) -> Option<(LevelUpInfo, u32)> {
+ let i = self
+ .level_up_gains
+ .iter()
+ .position(|(l, _)| l.level == level)?;
+ Some(self.level_up_gains.remove(i))
+ }
}
impl ChatLog {
diff --git a/crates/benilla-app/src/ui_chat/tests.rs b/crates/benilla-app/src/ui_chat/tests.rs
index 9d3e60e6..713d9f22 100644
--- a/crates/benilla-app/src/ui_chat/tests.rs
+++ b/crates/benilla-app/src/ui_chat/tests.rs
@@ -438,7 +438,7 @@ fn chat_vm() -> benilla_ui::script::UiScript {
// that would hide a real ordering fault. (The tooltip file is the dropdown kit's own
// dependency — its MenuBackdrop reads `TOOLTIP_DEFAULT_COLOR`.)
for file in [
- "Fonts.xml",
+ "Interface\\FrameXML\\Fonts.xml",
"GameTooltip.xml",
"Interface\\FrameXML\\UIDropDownMenu.xml",
// The UIMenu kit is the reference's own file since 1751 window 21, so this reads both
@@ -2324,3 +2324,38 @@ fn the_posture_emotes_carry_no_swim_suppression_flag() {
);
}
}
+
+/// **The ding's gains reach `PLAYER_LEVEL_UP` matched BY LEVEL, and a miss is zeros, not absence.**
+///
+/// The net layer has no `UiScript`, so `SMSG_LEVELUP_INFO`'s tuple is parked on `ChatLog` and the
+/// feed that owns the level edge picks it up (decision 1884). Matching on the level is what keeps
+/// a stale entry from attaching to a later ding — the trigger is a descriptor diff and the gains
+/// are packet-borne, so the two are only coincidentally in step.
+///
+/// The miss case is the load-bearing half: a GM demotion writes the descriptor with no packet, and
+/// the event must still carry nine arguments. `ChatFrame.lua` guards every one with
+/// `if ( argN > 0 )`, so a zero reads as "no line" while a nil raises.
+#[test]
+fn level_up_gains_are_matched_by_level_and_a_miss_is_not_an_absence() {
+ use benilla_protocol::messages::LevelUpInfo;
+
+ let mut log = super::feed::ChatLog::default();
+ let ding = LevelUpInfo {
+ level: 10,
+ health: 22,
+ powers: [15, 0, 0, 0, 0],
+ stats: [0, 1, 2, 3, 0],
+ };
+ log.push_level_up_gains(&ding, 1);
+
+ // A level edge that is not this ding's leaves the entry parked...
+ assert!(log.take_level_up_gains(11).is_none(), "wrong level matched");
+ // ...and the right one takes it, exactly once.
+ let (got, talent_points) = log.take_level_up_gains(10).expect("parked for level 10");
+ assert_eq!(got, ding);
+ assert_eq!(talent_points, 1);
+ assert!(
+ log.take_level_up_gains(10).is_none(),
+ "the entry was taken, not copied"
+ );
+}
diff --git a/crates/benilla-app/src/ui_items/drain.rs b/crates/benilla-app/src/ui_items/drain.rs
index 2dc8a2c7..b5589152 100644
--- a/crates/benilla-app/src/ui_items/drain.rs
+++ b/crates/benilla-app/src/ui_items/drain.rs
@@ -1067,16 +1067,14 @@ mod bind_confirm_tests {
const F_OBJECT_ENTRY: u16 = 3;
fn load_ui(s: &UiScript) {
- for file in ["Fonts.xml", "MoneyFrame.xml", "UiPanels.xml"] {
- let text = std::fs::read_to_string(
- std::path::Path::new(env!("CARGO_MANIFEST_DIR"))
- .join("assets/ui")
- .join(file),
- )
- .unwrap();
- let doc = benilla_ui::framexml::parse(&text).unwrap();
- let report = benilla_ui::loader::load(s, &doc, &|_| None);
- assert!(report.errors.is_empty(), "{file}: {:?}", report.errors);
+ // Through the chain-aware reader: this list names chain files now, and a
+ // reader that joins `assets/ui` cannot resolve one (1838, 1887, 1888).
+ for file in [
+ "Interface\\FrameXML\\Fonts.xml",
+ "MoneyFrame.xml",
+ "UiPanels.xml",
+ ] {
+ crate::ui_script::load_ui_for_test(s, file);
}
}
diff --git a/crates/benilla-app/src/ui_items/feed.rs b/crates/benilla-app/src/ui_items/feed.rs
index b8903b24..9c5951ee 100644
--- a/crates/benilla-app/src/ui_items/feed.rs
+++ b/crates/benilla-app/src/ui_items/feed.rs
@@ -1431,7 +1431,6 @@ fn diff_and_push(
}
}
memory.pushed = fresh;
- script.fire_event("BAG_UPDATE_DELAYED", vec![]);
return true;
}
// A `BAG_CLOSED` with nothing else to say still went into the VM — two identical bags swapped
diff --git a/crates/benilla-app/src/ui_loot.rs b/crates/benilla-app/src/ui_loot.rs
index b326194d..f4897e42 100644
--- a/crates/benilla-app/src/ui_loot.rs
+++ b/crates/benilla-app/src/ui_loot.rs
@@ -1111,11 +1111,10 @@ fn feed_loot(
script.fire_event("LOOT_SLOT_CLEARED", vec![ScriptValue::Int(i as i64 + 1)]);
}
}
- script.fire_event("LOOT_UPDATE", vec![]);
- // The reference keeps the two apart: `LOOT_UPDATE` repaints the rows, while a changed
- // candidate list refreshes the open dropdown in place without re-toggling it
- // (`LootFrame_OnEvent`'s `UIDropDownMenu_Refresh(GroupLootDropDown)`,
- // `LootFrame.lua:63`). Firing it only on a real change keeps a closed menu untouched.
+ // A changed candidate list refreshes the open dropdown in place without re-toggling
+ // it — `LootFrame_OnEvent`'s `UIDropDownMenu_Refresh(GroupLootDropDown)`, which the
+ // reference hangs off `UPDATE_MASTER_LOOT_LIST` (`LootFrame.lua:62-64`). Firing it
+ // only on a real change keeps a closed menu untouched.
if before.master_candidates != after.master_candidates {
script.fire_event("UPDATE_MASTER_LOOT_LIST", vec![]);
}
diff --git a/crates/benilla-app/src/ui_loot_roll.rs b/crates/benilla-app/src/ui_loot_roll.rs
index 46772150..c9d61b36 100644
--- a/crates/benilla-app/src/ui_loot_roll.rs
+++ b/crates/benilla-app/src/ui_loot_roll.rs
@@ -17,11 +17,12 @@
//! announcement lines into the chat window once their names resolve. [`drain_loot_rolls`] pulls the
//! `RollOnLoot` votes back out as [`ClientCommand::LootRoll`].
//!
-//! ## `UPDATE_LOOT_ROLL` — why a snapshot seam needs an event the real client doesn't have
+//! ## The late item template, and the `?` that outlives it
//!
-//! The reference's `GetLootRollItemInfo` reads live C state off the roll node, so its
-//! `GroupLootFrame_OnShow` can paint once and be done. Ours reads a **pushed snapshot**, and a
-//! snapshot is always at least one step behind the thing that made it change — twice over:
+//! The reference's `GetLootRollItemInfo` reads live C state off the roll node, so by the time
+//! `START_LOOT_ROLL` fires there is something to paint and `GroupLootFrame_OnShow` can paint once
+//! and be done. Ours reads a **pushed snapshot**, and a snapshot is at least one step behind the
+//! thing that changed it — twice over:
//!
//! 1. A roll is added to [`LootRolls::active`] and to `opened` in the same [`LootRolls::start`]
//! call, so the *first* snapshot that contains a roll is built in the same pass that announces
@@ -30,12 +31,20 @@
//! `None` until the query lands, which is typically several frames after the roll opens.
//!
//! (1) is fixed by ordering — the push precedes the events here, as it does in [`crate::ui_loot`].
-//! (2) cannot be, so `UPDATE_LOOT_ROLL(rollID)` fires whenever an open roll's *display identity*
-//! ([`display_identity`]) changes underneath a frame, and the frame repaints. Ordering alone would
-//! be a guarantee resting on system order in a file far from the Lua that depends on it; with the
-//! repair in place the paint is correct either way, and ordering only decides whether there is a
-//! visible blank first. Both halves ship: (1) for the frame you actually see, (2) because it is what
-//! makes the documented in-flight fallback resolve instead of staying a `?` forever.
+//!
+//! **(2) is currently a live defect: a roll whose template lands late paints `?` and keeps it.**
+//! We used to fire an `UPDATE_LOOT_ROLL(rollID)` when an open roll's display identity changed, and
+//! our own `GroupLootFrame` re-entered its paint from it. That frame is the reference's now, and
+//! the reference has no such seam — so the repaint stopped when the window migrated, and the event
+//! went on being fired into a room with nobody in it. 1883 removed it: an event the 1.12 client
+//! does not have, which nothing listened for, was not fixing anything.
+//!
+//! **Decision 1838 already carries the fix**, and it is the reference's own invariant rather than a
+//! re-invented seam: hold the roll until its template resolves, so the snapshot is populated when
+//! the frame first paints, exactly as the reference's C state is. The cost is the roll timer — a
+//! roll announced late is a roll with less time on it — so it wants a deadline (announce anyway
+//! after N ms, with the `?`) rather than an unbounded wait. Not built yet; 1883 only removed the
+//! event that was standing in for it.
//!
//! ## Two client-side behaviours, and why
//!
@@ -510,29 +519,6 @@ fn snapshot(
LootRollsState { rolls: entries }
}
-/// Everything about a roll a `GroupLootFrame` actually *paints* — deliberately **not**
-/// `time_left_ms`, which ticks every frame and would make "the snapshot changed" mean nothing.
-fn display_identity(e: &LootRollEntry) -> (&Option, &Option, Option, bool) {
- (&e.name, &e.texture, e.quality, e.bind_on_pickup)
-}
-
-/// The rolls open in *both* snapshots whose display identity changed — i.e. the ones with a frame
-/// already up that is now painting the wrong thing. A roll only in `fresh` is newly opened and gets
-/// its `START_LOOT_ROLL`; one only in `last` is closed and gets its `CANCEL_LOOT_ROLL`.
-fn repainted(last: &LootRollsState, fresh: &LootRollsState) -> Vec {
- fresh
- .rolls
- .iter()
- .filter(|f| {
- last.rolls
- .iter()
- .find(|l| l.roll_id == f.roll_id)
- .is_some_and(|l| display_identity(l) != display_identity(f))
- })
- .map(|f| f.roll_id)
- .collect()
-}
-
/// Tick the open rolls, push them into the VM, fire the open/close events, and drain the queued
/// announcement lines into chat.
#[allow(clippy::too_many_arguments)]
@@ -580,7 +566,6 @@ fn feed_loot_rolls(
// same `start()` call that queued `opened`, so pushing after would hand every fresh roll an
// empty lookup. Same order as ui_loot's window feed, for the same reason.
let fresh = snapshot(&rolls, &mut items, icons.as_deref(), &commands, catalogs);
- let changed = repainted(last, &fresh);
if fresh != *last {
script.set_loot_rolls(fresh.clone());
*last = fresh;
@@ -600,11 +585,6 @@ fn feed_loot_rolls(
debug!("ui_loot_roll: roll {roll_id} cancelled");
script.fire_event("CANCEL_LOOT_ROLL", vec![ScriptValue::Int(roll_id as i64)]);
}
- // The late item template landing under a frame that is already up (see the module docs).
- for roll_id in changed {
- debug!("ui_loot_roll: roll {roll_id} display identity resolved");
- script.fire_event("UPDATE_LOOT_ROLL", vec![ScriptValue::Int(roll_id as i64)]);
- }
}
/// Drain the Lua votes: each `RollOnLoot(rollID, rollType)` becomes one `CMSG_LOOT_ROLL` addressed
@@ -1008,55 +988,4 @@ mod tests {
r.start(start(0xBB, 0, 4306));
assert_eq!(r.active[0].roll_id, 2);
}
-
- fn entry(roll_id: u32, name: Option<&str>, time_left_ms: u32) -> LootRollEntry {
- LootRollEntry {
- roll_id,
- name: name.map(Into::into),
- texture: name.map(|_| "Interface\\Icons\\INV_Staff_12".into()),
- quantity: 1,
- quality: name.map(|_| 4),
- bind_on_pickup: name.is_some(),
- time_left_ms,
- item_id: 17182,
- // Lands with the name — one template answer fills both (decision 1059).
- link: name.map(|n| crate::ui_items::item_link(17182, n, 4)),
- random_property_id: 0,
- }
- }
-
- fn state(entries: &[LootRollEntry]) -> LootRollsState {
- LootRollsState {
- rolls: entries.to_vec(),
- }
- }
-
- /// `UPDATE_LOOT_ROLL` fires only when what a frame *paints* changed. The load-bearing half is
- /// the negative: `time_left_ms` ticks every single frame, so counting it would fire the repaint
- /// 60x a second and make the signal worthless (and the timer bar reads the model directly — it
- /// has never needed an event).
- #[test]
- fn only_a_display_change_asks_for_a_repaint() {
- let flight = state(&[entry(7, None, 60_000)]);
- let landed = state(&[entry(7, Some("Staff of Jordan"), 59_000)]);
-
- assert_eq!(repainted(&flight, &landed), vec![7], "the template landed");
- assert_eq!(repainted(&landed, &landed), Vec::::new(), "unchanged");
-
- // The timer alone, which is what changes on almost every frame.
- let ticked = state(&[entry(7, Some("Staff of Jordan"), 58_000)]);
- assert_eq!(
- repainted(&landed, &ticked),
- Vec::::new(),
- "a ticking bar is not a repaint"
- );
-
- // Opened and closed rolls are the START/CANCEL events' business, not this one's.
- let two = state(&[
- entry(7, Some("Staff of Jordan"), 59_000),
- entry(8, None, 60_000),
- ]);
- assert_eq!(repainted(&landed, &two), Vec::::new(), "8 is new");
- assert_eq!(repainted(&two, &landed), Vec::::new(), "8 closed");
- }
}
diff --git a/crates/benilla-app/src/ui_pet_stats.rs b/crates/benilla-app/src/ui_pet_stats.rs
index f0a54c0c..56d62128 100644
--- a/crates/benilla-app/src/ui_pet_stats.rs
+++ b/crates/benilla-app/src/ui_pet_stats.rs
@@ -29,7 +29,7 @@
use bevy::prelude::*;
-use benilla_ui::script::{PetStats, UiScript};
+use benilla_ui::script::{PetStats, ScriptValue, UiScript};
use crate::names::NameCache;
use crate::net::{NetCommands, ObjectStore};
@@ -317,7 +317,10 @@ fn feed_pet_stats(
script.set_pet_stats(fresh.0, fresh.1);
// Push before firing — dispatch runs the Lua handlers synchronously (the `ui_unit` rule).
if happiness_moved {
- script.fire_event("UNIT_HAPPINESS", vec![]);
+ // `%s` — the unit token, per the reference's own fire site (SignalEvent2, decision 1884).
+ // Every 1.12 `UNIT_*` event carries it, and its consumers gate on it: a handler's first
+ // line is `if ( arg1 == this.unit )`, so an argless fire reaches nobody.
+ script.fire_event("UNIT_HAPPINESS", vec![ScriptValue::Str("pet".into())]);
}
if xp_moved {
script.fire_event("UNIT_PET_EXPERIENCE", vec![]);
diff --git a/crates/benilla-app/src/ui_script/action_bar_tests.rs b/crates/benilla-app/src/ui_script/action_bar_tests.rs
index 7b3e9a97..79a57585 100644
--- a/crates/benilla-app/src/ui_script/action_bar_tests.rs
+++ b/crates/benilla-app/src/ui_script/action_bar_tests.rs
@@ -14,28 +14,16 @@ fn action_ids(s: &mut UiScript) -> Vec {
fn shipped_action_bar_drives_end_to_end() {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- for file in ["Cooldown.xml", "ActionBar.xml"] {
- let text = std::fs::read_to_string(
- std::path::Path::new(env!("CARGO_MANIFEST_DIR"))
- .join("assets/ui")
- .join(file),
- )
- .unwrap();
- let doc = benilla_ui::framexml::parse(&text).unwrap();
- let report = benilla_ui::loader::load(&s, &doc, &|_| None);
- assert!(
- report.errors.is_empty(),
- "{file}: loader errors: {:?}",
- report.errors
- );
- if file == "ActionBar.xml" {
- assert_eq!(
- report.frames, 59,
- "bar + XP StatusBar (+ its numerals overlay) + exhaustion tick + max-level rail + art frame + 12 buttons (each with a Cooldown child) + 2 page buttons + the performance meter and its hover button, \
+ super::test_ui::load_ui(&s, "Cooldown.xml");
+ // `load_ui` returns the same `report.frames` the disk reader asserted on, so this
+ // count is the one that always stood here — moved, not re-derived.
+ super::test_ui::load_ui(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
+ let frames = super::test_ui::load_ui(&s, "ActionBar.xml");
+ assert_eq!(
+ frames, 59,
+ "bar + XP StatusBar (+ its numerals overlay) + exhaustion tick + max-level rail + art frame + 12 buttons (each with a Cooldown child) + 2 page buttons + the performance meter and its hover button, \
+ BonusActionBarFrame and its 12 buttons with their Cooldown children (25 — hidden, as the reference's is; decision 1223) — and NO ReputationWatchBar: its three frames went home to the reference's own ReputationFrame.xml with 1875"
- );
- }
- }
+ );
// `ExhaustionTick_Update` indexes `ReputationWatchBar` UNGUARDED — the reference's own code,
// safe there because `ReputationFrame.xml` is always loaded and always declares the bar. Since
@@ -43,7 +31,7 @@ fn shipped_action_bar_drives_end_to_end() {
// or the tick raises on its first event.
// In manifest order: the fonts its check-box labels colour from, the panel templates those
// boxes inherit through, then the pane.
- super::test_ui::load_ui(&s, "Fonts.xml");
+ super::test_ui::load_ui(&s, "Interface\\FrameXML\\Fonts.xml");
super::test_ui::load_ui(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
super::test_ui::load_ui(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
super::test_ui::load_ui(&s, r"Interface\FrameXML\OptionsFrameTemplates.xml");
@@ -161,21 +149,9 @@ fn shipped_action_bar_drives_end_to_end() {
}
fn load_action_bar(s: &UiScript) {
- for file in ["Cooldown.xml", "ActionBar.xml"] {
- let text = std::fs::read_to_string(
- std::path::Path::new(env!("CARGO_MANIFEST_DIR"))
- .join("assets/ui")
- .join(file),
- )
- .unwrap();
- let doc = benilla_ui::framexml::parse(&text).unwrap();
- let report = benilla_ui::loader::load(s, &doc, &|_| None);
- assert!(
- report.errors.is_empty(),
- "{file}: loader errors: {:?}",
- report.errors
- );
- }
+ super::test_ui::load_ui(s, "Cooldown.xml");
+ super::test_ui::load_ui(s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
+ super::test_ui::load_ui(s, "ActionBar.xml");
// `ExhaustionTick_Update` indexes `ReputationWatchBar` UNGUARDED — the reference's own code,
// safe there because `ReputationFrame.xml` is always loaded and always declares the bar. Since
@@ -183,7 +159,7 @@ fn load_action_bar(s: &UiScript) {
// or the tick raises on its first event.
// In manifest order: the fonts its check-box labels colour from, the panel templates those
// boxes inherit through, then the pane.
- super::test_ui::load_ui(s, "Fonts.xml");
+ super::test_ui::load_ui(s, "Interface\\FrameXML\\Fonts.xml");
super::test_ui::load_ui(s, r"Interface\FrameXML\UIPanelTemplates.lua");
super::test_ui::load_ui(s, r"Interface\FrameXML\UIPanelTemplates.xml");
super::test_ui::load_ui(s, r"Interface\FrameXML\OptionsFrameTemplates.xml");
@@ -802,6 +778,7 @@ fn shipped_bag_frame_drives_end_to_end() {
for file in BAG_UI {
let frames = load_ui(&s, file);
if *file == "Cooldown.xml" {
+ load_ui(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
load_ui(&s, "ActionBar.xml");
}
if *file == "Interface\\FrameXML\\MainMenuBarBagButtons.xml" {
@@ -1298,9 +1275,10 @@ fn the_main_bar_pages_and_a_bonus_page_still_outranks_it() {
s.set_screen_size(1024.0, 768.0);
for file in [
// Fonts first: the pane's check-box labels colour from `RED_FONT_COLOR` in their own OnLoad.
- "Fonts.xml",
+ "Interface\\FrameXML\\Fonts.xml",
"UIParent.xml",
"Cooldown.xml",
+ "Interface\\FrameXML\\ActionButtonTemplate.xml",
"ActionBar.xml",
// The reference declares the reputation WATCH BAR in `ReputationFrame.xml`, and
// `ExhaustionTick_Update` reads `ReputationWatchBar:IsShown()` twice — the reference's own
@@ -1430,17 +1408,9 @@ fn the_main_bar_pages_and_a_bonus_page_still_outranks_it() {
fn bonus_bar_slides_up_with_sound_and_down_without() {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- for file in ["Cooldown.xml", "ActionBar.xml"] {
- let text = std::fs::read_to_string(
- std::path::Path::new(env!("CARGO_MANIFEST_DIR"))
- .join("assets/ui")
- .join(file),
- )
- .unwrap();
- let doc = benilla_ui::framexml::parse(&text).unwrap();
- let report = benilla_ui::loader::load(&s, &doc, &|_| None);
- assert!(report.errors.is_empty(), "{file}: {:?}", report.errors);
- }
+ super::test_ui::load_ui(&s, "Cooldown.xml");
+ super::test_ui::load_ui(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
+ super::test_ui::load_ui(&s, "ActionBar.xml");
// `ExhaustionTick_Update` indexes `ReputationWatchBar` UNGUARDED — the reference's own code,
// safe there because `ReputationFrame.xml` is always loaded and always declares the bar. Since
@@ -1448,7 +1418,7 @@ fn bonus_bar_slides_up_with_sound_and_down_without() {
// or the tick raises on its first event.
// In manifest order: the fonts its check-box labels colour from, the panel templates those
// boxes inherit through, then the pane.
- super::test_ui::load_ui(&s, "Fonts.xml");
+ super::test_ui::load_ui(&s, "Interface\\FrameXML\\Fonts.xml");
super::test_ui::load_ui(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
super::test_ui::load_ui(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
super::test_ui::load_ui(&s, r"Interface\FrameXML\OptionsFrameTemplates.xml");
@@ -1621,17 +1591,9 @@ fn bonus_bar_slides_up_with_sound_and_down_without() {
fn bonus_bar_turnaround_continues_from_position() {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- for file in ["Cooldown.xml", "ActionBar.xml"] {
- let text = std::fs::read_to_string(
- std::path::Path::new(env!("CARGO_MANIFEST_DIR"))
- .join("assets/ui")
- .join(file),
- )
- .unwrap();
- let doc = benilla_ui::framexml::parse(&text).unwrap();
- let report = benilla_ui::loader::load(&s, &doc, &|_| None);
- assert!(report.errors.is_empty(), "{file}: {:?}", report.errors);
- }
+ super::test_ui::load_ui(&s, "Cooldown.xml");
+ super::test_ui::load_ui(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
+ super::test_ui::load_ui(&s, "ActionBar.xml");
// `ExhaustionTick_Update` indexes `ReputationWatchBar` UNGUARDED — the reference's own code,
// safe there because `ReputationFrame.xml` is always loaded and always declares the bar. Since
@@ -1639,7 +1601,7 @@ fn bonus_bar_turnaround_continues_from_position() {
// or the tick raises on its first event.
// In manifest order: the fonts its check-box labels colour from, the panel templates those
// boxes inherit through, then the pane.
- super::test_ui::load_ui(&s, "Fonts.xml");
+ super::test_ui::load_ui(&s, "Interface\\FrameXML\\Fonts.xml");
super::test_ui::load_ui(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
super::test_ui::load_ui(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
super::test_ui::load_ui(&s, r"Interface\FrameXML\OptionsFrameTemplates.xml");
@@ -1688,17 +1650,9 @@ fn bonus_bar_turnaround_continues_from_position() {
fn the_page_arrows_do_not_steal_each_other_s_clicks() {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- for file in ["Cooldown.xml", "ActionBar.xml"] {
- let text = std::fs::read_to_string(
- std::path::Path::new(env!("CARGO_MANIFEST_DIR"))
- .join("assets/ui")
- .join(file),
- )
- .unwrap();
- let doc = benilla_ui::framexml::parse(&text).unwrap();
- let report = benilla_ui::loader::load(&s, &doc, &|_| None);
- assert!(report.errors.is_empty(), "{file}: {:?}", report.errors);
- }
+ super::test_ui::load_ui(&s, "Cooldown.xml");
+ super::test_ui::load_ui(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
+ super::test_ui::load_ui(&s, "ActionBar.xml");
// `ExhaustionTick_Update` indexes `ReputationWatchBar` UNGUARDED — the reference's own code,
// safe there because `ReputationFrame.xml` is always loaded and always declares the bar. Since
@@ -1706,7 +1660,7 @@ fn the_page_arrows_do_not_steal_each_other_s_clicks() {
// or the tick raises on its first event.
// In manifest order: the fonts its check-box labels colour from, the panel templates those
// boxes inherit through, then the pane.
- super::test_ui::load_ui(&s, "Fonts.xml");
+ super::test_ui::load_ui(&s, "Interface\\FrameXML\\Fonts.xml");
super::test_ui::load_ui(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
super::test_ui::load_ui(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
super::test_ui::load_ui(&s, r"Interface\FrameXML\OptionsFrameTemplates.xml");
diff --git a/crates/benilla-app/src/ui_script/basic_controls_tests.rs b/crates/benilla-app/src/ui_script/basic_controls_tests.rs
index f17253b9..62bd6963 100644
--- a/crates/benilla-app/src/ui_script/basic_controls_tests.rs
+++ b/crates/benilla-app/src/ui_script/basic_controls_tests.rs
@@ -12,7 +12,7 @@ use super::test_ui::load_ui as load_xml;
/// Fonts then BasicControls — the manifest's own order, and the whole dependency this file has.
fn basic_controls() -> UiScript {
let mut s = UiScript::new().unwrap();
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
s.set_screen_size(1024.0, 768.0);
s.resolve();
diff --git a/crates/benilla-app/src/ui_script/binder_tests.rs b/crates/benilla-app/src/ui_script/binder_tests.rs
index e200fbde..c84d646d 100644
--- a/crates/benilla-app/src/ui_script/binder_tests.rs
+++ b/crates/benilla-app/src/ui_script/binder_tests.rs
@@ -11,7 +11,7 @@ use super::test_ui::load_ui as load_xml;
fn setup() -> UiScript {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
diff --git a/crates/benilla-app/src/ui_script/buff_tests.rs b/crates/benilla-app/src/ui_script/buff_tests.rs
index 0f1e9b8c..e10f8bb2 100644
--- a/crates/benilla-app/src/ui_script/buff_tests.rs
+++ b/crates/benilla-app/src/ui_script/buff_tests.rs
@@ -26,10 +26,10 @@ fn harness() -> UiScript {
// under a timed aura. Our copy carried them as `X = X or "%d s"` fallbacks; the reference's
// file formats them straight and `format(nil, …)` raises.
load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
- load_xml(&s, "Fonts.xml"); // NORMAL/HIGHLIGHT_FONT_COLOR + the FontStrings' faces
- // `GameTooltip`, which the reference's BuffButton_Update indexes on EVERY repaint to ask
- // `IsOwned(this)` (BuffFrame.lua l.104) — not just on hover. Ours guarded it; the reference
- // does not, so a session without the tooltip loses the whole repaint.
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml"); // NORMAL/HIGHLIGHT_FONT_COLOR + the FontStrings' faces
+ // `GameTooltip`, which the reference's BuffButton_Update indexes on EVERY repaint to ask
+ // `IsOwned(this)` (BuffFrame.lua l.104) — not just on hover. Ours guarded it; the reference
+ // does not, so a session without the tooltip loses the whole repaint.
load_xml(&s, "GameTooltip.xml");
// `SecondsToTimeAbbrev`, which 1.12 keeps in UIParent.lua and so do we since window 18.
load_xml(&s, "MoneyFrame.xml");
@@ -38,6 +38,7 @@ fn harness() -> UiScript {
load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
load_xml(&s, "UIParent.xml");
load_xml(&s, "Cooldown.xml");
+ load_xml(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
load_xml(&s, "ActionBar.xml"); // BENILLA_FALLBACK_ICON (the unknown-icon fallback)
// The timer switch, PLANTED ON — not the shipped value. 1.12 declares it in
// UIOptionsFrame.lua (default "0"); we have no counterpart to that file, so it lives with the
diff --git a/crates/benilla-app/src/ui_script/cast_tests.rs b/crates/benilla-app/src/ui_script/cast_tests.rs
index 362fadaa..6002d0b6 100644
--- a/crates/benilla-app/src/ui_script/cast_tests.rs
+++ b/crates/benilla-app/src/ui_script/cast_tests.rs
@@ -15,8 +15,12 @@ use super::test_ui::load_ui as load_xml;
fn harness() -> UiScript {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
- load_xml(&s, "CastingBar.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+ // The stock file writes `CastingBarText:SetText(FAILED)` rather than a literal, so the window
+ // needs GlobalStrings — which the manifest has above it, and which our own retired
+ // `CastingBar.xml` did not need because it hardcoded "Failed".
+ load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
+ load_xml(&s, "Interface\\FrameXML\\CastingBarFrame.xml");
s
}
@@ -381,9 +385,9 @@ fn bottom(s: &UiScript, name: &str) -> f64 {
fn managed_positions_track_the_bottom_bar_stack() {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "UIParent.xml");
- load_xml(&s, "CastingBar.xml");
+ load_xml(&s, "Interface\\FrameXML\\CastingBarFrame.xml");
load_xml(&s, "Interface\\FrameXML\\UIMenu.xml"); // the kit the chat menus build from
load_xml(&s, "ChatFrame.xml");
diff --git a/crates/benilla-app/src/ui_script/character_tests.rs b/crates/benilla-app/src/ui_script/character_tests.rs
index 1178204f..25906786 100644
--- a/crates/benilla-app/src/ui_script/character_tests.rs
+++ b/crates/benilla-app/src/ui_script/character_tests.rs
@@ -1198,7 +1198,7 @@ fn an_addons_tab_click_selects_through_the_generic_entry_point() {
let _data = benilla_formats::wow_data_or_skip!();
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
// The reference's `PanelTemplates_SelectTab` ends with `if GameTooltip:IsOwned(tab)` —
diff --git a/crates/benilla-app/src/ui_script/chat_options_tests.rs b/crates/benilla-app/src/ui_script/chat_options_tests.rs
index 7be47096..17a776ca 100644
--- a/crates/benilla-app/src/ui_script/chat_options_tests.rs
+++ b/crates/benilla-app/src/ui_script/chat_options_tests.rs
@@ -39,7 +39,7 @@ fn bake_strings(s: &UiScript) {
fn chat_with_menu() -> UiScript {
let mut s = UiScript::new().unwrap();
for file in [
- "Fonts.xml",
+ "Interface\\FrameXML\\Fonts.xml",
"MoneyFrame.xml",
"UiPanels.xml",
"UIParent.xml",
diff --git a/crates/benilla-app/src/ui_script/chat_resize_tests.rs b/crates/benilla-app/src/ui_script/chat_resize_tests.rs
index 95720f71..be101254 100644
--- a/crates/benilla-app/src/ui_script/chat_resize_tests.rs
+++ b/crates/benilla-app/src/ui_script/chat_resize_tests.rs
@@ -17,7 +17,7 @@ use super::test_ui::load_ui as load_xml;
fn chat_ui() -> UiScript {
let mut s = UiScript::new().unwrap();
for file in [
- "Fonts.xml",
+ "Interface\\FrameXML\\Fonts.xml",
"MoneyFrame.xml",
"UiPanels.xml",
"UIParent.xml",
diff --git a/crates/benilla-app/src/ui_script/chat_tests.rs b/crates/benilla-app/src/ui_script/chat_tests.rs
index 2c73aa21..9072c731 100644
--- a/crates/benilla-app/src/ui_script/chat_tests.rs
+++ b/crates/benilla-app/src/ui_script/chat_tests.rs
@@ -12,7 +12,7 @@ use super::test_ui::load_ui as load_xml;
/// The full ChatFrame stack (fonts first, so the FontString's `inherits="ChatFontNormal"` resolves).
fn chat_frame() -> UiScript {
let mut s = UiScript::new().unwrap();
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
// GameTooltip.xml + UIDropDownMenu.xml are real RUNTIME dependencies of the chat tabs since
// decision 1589: a left click closes any open menu (`CloseDropDownMenus`, the reference's own
// first move in `FCF_Tab_OnClick`) and a right click opens the window's options menu.
@@ -241,7 +241,7 @@ fn chat_click_dismisses_a_stuck_spell_but_not_an_item() {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
for f in [
- "Fonts.xml",
+ "Interface\\FrameXML\\Fonts.xml",
"MoneyFrame.xml",
"UiPanels.xml",
r"Interface\FrameXML\UIPanelTemplates.lua",
@@ -978,7 +978,7 @@ fn the_chat_menu_builds_its_rows_on_the_references_kit() {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
for f in [
- "Fonts.xml",
+ "Interface\\FrameXML\\Fonts.xml",
"MoneyFrame.xml",
"UiPanels.xml",
r"Interface\FrameXML\UIPanelTemplates.lua",
diff --git a/crates/benilla-app/src/ui_script/cinematic_tests.rs b/crates/benilla-app/src/ui_script/cinematic_tests.rs
index c8245178..1c6e8ad2 100644
--- a/crates/benilla-app/src/ui_script/cinematic_tests.rs
+++ b/crates/benilla-app/src/ui_script/cinematic_tests.rs
@@ -22,7 +22,7 @@ use super::test_ui::load_ui as load_xml;
fn ui_with_the_cinematic_frame() -> UiScript {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "UIParent.xml");
load_xml(&s, "MoneyFrame.xml"); // StaticPopup's money row, or UiPanels errors at load
load_xml(&s, "UiPanels.xml");
diff --git a/crates/benilla-app/src/ui_script/color_picker_tests.rs b/crates/benilla-app/src/ui_script/color_picker_tests.rs
index 9c029faa..6bebc046 100644
--- a/crates/benilla-app/src/ui_script/color_picker_tests.rs
+++ b/crates/benilla-app/src/ui_script/color_picker_tests.rs
@@ -17,7 +17,7 @@ use super::test_ui::load_ui as load_xml;
fn picker() -> UiScript {
let mut s = UiScript::new().unwrap();
for file in [
- "Fonts.xml",
+ "Interface\\FrameXML\\Fonts.xml",
"MoneyFrame.xml",
"UiPanels.xml",
"UIParent.xml",
diff --git a/crates/benilla-app/src/ui_script/combat_text_tests.rs b/crates/benilla-app/src/ui_script/combat_text_tests.rs
index c03d36d1..149bebbe 100644
--- a/crates/benilla-app/src/ui_script/combat_text_tests.rs
+++ b/crates/benilla-app/src/ui_script/combat_text_tests.rs
@@ -18,7 +18,7 @@ use super::test_ui::load_ui as load_xml;
fn load_combat_text() -> UiScript {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "UIParent.xml");
load_xml(&s, "CombatText.xml");
s.run("SHOW_COMBAT_TEXT = \"1\"; CombatText_UpdateDisplayedMessages()")
diff --git a/crates/benilla-app/src/ui_script/combo_frame_tests.rs b/crates/benilla-app/src/ui_script/combo_frame_tests.rs
index 6c3ef75e..ea5c1716 100644
--- a/crates/benilla-app/src/ui_script/combo_frame_tests.rs
+++ b/crates/benilla-app/src/ui_script/combo_frame_tests.rs
@@ -18,7 +18,7 @@ use super::test_ui::load_ui as load_xml;
fn load_combo_frame() -> UiScript {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "UIParent.xml");
load_xml(&s, "GameTooltip.xml");
load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
diff --git a/crates/benilla-app/src/ui_script/death_tests.rs b/crates/benilla-app/src/ui_script/death_tests.rs
index 7dcf4639..a47de347 100644
--- a/crates/benilla-app/src/ui_script/death_tests.rs
+++ b/crates/benilla-app/src/ui_script/death_tests.rs
@@ -10,7 +10,7 @@ use super::test_ui::load_ui as load_xml;
fn setup() -> UiScript {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
diff --git a/crates/benilla-app/src/ui_script/delete_item_tests.rs b/crates/benilla-app/src/ui_script/delete_item_tests.rs
index 7a4ee2b1..2778770d 100644
--- a/crates/benilla-app/src/ui_script/delete_item_tests.rs
+++ b/crates/benilla-app/src/ui_script/delete_item_tests.rs
@@ -55,7 +55,7 @@ fn one_item_backpack(item_id: u32, name: &str, quality: u32) -> ContainerState {
fn setup() -> UiScript {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
diff --git a/crates/benilla-app/src/ui_script/dressup_tests.rs b/crates/benilla-app/src/ui_script/dressup_tests.rs
index c310e687..b5a4fdfc 100644
--- a/crates/benilla-app/src/ui_script/dressup_tests.rs
+++ b/crates/benilla-app/src/ui_script/dressup_tests.rs
@@ -49,7 +49,7 @@ const ROOM_UI: &[&str] = &[
/// cannot.
fn load_room(s: &UiScript) {
for file in [
- "Fonts.xml",
+ "Interface\\FrameXML\\Fonts.xml",
"MoneyFrame.xml",
"UiPanels.xml",
r"Interface\FrameXML\UIPanelTemplates.lua",
diff --git a/crates/benilla-app/src/ui_script/dropdown_tests.rs b/crates/benilla-app/src/ui_script/dropdown_tests.rs
index 6f6a59b3..7f7ff0f5 100644
--- a/crates/benilla-app/src/ui_script/dropdown_tests.rs
+++ b/crates/benilla-app/src/ui_script/dropdown_tests.rs
@@ -20,7 +20,7 @@ use super::test_ui::load_ui as load_xml;
/// which GameTooltip.xml declares.
fn load_dropdown_kit(s: &UiScript) {
for file in [
- "Fonts.xml",
+ "Interface\\FrameXML\\Fonts.xml",
"UIParent.xml",
"GameTooltip.xml",
"Interface\\FrameXML\\UIDropDownMenu.xml",
diff --git a/crates/benilla-app/src/ui_script/duel_tests.rs b/crates/benilla-app/src/ui_script/duel_tests.rs
index 374b2f87..e6e8fac7 100644
--- a/crates/benilla-app/src/ui_script/duel_tests.rs
+++ b/crates/benilla-app/src/ui_script/duel_tests.rs
@@ -10,7 +10,7 @@ use super::test_ui::load_ui as load_xml;
fn setup() -> UiScript {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
diff --git a/crates/benilla-app/src/ui_script/durability_tests.rs b/crates/benilla-app/src/ui_script/durability_tests.rs
index 04172362..230ce4fd 100644
--- a/crates/benilla-app/src/ui_script/durability_tests.rs
+++ b/crates/benilla-app/src/ui_script/durability_tests.rs
@@ -15,7 +15,7 @@ fn harness() -> UiScript {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
for f in [
- "Fonts.xml",
+ "Interface\\FrameXML\\Fonts.xml",
"MoneyFrame.xml",
"UiPanels.xml",
r"Interface\FrameXML\UIPanelTemplates.lua",
@@ -387,7 +387,7 @@ fn the_quest_tracker_stacks_below_the_durability_guy() {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
for f in [
- "Fonts.xml",
+ "Interface\\FrameXML\\Fonts.xml",
"MoneyFrame.xml",
"UiPanels.xml",
r"Interface\FrameXML\UIPanelTemplates.lua",
diff --git a/crates/benilla-app/src/ui_script/enchant_confirm_tests.rs b/crates/benilla-app/src/ui_script/enchant_confirm_tests.rs
index 9e2dabaf..fbb7031d 100644
--- a/crates/benilla-app/src/ui_script/enchant_confirm_tests.rs
+++ b/crates/benilla-app/src/ui_script/enchant_confirm_tests.rs
@@ -15,7 +15,7 @@ use super::test_ui::load_ui as load_xml;
fn setup() -> UiScript {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
diff --git a/crates/benilla-app/src/ui_script/errors_tests.rs b/crates/benilla-app/src/ui_script/errors_tests.rs
index 2d4be695..b3dba47f 100644
--- a/crates/benilla-app/src/ui_script/errors_tests.rs
+++ b/crates/benilla-app/src/ui_script/errors_tests.rs
@@ -39,7 +39,7 @@ fn info_and_error_messages_stack_hold_and_expire() {
let _data = benilla_formats::wow_data_or_skip!();
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "Interface\\FrameXML\\UIErrorsFrame.xml");
// Empty at load. The frame itself is shown — a MessageFrame with nothing to say simply draws
@@ -109,7 +109,7 @@ fn an_error_toast_draws_over_an_open_panel_window() {
let _data = benilla_formats::wow_data_or_skip!();
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, "GameTooltip.xml");
diff --git a/crates/benilla-app/src/ui_script/escape_tests.rs b/crates/benilla-app/src/ui_script/escape_tests.rs
index 62a7c9b4..4a47ad81 100644
--- a/crates/benilla-app/src/ui_script/escape_tests.rs
+++ b/crates/benilla-app/src/ui_script/escape_tests.rs
@@ -178,7 +178,7 @@ fn escape_is_consumed_by_a_focused_editbox_and_leaves_windows_open() {
fn escape_closes_the_options_window_before_opening_the_menu() {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
@@ -478,7 +478,7 @@ fn escape_ladder_targeting_rung_after_cast_before_windows() {
fn an_addon_frame_registered_in_uispecialframes_closes_on_escape() {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
diff --git a/crates/benilla-app/src/ui_script/exp_bar_tests.rs b/crates/benilla-app/src/ui_script/exp_bar_tests.rs
index b7b1a54e..e9f6c317 100644
--- a/crates/benilla-app/src/ui_script/exp_bar_tests.rs
+++ b/crates/benilla-app/src/ui_script/exp_bar_tests.rs
@@ -15,12 +15,13 @@ fn exp_bar_harness() -> UiScript {
// is the reference's own since 1751, and a hand-rolled reader here would look for it in the
// wrong store — and would leave its `` unresolved besides.
for file in [
- "Fonts.xml",
+ "Interface\\FrameXML\\Fonts.xml",
"UIParent.xml",
"GameTooltip.xml",
"Interface\\FrameXML\\TextStatusBar.lua",
"Interface\\FrameXML\\TextStatusBar.xml",
"Cooldown.xml",
+ "Interface\\FrameXML\\ActionButtonTemplate.xml",
"ActionBar.xml",
// The reference declares the reputation WATCH BAR in `ReputationFrame.xml`, and
// `ExhaustionTick_Update` reads `ReputationWatchBar:IsShown()` twice — the reference's own
diff --git a/crates/benilla-app/src/ui_script/faux_scroll_tests.rs b/crates/benilla-app/src/ui_script/faux_scroll_tests.rs
index ed084ed3..21bd7802 100644
--- a/crates/benilla-app/src/ui_script/faux_scroll_tests.rs
+++ b/crates/benilla-app/src/ui_script/faux_scroll_tests.rs
@@ -40,7 +40,7 @@ fn load_inline(s: &UiScript, xml: &str) {
fn harness() -> UiScript {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "ScrollTemplates.xml");
load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
@@ -399,7 +399,7 @@ fn the_reference_on_vertical_scroll_path_runs_once_a_scroll_child_exists() {
#[test]
fn scrolling_edit_helpers_answer_bare_calls_from_a_handler() {
let s = UiScript::new().unwrap();
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "ScrollTemplates.xml");
load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
diff --git a/crates/benilla-app/src/ui_script/friends_tests.rs b/crates/benilla-app/src/ui_script/friends_tests.rs
index 7c649486..7cb9001c 100644
--- a/crates/benilla-app/src/ui_script/friends_tests.rs
+++ b/crates/benilla-app/src/ui_script/friends_tests.rs
@@ -15,13 +15,14 @@ use super::test_ui::load_ui_strict as load_xml;
fn setup() -> UiScript {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, "GameTooltip.xml");
load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
// The row right-click menu is the shared UnitPopup "FRIEND" menu, so the window's slice of
// the manifest includes it (it loads well before FriendsFrame.xml in the real order).
+ load_xml(&s, "UIParent.xml");
load_xml(&s, "UnitPopup.xml");
load_xml(&s, "ScrollTemplates.xml");
// The guild pane's frames inherit the reference's shared UIPanelButtonTemplate /
diff --git a/crates/benilla-app/src/ui_script/game_menu_tests.rs b/crates/benilla-app/src/ui_script/game_menu_tests.rs
index dfd950b6..f64af21c 100644
--- a/crates/benilla-app/src/ui_script/game_menu_tests.rs
+++ b/crates/benilla-app/src/ui_script/game_menu_tests.rs
@@ -37,7 +37,7 @@ fn harness_with(extra: &[&str]) -> UiScript {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
let files: Vec<&str> = [
- "Fonts.xml",
+ "Interface\\FrameXML\\Fonts.xml",
// `GameMenuFrame` and the panels it opens declare `parent="UIParent"`, resolved at LOAD
// (decision 1734) — UIParent must already be there, as it is in the manifest.
"UIParent.xml",
@@ -662,7 +662,11 @@ fn the_bag_row_greys_under_the_menu_without_any_of_it_disappearing() {
// bar anchors into and seats itself above (`BenillaActionBarArt_SeatAbove`, nil-guarded in
// BagFrame.xml precisely because most harnesses load no bar).
let mut s = bag_harness_with(
- &["Cooldown.xml", "ActionBar.xml"],
+ &[
+ "Cooldown.xml",
+ "Interface\\FrameXML\\ActionButtonTemplate.xml",
+ "ActionBar.xml",
+ ],
&["Interface\\FrameXML\\MerchantFrame.xml"],
);
s.set_money(0);
diff --git a/crates/benilla-app/src/ui_script/group_loot_tests.rs b/crates/benilla-app/src/ui_script/group_loot_tests.rs
index b65ead62..48956876 100644
--- a/crates/benilla-app/src/ui_script/group_loot_tests.rs
+++ b/crates/benilla-app/src/ui_script/group_loot_tests.rs
@@ -70,8 +70,8 @@ fn setup() -> UiScript {
// loader warns on a key with no global behind it rather than failing — which is exactly the
// kind of warning `load_ui_no_warnings` is here to catch (decision 1838).
load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
- load_xml(&s, "Fonts.xml"); // ITEM_QUALITY_COLORS + GameFontNormalSmall
- // The loot window's slots inherit it — the same dependency the inspect window needed (1832).
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml"); // ITEM_QUALITY_COLORS + GameFontNormalSmall
+ // The loot window's slots inherit it — the same dependency the inspect window needed (1832).
load_xml(&s, r"Interface\FrameXML\ItemButtonTemplate.xml");
// `UIPanelCloseButton`, which the loot window's four close buttons inherit.
load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
@@ -80,6 +80,7 @@ fn setup() -> UiScript {
load_xml(&s, "UiPanels.xml");
load_xml(&s, "GameTooltip.xml"); // PASS/NEED/GREED + item hovers
load_xml(&s, "Cooldown.xml");
+ load_xml(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
load_xml(&s, "ActionBar.xml"); // BENILLA_FALLBACK_ICON (the in-flight icon fallback) —
// buff_tests.rs's own load-order precedent for this same global.
s
@@ -444,9 +445,12 @@ fn in_flight_roll_does_not_error_and_falls_back() {
/// exactly how a roll dialog that shipped "green" reached the director showing a `?` icon and a
/// blank name.
///
-/// The guarantee this pins is therefore not an ordering but a *repair*: whenever a roll's display
-/// identity changes under an open frame — the snapshot finally arriving, or a late item template —
-/// `UPDATE_LOOT_ROLL(rollID)` repaints it.
+/// What this pins now is the DEFECT, deliberately: a roll whose template lands after the frame is
+/// up keeps its `?`. Our retired frame repaired it from an `UPDATE_LOOT_ROLL(rollID)`; the stock
+/// frame has no such seam and never listened, so 1883 stopped firing an event the 1.12 client does
+/// not have. Decision 1838 carries the real fix — hold the roll until its template resolves, which
+/// is the reference's own invariant. This test goes green-to-red the day that lands, which is the
+/// point of writing it against the current behaviour rather than deleting it.
#[test]
fn a_roll_that_opens_before_its_snapshot_stays_blank() {
let _data = benilla_formats::wow_data_or_skip!();
@@ -473,11 +477,12 @@ fn a_roll_that_opens_before_its_snapshot_stays_blank() {
// ...and then the snapshot carrying it lands.
s.set_loot_rolls(rolls());
- s.fire_event("UPDATE_LOOT_ROLL", vec![ScriptValue::Int(7)]);
assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
// **The repaint does not happen, and this is the migration's one real loss.** Our retired file
- // split the paint out of `OnShow` precisely so `UPDATE_LOOT_ROLL` could re-enter it; the
+ // split the paint out of `OnShow` precisely so an `UPDATE_LOOT_ROLL` could re-enter it — an
+ // event the 1.12 client does not have, which 1883 stopped firing once the stock frame proved
+ // nothing listened for it. The
// reference has no such seam, because its `GetLootRollItemInfo` reads live C state that is
// already populated when `START_LOOT_ROLL` fires. Ours reads a pushed snapshot, and while
// `feed_loot_rolls` does push it BEFORE firing, the item template can still be in flight.
@@ -506,9 +511,8 @@ fn a_roll_that_opens_before_its_snapshot_stays_blank() {
}),
"and no icon arrives either — same missing repaint, same one cause"
);
- // An update for a roll this frame does not hold still leaves it alone and still does not
+ // A snapshot naming a roll this frame does not hold still leaves it alone and still does not
// error — the half of this test that survives the migration intact.
- s.fire_event("UPDATE_LOOT_ROLL", vec![ScriptValue::Int(999)]);
assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
assert_eq!(
s.eval::>("return GroupLootFrame1Name:GetText()")
@@ -532,7 +536,7 @@ fn managed_positions_engage_for_the_bare_frame_name() {
let _data = benilla_formats::wow_data_or_skip!();
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "UIParent.xml");
// UiPanels.xml before GroupLootFrame.xml, mirroring the shipped manifest order
// (`ui_script::load_default_ui`): the roll file's CONFIRM_LOOT_ROLL entry indexes
diff --git a/crates/benilla-app/src/ui_script/guild_tests.rs b/crates/benilla-app/src/ui_script/guild_tests.rs
index 495bc850..298e31ab 100644
--- a/crates/benilla-app/src/ui_script/guild_tests.rs
+++ b/crates/benilla-app/src/ui_script/guild_tests.rs
@@ -203,12 +203,13 @@ fn setup() -> UiScript {
..UnitState::default()
}),
);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, "GameTooltip.xml");
load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
+ load_xml(&s, "UIParent.xml");
load_xml(&s, "UnitPopup.xml");
load_xml(&s, "ScrollTemplates.xml");
load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
diff --git a/crates/benilla-app/src/ui_script/help_frame_tests.rs b/crates/benilla-app/src/ui_script/help_frame_tests.rs
index 9460b186..03da1083 100644
--- a/crates/benilla-app/src/ui_script/help_frame_tests.rs
+++ b/crates/benilla-app/src/ui_script/help_frame_tests.rs
@@ -9,7 +9,7 @@
//! anywhere in that chain files every ticket under the wrong heading with nothing on screen to
//! show for it.
-use benilla_ui::script::{GmTicketIntent, GmTicketWrite, ScriptValue, UiScript};
+use benilla_ui::script::{GmTicketIntent, ScriptValue, UiScript};
use super::test_ui::load_ui as load_xml;
@@ -19,7 +19,7 @@ fn setup() -> UiScript {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
for file in [
- "Fonts.xml",
+ "Interface\\FrameXML\\Fonts.xml",
"Interface\\FrameXML\\BasicControls.xml",
r"Interface\FrameXML\UIPanelTemplates.lua",
r"Interface\FrameXML\UIPanelTemplates.xml",
@@ -30,7 +30,18 @@ fn setup() -> UiScript {
// talent-wipe fixture hit this first).
"MoneyFrame.xml",
"UiPanels.xml",
- "HelpFrame.xml",
+ // The stock file's `HelpFrame_OnShow` calls `UpdateMicroButtons()` before
+ // `GetGMStatus()`, so without the micro row the OnShow raises and the status ask never
+ // happens. Ours never called it. MicroMenu needs the bar's button kit under it.
+ "Cooldown.xml",
+ "Interface\\FrameXML\\ActionButtonTemplate.xml",
+ "ActionBar.xml",
+ "MicroMenu.xml",
+ // `TicketStatusFrame_OnEvent` re-anchors TemporaryEnchantFrame before it arms the repoll
+ // timer, so without BuffFrame the handler raises and `refreshTime` is never set. This is
+ // the one ordering requirement benilla.toc already calls out for this window.
+ "Interface\\FrameXML\\BuffFrame.xml",
+ "Interface\\FrameXML\\HelpFrame.xml",
] {
load_xml(&s, file);
}
@@ -70,107 +81,6 @@ fn open_ticket_args(
]
}
-/// **The whole point of decision 1687: one click from Home to the text box.**
-///
-/// The category list and the per-category blurb page are gone, so this walks what is left — open
-/// the window, press the one button, type, submit — and asserts the ticket goes out **uncategorised
-/// (0)**. That last part is the assertion that actually pins 1687: 0 is what makes a GM's queue read
-/// "Unknown" instead of a heading the player never chose.
-#[test]
-fn one_click_from_home_files_an_uncategorised_ticket() {
- let _data = benilla_formats::wow_data_or_skip!();
- let mut s = setup();
- s.run("ToggleHelpFrame()").unwrap();
- let _ = s.take_gm_ticket_intents(); // the OnShow GetGMStatus
-
- assert!(
- s.eval::("return HelpFrameHome:IsVisible()").unwrap(),
- "the window opens on Home"
- );
- s.run("HelpFrameHomeIssues:Click()").unwrap();
- assert!(
- s.eval::("return HelpFrameOpenTicket:IsVisible()")
- .unwrap(),
- "one click lands on the editor — no category page in between"
- );
-
- s.run("HelpFrameOpenTicketText:SetText(\"My sword vanished.\")")
- .unwrap();
- s.run("HelpFrameOpenTicketSubmit_OnClick()").unwrap();
-
- assert_eq!(
- s.take_gm_ticket_intents(),
- vec![GmTicketIntent::Write(GmTicketWrite {
- category: 0,
- text: "My sword vanished.".into(),
- is_new: true,
- })],
- "a create files under 0 — \"Unknown\" in the GM's queue"
- );
-}
-
-/// **Auto-Unstuck sits on Home now**, beside the ticket button — it used to be the Stuck category's
-/// action button, three pages down, which is nowhere.
-///
-/// Clicked through the real button rather than by calling the handler, because the button's
-/// existence on Home *is* the change.
-#[test]
-fn auto_unstuck_is_a_button_on_home() {
- let _data = benilla_formats::wow_data_or_skip!();
- let mut s = setup();
- s.run("ToggleHelpFrame()").unwrap();
- s.run("BenillaHelpFrameHomeUnstick:Click()").unwrap();
- assert_eq!(s.take_stuck_casts(), 1);
- assert!(
- !s.eval::("return HelpFrame:IsVisible()").unwrap(),
- "and it closes the window"
- );
-}
-
-/// **The two Home buttons do not overlap, and both fit their labels.**
-///
-/// The layout is ours (the reference had one button here), and its whole trick is that the left
-/// button hangs by its TOPRIGHT and the right one off that fixed edge, so fitting them to their
-/// text grows them *away* from the gutter. Nothing else in the suite would notice them landing on
-/// top of each other: a script error inside `OnShow` is swallowed into the VM's error record, so a
-/// fit that never ran still leaves every other test green.
-#[test]
-fn the_two_home_buttons_sit_side_by_side_without_overlapping() {
- let _data = benilla_formats::wow_data_or_skip!();
- let mut s = setup();
- s.run("ToggleHelpFrame()").unwrap();
- s.resolve();
-
- let edge = |frame: &str, edge: &str| {
- s.eval::(&format!("return {frame}:Get{edge}()"))
- .unwrap_or_else(|e| panic!("{frame}:Get{edge}(): {e}"))
- };
- let (ticket_l, ticket_r) = (
- edge("HelpFrameHomeIssues", "Left"),
- edge("HelpFrameHomeIssues", "Right"),
- );
- let (stuck_l, stuck_r) = (
- edge("BenillaHelpFrameHomeUnstick", "Left"),
- edge("BenillaHelpFrameHomeUnstick", "Right"),
- );
-
- assert!(
- ticket_r <= stuck_l,
- "the buttons overlap: ticket ends at {ticket_r}, unstick starts at {stuck_l}"
- );
- assert!(
- ticket_r > ticket_l && stuck_r > stuck_l,
- "both buttons must have width: {ticket_l}..{ticket_r}, {stuck_l}..{stuck_r}"
- );
- // The fit ran: an unfitted button keeps its authored 250px, and "Auto-Unstuck" is nowhere near
- // that wide. This is what catches an OnShow that silently errored out.
- assert!(
- stuck_r - stuck_l < 200.0,
- "the unstick button was never fitted to its label (width {})",
- stuck_r - stuck_l
- );
-}
-
/// **`UPDATE_TICKET`'s two faces.** With a ticket the editor becomes an editor (Save Changes /
/// Exit); with the bare `arg1 = 0` it goes back to being a form (Submit / Cancel). The zero leg is
/// the one that would silently rot: it is the ordinary answer, so a window stuck in edit mode
@@ -219,81 +129,6 @@ fn an_open_ticket_turns_the_form_into_an_editor_and_a_zero_turns_it_back() {
);
}
-/// The Submit button picks its verb from the window's own `hasTicket` — an edit after an answer is
-/// an UPDATE, a submit before one is a CREATE — **and the two legs send different categories**.
-///
-/// That asymmetry is decision 1687's real content, and it is the half a suite would otherwise miss.
-/// A create has nothing to go on and sends 0. An edit sends the server's own category straight
-/// back, because `HandleGMTicketUpdateTextOpcode` overwrites the field with whatever arrives: send
-/// 0 there and a GM who re-filed the ticket onto a real heading watches it drop to "Unknown" the
-/// moment the player fixes a typo. Nothing on screen would ever show that.
-#[test]
-fn a_create_files_under_zero_and_an_edit_gives_the_server_its_category_back() {
- let _data = benilla_formats::wow_data_or_skip!();
- let mut s = setup();
- s.run("ShowUIPanel(HelpFrame) HelpFrame_ShowFrame(\"OpenTicket\")")
- .unwrap();
- let _ = s.take_gm_ticket_intents(); // the OnShow GetGMStatus
-
- // A stale `ticketType` must NOT leak into a create — the window has no picker, so a create is
- // uncategorised no matter what is lying around on the frame.
- s.run("HelpFrameOpenTicket.ticketType = 3 HelpFrameOpenTicketText:SetText(\"a\")")
- .unwrap();
- s.run("HelpFrameOpenTicketSubmit_OnClick()").unwrap();
- let intents = s.take_gm_ticket_intents();
- let [GmTicketIntent::Write(create)] = intents.as_slice() else {
- panic!("expected exactly one write, got {intents:?}");
- };
- assert!(create.is_new, "no ticket known yet — this is a create");
- assert_eq!(create.category, 0, "a create is uncategorised");
-
- // The server answers: this ticket is filed under 4 (Item) — a GM moved it there.
- s.fire_event("UPDATE_TICKET", open_ticket_args(4, "a", 0.1, 0.2, 0.01));
- s.run("HelpFrameOpenTicketText:SetText(\"a, still\")")
- .unwrap();
- s.run("HelpFrameOpenTicketSubmit_OnClick()").unwrap();
- let intents = s.take_gm_ticket_intents();
- let [GmTicketIntent::Write(edit)] = intents.as_slice() else {
- panic!("expected exactly one write, got {intents:?}");
- };
- assert!(!edit.is_new, "a ticket is known — this is an update");
- assert_eq!(edit.text, "a, still");
- assert_eq!(
- edit.category, 4,
- "the edit must hand the GM's own category back, not overwrite it with 0"
- );
-}
-
-/// **The queue gate.** `UPDATE_GM_STATUS(0)` takes the petition queue down, and asking for the
-/// editor then closes the window and says why instead of showing a form that cannot submit.
-/// The `1` leg must put it back — a one-way gate would lock the player out for the session.
-#[test]
-fn a_downed_queue_refuses_the_editor_and_says_so_and_comes_back_up() {
- let _data = benilla_formats::wow_data_or_skip!();
- let mut s = setup();
- s.fire_event("UPDATE_GM_STATUS", vec![ScriptValue::Int(0)]);
- s.run("ShowUIPanel(HelpFrame) HelpFrame_ShowFrame(\"OpenTicket\")")
- .unwrap();
- assert!(
- !s.eval::("return HelpFrame:IsVisible()").unwrap(),
- "the window closes"
- );
- assert!(
- s.eval::("return StaticPopup_Visible(\"HELP_TICKET_QUEUE_DISABLED\") ~= nil")
- .unwrap(),
- "and the dialog says why"
- );
-
- s.fire_event("UPDATE_GM_STATUS", vec![ScriptValue::Int(1)]);
- s.run("ShowUIPanel(HelpFrame) HelpFrame_ShowFrame(\"OpenTicket\")")
- .unwrap();
- assert!(
- s.eval::("return HelpFrameOpenTicket:IsVisible()")
- .unwrap(),
- "queue back up, editor opens"
- );
-}
-
/// The toast follows the ticket: up while one is open, gone when it is not. It is the only thing
/// on screen that says a ticket exists at all once the window is closed.
#[test]
@@ -345,23 +180,6 @@ fn the_toast_repolls_the_server_only_after_the_full_interval() {
);
}
-/// Abandoning goes through a confirm, and only its Yes sends the delete. A dialog whose Yes did
-/// nothing would look identical to one that worked, right up until the ticket reappeared.
-#[test]
-fn abandoning_a_ticket_confirms_first_and_only_yes_sends_it() {
- let _data = benilla_formats::wow_data_or_skip!();
- let mut s = setup();
- s.run("StaticPopup_Show(\"HELP_TICKET_ABANDON_CONFIRM\")")
- .unwrap();
- s.run("StaticPopup_OnClick(StaticPopup1, 2)").unwrap();
- assert!(s.take_gm_ticket_intents().is_empty(), "No sends nothing");
-
- s.run("StaticPopup_Show(\"HELP_TICKET_ABANDON_CONFIRM\")")
- .unwrap();
- s.run("StaticPopup_OnClick(StaticPopup1, 1)").unwrap();
- assert_eq!(s.take_gm_ticket_intents(), vec![GmTicketIntent::Delete]);
-}
-
/// `ToggleHelpFrame` is the micro button's whole wiring, and opening the window asks the server
/// for the queue status — without that ask the gate above would run on a stale assumption for the
/// life of the session.
@@ -385,88 +203,3 @@ fn toggling_the_window_opens_it_and_asks_for_the_queue_status() {
s.run("ToggleHelpFrame()").unwrap();
assert!(!s.eval::("return HelpFrame:IsVisible()").unwrap());
}
-
-/// **The retail-only text is gone from the Home page** (director's call, 2026-08-29).
-///
-/// The page is entirely GlobalStrings off the player's own chain, so three of its strings still
-/// pointed at `worldofwarcraft.com` — a dead PvP-policy link, and a closing paragraph directing the
-/// player to Blizzard's forums and policy pages. The window overrides them before the markup
-/// resolves.
-///
-/// This test exists because the failure mode is *invisible in a test suite*: nothing breaks if the
-/// override is dropped, the page simply starts advertising dead links again. Asserted on the
-/// rendered FontStrings rather than the globals, so it also catches the markup being re-pointed at
-/// a different key.
-#[test]
-fn the_home_page_advertises_no_dead_retail_links() {
- let _data = benilla_formats::wow_data_or_skip!();
- let s = setup();
- s.run("ShowUIPanel(HelpFrame) HelpFrame_ShowFrame(\"Home\")")
- .unwrap();
-
- for frame in [
- "HelpFrameHomePvpPolicyUrl",
- "HelpFrameHomeText2",
- "HelpFrameHomeIssue3",
- "HelpFrameHomeText1",
- ] {
- let text = s
- .eval::(&format!("return {frame}:GetText() or \"\""))
- .unwrap()
- .to_lowercase();
- for dead in [
- "worldofwarcraft.com",
- "http://",
- "www.",
- ".shtml",
- "the forums",
- ] {
- assert!(
- !text.contains(dead),
- "{frame} still carries retail-only text ({dead:?}): {text:?}"
- );
- }
- }
-
- // The PvP guidance itself is KEPT — only the sentence introducing the link went. A test that
- // let the whole bullet be emptied would pass on an over-correction, which is the other way to
- // get this wrong.
- let pvp = s
- .eval::("return HelpFrameHomeIssue3:GetText()")
- .unwrap();
- assert!(
- pvp.contains("PVP game mechanics"),
- "the PvP guidance must survive the link's removal: {pvp:?}"
- );
-}
-
-/// **The geometry oracle** (decision 0675): every element the transcription shares with the
-/// reference file carries the reference's own `` numbers.
-///
-/// **Verified to fail**, as 0675 requires, and re-verified after 1687 lowered `min_compared` from
-/// 60 to 28: nudging `TicketStatusFrame`'s width 208 → 209 reports
-/// `TicketStatusFrame: ours [(209.0, 52.0), …] != ref [(208.0, 52.0), …]` and fails. Re-checking
-/// that after shrinking the floor is the point — a guard whose floor drops below what it actually
-/// compares stops guarding and never says so.
-#[test]
-fn the_windows_geometry_matches_the_reference_file() {
- let _data = benilla_formats::wow_data_or_skip!();
- let Some(reference) = super::framexml_diff::reference("HelpFrame.xml") else {
- return; // no install — this test is a no-op rather than a failure
- };
- /// Deliberate deviations, by REFERENCE name. Each earns its reason here; a tolerance would
- /// let a real difference hide, so this is a list and stays a list.
- const EXPECTED: &[&str] = &[
- // The ticket editor's scroll frame carries the house kit's shared trough in place of the
- // three loose bar textures the reference hangs beside it (HelpFrame.xml's header).
- "HelpFrameOpenTicketScrollFrame",
- // Home's button row is ours: the reference has one button centred under the text, we have
- // two, so the left one hangs by its TOPRIGHT at -6 rather than centred at 0. Its SIZE still
- // matches, which is why only the offset differs.
- "HelpFrameHomeIssues",
- ];
- // 1687 deleted the category list and the per-category page, and roughly seventy named elements
- // went with them — hence 28 rather than 60. The floor still has to bite: it is what stops this
- // guard quietly comparing nothing after the next window-shrinking change.
- super::framexml_diff::assert_geometry_matches("HelpFrame.xml", &reference, EXPECTED, 28);
-}
diff --git a/crates/benilla-app/src/ui_script/honor_frame_tests.rs b/crates/benilla-app/src/ui_script/honor_frame_tests.rs
index 73eb93c9..914cb7ed 100644
--- a/crates/benilla-app/src/ui_script/honor_frame_tests.rs
+++ b/crates/benilla-app/src/ui_script/honor_frame_tests.rs
@@ -366,7 +366,7 @@ fn shown_inspect_honor_page() -> UiScript {
s.set_screen_size(1024.0, 768.0);
s.run(RANK_GLOBALS).unwrap();
for file in [
- "Fonts.xml",
+ "Interface\\FrameXML\\Fonts.xml",
// `TEXT`, the stock level line's formatter.
"Interface\\FrameXML\\BasicControls.xml",
"MoneyFrame.xml",
diff --git a/crates/benilla-app/src/ui_script/inspect_tests.rs b/crates/benilla-app/src/ui_script/inspect_tests.rs
index cf2be346..67a3ecaa 100644
--- a/crates/benilla-app/src/ui_script/inspect_tests.rs
+++ b/crates/benilla-app/src/ui_script/inspect_tests.rs
@@ -114,7 +114,7 @@ fn armed() -> UiScript {
// `PLAYER_LEVEL`, the template the stock level line formats through — the reference keeps its
// strings here, and our retired file had the sentence written into it (1832).
load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
// `TEXT`, which the stock `InspectPaperDollFrame_SetLevel` formats its level line through.
load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
load_xml(&s, "MoneyFrame.xml");
@@ -161,7 +161,7 @@ fn shipped_inspect_frame_loads_clean() {
// `PLAYER_LEVEL`, the template the stock level line formats through — the reference keeps its
// strings here, and our retired file had the sentence written into it (1832).
load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
// `TEXT`, which the stock `InspectPaperDollFrame_SetLevel` formats its level line through.
load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
load_xml(&s, "MoneyFrame.xml");
diff --git a/crates/benilla-app/src/ui_script/instance_tests.rs b/crates/benilla-app/src/ui_script/instance_tests.rs
index b8d4bacb..249ca62c 100644
--- a/crates/benilla-app/src/ui_script/instance_tests.rs
+++ b/crates/benilla-app/src/ui_script/instance_tests.rs
@@ -87,7 +87,7 @@ fn the_self_menu_row_gates_on_the_binding_and_confirms_before_sending() {
)
.unwrap();
for file in [
- "Fonts.xml",
+ "Interface\\FrameXML\\Fonts.xml",
"UIParent.xml",
"MoneyFrame.xml",
"UiPanels.xml",
diff --git a/crates/benilla-app/src/ui_script/keybindings_tests.rs b/crates/benilla-app/src/ui_script/keybindings_tests.rs
index 734bb2d6..fcf08487 100644
--- a/crates/benilla-app/src/ui_script/keybindings_tests.rs
+++ b/crates/benilla-app/src/ui_script/keybindings_tests.rs
@@ -43,7 +43,7 @@ pub(crate) fn harness() -> UiScript {
s.register_bindings(&cmds);
s.set_screen_size(1024.0, 768.0);
for file in [
- "Fonts.xml",
+ "Interface\\FrameXML\\Fonts.xml",
"MoneyFrame.xml",
"UiPanels.xml",
r"Interface\FrameXML\UIPanelTemplates.lua",
diff --git a/crates/benilla-app/src/ui_script/macro_tests.rs b/crates/benilla-app/src/ui_script/macro_tests.rs
index dd965904..24513744 100644
--- a/crates/benilla-app/src/ui_script/macro_tests.rs
+++ b/crates/benilla-app/src/ui_script/macro_tests.rs
@@ -89,7 +89,7 @@ fn harness_with(player: &str) -> UiScript {
// reader cannot name it (decision 1848).
for file in [
r"Interface\FrameXML\GlobalStrings.lua",
- "Fonts.xml",
+ "Interface\\FrameXML\\Fonts.xml",
"Interface\\FrameXML\\BasicControls.xml", // `TEXT`
"MoneyFrame.xml",
"UiPanels.xml",
diff --git a/crates/benilla-app/src/ui_script/manifest.rs b/crates/benilla-app/src/ui_script/manifest.rs
index fb69f7f6..698cf121 100644
--- a/crates/benilla-app/src/ui_script/manifest.rs
+++ b/crates/benilla-app/src/ui_script/manifest.rs
@@ -279,7 +279,7 @@ mod tests {
assert_eq!(toc.directive("Title"), Some("benilla"));
assert_eq!(
toc.files.first().map(String::as_str),
- Some("Fonts.xml"),
+ Some("Interface\\FrameXML\\Fonts.xml"),
"the font registry is the manifest's first entry — the loader splits there"
);
}
diff --git a/crates/benilla-app/src/ui_script/micro_menu_tests.rs b/crates/benilla-app/src/ui_script/micro_menu_tests.rs
index a0acc0f1..0ac80ffc 100644
--- a/crates/benilla-app/src/ui_script/micro_menu_tests.rs
+++ b/crates/benilla-app/src/ui_script/micro_menu_tests.rs
@@ -22,28 +22,19 @@ fn harness_with(extra: &[&str]) -> UiScript {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
let files: Vec<&str> = [
- "Fonts.xml",
+ "Interface\\FrameXML\\Fonts.xml",
"Cooldown.xml",
+ "Interface\\FrameXML\\ActionButtonTemplate.xml",
"ActionBar.xml",
"MicroMenu.xml",
]
.into_iter()
.chain(extra.iter().copied())
.collect();
+ // Through `test_ui::load_ui`, not off disk: the list above now names a chain file, and a
+ // reader that joins `assets/ui` cannot resolve one (the wall 1838 hit, and 1887 again).
for file in files {
- let text = std::fs::read_to_string(
- std::path::Path::new(env!("CARGO_MANIFEST_DIR"))
- .join("assets/ui")
- .join(file),
- )
- .unwrap();
- let doc = benilla_ui::framexml::parse(&text).unwrap();
- let report = benilla_ui::loader::load(&s, &doc, &|_| None);
- assert!(
- report.errors.is_empty(),
- "{file}: loader errors: {:?}",
- report.errors
- );
+ super::test_ui::load_ui(&s, file);
}
assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
s
diff --git a/crates/benilla-app/src/ui_script/minimap_tests.rs b/crates/benilla-app/src/ui_script/minimap_tests.rs
index a4504a81..8aeb6e9e 100644
--- a/crates/benilla-app/src/ui_script/minimap_tests.rs
+++ b/crates/benilla-app/src/ui_script/minimap_tests.rs
@@ -21,7 +21,7 @@ fn minimap_zoom_buttons_resync_when_switching_inside_and_outside() {
s.run("function GetMinimapZoneText() return '' end")
.unwrap();
s.run("function PlaySound() end").unwrap();
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
// The shipped load order provides GameTooltip before the cluster; Minimap_Update's tooltip
// half (the PVP tint slice, decision 0287) touches it from OnLoad on.
load_xml(&s, "GameTooltip.xml");
@@ -86,7 +86,7 @@ fn tracking_frame_follows_get_tracking_texture_across_player_auras_changed() {
s.run("function GetMinimapZoneText() return '' end")
.unwrap();
s.run("function PlaySound() end").unwrap();
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "GameTooltip.xml");
load_xml(&s, "MinimapCluster.xml");
@@ -132,7 +132,7 @@ fn game_time_session(hour: u32, minute: u32) -> UiScript {
load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
load_xml(&s, "Interface\\FrameXML\\Localization.xml");
s.run("LocalizeFrames()").unwrap();
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
// `TEXT()`, which the reference's own tooltip and label formatting passes every string through.
load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
load_xml(&s, "GameTooltip.xml");
@@ -245,7 +245,7 @@ fn a_click_on_the_minimap_parks_a_centre_relative_ping_request() {
s.run("function GetMinimapZoneText() return '' end")
.unwrap();
s.run("function PlaySound() end").unwrap();
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "GameTooltip.xml");
load_xml(&s, "MinimapCluster.xml");
s.resolve();
@@ -289,7 +289,7 @@ fn get_ping_position_is_nil_until_there_is_a_ping() {
s.run("function GetMinimapZoneText() return '' end")
.unwrap();
s.run("function PlaySound() end").unwrap();
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "GameTooltip.xml");
load_xml(&s, "MinimapCluster.xml");
diff --git a/crates/benilla-app/src/ui_script/mirror_timer_tests.rs b/crates/benilla-app/src/ui_script/mirror_timer_tests.rs
index 5615bdd1..d90c8ac3 100644
--- a/crates/benilla-app/src/ui_script/mirror_timer_tests.rs
+++ b/crates/benilla-app/src/ui_script/mirror_timer_tests.rs
@@ -15,7 +15,7 @@ use super::test_ui::load_ui as load_xml;
fn harness() -> UiScript {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
// The bars' START driver: `UIParent_OnEvent`'s MIRROR_TIMER_START arm is what calls
// `MirrorTimer_Show`, which is where the reference keeps it (UIParent.lua l.97 + l.374-377)
// and where window 7 moved ours back to. Without this file the event reaches nothing.
diff --git a/crates/benilla-app/src/ui_script/money_frame_tests.rs b/crates/benilla-app/src/ui_script/money_frame_tests.rs
index dee99205..c0c2d775 100644
--- a/crates/benilla-app/src/ui_script/money_frame_tests.rs
+++ b/crates/benilla-app/src/ui_script/money_frame_tests.rs
@@ -26,7 +26,7 @@ fn harness(money: u64) -> UiScript {
// below is deliberate rather than an artefact of an unfed VM — a flat 8px per digit makes
// every expected number readable as `digits x 8 + icon`.
s.set_text_measurer(Box::new(super::FixedWidthFont(8.0)));
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
let doc = benilla_ui::framexml::parse(
@@ -374,7 +374,7 @@ fn the_money_type_table_carries_all_seven_reference_types() {
fn the_chains_money_input_frame_splits_an_amount_across_its_three_boxes() {
let _data = benilla_formats::wow_data_or_skip!();
let s = UiScript::new().unwrap();
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml"); // COPPER_PER_GOLD / COPPER_PER_SILVER live here
// The manifest's own order: the `.lua` brings the ten verbs, the `.xml` the template.
load_xml(&s, r"Interface\FrameXML\MoneyInputFrame.lua");
diff --git a/crates/benilla-app/src/ui_script/multibar_stance_tests.rs b/crates/benilla-app/src/ui_script/multibar_stance_tests.rs
index 8d46287f..df16f617 100644
--- a/crates/benilla-app/src/ui_script/multibar_stance_tests.rs
+++ b/crates/benilla-app/src/ui_script/multibar_stance_tests.rs
@@ -18,10 +18,11 @@ use super::test_ui::load_ui as load_xml;
/// `ActionBar.xml` (the anchor target + shared globals both new bars need).
fn load_action_bar(s: &UiScript) {
for file in [
- "Fonts.xml",
+ "Interface\\FrameXML\\Fonts.xml",
"UIParent.xml",
"GameTooltip.xml",
"Cooldown.xml",
+ "Interface\\FrameXML\\ActionButtonTemplate.xml",
"ActionBar.xml",
// The reference declares the reputation WATCH BAR in `ReputationFrame.xml`, and
// `ExhaustionTick_Update` reads `ReputationWatchBar:IsShown()` twice — the reference's own
@@ -432,10 +433,11 @@ fn multibar_hover_renders_the_buttons_own_action() {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
for file in [
- "Fonts.xml",
+ "Interface\\FrameXML\\Fonts.xml",
"UIParent.xml",
"GameTooltip.xml",
"Cooldown.xml",
+ "Interface\\FrameXML\\ActionButtonTemplate.xml",
"ActionBar.xml",
// The reference declares the reputation WATCH BAR in `ReputationFrame.xml`, and
// `ExhaustionTick_Update` reads `ReputationWatchBar:IsShown()` twice — the reference's own
@@ -657,7 +659,7 @@ fn raising_a_bottom_bar_moves_the_managed_bottom_stack() {
s.set_screen_size(1024.0, 768.0);
load_action_bar(&s);
load_xml(&s, "MultiBars.xml");
- load_xml(&s, "CastingBar.xml");
+ load_xml(&s, "Interface\\FrameXML\\CastingBarFrame.xml");
// The pass writes the y of a frame row into its anchor; read it back off the anchor rather
// than off a resolved rect, so a hidden cast bar answers the same as a visible one.
diff --git a/crates/benilla-app/src/ui_script/options_tests.rs b/crates/benilla-app/src/ui_script/options_tests.rs
index 9851e5ae..3c9b4cca 100644
--- a/crates/benilla-app/src/ui_script/options_tests.rs
+++ b/crates/benilla-app/src/ui_script/options_tests.rs
@@ -37,7 +37,7 @@ fn harness() -> UiScript {
fn harness_on(mut s: UiScript) -> UiScript {
s.set_screen_size(1024.0, 768.0);
for file in [
- "Fonts.xml",
+ "Interface\\FrameXML\\Fonts.xml",
// Every panel window declares `parent="UIParent"`, resolved at LOAD — so UIParent has to
// exist by the time they are read, exactly as it does in the manifest (decision 1734).
"UIParent.xml",
@@ -716,7 +716,7 @@ fn interface_harness() -> UiScript {
load_definers(
&s,
&[
- "Fonts.xml",
+ "Interface\\FrameXML\\Fonts.xml",
"MoneyFrame.xml",
"UiPanels.xml",
r"Interface\FrameXML\UIPanelTemplates.lua",
@@ -749,6 +749,7 @@ fn interface_harness() -> UiScript {
// loaded it too.
"Interface\\FrameXML\\ColorPickerFrame.xml",
"Cooldown.xml",
+ "Interface\\FrameXML\\ActionButtonTemplate.xml",
"ActionBar.xml",
// The reference declares the reputation WATCH BAR in `ReputationFrame.xml`, and
// `ExhaustionTick_Update` reads `ReputationWatchBar:IsShown()` twice — the reference's own
@@ -779,7 +780,7 @@ fn chat_harness() -> UiScript {
load_definers(
&s,
&[
- "Fonts.xml",
+ "Interface\\FrameXML\\Fonts.xml",
"MoneyFrame.xml",
"UiPanels.xml",
r"Interface\FrameXML\UIPanelTemplates.lua",
@@ -805,9 +806,10 @@ fn actionbars_harness() -> UiScript {
load_definers(
&s,
&[
- "Fonts.xml",
+ "Interface\\FrameXML\\Fonts.xml",
"UIParent.xml",
"Cooldown.xml",
+ "Interface\\FrameXML\\ActionButtonTemplate.xml",
"ActionBar.xml",
// The reference declares the reputation WATCH BAR in `ReputationFrame.xml`, and
// `ExhaustionTick_Update` reads `ReputationWatchBar:IsShown()` twice — the reference's own
diff --git a/crates/benilla-app/src/ui_script/panel_template_tests.rs b/crates/benilla-app/src/ui_script/panel_template_tests.rs
index eaa0dba9..8eaa4c13 100644
--- a/crates/benilla-app/src/ui_script/panel_template_tests.rs
+++ b/crates/benilla-app/src/ui_script/panel_template_tests.rs
@@ -43,7 +43,7 @@ fn harness() -> UiScript {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
for file in [
- "Fonts.xml",
+ "Interface\\FrameXML\\Fonts.xml",
"UIParent.xml",
"MoneyFrame.xml",
"UiPanels.xml",
diff --git a/crates/benilla-app/src/ui_script/panel_tests.rs b/crates/benilla-app/src/ui_script/panel_tests.rs
index ddbfa840..dee9206f 100644
--- a/crates/benilla-app/src/ui_script/panel_tests.rs
+++ b/crates/benilla-app/src/ui_script/panel_tests.rs
@@ -817,7 +817,7 @@ fn gossip_bank_option_hands_the_left_slot_to_the_bank() {
let order_first = |bank_first: bool| {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml"); // the reference bank's slot buttons inherit it
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
diff --git a/crates/benilla-app/src/ui_script/perf_bar_tests.rs b/crates/benilla-app/src/ui_script/perf_bar_tests.rs
index f6e072ab..4a91af08 100644
--- a/crates/benilla-app/src/ui_script/perf_bar_tests.rs
+++ b/crates/benilla-app/src/ui_script/perf_bar_tests.rs
@@ -14,8 +14,9 @@ use super::test_ui::load_ui as load_xml;
fn harness(extra: &[&str]) -> UiScript {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "Cooldown.xml");
+ load_xml(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
load_xml(&s, "ActionBar.xml");
for f in extra {
load_xml(&s, f);
diff --git a/crates/benilla-app/src/ui_script/pet_bar_tests.rs b/crates/benilla-app/src/ui_script/pet_bar_tests.rs
index ec4c68b5..ab48d6c5 100644
--- a/crates/benilla-app/src/ui_script/pet_bar_tests.rs
+++ b/crates/benilla-app/src/ui_script/pet_bar_tests.rs
@@ -13,17 +13,18 @@ fn load_pet_bar(s: &UiScript) {
for file in [
"MoneyFrame.xml",
"UiPanels.xml",
- "Fonts.xml",
+ "Interface\\FrameXML\\Fonts.xml",
r"Interface\FrameXML\UIPanelTemplates.lua",
r"Interface\FrameXML\UIPanelTemplates.xml",
"UIParent.xml",
"Cooldown.xml",
+ "Interface\\FrameXML\\ActionButtonTemplate.xml",
"ActionBar.xml",
// The reference declares the reputation WATCH BAR in `ReputationFrame.xml`, and
// `ExhaustionTick_Update` reads `ReputationWatchBar:IsShown()` twice — the reference's own
// coupling of MainMenuBar to that pane. So an action-bar harness loads it, and with it the
// two template files its check boxes inherit through (1875).
- "Fonts.xml",
+ "Interface\\FrameXML\\Fonts.xml",
r"Interface\FrameXML\UIPanelTemplates.lua",
r"Interface\FrameXML\UIPanelTemplates.xml",
r"Interface\FrameXML\OptionsFrameTemplates.xml",
@@ -363,17 +364,18 @@ fn pet_bar_row(with_multibar: bool) -> (usize, f32) {
for file in [
"MoneyFrame.xml",
"UiPanels.xml",
- "Fonts.xml",
+ "Interface\\FrameXML\\Fonts.xml",
r"Interface\FrameXML\UIPanelTemplates.lua",
r"Interface\FrameXML\UIPanelTemplates.xml",
"UIParent.xml",
"Cooldown.xml",
+ "Interface\\FrameXML\\ActionButtonTemplate.xml",
"ActionBar.xml",
// The reference declares the reputation WATCH BAR in `ReputationFrame.xml`, and
// `ExhaustionTick_Update` reads `ReputationWatchBar:IsShown()` twice — the reference's own
// coupling of MainMenuBar to that pane. So an action-bar harness loads it, and with it the
// two template files its check boxes inherit through (1875).
- "Fonts.xml",
+ "Interface\\FrameXML\\Fonts.xml",
r"Interface\FrameXML\UIPanelTemplates.lua",
r"Interface\FrameXML\UIPanelTemplates.xml",
r"Interface\FrameXML\OptionsFrameTemplates.xml",
@@ -654,7 +656,7 @@ fn the_keybind_pair_pushes_and_casts_without_the_clicks_forks() {
/// prerequisite for the managed stack — for `GetBindingText`, which renders the key.
fn load_pet_bar_with_tooltip(s: &UiScript) {
for file in [
- "Fonts.xml",
+ "Interface\\FrameXML\\Fonts.xml",
"MoneyFrame.xml",
"UiPanels.xml",
r"Interface\FrameXML\UIPanelTemplates.lua",
@@ -662,6 +664,7 @@ fn load_pet_bar_with_tooltip(s: &UiScript) {
"UIParent.xml",
"GameTooltip.xml",
"Cooldown.xml",
+ "Interface\\FrameXML\\ActionButtonTemplate.xml",
"ActionBar.xml",
// The reference declares the reputation WATCH BAR in `ReputationFrame.xml`, and
// `ExhaustionTick_Update` reads `ReputationWatchBar:IsShown()` twice — the reference's own
diff --git a/crates/benilla-app/src/ui_script/pet_frame_tests.rs b/crates/benilla-app/src/ui_script/pet_frame_tests.rs
index bf45055d..fdf22674 100644
--- a/crates/benilla-app/src/ui_script/pet_frame_tests.rs
+++ b/crates/benilla-app/src/ui_script/pet_frame_tests.rs
@@ -26,7 +26,7 @@ use super::test_ui::load_ui as load_xml;
fn load_pet_frame() -> UiScript {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "UIParent.xml");
load_xml(&s, "GameTooltip.xml");
load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
diff --git a/crates/benilla-app/src/ui_script/petition_tests.rs b/crates/benilla-app/src/ui_script/petition_tests.rs
index 775feced..0580d442 100644
--- a/crates/benilla-app/src/ui_script/petition_tests.rs
+++ b/crates/benilla-app/src/ui_script/petition_tests.rs
@@ -90,7 +90,7 @@ fn setup() -> UiScript {
// out of GlobalStrings, with no fallback of its own — `format(nil, …)` raises, and the window
// never paints.
load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
diff --git a/crates/benilla-app/src/ui_script/quest_share_tests.rs b/crates/benilla-app/src/ui_script/quest_share_tests.rs
index 643a9e5b..dfda8093 100644
--- a/crates/benilla-app/src/ui_script/quest_share_tests.rs
+++ b/crates/benilla-app/src/ui_script/quest_share_tests.rs
@@ -13,7 +13,7 @@ use super::test_ui::load_ui as load_xml;
fn setup() -> UiScript {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
diff --git a/crates/benilla-app/src/ui_script/quest_tests.rs b/crates/benilla-app/src/ui_script/quest_tests.rs
index 01ed1201..0c417ffe 100644
--- a/crates/benilla-app/src/ui_script/quest_tests.rs
+++ b/crates/benilla-app/src/ui_script/quest_tests.rs
@@ -17,7 +17,7 @@ use super::test_ui::load_ui as load_xml;
fn questgiver_show_hide_plays_open_and_close_kits() {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, "GameTooltip.xml");
@@ -79,7 +79,7 @@ fn questgiver_show_hide_plays_open_and_close_kits() {
fn panel_events_show_exactly_one_child_panel_and_hide_the_others() {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, "GameTooltip.xml");
@@ -159,7 +159,7 @@ fn panel_events_show_exactly_one_child_panel_and_hide_the_others() {
fn detail_panel_reward_grid_follows_the_refs_two_per_row_layout() {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, "GameTooltip.xml");
@@ -245,7 +245,7 @@ fn detail_panel_reward_grid_follows_the_refs_two_per_row_layout() {
fn reward_panel_choice_click_selects_and_completes_with_zero_based_index() {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, "GameTooltip.xml");
@@ -311,7 +311,7 @@ fn reward_panel_choice_click_selects_and_completes_with_zero_based_index() {
fn greeting_goodbye_button_closes_the_window() {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, "GameTooltip.xml");
@@ -355,7 +355,7 @@ fn greeting_goodbye_button_closes_the_window() {
fn detail_panel_action_buttons_resolve_to_real_onscreen_rects() {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, "GameTooltip.xml");
@@ -470,7 +470,7 @@ fn detail_panel_action_buttons_resolve_to_real_onscreen_rects() {
fn write_on_still_fades_when_instant_text_is_off() {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, "GameTooltip.xml");
@@ -534,7 +534,7 @@ fn write_on_still_fades_when_instant_text_is_off() {
fn npc_name_reaches_the_title_bar_on_open_and_on_refresh() {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, "GameTooltip.xml");
@@ -600,7 +600,7 @@ fn npc_name_reaches_the_title_bar_on_open_and_on_refresh() {
fn greeting_panel_title_rows_grow_to_their_wrapped_titles() {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, "GameTooltip.xml");
@@ -687,7 +687,7 @@ fn greeting_panel_title_rows_grow_to_their_wrapped_titles() {
fn reward_rows_preview_and_post_without_selecting_the_choice() {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, "GameTooltip.xml");
diff --git a/crates/benilla-app/src/ui_script/quest_timer_tests.rs b/crates/benilla-app/src/ui_script/quest_timer_tests.rs
index 410ac949..47883f74 100644
--- a/crates/benilla-app/src/ui_script/quest_timer_tests.rs
+++ b/crates/benilla-app/src/ui_script/quest_timer_tests.rs
@@ -25,7 +25,7 @@ fn harness() -> UiScript {
// the player's own strings it draws the KEY, which is exactly what a `text=` attribute does
// with an unknown name.
load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
// `SecondsToTime`, which the reference's `QuestTimerFrame_Update` formats every row with, and
// `UIParent_ManageFramePositions`, which its OnShow/OnHide call.
load_xml(&s, "UIParent.xml");
diff --git a/crates/benilla-app/src/ui_script/questlog_tests.rs b/crates/benilla-app/src/ui_script/questlog_tests.rs
index 042f0265..e7d1e41e 100644
--- a/crates/benilla-app/src/ui_script/questlog_tests.rs
+++ b/crates/benilla-app/src/ui_script/questlog_tests.rs
@@ -83,7 +83,7 @@ const HAMMER_LINK: &str = "|cffffffff|Hitem:2024:0:0:0|h[Militia Hammer]|h|r";
fn shipped_questlog_frame_loads_clean() {
let _data = benilla_formats::wow_data_or_skip!();
let s = UiScript::new().unwrap();
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, "GameTooltip.xml");
@@ -107,7 +107,7 @@ fn shipped_questlog_frame_drives_end_to_end() {
let _data = benilla_formats::wow_data_or_skip!();
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, "GameTooltip.xml");
@@ -302,7 +302,7 @@ fn shift_click_toggles_the_watch_checkbox_and_the_tracker_hud() {
let _data = benilla_formats::wow_data_or_skip!();
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, "GameTooltip.xml");
@@ -425,7 +425,7 @@ fn watch_guards_no_op_without_erroring() {
let _data = benilla_formats::wow_data_or_skip!();
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, "GameTooltip.xml");
@@ -522,7 +522,7 @@ fn progress_auto_watches_for_five_minutes() {
let _data = benilla_formats::wow_data_or_skip!();
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, "GameTooltip.xml");
@@ -587,7 +587,7 @@ fn the_auto_watch_flag_is_the_references_uvar_and_gates_the_watch() {
let _data = benilla_formats::wow_data_or_skip!();
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, "GameTooltip.xml");
@@ -634,7 +634,7 @@ fn the_row_tag_is_its_own_right_flush_string_and_the_state_word_wins() {
let _data = benilla_formats::wow_data_or_skip!();
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
// The state word comes from the reference's OWN globals (`COMPLETE`/`FAILED`) as of this row's
// ref-verbatim tag handling — the app loads GlobalStrings.lua as `benilla.toc`'s second entry,
// so this harness must too or the override silently reads nil.
@@ -707,7 +707,7 @@ fn empty_quest_log_hides_rows_and_disables_abandon() {
let _data = benilla_formats::wow_data_or_skip!();
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, "GameTooltip.xml");
@@ -760,7 +760,7 @@ fn reward_rows_follow_the_refs_two_per_row_layout() {
let _data = benilla_formats::wow_data_or_skip!();
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, "GameTooltip.xml");
@@ -919,7 +919,7 @@ fn overflowing_detail_content_clips_to_the_scrollframe_rect() {
let _data = benilla_formats::wow_data_or_skip!();
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, "GameTooltip.xml");
@@ -983,7 +983,7 @@ fn wheel_over_the_detail_pane_changes_vertical_scroll() {
let _data = benilla_formats::wow_data_or_skip!();
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, "GameTooltip.xml");
@@ -1032,7 +1032,7 @@ fn selection_change_resets_detail_scroll_but_a_quest_log_update_refresh_does_not
let _data = benilla_formats::wow_data_or_skip!();
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, "GameTooltip.xml");
@@ -1092,7 +1092,7 @@ fn reward_row_hover_serves_the_shared_item_tooltip() {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, "GameTooltip.xml");
@@ -1186,7 +1186,7 @@ fn popup_children_inherit_the_dialog_stratum() {
let _data = benilla_formats::wow_data_or_skip!();
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
@@ -1237,7 +1237,7 @@ fn reward_rows_preview_and_post_and_a_plain_click_stays_inert() {
let _data = benilla_formats::wow_data_or_skip!();
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, "GameTooltip.xml");
@@ -1320,7 +1320,7 @@ fn shift_click_on_a_title_posts_the_quest_name_with_chat_open_and_watches_with_i
let _data = benilla_formats::wow_data_or_skip!();
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, "GameTooltip.xml");
@@ -1414,7 +1414,7 @@ fn share_quest_needs_both_a_sharable_selection_and_a_party() {
let _data = benilla_formats::wow_data_or_skip!();
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, "GameTooltip.xml");
@@ -1491,7 +1491,7 @@ fn share_quest_is_dark_on_an_empty_log_even_in_a_party() {
let _data = benilla_formats::wow_data_or_skip!();
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, "GameTooltip.xml");
@@ -1522,7 +1522,7 @@ fn share_quest_click_queues_the_selected_quests_id() {
let _data = benilla_formats::wow_data_or_skip!();
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, "GameTooltip.xml");
diff --git a/crates/benilla-app/src/ui_script/raid_tests.rs b/crates/benilla-app/src/ui_script/raid_tests.rs
index b0b1d329..f176faa4 100644
--- a/crates/benilla-app/src/ui_script/raid_tests.rs
+++ b/crates/benilla-app/src/ui_script/raid_tests.rs
@@ -24,7 +24,7 @@ use super::test_ui::load_ui_strict as load_xml;
fn setup() -> UiScript {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, "UIParent.xml");
diff --git a/crates/benilla-app/src/ui_script/reference_ui.rs b/crates/benilla-app/src/ui_script/reference_ui.rs
index 12dedbd0..7daf706c 100644
--- a/crates/benilla-app/src/ui_script/reference_ui.rs
+++ b/crates/benilla-app/src/ui_script/reference_ui.rs
@@ -221,19 +221,7 @@ mod tests {
let mut s = UiScript::new().expect("VM");
s.set_screen_size(1024.0, 768.0);
- // The in-game UI materializes on world entry (1051), so a player always exists by the time the
- // manifest loads — and the stock macro window's character tab formats `UnitName("player")`
- // into its label inside its own OnLoad. A manifest load with no player is a state the client
- // never reaches (decision 1848).
- s.set_unit(
- "player",
- Some(benilla_ui::script::UnitState {
- exists: true,
- name: Some("Probefour".into()),
- level: 60,
- ..Default::default()
- }),
- );
+ seat_a_player(&mut s);
let failures = super::super::manifest::load_default_ui(&s);
assert!(failures.is_empty(), "the default UI: {failures:#?}");
@@ -356,19 +344,7 @@ mod tests {
let mut s = UiScript::new().expect("VM");
s.set_screen_size(1024.0, 768.0);
- // The in-game UI materializes on world entry (1051), so a player always exists by the time the
- // manifest loads — and the stock macro window's character tab formats `UnitName("player")`
- // into its label inside its own OnLoad. A manifest load with no player is a state the client
- // never reaches (decision 1848).
- s.set_unit(
- "player",
- Some(benilla_ui::script::UnitState {
- exists: true,
- name: Some("Probefour".into()),
- level: 60,
- ..Default::default()
- }),
- );
+ seat_a_player(&mut s);
let failures = super::super::manifest::load_default_ui(&s);
assert!(failures.is_empty(), "the default UI: {failures:#?}");
@@ -532,19 +508,7 @@ mod tests {
}
let mut s = UiScript::new().expect("VM");
s.set_screen_size(1024.0, 768.0);
- // The in-game UI materializes on world entry (1051), so a player always exists by the time the
- // manifest loads — and the stock macro window's character tab formats `UnitName("player")`
- // into its label inside its own OnLoad. A manifest load with no player is a state the client
- // never reaches (decision 1848).
- s.set_unit(
- "player",
- Some(benilla_ui::script::UnitState {
- exists: true,
- name: Some("Probefour".into()),
- level: 60,
- ..Default::default()
- }),
- );
+ seat_a_player(&mut s);
let base = super::super::manifest::load_default_ui(&s);
assert!(base.is_empty(), "the shipped manifest itself: {base:#?}");
s.resolve();
@@ -697,19 +661,7 @@ mod tests {
// global our own FrameXML defines.
let mut s = UiScript::new().expect("VM");
s.set_screen_size(1024.0, 768.0);
- // The in-game UI materializes on world entry (1051), so a player always exists by the time the
- // manifest loads — and the stock macro window's character tab formats `UnitName("player")`
- // into its label inside its own OnLoad. A manifest load with no player is a state the client
- // never reaches (decision 1848).
- s.set_unit(
- "player",
- Some(benilla_ui::script::UnitState {
- exists: true,
- name: Some("Probefour".into()),
- level: 60,
- ..Default::default()
- }),
- );
+ seat_a_player(&mut s);
let failures = super::super::manifest::load_default_ui(&s);
assert!(failures.is_empty(), "the shipped manifest: {failures:#?}");
let have: std::collections::HashSet = s
@@ -1028,6 +980,7 @@ mod tests {
let loads = {
let mut probe = UiScript::new().expect("VM");
probe.set_screen_size(1024.0, 768.0);
+ seat_a_player(&mut probe);
let base = super::super::manifest::load_default_ui(&probe);
assert!(base.is_empty(), "the shipped manifest itself: {base:#?}");
probe.resolve();
@@ -1457,19 +1410,7 @@ mod tests {
let mut s = UiScript::new().expect("VM");
s.set_screen_size(1024.0, 768.0);
- // The in-game UI materializes on world entry (1051), so a player always exists by the time the
- // manifest loads — and the stock macro window's character tab formats `UnitName("player")`
- // into its label inside its own OnLoad. A manifest load with no player is a state the client
- // never reaches (decision 1848).
- s.set_unit(
- "player",
- Some(benilla_ui::script::UnitState {
- exists: true,
- name: Some("Probefour".into()),
- level: 60,
- ..Default::default()
- }),
- );
+ seat_a_player(&mut s);
let failures = super::super::manifest::load_default_ui(&s);
assert!(failures.is_empty(), "the shipped manifest: {failures:#?}");
let have: std::collections::HashSet = s
@@ -1687,7 +1628,7 @@ mod tests {
"Interface/FrameXML/ContainerFrame.xml"
));
assert!(!super::is_chain_entry("BagFrame.xml"));
- assert!(!super::is_chain_entry("Fonts.xml"));
+ assert!(!super::is_chain_entry("UIParent.xml"));
}
/// Every global function and virtual template name a manifest entry declares.
///
@@ -2088,6 +2029,13 @@ mod tests {
"TextStatusBar.lua — a CVar change does not repaint the bar text",
),
("DISPLAY_SIZE_CHANGED", "the four paperdoll files"),
+ (
+ "GMSURVEY_DISPLAY",
+ "HelpFrame.lua — the post-ticket survey. A real 1.12 event (fired at \
+ `0x5e797b`, id 538) whose whole UI is the LoadOnDemand `Blizzard_GMSurveyUI`; \
+ we have neither the producer nor the addon on the chain, and the ticket \
+ flow works without it",
+ ),
("ITEM_TEXT_TRANSLATION", "ItemTextFrame.lua"),
(
"PARTY_MEMBER_DISABLE",
@@ -2131,17 +2079,52 @@ mod tests {
stack.push(p);
} else if p.extension().is_some_and(|x| x == "rs") {
let text = std::fs::read_to_string(&p).unwrap_or_default();
+ // Split so this file cannot match its own walker (see the sibling gate).
+ const CALL: &str = concat!("fire_event", "(");
let mut from = 0;
- while let Some(i) = text[from..].find("fire_event(") {
- let at = from + i + "fire_event(".len();
+ let mut fires_indirectly = false;
+ while let Some(i) = text[from..].find(CALL) {
+ let at = from + i + CALL.len();
from = at;
let rest = text[at..].trim_start();
+ if !rest.starts_with('"') {
+ // `fire_event(event, args)` — the name reached the call through a
+ // variable, so adjacency cannot see it. `ui_cast.rs` does exactly
+ // this: a `match edge` yields `("SPELLCAST_INTERRUPTED", vec![])` and
+ // one call site fires whatever it produced. Treated below.
+ fires_indirectly = true;
+ }
if let Some(body) = rest.strip_prefix('"') {
if let Some(end) = body.find('"') {
fired.insert(body[..end].to_string());
}
}
}
+ if fires_indirectly {
+ // The name reached `fire_event` through a variable. Rather than guess, we
+ // match the SHAPE that produced it: `("EVENT_NAME", vec!` — a tuple whose
+ // second element is the argument vector, which is how `ui_cast.rs`'s
+ // `match edge` hands a name and its args to one shared call site.
+ //
+ // The first attempt at this counted EVERY SCREAMING_CASE literal in such a
+ // file, and that swept up eighteen names off the UNPRODUCED list — a gate
+ // made vacuous by its own conservatism, which is the failure mode this
+ // file has now hit twice. The shape is the discipline: it admits the
+ // literals that are actually being fired and nothing else.
+ const SHAPE: &str = "\", vec!";
+ for (i, _) in text.match_indices(SHAPE) {
+ let before = &text[..i];
+ let Some(q) = before.rfind('"') else { continue };
+ let lit = &before[q + 1..];
+ if !lit.is_empty()
+ && lit.chars().all(|c| {
+ c.is_ascii_uppercase() || c == '_' || c.is_ascii_digit()
+ })
+ {
+ fired.insert(lit.to_string());
+ }
+ }
+ }
}
}
}
@@ -2193,4 +2176,127 @@ mod tests {
what it says:\n {fixed:?}"
);
}
+
+ /// Seat a player before a probe loads the manifest — **what the live client always does.**
+ ///
+ /// The in-game UI materializes on world entry (1051), so a player always exists by the time
+ /// the manifest loads, and the stock macro window's character tab formats `UnitName("player")`
+ /// into its label inside its own `OnLoad`. A manifest load with no player is a state the
+ /// client never reaches (decision 1848) — and one a probe reaches by default, where it raises
+ /// `bad argument #2 to 'format'` and looks exactly like a load failure.
+ ///
+ /// This was five identical copies of the same six-line comment and the same seven-line seed,
+ /// inlined at every probe in this file — and the sixth, `chain_gap_report`'s, did not have it,
+ /// which is why that instrument could not run at all. One function is harder to forget.
+ fn seat_a_player(s: &mut UiScript) {
+ s.set_unit(
+ "player",
+ Some(benilla_ui::script::UnitState {
+ exists: true,
+ name: Some("Probefour".into()),
+ level: 60,
+ ..Default::default()
+ }),
+ );
+ }
+
+ /// **Every event benilla fires must be an event the 1.12 client HAS** — the 1818/1819 seam,
+ /// in the one direction nothing was checking.
+ ///
+ /// [`every_event_a_chain_file_registers_has_a_producer`] runs the other way: a stock file
+ /// listens, does anything fire it. This asks whether a name we fire is a 1.12 name at all.
+ /// Firing a Classic Era event is invisible to every other gate — our own halves agree with
+ /// each other, the name is spelled correctly, and Lua that never registers it never notices.
+ /// That is exactly how `UNIT_POWER_UPDATE` (1819) survived, and how the three this test found
+ /// on its first run did: `BAG_UPDATE_DELAYED` (Era-only; 1.12 has `BAG_UPDATE` alone),
+ /// `LOOT_UPDATE` and `UPDATE_LOOT_ROLL` (both invented here), each fired into a room with
+ /// nobody in it. Decision 1883.
+ ///
+ /// **The oracle is the reference binary's own string table.** An event the client can
+ /// dispatch is a NUL-terminated string in `WoW.exe`; a name that is not there is a name the
+ /// client cannot dispatch. That is a stronger oracle than the FrameXML corpus, which only
+ /// shows what the stock UI happens to consume — and which this repo has only four of the
+ /// LoadOnDemand addons of, so a corpus grep alone flags real events like `CRAFT_UPDATE`.
+ ///
+ /// Test files are skipped: `script/tests/events.rs` fires synthetic names (`E3`) at the
+ /// dispatcher on purpose, and a test's own scaffolding is not a product surface.
+ #[test]
+ fn every_event_we_fire_is_an_event_the_reference_has() {
+ let data = benilla_formats::wow_data_or_skip!();
+ let exe = data.parent().expect("install root").join("WoW.exe");
+ let Ok(bytes) = std::fs::read(&exe) else {
+ eprintln!("skipping: no WoW.exe at {exe:?}");
+ return;
+ };
+
+ let root = std::path::Path::new(env!("CARGO_MANIFEST_DIR"))
+ .parent()
+ .and_then(|p| p.parent())
+ .expect("workspace root")
+ .join("crates");
+ let mut fired: std::collections::BTreeMap =
+ std::collections::BTreeMap::new();
+ let mut stack = vec![root];
+ while let Some(dir) = stack.pop() {
+ for e in std::fs::read_dir(&dir).into_iter().flatten().flatten() {
+ let p = e.path();
+ if p.is_dir() {
+ stack.push(p);
+ continue;
+ }
+ if p.extension().is_none_or(|x| x != "rs") {
+ continue;
+ }
+ // A test's own synthetic events are not a surface we ship.
+ if p.to_string_lossy().contains("test") {
+ continue;
+ }
+ let text = std::fs::read_to_string(&p).unwrap_or_default();
+ // Split so this file cannot match its OWN walker — it did on the first run, and
+ // reported four fragments of this function as ghost events.
+ const CALL: &str = concat!("fire_event", "(");
+ let mut from = 0;
+ while let Some(i) = text[from..].find(CALL) {
+ let at = from + i + CALL.len();
+ from = at;
+ let rest = text[at..].trim_start();
+ if let Some(body) = rest.strip_prefix('"') {
+ if let Some(end) = body.find('"') {
+ fired
+ .entry(body[..end].to_string())
+ .or_insert_with(|| p.display().to_string());
+ }
+ }
+ }
+ }
+ }
+ assert!(
+ fired.len() > 100,
+ "the walker found only {} fired events — it stopped matching, which would make this \
+ gate silently vacuous",
+ fired.len()
+ );
+
+ let ghosts: Vec = fired
+ .iter()
+ // A `BENILLA_`-prefixed name declares itself ours and cannot be mistaken for a 1.12
+ // one — the same discipline `BENILLA_ALLOW_OWN_UI` uses. `BENILLA_QUEST_PROGRESS` is
+ // the live example: an engine event our quest log registers, which exists because the
+ // shipped 1.12 auto-watch chain is broken at the `QUEST_WATCH_UPDATE` arg seam. The
+ // prefix is what makes an invented event honest instead of a mistake.
+ .filter(|(ev, _)| !ev.starts_with("BENILLA_"))
+ .filter(|(ev, _)| {
+ let needle: Vec = ev.bytes().chain(std::iter::once(0)).collect();
+ !bytes.windows(needle.len()).any(|w| w == needle)
+ })
+ .map(|(ev, at)| format!("{ev} (fired from {at})"))
+ .collect();
+ assert!(
+ ghosts.is_empty(),
+ "benilla fires {} event(s) the 1.12 client does not have — a Classic Era name, or one \
+ invented here. Nothing in the stock UI can ever listen for these:\n {}",
+ ghosts.len(),
+ ghosts.join("\n ")
+ );
+ }
}
diff --git a/crates/benilla-app/src/ui_script/screenshot_tests.rs b/crates/benilla-app/src/ui_script/screenshot_tests.rs
index 701de4c3..45185088 100644
--- a/crates/benilla-app/src/ui_script/screenshot_tests.rs
+++ b/crates/benilla-app/src/ui_script/screenshot_tests.rs
@@ -14,7 +14,7 @@ fn harness() -> UiScript {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
for f in [
- "Fonts.xml",
+ "Interface\\FrameXML\\Fonts.xml",
"MoneyFrame.xml",
"UiPanels.xml",
r"Interface\FrameXML\UIPanelTemplates.lua",
diff --git a/crates/benilla-app/src/ui_script/shipped_xml_tests.rs b/crates/benilla-app/src/ui_script/shipped_xml_tests.rs
index ba335982..41b5706d 100644
--- a/crates/benilla-app/src/ui_script/shipped_xml_tests.rs
+++ b/crates/benilla-app/src/ui_script/shipped_xml_tests.rs
@@ -896,17 +896,14 @@ fn every_texture_frame_outranks_its_status_bars() {
fn the_boot_phase_materializes_no_frames() {
let mut s = benilla_ui::script::UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- let dir = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("assets/ui/Fonts.xml");
- let text = std::fs::read_to_string(&dir).expect("Fonts.xml");
- let doc = benilla_ui::framexml::parse(&text).expect("parses");
- let provider = |_: &str| -> Option> { None };
- let report = benilla_ui::loader::load(&s, &doc, &provider);
+ // The font registry is manifest entry 0 and comes off the chain since 1888, so this reads
+ // through `test_ui::load_ui` rather than joining `assets/ui` — the file is not ours any more.
+ // `load_ui` returns the same `report.frames` this asserted on and fails on any loader error.
+ let frames = super::test_ui::load_ui(&s, "Interface\\FrameXML\\Fonts.xml");
assert_eq!(
- report.frames, 0,
- "the boot-phase load materialized {} frame(s) — the login screen is meant to carry none",
- report.frames
+ frames, 0,
+ "the boot-phase load materialized {frames} frame(s) — the login screen is meant to carry none"
);
- assert!(report.errors.is_empty(), "{:?}", report.errors);
}
/// **The font registry alone covers the WHOLE glyph-atlas bake plan** — the property that makes
@@ -1039,18 +1036,23 @@ fn every_shipped_font_object_is_published_as_a_lua_global() {
let failures = super::load_default_ui(&s);
assert!(failures.is_empty(), "loader errors: {failures:?}");
- // Collect the declared names straight out of the shipped XML, so the sweep cannot go stale.
- let dir = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("assets/ui");
+ // Collect the declared names straight out of the MANIFEST's own entries, so the sweep cannot
+ // go stale — and so it follows a file onto the chain. It swept `assets/ui` until 1888 put the
+ // font registry on the chain and the count fell from 51 to 3, which is the failure this shape
+ // prevents: the sweep's subject is what the manifest declares, not what happens to be ours.
let mut names: Vec = Vec::new();
- for entry in std::fs::read_dir(&dir).expect("assets/ui").flatten() {
- let path = entry.path();
- if path.extension().is_some_and(|e| e == "xml") {
- let text = std::fs::read_to_string(&path).expect("read");
- for chunk in text.split(" benilla_ui::script::PetBookState {
fn the_pet_tab_switches_books_and_renders_the_pets_spells() {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
@@ -664,7 +665,7 @@ fn the_macro_editor_takes_a_shift_click_and_only_a_shift_click() {
);
for file in [
r"Interface\FrameXML\GlobalStrings.lua",
- "Fonts.xml",
+ "Interface\\FrameXML\\Fonts.xml",
"Interface\\FrameXML\\BasicControls.xml", // `TEXT`
"MoneyFrame.xml",
"UiPanels.xml",
@@ -682,6 +683,7 @@ fn the_macro_editor_takes_a_shift_click_and_only_a_shift_click() {
// The icon chooser's scroll frame inherits `ClassTrainerListScrollFrameTemplate`.
r"Interface\FrameXML\ClassTrainerFrameTemplates.xml",
"MicroMenu.xml",
+ "Interface\\FrameXML\\ActionButtonTemplate.xml",
"ActionBar.xml",
// The reference declares the reputation WATCH BAR in `ReputationFrame.xml`, and
// `ExhaustionTick_Update` reads `ReputationWatchBar:IsShown()` twice — the reference's own
diff --git a/crates/benilla-app/src/ui_script/static_popup_tests.rs b/crates/benilla-app/src/ui_script/static_popup_tests.rs
index 06591ca9..4db527dd 100644
--- a/crates/benilla-app/src/ui_script/static_popup_tests.rs
+++ b/crates/benilla-app/src/ui_script/static_popup_tests.rs
@@ -10,7 +10,7 @@ use super::test_ui::load_ui as load_xml;
fn setup() -> UiScript {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
diff --git a/crates/benilla-app/src/ui_script/summon_tests.rs b/crates/benilla-app/src/ui_script/summon_tests.rs
index e083a598..273a54bd 100644
--- a/crates/benilla-app/src/ui_script/summon_tests.rs
+++ b/crates/benilla-app/src/ui_script/summon_tests.rs
@@ -26,7 +26,7 @@ use super::test_ui::load_ui as load_xml;
fn setup() -> UiScript {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
diff --git a/crates/benilla-app/src/ui_script/talent_wipe_tests.rs b/crates/benilla-app/src/ui_script/talent_wipe_tests.rs
index 2d7649e6..58f77b78 100644
--- a/crates/benilla-app/src/ui_script/talent_wipe_tests.rs
+++ b/crates/benilla-app/src/ui_script/talent_wipe_tests.rs
@@ -12,7 +12,7 @@ use super::test_ui::load_ui as load_xml;
fn setup() -> UiScript {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
diff --git a/crates/benilla-app/src/ui_script/target_aura_tests.rs b/crates/benilla-app/src/ui_script/target_aura_tests.rs
index 146e45f9..0cff75cb 100644
--- a/crates/benilla-app/src/ui_script/target_aura_tests.rs
+++ b/crates/benilla-app/src/ui_script/target_aura_tests.rs
@@ -19,13 +19,16 @@ use super::test_ui::load_ui as load_xml;
fn harness() -> UiScript {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "GameTooltip.xml"); // TOOLTIP_DEFAULT_* (the dropdown kit's MenuBackdrop)
load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml"); // the unit popups' kit (TargetFrameDropDown's template)
- load_xml(&s, "UnitPopup.xml");
load_xml(&s, "Cooldown.xml");
+ load_xml(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
load_xml(&s, "ActionBar.xml"); // BENILLA_FALLBACK_ICON
+ // Before UnitPopup: that file reads ITEM_QUALITY_COLORS at FILE SCOPE, and its
+ // declarer is UIParent (ref UIParent.lua:65) since 1888.
load_xml(&s, "UIParent.xml");
+ load_xml(&s, "UnitPopup.xml");
load_xml(&s, "Interface\\FrameXML\\TextStatusBar.lua");
load_xml(&s, "Interface\\FrameXML\\TextStatusBar.xml");
load_xml(&s, "Interface\\FrameXML\\BuffFrame.xml");
diff --git a/crates/benilla-app/src/ui_script/taxi_tests.rs b/crates/benilla-app/src/ui_script/taxi_tests.rs
index f5e98c31..9e7b1c11 100644
--- a/crates/benilla-app/src/ui_script/taxi_tests.rs
+++ b/crates/benilla-app/src/ui_script/taxi_tests.rs
@@ -14,7 +14,7 @@ use super::test_ui::load_ui as load_xml;
fn taxi_script() -> UiScript {
let mut s = UiScript::new().unwrap();
s.set_screen_size(1024.0, 768.0);
- load_xml(&s, "Fonts.xml");
+ load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
load_xml(&s, "MoneyFrame.xml");
load_xml(&s, "UiPanels.xml");
load_xml(&s, "GameTooltip.xml"); // TaxiNodeOnButtonEnter's tooltip + SetTooltipMoney
diff --git a/crates/benilla-app/src/ui_script/test_ui.rs b/crates/benilla-app/src/ui_script/test_ui.rs
index ef17d6aa..ba503e94 100644
--- a/crates/benilla-app/src/ui_script/test_ui.rs
+++ b/crates/benilla-app/src/ui_script/test_ui.rs
@@ -95,7 +95,7 @@ fn load_entry(s: &UiScript, entry: &str, strict_templates: bool, no_warnings: bo
/// One file's bytes, from whichever store its path names — the chain for a path, this crate's
/// `assets/ui` for a bare name. Also the `` / `