wow/buffalo2: ObjectiveTracker/ObjectiveTracker.lua comparison

comparison ObjectiveTracker/ObjectiveTracker.lua @ 34:9856ebc63fa4

- half solution to Update being fired multiple times during load - change securefunc handlers to dispense a reason code; catch that reason code in the enclosure passed to hooksecurefunc, and decide whether to update or not from there.

author	Nenue
date	Sun, 17 Apr 2016 00:21:45 -0400
parents	64f2a9bbea79
children	69d03f8e293e

comparison

equal deleted inserted replaced

-:64f2a9bbea79
+:9856ebc63fa4
 T.strings = {}
 T.strings.CLICK_TO_ACCCEPT = 'Click to Accept'
 T.strings.CLICK_TO_COMPLETE = 'Click to complete'
 T.colors ={
 enable = true,
-default = {
-titlebg = {'HORIZONTAL', 1, 0, .7, .25,    1, 0, .7, .125},
-textbg = {'HORIZONTAL', 0, 0, 0, 0.4,      0, 0, 0, 0 },
-selectionbg = {'HORIZONTAL', 1, 1, 1, 0, 1, 1, 1, 0.225},
-},
-daily = {
-titlebg = {'HORIZONTAL', 0, .7, 1, .25,  0, 1, .7, .125},
-textbg = {'HORIZONTAL', 0, .7, 1, .1,    0, 1, .7, .075 },
-},
-weekly = {
-titlebg = {'HORIZONTAL', 0, .35, .7, .25,   0, .35, .7, .125},
-textbg = {'HORIZONTAL', 0, .35, .7, .1,     0, .35, .7, .075 },
-},
-account = {
-titlebg = {'HORIZONTAL', .1, .1, .1, .25, .1, .1, .1, .125},
-textbg = {'HORIZONTAL', .1, .1, .1, 0.4, .1, .1, .1, .085 },
-},
--- alliance
-faction_1 = {
-titlebg = {'HORIZONTAL', .2, .4, 1, 0.4, .2, .4, 1, .085 },
-textbg = {'HORIZONTAL', .2, .4, 1, 0.4, .2, .4, 1, .085 },
-},
--- horde
-faction_2 = {
-titlebg = {'HORIZONTAL', .6, 0, 0.4, 0.4,  .6, 0, 0.4, .085 },
-textbg = {'HORIZONTAL', .6, 0, 0.4, 0.4,   .6, 0, 0.4, .085 },
-}
 }
 T.watchMoneyReasons = 0
 --- Baseline defaults table; values defined in the files that they pertain to
 T.defaults = {}
 --- Tracker display order
 T.orderedNames = {'Bonus', 'AutoQuest', 'Quest', 'Cheevs'}
 --- ipairs() argument tables
 updateReasonEvent  = 0x00FF,
 numWatched = 0,   --- number of entries being handled
 numBlocks = 0,    --- number of blocks created
 actualBlocks = 0, --- number of blocks in use
+Info = {},        --- stored watch list information, keyed by whatever unique ID is involved for that tracker
-freeBlocks = {},  --- block heap
+Watched = {},     --- stores whether the given unique ID is tracked
-usedBlocks = {},
+freeBlocks = {},  --- blocks hidden due to list shrinkage
-Info = {},        -- find data by ID
+usedBlocks = {},  --- block in use
-BlockInfo = {},   -- find data by block ID
+BlockInfo = {},   --- by block creation offset, used by framescript
-Watched = {},     -- find watchIndex by data ID
-WatchInfo = {},   -- find data by watch index
+--- Indexes
-WatchBlock = {},  -- find block by watch index
+LogBlock = {},    --- by API log offset, used by GetBlock if possible
+WatchBlock = {},  --- block by internal offset, used in GetBlock scope
+WatchInfo = {},   --- info by internal offset, used in Update scope
 }
 T.AutoQuest = {
 name = "AutoQuest",
 displayName = "Notice",
 updateReasonModule = OBJECTIVE_TRACKER_UPDATE_MODULE_QUEST,
 updateReasonEvents = OBJECTIVE_TRACKER_UPDATE_QUEST + OBJECTIVE_TRACKER_UPDATE_QUEST_ADDED,
 LogInfo = {},
-LogBlock = {},
 QuestBlock = {},
 }
 T.Quest = {
 name = "Quest",
 displayName = "Quests",
 updateReasonModule = OBJECTIVE_TRACKER_UPDATE_MODULE_QUEST,
 updateReasonEvents = OBJECTIVE_TRACKER_UPDATE_QUEST + OBJECTIVE_TRACKER_UPDATE_QUEST_ADDED,
 itemButtons = {},
 freeButtons = {},
 LogInfo = {},
-LogBlock = {},
 QuestBlock = {},
 }
 T.Cheevs = {
 name = "Cheevs",
 displayName = "Achievements",
 local GetNumQuestWatches, AddQuestWatch, SetSuperTrackedQuestID = GetNumQuestWatches, AddQuestWatch, SetSuperTrackedQuestID
 Event.QUEST_ACCEPTED = function(questLogIndex, questID, added)
 if ( IsQuestTask(questID) ) then
 return OBJECTIVE_TRACKER_UPDATE_TASK_ADDED, questID
 else
-if ( _G.AUTO_QUEST_WATCH == "1" ) then
-AddQuestWatch(questLogIndex);
-SetSuperTrackedQuestID(questID);
-end
 return OBJECTIVE_TRACKER_UPDATE_QUEST_ADDED, questID, added
 end
 end
 Event.QUEST_REMOVED = function(questLogIndex, questID)
 end
 T.Event = Event
 --- Done once per ui load
 local BlizzHooks = {
+['AcceptQuest'] = 'AcceptQuest',
 ['AddQuestWatch'] = 'AddQuestWatch',
 ['RemoveQuestWatch'] = 'RemoveQuestWatch',
 ['AbandonQuest'] = 'AbandonQuest',
 ['AcknowledgeAutoAcceptQuest'] = 'AcknowledgeAutoAcceptQuest',
 ['AddAutoQuestPopUp'] = 'AddAutoQuestPopUp',
 end
 end
 local iprint = B.print('Info')
 T.SetRewards = function(t, questID)
+local previousSelection = GetQuestLogSelection()
 SelectQuestLogEntry(GetQuestLogIndexByID(questID))
 local numQuestChoices = GetNumQuestLogChoices();
 local skillName, skillIcon, skillPoints = GetQuestLogRewardSkillPoints();
 local xp = GetQuestLogRewardXP();
 local playerTitle = GetQuestLogRewardTitle();
 ProcessQuestLogRewardFactions();
+if previousSelection then
+SelectQuestLogEntry(previousSelection)
+end
 local rewards = {}
 local texture, name, isTradeskillSpell, isSpellLearned, hideSpellLearnText, isBoostSpell, garrFollowerID = GetQuestLogRewardSpell(questID)
 if name  then
 tinsert(rewards,{
 type = 'spell',
 t.rewardInfo = rewards
 end
 end
 local Play = function(file) if Devian and Devian.InWorkspace() then PlaySoundFile(file) end end
+T.OnHookedFunc = function(name, ...)
+print('|cFFFF8800securehook:|r', name, '|cFF00FFFFargs:|r', ...)
+local updateReason = T[name](...)
+if updateReason then
+print('|cFF00FFFFupdate reason:|r', updateReason)
+T:Update(updateReason)
+end
+end
 function T:OnEvent (event, ...)
 local isHandled
 print('OnEvent(|cFF00FF00'.. event ..'|r):', ...)
 local reason, arg1, arg2, arg3
 VeneerData.CallLog = VeneerData.CallLog or {}
 if not T.isHooked then
 T.isHooked = true
 for blizzFunc, veneerFunc in pairs(BlizzHooks) do
 if T[veneerFunc] then
-hooksecurefunc(blizzFunc, T[veneerFunc])
+hooksecurefunc(blizzFunc, function(...) return T.OnHookedFunc(blizzFunc, ...) end)
 else
 hooksecurefunc(blizzFunc, function(...)
 print('|cFFFF0088securehook('..tostring(blizzFunc)..')|r args:', ...)
 tinsert(VeneerData.CallLog, {blizzFunc, ...})
 end)
 --- Done any time the the minimize button is toggled up
 function T:OnEnable()
 print(B.Conf.VeneerObjectiveWrapper.enabled)
-if not B.Conf.VeneerObjectiveWrapper.enabled then
-return
-end
 for event, action in pairs(Event) do
 print('|cFFFF0088listen to', event, 'for action|r', tostring(action))
 Wrapper:RegisterEvent(event)
 end

Mercurial > wow > buffalo2

comparison ObjectiveTracker/ObjectiveTracker.lua @ 34:9856ebc63fa4