Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add callback support for client.jumpto 

Instead of true/false `merge` can be a callback now, which allows for
more dynamic handling of the client not being visible, e.g. moving it to
the current tag, instead of merging.
This commit is contained in:
Daniel Hahler 2016-02-28 22:45:15 +01:00
parent 4ba8386f7b
commit 0278d5f123
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/awful/client.lua
View File

@ -65,7 +65,10 @@ client.shape = require("awful.client.shape")
-- Takes care of focussing the screen, the right tag, etc. -- Takes care of focussing the screen, the right tag, etc.
-- --
-- @client c the client to jump to -- @client c the client to jump to
-- @tparam bool merge If true then merge tags when clients are not visible. -- @tparam bool|function merge If true then merge tags (select the client's
-- first tag additionally) when the client is not visible.
-- If it is a function, it will be called with the client and its first
-- tag as arguments.
function client.jumpto(c, merge) function client.jumpto(c, merge)
local s = get_screen(screen.focused()) local s = get_screen(screen.focused())
-- focus the screen -- focus the screen
@ -73,12 +76,16 @@ function client.jumpto(c, merge)
screen.focus(c.screen) screen.focus(c.screen)
end end
-- Try to make client visible, this also covers e.g. sticky -- Try to make client visible, this also covers e.g. sticky.
local t = c.first_tag if not c:isvisible() then
if t and not c:isvisible() then local t = c.first_tag
if merge then if merge then
t.selected = true if type(merge) == "function" then
else merge(c, t)
elseif t then
t.selected = true
end
elseif t then
tag.viewonly(t) tag.viewonly(t)
end end
end end
@ -105,7 +112,9 @@ end
--- Jump to the client that received the urgent hint first. --- Jump to the client that received the urgent hint first.
-- --
-- @tparam bool merge If true then merge tags when clients are not visible. -- @tparam bool|function merge If true then merge tags (select the client's
-- first tag additionally) when the client is not visible.
-- If it is a function, it will be called with the client as argument.
function client.urgent.jumpto(merge) function client.urgent.jumpto(merge)
local c = client.urgent.get() local c = client.urgent.get()
if c then if c then
@ -1027,7 +1036,9 @@ end
-- --
-- @param cmd the command to execute -- @param cmd the command to execute
-- @param matcher a function that returns true to indicate a matching client -- @param matcher a function that returns true to indicate a matching client
-- @param merge if true then merge tags when clients are not visible -- @tparam bool|function merge If true then merge tags (select the client's
-- first tag additionally) when the client is not visible.
-- If it is a function, it will be called with the client as argument.
-- --
-- @usage -- run or raise urxvt (perhaps, with tabs) on modkey + semicolon -- @usage -- run or raise urxvt (perhaps, with tabs) on modkey + semicolon
-- awful.key({ modkey, }, 'semicolon', function () -- awful.key({ modkey, }, 'semicolon', function ()