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

awful.menu: optimizations 

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Damien Leone 2009-03-04 19:42:25 +01:00 committed by Julien Danjou
parent 858802537f
commit e823596e5a
1 changed files with 52 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
lib/awful/menu.lua.in
View File

@ -13,7 +13,12 @@ local wibox = wibox
local image = image local image = image
local widget = widget local widget = widget
local button = button local button = button
local capi = { screen = screen, mouse = mouse, client = client } local capi =
{
screen = screen,
mouse = mouse,
client = client
}
local util = require("awful.util") local util = require("awful.util")
local tags = require("awful.tag") local tags = require("awful.tag")
local awbeautiful = require("beautiful") local awbeautiful = require("beautiful")
@ -44,6 +49,13 @@ local function load_theme(custom)
return theme return theme
end end
local function item_leave(menu, num)
if num > 0 then
menu.items[num].wibox.fg = menu.theme.fg_normal
menu.items[num].wibox.bg = menu.theme.bg_normal
end
end
--- Hide a menu popup. --- Hide a menu popup.
-- @param menu The menu to hide. -- @param menu The menu to hide.
function hide(menu) function hide(menu)
@ -51,63 +63,69 @@ function hide(menu)
for i = 1, #menu.items do for i = 1, #menu.items do
-- Call mouse_leave to clear menu entry -- Call mouse_leave to clear menu entry
for k, w in pairs(menu.items[i].wibox.widgets) do for k, w in pairs(menu.items[i].wibox.widgets) do
w.mouse_leave() item_leave(menu, i)
end end
menu.items[i].wibox.screen = nil menu.items[i].wibox.screen = nil
end end
if menu.active_child then if menu.active_child then
menu.active_child:hide() menu.active_child:hide()
active_child = nil menu.active_child = nil
end end
menu.sel = nil
end end
-- Get the elder parent so for example when you kill -- Get the elder parent so for example when you kill
-- it, it will destroy the whole family. -- it, it will destroy the whole family.
local function get_parents(data) local function get_parents(menu)
if data.parent then if menu.parent then
return get_parents(data.parent) return get_parents(menu.parent)
end end
return data return menu
end end
local function exec(data, num) local function exec(menu, num, mouse_event)
cmd = data.items[num].cmd cmd = menu.items[num].cmd
if type(cmd) == "table" then if type(cmd) == "table" then
if not data.child[num] then if not menu.child[num] then
data.child[num] = new({ items = cmd }, data, num) menu.child[num] = new({ items = cmd }, menu, num)
end end
if data.active_child then
data.active_child:hide() if menu.active_child then
menu.active_child:hide()
menu.active_child = nil
end end
data.active_child = data.child[num] menu.active_child = menu.child[num]
data.active_child:show() menu.active_child:show()
elseif type(cmd) == "string" then elseif type(cmd) == "string" then
get_parents(data):hide() get_parents(menu):hide()
util.spawn(cmd) util.spawn(cmd)
elseif type(cmd) == "function" then elseif type(cmd) == "function" then
get_parents(data):hide() get_parents(menu):hide()
cmd() cmd()
end end
end end
local function item_enter(data, num) local function item_enter(menu, num, mouse_event)
data.items[num].wibox.fg = data.theme.fg_focus if menu.sel == num then
data.items[num].wibox.bg = data.theme.bg_focus return
elseif menu.sel then
if data.auto_expand == true then item_leave(menu, menu.sel)
if data.active_child then
data.active_child:hide()
end end
if type(data.items[num].cmd) == "table" then menu.items[num].wibox.fg = menu.theme.fg_focus
exec(data, num) menu.items[num].wibox.bg = menu.theme.bg_focus
end menu.sel = num
end
end
local function item_leave(data, num) if menu.auto_expand and mouse_event then
data.items[num].wibox.fg = data.theme.fg_normal if menu.active_child then
data.items[num].wibox.bg = data.theme.bg_normal menu.active_child:hide()
menu.active_child = nil
end
if type(menu.items[num].cmd) == "table" then
exec(menu, num)
end
end
end end
local function add_item(data, num, item_info) local function add_item(data, num, item_info)
@ -121,7 +139,7 @@ local function add_item(data, num, item_info)
-- Create bindings -- Create bindings
local bindings = { local bindings = {
button({}, 1, function () exec(data, num) end), button({}, 1, function () item_enter(data, num); exec(data, num) end),
button({}, 3, function () hide(data) end) button({}, 3, function () hide(data) end)
} }
@ -146,11 +164,8 @@ local function add_item(data, num, item_info)
item:buttons(bindings) item:buttons(bindings)
function label.mouse_enter() item_enter(data, num) end function label.mouse_enter() item_enter(data, num, true) end
function label.mouse_leave() item_leave(data, num) end function item.mouse_enter() item_enter(data, num, true) end
function item.mouse_enter() item_enter(data, num) end
function item.mouse_leave() item_leave(data, num) end
-- Create the submenu icon widget -- Create the submenu icon widget
local submenu local submenu
@ -159,8 +174,7 @@ local function add_item(data, num, item_info)
submenu.image = data.theme.submenu_icon and image(data.theme.submenu_icon) submenu.image = data.theme.submenu_icon and image(data.theme.submenu_icon)
submenu:buttons(bindings) submenu:buttons(bindings)
function submenu.mouse_enter() item_enter(data, num) end function submenu.mouse_enter() item_enter(data, num, true) end
function submenu.mouse_leave() item_leave(data, num) end
end end
-- Add widgets to the wibox -- Add widgets to the wibox