awesomewm-mirrors
/
tyrannical
mirror of https://github.com/Elv13/tyrannical.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Experimental changes, please report any regression, required to implement show_tag and future changes

This commit is contained in:
Emmanuel LEpage Vallee 2013-05-21 22:43:07 -04:00
parent aaf88ee7a8
commit f160e95917
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
init.lua
View File

@ -44,7 +44,6 @@ local function fill_tyrannical(tab_in,tab_out,value)
for i=1,#tab_in do for i=1,#tab_in do
local low = string.lower(tab_in[i]) local low = string.lower(tab_in[i])
local tmp = tab_out[low] or {tags={},properties={}} local tmp = tab_out[low] or {tags={},properties={}}
value.instances= value.instances or {}
tmp.tags[#tmp.tags+1] = value tmp.tags[#tmp.tags+1] = value
tab_out[low] = tmp tab_out[low] = tmp
end end
@ -55,17 +54,16 @@ end
local function load_tags(tyrannical_tags) local function load_tags(tyrannical_tags)
for k,v in ipairs(tyrannical_tags) do for k,v in ipairs(tyrannical_tags) do
if v.init ~= false then if v.init ~= false then
v.instances = {}
local stype = type(v.screen) local stype = type(v.screen)
if stype == "table" then if stype == "table" then
for k2,v2 in pairs(v.screen) do for k2,v2 in pairs(v.screen) do
if v2 <= capi.screen.count() then if v2 <= capi.screen.count() then
v.screen = v2 v.screen = v2
v.instances[v2] = awful.tag.add(v.name,v) awful.tag.add(v.name,v)
end end
end end
elseif (v.screen or 1) <= capi.screen.count() then elseif (v.screen or 1) <= capi.screen.count() then
v.instances[v.screen or 1] = awful.tag.add(v.name,v) awful.tag.add(v.name,v)
end end
elseif v.volatile == nil then elseif v.volatile == nil then
v.volatile = true v.volatile = true
@ -130,7 +128,7 @@ local function match_client(c, startup)
tag_tmp.screen = tag_tmp.force_screen == true and tag_tmp.screen or c.screen tag_tmp.screen = tag_tmp.force_screen == true and tag_tmp.screen or c.screen
tag_tmp.screen = (tag_tmp.screen <= capi.screen.count()) and tag_tmp.screen or 1 tag_tmp.screen = (tag_tmp.screen <= capi.screen.count()) and tag_tmp.screen or 1
c.screen = tag_tmp.screen c.screen = tag_tmp.screen
tag_tmp.instances[(c.screen <= capi.screen.count()) and tag_tmp.screen or 1] = awful.tag.add(tag_tmp.name,tag_tmp) awful.tag.add(tag_tmp.name,tag_tmp)
tag_tmp.screen = cache tag_tmp.screen = cache
end end
tags[#tags+1] = tag_tmp.instances[(c.screen <= capi.screen.count()) and c.screen or 1] tags[#tags+1] = tag_tmp.instances[(c.screen <= capi.screen.count()) and c.screen or 1]
@ -200,6 +198,8 @@ awful.tag.add,awful.tag._setscreen = function(tag,props)
end end
t.selected = props.selected or false t.selected = props.selected or false
t:connect_signal("property::selected", function(t) on_selected_change(t,props or {}) end) t:connect_signal("property::selected", function(t) on_selected_change(t,props or {}) end)
props.instances = props.instances or {}
props.instances[t.screen or 1] = t
return t return t
end,awful.tag.setscreen end,awful.tag.setscreen
@ -235,11 +235,11 @@ local function getter (table, key)
if key == "properties" then if key == "properties" then
return properties return properties
elseif key == "tags_by_name" then elseif key == "tags_by_name" then
return tags_hash return tags_hash --Getter only, use .tags for setter, see syntax
end end
end end
local function setter (table, key,value) local function setter (table, key,value)
if key == "tags" then if key == "tags" then --Setter only, use "tags_by_name" to get
load_tags(value) load_tags(value)
elseif key == "properties" then elseif key == "properties" then
properties = value properties = value