wow/devian: Devian.lua comparison

comparison Devian.lua @ 18:01c32c98e72a v1.4

LuaDoc info added Removal of release tagged debug output /dvn tag <prefix> <channel> can be applied to multiple channels, and re-using the command will toggle that output off SetChannel data clobbering fixed Message prefix coloring fixed

author	Nenue
date	Sun, 20 Dec 2015 18:27:26 -0500
parents	48a1d9c14af5
children	df098747b31d

comparison

equal deleted inserted replaced

-:48a1d9c14af5
+:01c32c98e72a
 local MAJOR, MINOR = 'Devian-1.3', 'r@project-revision@'
 local D = _G.Devian
 local STATE_LOW, STATE_HIGH = 1, 2
 local PLAYER_REALM = UnitName("player") .. '-' .. GetRealmName()
 local DEVIAN_FRAME = 'DevianConsole'
-local print = function(...)
+local print = _G.print
-_G.print('Dvn', ...)
-end
 local db
 local defaults = {
 ['global'] = {[STATE_LOW] = {}, [STATE_HIGH] = {}},
 ['tags'] = {},
 ['channels'] = {[1] = {signature = 'Dvn', name = 'Main', header = "%n [%t]", x = 100, y = 800, height = 500, width = 600, enabled = true}},
 return D:StackFrames()
 elseif mode == 'grid' then
 return D:DistributeFrames()
 elseif mode == 'tag' then -- tagging
 if tag ~= nil and dest ~= nil then
-if not D.console[dest] and not D.sig[dest] then
+local channel = D:SetChannel(dest:match('%a'), dest:match('%d'))
-local sig = dest:match('%a')
+if not D.tags[tag] then
-local id = dest:match('%d')
+D.tags[tag] = {}
-if not id then
+end
-id = self.last_channel + 1
+if D.tags[tag][channel.index] then
-end
+D.tags[tag][channel.index] = nil
-if not sig then
+D:Print('Removed |cFFFFFF00'..tag..'|r from |cFF00FFFF'.. dest .. '|r')
-sig = tag
+else
-end
+D.tags[tag][channel.index] = channel.index
-D:SetChannel(sig, id)
+D:Print('Assigning |cFFFFFF00'..tag..'|r to |cFF00FFFF'.. dest .. '|r')
 end
-D:Print('Assigning |cFFFFFF00'..tag..'|r to |cFF00FFFF'.. dest .. '|r')
 else
 D:Print('Usage: /dvn tag <prefix> <console name or number>')
 end
 return
 elseif mode ~= nil then
 else
 D:Print('toggled off?')
 end
 end
--- Bring console to the front
+--- Brings the console to the front.
+-- Frame method used to bring a console frame to the front of the display stack.
 local function Console_ToFront(c)
 --print(D.raise_ct, 'Raising', c.signature)
 --print(unpack(db.frontdrop))
 --print(unpack(db.frontgrad))
 --print(db.frontblend)
 D.raise_ct = D.raise_ct + 1
 c:Raise()
 c.out.backdrop:SetTexture(unpack(db.frontdrop))
 c.out.backdrop:SetGradientAlpha(unpack(db.frontgrad))
 c.out.backdrop:SetBlendMode(db.frontblend)
+D.current_channel = c.index
+for _, part in pairs(c.border) do
+part:SetTexture(1,0,0,1)
+end
 for id, bc in pairs(D.console) do
 if id ~= c.index then
 --print(D.raise_ct, 'Lowering', bc.signature)
 --print(unpack(db.backdrop))
 --print(unpack(db.backgrad))
 --print(db.backblend)
 bc.out.backdrop:SetTexture(unpack(db.backdrop))
 bc.out.backdrop:SetGradientAlpha(unpack(db.backgrad))
 bc.out.backdrop:SetBlendMode(db.backblend)
-end
-end
+for _, part in pairs(bc.border) do
+part:SetTexture(0,0,0.5,0.6)
 end
+end
--- Generate a console frame
--- @paramsig id, vars
+end
--- @param id channel number
--- @param vars alternative config, else uses db.channels[id]
+end
+--- Constructs the frame object for a console channel
+-- Initializes the console channel at a specified index.
+-- Configuration data can be overridden by passing a desired settings table.
+-- @param i Numeric index of the channel as it manifests in db.channels
+-- @param vars Optional settings table to be used.
 local function CreateConsole(i, vars)
 if not vars then
 vars = db.channels[i]
 end
 end
 return f
 end
--- Print to Devian output
+--- Creates a Devian-style output.
--- @paramsig tag, ...
+-- The first argument describes the channel to output on, and the remaining arguments are concatenated in a manner similar to default print()
--- @param tag channel signature or number used to select console
+-- This becomes the print handler when development mode is active. The original print() function is assigned to oldprint().
--- @param ... print arguments
+-- @param Tag, signature, or numeric index of the channel to output on. Defaults to primary channel.
+-- @param ... Output contents.
 local function Message(prefix, ...)
 if prefix == nil then
 prefix = 1
 end
-local channel
+local sendq = {}
+local tag, id
 local byName = true
+if D.tags[prefix] then
+for _, id in pairs(D.tags[prefix]) do
+if D.console[id] then
+sendq[id] = D.console[id]
+end
+end
+end
 if D.sig[prefix] then
-channel = D.sig[prefix]
+sendq[D.sig[prefix].index] = D.sig[prefix]
 elseif D.console[prefix] then
-channel = D.console[prefix]
+sendq[D.console[prefix]] = D.console[prefix]
-byName = nil
+else
-else
+sendq[D.primary_channel] = D.console[D.primary_channel]
-channel = D.console[1]
+end
-end
 -- color me timbers
 local pcolor
-if D.tags[prefix] then
+if (not db.tagcolor[prefix]) and byName then
-pcolor = db.tags[prefix]
-elseif byName then
 local c  = {0, 0, 0 }
 local max = string.len(prefix)
 for i = 1, max, 3 do
 for k, v in ipairs(c) do
 local j = i + (k - 1)
 c[k] = 0
 elseif c[k] > 127 then
 c[k] = 255
 end
 end
-D.tags[prefix] = string.format('%02X%02X%02X', unpack(c))
+db.tagcolor[prefix] = string.format('%02X%02X%02X', unpack(c))
 end
+pcolor = db.tagcolor[prefix]
-local buffer = {'|cFF'.. D.tags[prefix]..prefix ..'|r'}
+local buffer = {'|cFF'.. pcolor..prefix ..'|r'}
 for i = 1, select('#',...) do
 local var = select(i, ...)
 if type(var) == 'table' then
 var = '<table>'
 var = 'nil'
 end
 table.insert(buffer, var)
 end
-channel.out:AddMessage(table.concat(buffer, ' '))
+local message = table.concat(buffer, ' ')
+for id, channel in pairs(sendq) do
+channel.out:AddMessage(message)
+end
 table.wipe(buffer)
 end
--- Spaces each frame evenly across the screen
+--- Spaces each frame evenly across the screen.
 function D:DistributeFrames() --
 --print('frame grid:', max, num_side)
 local max = self.num_channels
 local num_side = math.ceil(math.sqrt(max))
 local w = GetScreenWidth() / num_side
 frame:Save()
 end
 end
--- Place all frames stacked beneath the primary frame
+--- Place all frames stacked beneath the primary frame.
--- @paramsig
 function D:StackFrames()
 local last
 for i, frame in pairs(self.console) do
 if last then
 frame.x = last.x
 frame:Save()
 last = frame
 end
 end
--- Creates or updates a console frame
+--- Updates a console "channel" entry, generating a new one if necessary.
--- @paramsig cinfo [, i]
+-- Config data will be take from cinfo. If cinfo is a string, then only channel signature is set. The remaining variables are filled in from the primary channel.
--- @param cinfo an array from db.channels[x] or the desired string signature
+-- i can be given to select a specific channel table entry to work on. Otherwise, it will just create a new channel and the frame associated with it.
--- @param id when set, the console at that index will be assigned all parameters in cinfo
+-- @usage cinfo [, i]
+-- @param cinfo Config variables table, or a string to be used as channel signature
+-- @param i Console index. If valid, settings will be inherited from that channel.
 function D:SetChannel(cinfo, i)
 --print('join:', i , cinfo)
 local t_info = {}
+local dbvars = db.channels[self.primary_channel]
+if type(cinfo) == 'string' then
+local signame = tostring(cinfo)
+t_info.signature = signame
+end
 if type(cinfo) ~= 'table' then
-t_info.signature = tostring(cinfo)
 cinfo = {}
 end
-local srcdb = db.channels[self.primary_channel]
-if i ~= nil then
+if i then
 i = tonumber(i)
 if db.channels[i] then
---print('pull vars from '..db.channels[i].signature)
+dbvars = db.channels[i]
-cinfo = db.channels[i]
+else
-srcdb = cinfo
+-- if there is no channels[i], then we need to check for sig collision
-end
+local sigvar = signame
-end
+local j = 2
+while D.sig[sigvar] do
-for k,v in pairs(srcdb) do
+sigvar = signame .. j
+j = j + 1
+end
+t_info.signature = sigvar
+end
+end
+if not (cinfo.signature or t_info.signature) then
+t_info.signature = 'Console'..i
+end
+for k,v in pairs(dbvars) do
 if not t_info[k] then
 if cinfo[k] then
---print('- pulling', k..':',v)
 t_info[k] = cinfo[k]
+elseif db.channels[self.primary_channel][k] then
+t_info[k] = db.channels[self.primary_channel][k]
 end
 end
 end
 if not db.channels[i] then
 t_info.x = t_info.x + 20
 t_info.y = t_info.y - 20
 db.channels[i] = t_info
 end
 if not self.console[i] then
 self.console[i] = CreateConsole(i, t_info)
 end
+local channel = self.console[i]
-self.sig[cinfo.signature] = self.console[i]
-self.sigID[cinfo.signature] = i
+self.sig[t_info.signature] = channel
-self.IDsig[i] = cinfo.signature
+self.sigID[t_info.signature] = i
+self.IDsig[i] = t_info.signature
+return channel
 end
 function D:OnEnable()
 -- commands
 local cmdlist = {
 if not cherry then
 cherry = "This character didn't have an AddOn table."
 end
 end
--- copy tags
-self.tags = {}
+if not db.tags then
-for n, c in pairs(db.tags) do
+db.tags = {}
-self.tags[n] = c
+end
-end
+self.tags = db.tags
 if cherry then
 D:Print(cherry)
 end
 D.oldprint = getprinthandler()
 if not _G.oldprint then
 if i > self.last_channel then
 self.last_channel = i
 end
 self.num_channels = self.num_channels + 1
 end
-setprinthandler(Message)
+if self.console[db.current_channel] then
+self.console[db.current_channel]:ToFront()
+end
+-- only do this in dev mode
+if db.enabled == false then
+setprinthandler(Message)
+print = function(...)
+_G.print('Dvn', ...)
+end
+end
 print(MAJOR, MINOR)
 end

Mercurial > wow > devian

comparison Devian.lua @ 18:01c32c98e72a v1.4