Merge main for v4.8.0 release

Author: mergetest

CHANGELOG.md

@@ -1,5 +1,17 @@
 # DandersFrames Changelog
 
+## [4.8.0]
+
+### Bug Fixes
+
+* (Click Casting) Fixed all binds being dead in your first arena or dungeon of a session until a reload. (by Krathe)
+* (Pinned Frames) Fixed an empty "drag to move" box getting stuck on screen after a profile switch, surviving reloads. (by Krathe)
+
+### Improvements
+
+* (Click Casting) Enabling a targeting fallback on a key that already does something now asks for confirmation and names what the key will stop doing.
+* (Click Casting) "Clear Blizzard Bindings" now warns that clearing is permanent, and only clears when you press it.
+
 ## [4.7.5]
 
 ### Bug Fixes

ClickCasting/Bindings.lua

@@ -2408,13 +2408,55 @@ end
 
 -- Process all bindings and build unified macro map
 -- Returns: { [keyString] = { macroText = "...", templateBinding = binding } }
+-- Re-resolve click-casting state once cold-start data becomes available. Two
+-- things can be built before GetSpecialization() resolves at the first login
+-- of a session, and both used to stay wrong all day until a /reload:
+--   * loadoutCheckUnresolved (CheckLoadoutProfileSwitch): the spec→profile
+--     auto-switch could not run (or, before the guard, ran with the `or 1`
+--     spec fallback and switched to the WRONG spec's profile) — the field
+--     report: "none of my binds work in my first arena of the day"
+--   * macroMapUnresolved (BuildUnifiedMacroMap): loadSpec-scoped bindings
+--     were dropped from the map (legacy/import-only config; belt)
+-- Debounced; each resolver clears its own flag on success and self-defers in
+-- combat (pendingLoadoutCheck / needsBindingRefresh). No-op in steady state,
+-- so the extra triggers cost nothing.
+function CC:ResolveProvisionalMap(reason)
+    if not (self.macroMapUnresolved or self.loadoutCheckUnresolved) then return end
+    if not (self.db and self.db.enabled) then return end
+    if self.provisionalResolveTimer then self.provisionalResolveTimer:Cancel() end
+    self.provisionalResolveTimer = C_Timer.NewTimer(0.5, function()
+        CC.provisionalResolveTimer = nil
+        if CC.loadoutCheckUnresolved then
+            DF:Debug("CLICK", "Re-running deferred loadout profile check (%s)", tostring(reason))
+            CC:CheckLoadoutProfileSwitch()
+        end
+        if CC.macroMapUnresolved then
+            DF:Debug("CLICK", "Rebuilding provisional binding map (%s)", tostring(reason))
+            CC:ApplyBindings()
+        end
+    end)
+end
+
 function CC:BuildUnifiedMacroMap()
     local macroMap = {}
-    
+
+    -- Cold-start guard: ShouldBindingLoad drops every loadSpec-scoped binding
+    -- while GetSpecialization() is still nil (first login of a session, before
+    -- spec data resolves). The map is built once and cached, so a map built in
+    -- that window silently loses those bindings — and an all-spec-scoped setup
+    -- comes up EMPTY, which downstream disables clicks on our frames entirely
+    -- ("none of my binds work in my first arena of the day until I reload").
+    -- Record the condition on the module; the resolve watchers (SPELLS_CHANGED /
+    -- PLAYER_SPECIALIZATION_CHANGED / arena prep) rebuild when data arrives, and
+    -- ApplyBindingsToFrameUnified refuses to wipe a frame off a suspect map.
+    local specKnown = GetSpecialization() ~= nil
+    local anySpecScoped = false
+
     -- Group all bindings by their key string
     local keyGroups = {}
     for i, binding in ipairs(self.db.bindings) do
         if binding.enabled ~= false then
+            if binding.loadSpec then anySpecScoped = true end
             local keyString = self:GetBindingKeyString(binding)
             if keyString then
                 if not keyGroups[keyString] then
@@ -2424,6 +2466,11 @@ function CC:BuildUnifiedMacroMap()
             end
         end
     end
+
+    self.macroMapUnresolved = (anySpecScoped and not specKnown) or nil
+    if self.macroMapUnresolved then
+        DF:DebugWarn("CLICK", "BuildUnifiedMacroMap: spec unknown with spec-scoped bindings — map is provisional")
+    end
 
     -- Build macro for each key group
     for keyString, group in pairs(keyGroups) do
@@ -2529,17 +2576,16 @@ function CC:ApplyBindingsToFrameUnified(frame, skipKeyboardUpdate)
             frameName, debugstack(2, 1, 0) or "unknown")
     end
 
-    -- Clear existing bindings first
-    self:ClearBindingsFromFrame(frame)
-    
     -- Build unified macro map if not already built
     if not self.unifiedMacroMap then
         self.unifiedMacroMap = self:BuildUnifiedMacroMap()
         -- Refresh keyboard bindings on all frames since map was just built
         self:RefreshKeyboardBindings()
     end
-    
-    -- Check if this frame has ANY bindings that apply to it
+
+    -- Check if this frame has ANY bindings that apply to it — BEFORE the
+    -- destructive clear below, so a provisional (cold-start) map can bail out
+    -- without touching the frame's existing state.
     local hasAnyBindings = false
     local isDandersFrame = frame.dfIsDandersFrame == true
     local isBlizzardFrame = frame.dfIsBlizzardFrame == true
@@ -2565,6 +2611,16 @@ function CC:ApplyBindingsToFrameUnified(frame, skipKeyboardUpdate)
 
     -- If no bindings apply to this frame
     if not hasAnyBindings then
+        -- Provisional map (spec not yet resolved at build time): the emptiness
+        -- is almost certainly the cold-start drop, not the user's config. Do
+        -- NOT clear/disable anything — leave the frame exactly as it is; the
+        -- resolve watchers rebuild and re-apply once spec data arrives.
+        if self.macroMapUnresolved then
+            DF:Debug("CLICK", "ApplyBindings %s deferred — provisional map (spec unresolved)", frameName)
+            return
+        end
+        -- Genuinely no bindings for this frame: clean it up.
+        self:ClearBindingsFromFrame(frame)
         if isDandersFrame then
             -- For DandersFrames, completely disable clicks when no bindings apply
             -- Our own frames get type1/type2 set in InitializeHeaderChild as a safety net
@@ -2579,7 +2635,11 @@ function CC:ApplyBindingsToFrameUnified(frame, skipKeyboardUpdate)
         end
         return
     end
-    
+
+    -- Clear existing bindings first (moved below the applicability check so a
+    -- provisional-map bailout above never strips a frame's working state)
+    self:ClearBindingsFromFrame(frame)
+
     -- Register for clicks based on castOnDown option
     if frame.RegisterForClicks then
         local castOnDown = self.profile and self.profile.options and self.profile.options.castOnDown

ClickCasting/Constants.lua

@@ -441,22 +441,28 @@ local FRAME_INFO = {
 CC.FRAME_INFO = FRAME_INFO
 
 -- Targeting Fallback info (checkboxes - for keyboard/hover bindings)
+-- Shared warning: every fallback below forces the binding's key onto the
+-- PERMANENT global bind list (BuildHovercastSetupScript) — the key then does
+-- this binding everywhere and stops performing its normal action, even away
+-- from the frames. The editor also confirms via ConfirmGlobalKeyCapture when
+-- the key already has a Blizzard binding.
+local GLOBAL_CAPTURE_WARNING = " While enabled, the key is captured everywhere — it performs this binding instead of its normal action, even away from the frames."
 local FALLBACK_INFO = {
     mouseover = {
         name = "Global",
-        desc = "Cast on nameplates or characters in the world. Not needed for party/raid frames.",
+        desc = "Cast on nameplates or characters in the world. Not needed for party/raid frames." .. GLOBAL_CAPTURE_WARNING,
     },
     target = {
         name = "Target",
-        desc = "Cast on your current target if no frame or mouseover unit is found.",
+        desc = "Cast on your current target if no frame or mouseover unit is found." .. GLOBAL_CAPTURE_WARNING,
     },
     selfCast = {
         name = "Self",
-        desc = "Cast on yourself as a last resort if no other valid target is found.",
+        desc = "Cast on yourself as a last resort if no other valid target is found." .. GLOBAL_CAPTURE_WARNING,
     },
     alwaysCast = {
         name = "Always Cast",
-        desc = "If no rule above matches (hovering nothing, or an ineligible unit), cast anyway using the spell's normal targeting. Lets ground-targeted spells show their aiming circle when pressed in the open. If Self is also enabled, Self applies first.",
+        desc = "If no rule above matches (hovering nothing, or an ineligible unit), cast anyway using the spell's normal targeting. Lets ground-targeted spells show their aiming circle when pressed in the open. If Self is also enabled, Self applies first." .. GLOBAL_CAPTURE_WARNING,
     },
     stopSpellTarget = {
         name = "Cancel Targeting",

ClickCasting/Events.lua

@@ -29,6 +29,9 @@ function CC:RegisterEvents()
     -- Nameplate events for click-casting on nameplates
     eventFrame:RegisterEvent("NAME_PLATE_UNIT_ADDED")
     eventFrame:RegisterEvent("NAME_PLATE_UNIT_REMOVED")
+
+    -- Spell data arrival — resolves a provisional (cold-start) binding map
+    eventFrame:RegisterEvent("SPELLS_CHANGED")
 
     eventFrame:SetScript("OnEvent", function(_, event, ...)
         if event == "PLAYER_REGEN_ENABLED" then
@@ -39,6 +42,12 @@ function CC:RegisterEvents()
         elseif event == "PLAYER_SPECIALIZATION_CHANGED" or event == "ACTIVE_PLAYER_SPECIALIZATION_CHANGED" then
             -- Spec changed - check for profile switch
             CC:OnSpecChanged()
+            -- Cold-start resolve: a map built before GetSpecialization()
+            -- resolved dropped every spec-scoped binding — rebuild it now
+            CC:ResolveProvisionalMap("spec-resolved")
+        elseif event == "SPELLS_CHANGED" then
+            -- Spell data arrived/changed — no-op unless the map is provisional
+            CC:ResolveProvisionalMap("spells-changed")
         elseif event == "TRAIT_CONFIG_UPDATED" or event == "TRAIT_CONFIG_CREATED" or event == "ACTIVE_COMBAT_CONFIG_CHANGED" then
             -- Loadout/talent changed - check for profile switch and reapply bindings (with debounce)
             if not InCombatLockdown() then
@@ -96,15 +105,26 @@ function CC:RegisterEvents()
                 -- so a broken hover-bind state never survives a zone change
                 CC:RunBindingRepair("zone-in", true)
 
-                -- Check for loadout-based profile on initial load
+                -- Cold-start resolve: if the login build ran before spec data
+                -- was available, the map is provisional — rebuild it on the
+                -- first loading screen so it is correct BEFORE the first
+                -- arena/dungeon of the session, not only after a /reload
+                CC:ResolveProvisionalMap("zone-in")
+
+                -- Check for loadout-based profile on initial load. No combat
+                -- guard here: CheckLoadoutProfileSwitch defers itself via
+                -- pendingLoadoutCheck in lockdown — the old call-site guard
+                -- silently DROPPED the check when zone-in+1s landed in combat
+                -- (the arena-load race), leaving the previous spec's profile
+                -- active for the whole match.
                 C_Timer.After(1, function()
-                    if not InCombatLockdown() then
-                        CC:CheckLoadoutProfileSwitch()
-                    end
+                    CC:CheckLoadoutProfileSwitch()
                 end)
             end)
         elseif event == "ARENA_PREP_OPPONENT_SPECIALIZATIONS" then
             -- Arena frames should now exist
+            -- Belt: never enter an arena on a provisional (cold-start) map
+            CC:ResolveProvisionalMap("arena-prep")
             CC:OnArenaPrep()
         elseif event == "INSTANCE_ENCOUNTER_ENGAGE_UNIT" then
             -- Boss frames should now exist

ClickCasting/Frames.lua

@@ -76,7 +76,12 @@ function CC:InitializeSavedVariables()
     if self.db.global.disableWhileFlying == nil then
         self.db.global.disableWhileFlying = false
     end
-    
+
+    -- Retired: the persisted "re-wipe Blizzard's click-cast profile on every
+    -- enable" flag (see the removal note in DisableBlizzardClickCast).
+    -- Clearing is a one-time, explicitly confirmed action now.
+    self.db.clearBlizzardOnEnable = nil
+
     -- Ensure classes table exists
     if not self.db.classes then
         self.db.classes = {}
@@ -568,12 +573,14 @@ function CC:DisableBlizzardClickCasting()
 
     -- Hook into Blizzard's click cast system to prevent conflicts
     if not self.blizzardClickCastDisabled then
-        -- Reset Blizzard's click-casting profile on first run (if user chose to clear)
-        -- This completely removes any Blizzard click-cast bindings
-        if self.db.clearBlizzardOnEnable and C_ClickBindings and C_ClickBindings.ResetCurrentProfile then
-            C_ClickBindings.ResetCurrentProfile()
-        end
-        
+        -- (Removed) The clearBlizzardOnEnable auto re-wipe. Pressing "Clear
+        -- Blizzard Bindings" once used to persist the flag and silently
+        -- ResetCurrentProfile() — a PERMANENT wipe of the user's native
+        -- click-cast profile — on every future enable. Clearing is now a
+        -- one-time action taken only when the button is pressed (with a
+        -- permanence warning in the dialog); the stored flag is stripped in
+        -- InitializeSavedVariables.
+
         -- Clear any existing Blizzard click cast config on our frames
         if SetUnitFrameClickCastConfig then
             -- Hook to prevent Blizzard from setting click casts on frames we manage

ClickCasting/Profiles.lua

@@ -492,10 +492,27 @@ end
 -- Check and auto-switch profile based on current loadout
 function CC:CheckLoadoutProfileSwitch()
     if InCombatLockdown() then
-        -- Will be called again when combat ends
+        -- Defer, don't drop: entering an arena/dungeon starts combat quickly,
+        -- and silently losing the check leaves the previous spec's profile
+        -- active for the whole match. OnCombatEnd drains pendingLoadoutCheck.
+        self.pendingLoadoutCheck = true
         return
     end
-    
+
+    -- Cold-start guard: at the first login of a session this can run BEFORE
+    -- GetSpecialization() resolves. GetCurrentSpec()'s `or 1` fallback would
+    -- then MASK the missing data and switch to spec 1's profile — the wrong
+    -- profile for anyone whose actual spec is 2+ ("none of my binds work in
+    -- my first arena of the day until I reload"). Record the unresolved state
+    -- and let the resolve watchers (spec/spell events, loading screens, arena
+    -- prep) re-run this check once real data arrives.
+    if not GetSpecialization() then
+        self.loadoutCheckUnresolved = true
+        DF:Debug("CLICK", "CheckLoadoutProfileSwitch: spec data not ready — deferred to resolve watchers")
+        return
+    end
+    self.loadoutCheckUnresolved = nil
+
     local specIndex = GetCurrentSpec()
     local loadoutID = GetCurrentLoadoutConfigID()
     local assignedProfile, isSpecific = self:GetProfileForLoadout(specIndex, loadoutID)

ClickCasting/UI/BindingEditor.lua

@@ -710,12 +710,46 @@ function CC:CreateEditBindingPanel()
     fallbackSubtitle:SetTextColor(0.5, 0.5, 0.5)
     panel.fallbackSubtitle = fallbackSubtitle
 
+    -- Enabling any global-forcing fallback (Mouseover/Target/Self/Always Cast)
+    -- puts the binding's key on the PERMANENT global bind list
+    -- (BuildHovercastSetupScript): the key then performs this binding
+    -- everywhere and stops doing its normal job, even away from the frames —
+    -- a wheel bind eats camera zoom, for example. If the key currently has a
+    -- Blizzard binding, confirm the capture and name exactly what gets
+    -- replaced. The flag is already set by the checkbox handler; Cancel
+    -- reverts it (nothing persists until Save anyway).
+    local function ConfirmGlobalKeyCapture(cb, flagKey)
+        if not cb:GetChecked() then return end          -- unchecking never captures
+        local b = panel.pendingBinding
+        if not b or (b.bindType ~= "key" and b.bindType ~= "scroll") then return end
+        local keyString = CC:GetBindingKeyString(b)
+        if not keyString or keyString == "" then return end
+        local action = GetBindingAction and GetBindingAction(keyString)
+        if not action or action == "" then return end
+        local actionName = (GetBindingText and GetBindingText(action)) or action
+        DF:ShowPopupAlert({
+            title = L["Key Used Elsewhere"],
+            message = format(L["This will capture %s everywhere — even away from the frames — and replace its current action:"], keyString)
+                .. "\n\n|cffffcc00" .. actionName .. "|r",
+            buttons = {
+                { label = L["Enable Anyway"], onClick = nil },
+                { label = L["Cancel"], onClick = function()
+                    cb:SetChecked(false)
+                    if panel.pendingBinding and panel.pendingBinding.fallback then
+                        panel.pendingBinding.fallback[flagKey] = false
+                    end
+                end },
+            },
+        })
+    end
+
     -- Mouseover checkbox
     local mouseoverCB = CreateCheckbox(advancedContent, FALLBACK_INFO.mouseover.name, FALLBACK_INFO.mouseover.desc)
     mouseoverCB:SetPoint("TOPLEFT", 18, -38)
     mouseoverCB:SetScript("OnClick", function(self)
         panel.pendingBinding.fallback = panel.pendingBinding.fallback or {}
         panel.pendingBinding.fallback.mouseover = self:GetChecked()
+        ConfirmGlobalKeyCapture(self, "mouseover")
     end)
     panel.mouseoverCB = mouseoverCB
 
@@ -725,6 +759,7 @@ function CC:CreateEditBindingPanel()
     targetFallbackCB:SetScript("OnClick", function(self)
         panel.pendingBinding.fallback = panel.pendingBinding.fallback or {}
         panel.pendingBinding.fallback.target = self:GetChecked()
+        ConfirmGlobalKeyCapture(self, "target")
     end)
     panel.targetFallbackCB = targetFallbackCB
 
@@ -734,6 +769,7 @@ function CC:CreateEditBindingPanel()
     selfCB:SetScript("OnClick", function(self)
         panel.pendingBinding.fallback = panel.pendingBinding.fallback or {}
         panel.pendingBinding.fallback.selfCast = self:GetChecked()
+        ConfirmGlobalKeyCapture(self, "selfCast")
     end)
     panel.selfCB = selfCB
 
@@ -743,6 +779,7 @@ function CC:CreateEditBindingPanel()
     alwaysCastCB:SetScript("OnClick", function(self)
         panel.pendingBinding.fallback = panel.pendingBinding.fallback or {}
         panel.pendingBinding.fallback.alwaysCast = self:GetChecked()
+        ConfirmGlobalKeyCapture(self, "alwaysCast")
     end)
     panel.alwaysCastCB = alwaysCastCB