From 1aa1c8052db101744735d7f2d8788dd045bb7b28 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 29 Mar 2015 20:18:29 +0200 Subject: [PATCH 1/2] Add client.get_transient_for_matching and .is_transient_for --- lib/awful/client.lua | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/lib/awful/client.lua b/lib/awful/client.lua index 098545d6..ca32b0cf 100644 --- a/lib/awful/client.lua +++ b/lib/awful/client.lua @@ -1030,6 +1030,37 @@ function client.run_or_raise(cmd, matcher, merge) util.spawn(cmd) end +--- Get a matching transient_for client (if any). +-- @client c The client. +-- @tparam function matcher A function that should return true, if +-- a matching parent client is found. +-- @treturn client.client|nil The matching parent client or nil. +function client.get_transient_for_matching(c, matcher) + local tc = c.transient_for + while tc do + if matcher(tc) then + return tc + end + tc = tc.transient_for + end + return nil +end + +--- Is a client transient for another one? +-- @client c The child client (having transient_for). +-- @client c2 The parent client to check. +-- @treturn client.client|nil The parent client or nil. +function client.is_transient_for(c, c2) + local tc = c + while tc.transient_for do + if tc.transient_for == c2 then + return tc + end + tc = tc.transient_for + end + return nil +end + -- Register standards signals capi.client.add_signal("property::floating_geometry") capi.client.add_signal("property::floating") From 57ec268b8e0e3666a29a25305f68e6031a2d9e48 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 29 Mar 2015 20:20:53 +0200 Subject: [PATCH 2/2] tasklist: handle transient_for with skip_taskbar clients Ref: https://github.com/awesomeWM/awesome/issues/182 --- lib/awful/widget/tasklist.lua | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/awful/widget/tasklist.lua b/lib/awful/widget/tasklist.lua index 8a8c7656..052959d1 100644 --- a/lib/awful/widget/tasklist.lua +++ b/lib/awful/widget/tasklist.lua @@ -79,7 +79,17 @@ local function tasklist_label(c, args) else name = name .. (util.escape(c.name) or util.escape("")) end - if capi.client.focus == c then + local focused = capi.client.focus == c + -- Handle transient_for: the first parent that does not skip the taskbar + -- is considered to be focused, if the real client has skip_taskbar. + if not focused and capi.client.focus and capi.client.focus.skip_taskbar + and client.get_transient_for_matching(capi.client.focus, + function(c) + return not c.skip_taskbar + end) == c then + focused = true + end + if focused then bg = bg_focus text = text .. ""..name.."" bg_image = bg_image_focus