Miroirs/awesome
1
0
Fork 0
mirror of https://github.com/awesomeWM/awesome synced 2024-11-17 07:47:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

awful.titlebar: fix buttons bindings

Browse source 
A recent commit change and fix what was pushed upon click on widget.
We used to get only wibox (bug) but now we get widget, wibox.

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2009-04-29 15:05:23 +02:00
parent 7d20e63bc0
commit e43d2b76ef
1 changed files with 37 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
lib/awful/titlebar.lua.in
View file

@ -32,6 +32,20 @@ local data = setmetatable({}, { __mode = 'k' })
-- Predeclaration for buttons -- Predeclaration for buttons
local button_groups local button_groups
local function button_callback_focus_raise_move(w, t)
capi.client.focus = t.client
t.client:raise()
mouse.client.move(t.client)
end
local function button_callback_move(w, t)
return mouse.client.move(t.client)
end
local function button_callback_resize(w, t)
return mouse.client.resize(t.client)
end
--- Create a standard titlebar. --- Create a standard titlebar.
-- @param c The client. -- @param c The client.
-- @param args Arguments. -- @param args Arguments.
@ -58,16 +72,13 @@ function add(c, args)
local title = capi.widget({ type = "textbox", align = "flex" }) local title = capi.widget({ type = "textbox", align = "flex" })
if c.name then if c.name then
title.text = " " .. util.escape(c.name) .. " " title.text = " " .. util.escape(c.name) .. " "
else
title.text = nil
end end
-- Redirect relevant events to the client the titlebar belongs to -- Redirect relevant events to the client the titlebar belongs to
local bts = util.table.join( local bts = util.table.join(
button({ }, 1, function (t) capi.client.focus = t.client t.client:raise() mouse.client.move(t.client) end), button({ }, 1, button_callback_focus_raise_move),
button({ args.modkey }, 1, function (t) mouse.client.move(t.client) end), button({ args.modkey }, 1, button_callback_move),
button({ args.modkey }, 3, function (t) mouse.client.resize(t.client) end) button({ args.modkey }, 3, button_callback_resize))
)
title:buttons(bts) title:buttons(bts)
local appicon = capi.widget({ type = "imagebox", align = "left" }) local appicon = capi.widget({ type = "imagebox", align = "left" })
@ -145,11 +156,7 @@ end
-- @param theme The theme from beautifull. Used to get the image paths -- @param theme The theme from beautifull. Used to get the image paths
-- @param state The state the button is associated to. Containse path the action and info about the image -- @param state The state the button is associated to. Containse path the action and info about the image
local function button_new(c, name, modkey, theme, state) local function button_new(c, name, modkey, theme, state)
local bts = util.table.join( local bts = button({ }, 1, nil, state.action)
button({ }, 1, nil, state.action),
button({ modkey }, 1, function (t) mouse.client.move(t.client) end),
button({ modkey }, 3, function (t) mouse.client.resize(t.client) end)
)
-- get the image path from the theme. Only return a button if we find an image -- get the image path from the theme. Only return a button if we find an image
local img local img
@ -320,50 +327,50 @@ local close_buttons = button_group("close",
{ align = "left" }, { align = "left" },
select_state_focus, select_state_focus,
{ idx = "n", img = "normal", { idx = "n", img = "normal",
action = function (t) t.client:kill() end }, action = function (w, t) t.client:kill() end },
{ idx = "f", img = "focus", { idx = "f", img = "focus",
action = function (t) t.client:kill() end }) action = function (w, t) t.client:kill() end })
local ontop_buttons = button_group("ontop", local ontop_buttons = button_group("ontop",
{ align = "right" }, { align = "right" },
function(c,p) return select_state(c, p, "ontop") end, function(c,p) return select_state(c, p, "ontop") end,
{ idx = "n/i", img = "normal_inactive", { idx = "n/i", img = "normal_inactive",
action = function(t) t.client.ontop = true end }, action = function(w, t) t.client.ontop = true end },
{ idx = "f/i", img = "focus_inactive", { idx = "f/i", img = "focus_inactive",
action = function(t) t.client.ontop = true end }, action = function(w, t) t.client.ontop = true end },
{ idx = "n/a", img = "normal_active", { idx = "n/a", img = "normal_active",
action = function(t) t.client.ontop = false end }, action = function(w, t) t.client.ontop = false end },
{ idx = "f/a", img = "focus_active", { idx = "f/a", img = "focus_active",
action = function(t) t.client.ontop = false end }) action = function(w, t) t.client.ontop = false end })
local sticky_buttons = button_group("sticky", local sticky_buttons = button_group("sticky",
{ align = "right" }, { align = "right" },
function(c,p) return select_state(c,p,"sticky") end, function(c,p) return select_state(c,p,"sticky") end,
{ idx = "n/i", img = "normal_inactive", { idx = "n/i", img = "normal_inactive",
action = function(t) t.client.sticky = true end }, action = function(w, t) t.client.sticky = true end },
{ idx = "f/i", img = "focus_inactive", { idx = "f/i", img = "focus_inactive",
action = function(t) t.client.sticky = true end }, action = function(w, t) t.client.sticky = true end },
{ idx = "n/a", img = "normal_active", { idx = "n/a", img = "normal_active",
action = function(t) t.client.sticky = false end }, action = function(w, t) t.client.sticky = false end },
{ idx = "f/a", img = "focus_active", { idx = "f/a", img = "focus_active",
action = function(t) t.client.sticky = false end }) action = function(w, t) t.client.sticky = false end })
local maximized_buttons = button_group("maximized", local maximized_buttons = button_group("maximized",
{ align = "right" }, { align = "right" },
select_state_maximized, select_state_maximized,
{ idx = "n/i", img = "normal_inactive", { idx = "n/i", img = "normal_inactive",
action = function(t) t.client.maximized_horizontal = true action = function(w, t) t.client.maximized_horizontal = true
t.client.maximized_vertical = true end }, t.client.maximized_vertical = true end },
{ idx = "f/i", img = "focus_inactive", { idx = "f/i", img = "focus_inactive",
action = function(t) t.client.maximized_horizontal = true action = function(w, t) t.client.maximized_horizontal = true
t.client.maximized_vertical = true end }, t.client.maximized_vertical = true end },
{ idx = "n/a", img = "normal_active", { idx = "n/a", img = "normal_active",
action = function(t) t.client.maximized_horizontal = false action = function(w, t) t.client.maximized_horizontal = false
t.client.maximized_vertical = false end }, t.client.maximized_vertical = false end },
{ idx = "f/a", img = "focus_active", { idx = "f/a", img = "focus_active",
action = function(t) t.client.maximized_horizontal = false action = function(w, t) t.client.maximized_horizontal = false
t.client.maximized_vertical = false end }) t.client.maximized_vertical = false end })
local function floating_update(t) local function floating_update(w, t)
client.floating.toggle(t.client) client.floating.toggle(t.client)
end end