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

alttab: Prevent toggle from other screens

This commit is contained in:
Emmanuel Lepage Vallee 2015-03-08 18:37:32 -04:00
parent 4be9babed8
commit e65ae86d1d
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
impl/alttab/init.lua
View File

@ -113,9 +113,10 @@ local function new(args)
return return
end end
local t,auto_release = tag.selected(capi.client.focus and capi.client.focus.screen or capi.mouse.screen),args.auto_release local scr = capi.client.focus and capi.client.focus.screen or capi.mouse.screen
local t,auto_release = tag.selected(scr),args.auto_release
local currentMenu = radical.box({filter = true, show_filter=not auto_release, autodiscard = true, local currentMenu = radical.box({filter = true, show_filter=not auto_release, autodiscard = true,
disable_markup=true,fkeys_prefix=not auto_release,width=(((capi.screen[capi.client.focus and capi.client.focus.screen or capi.mouse.screen]).geometry.width)/2), disable_markup=true,fkeys_prefix=not auto_release,width=(((capi.screen[scr]).geometry.width)/2),
icon_transformation = beautiful.alttab_icon_transformation,filter_underlay="Use [Shift] and [Control] to toggle clients",filter_underlay_color=beautiful.menu_bg_normal, icon_transformation = beautiful.alttab_icon_transformation,filter_underlay="Use [Shift] and [Control] to toggle clients",filter_underlay_color=beautiful.menu_bg_normal,
filter_placeholder="<span fgcolor='".. (beautiful.menu_fg_disabled or beautiful.fg_disabled or "#777777") .."'>Type to filter</span>"}) filter_placeholder="<span fgcolor='".. (beautiful.menu_fg_disabled or beautiful.fg_disabled or "#777777") .."'>Type to filter</span>"})
@ -152,6 +153,7 @@ local function new(args)
local item = currentMenu._current_item local item = currentMenu._current_item
item.checked = not item.checked item.checked = not item.checked
local c = item.client local c = item.client
if c.screen ~= scr then return end
client2.toggletag (t, c) client2.toggletag (t, c)
reload_underlay(c,item) reload_underlay(c,item)
if not auto_release then if not auto_release then
@ -165,8 +167,10 @@ local function new(args)
currentMenu:add_key_hook({}, "Control_L", "press", function() currentMenu:add_key_hook({}, "Control_L", "press", function()
local item = currentMenu._current_item local item = currentMenu._current_item
item.checked = not item.checked item.checked = not item.checked
client2.movetotag(t, item.client) local c = item.client
reload_underlay(item.client,item) if c.screen ~= scr then return end
client2.movetotag(t, c)
reload_underlay(c,item)
if not auto_release then if not auto_release then
reload_highlight(item) reload_highlight(item)
end end
@ -193,8 +197,8 @@ local function new(args)
suffix_widget = not auto_release and l or nil, suffix_widget = not auto_release and l or nil,
selected = capi.client.focus and capi.client.focus == v, selected = capi.client.focus and capi.client.focus == v,
underlay = underlays, underlay = underlays,
checkable = not auto_release, checkable = (not auto_release) and v.screen == scr,
checked = not auto_release and is_in_tag(t,v) or nil, checked = v.screen == scr and (not auto_release and is_in_tag(t,v)) or nil,
button1 = function(a,b,c,d,no_hide) button1 = function(a,b,c,d,no_hide)
local t = focusTag[v] or v:tags()[1] local t = focusTag[v] or v:tags()[1]
if t and t.selected == false and not util.table.hasitem(v:tags(),tag.selected(v.screen)) then if t and t.selected == false and not util.table.hasitem(v:tags(),tag.selected(v.screen)) then