From 8824d9f70348423b348ff1f54b6fd2b4d79ed2b0 Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Wed, 22 Oct 2008 17:52:51 +0200
Subject: [PATCH] awful.menu: add support for functions

Signed-off-by: Julien Danjou <julien@danjou.info>
---
 awesomerc.lua.in      | 13 ++++++-------
 lib/awful/menu.lua.in |  2 ++
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/awesomerc.lua.in b/awesomerc.lua.in
index f23bd3eb..4a94e6cc 100644
--- a/awesomerc.lua.in
+++ b/awesomerc.lua.in
@@ -100,21 +100,20 @@ mytextbox.text = "<b><small> " .. AWESOME_RELEASE .. " </small></b>"
 
 -- Create a laucher widget and a main menu
 myawesomemenu = {
-   {"manual", terminal .. " -e man awesome"},
-   {"edit config", terminal .. " -e nano ~/.config/awesome/rc.lua"},
-   {"restart", "echo \"awesome.restart()\" | awesome-client"},
-   {"quit", "echo \"awesome.quit()\" | awesome-client"}
+   {"manual", terminal .. " -e man awesome" },
+   {"edit config", terminal .. " -e " .. os.getenv("EDITOR") .. " ~/.config/awesome/rc.lua" },
+   {"restart", awesome.restart },
+   {"quit", awesome.quit }
 }
 
 mymainmenu = {
    {"awesome", myawesomemenu, "@AWESOME_ICON_PATH@/awesome16.png" },
-   {"open terminal", terminal}
+   {"open terminal", terminal }
 }
 
 mylauncher = awful.widget.launcher({ name = "mylauncher",
                                      image = "@AWESOME_ICON_PATH@/awesome16.png",
-                                     menu = {"mymainmenu", mymainmenu}
-                                  })
+                                     menu = { "mymainmenu", mymainmenu } })
 
 -- Create a systray
 mysystray = widget({ type = "systray", name = "mysystray", align = "right" })
diff --git a/lib/awful/menu.lua.in b/lib/awful/menu.lua.in
index 2aac84c5..593860f3 100644
--- a/lib/awful/menu.lua.in
+++ b/lib/awful/menu.lua.in
@@ -92,6 +92,8 @@ local function exec(data, action, num)
     elseif type(action[2]) == "string" then
         destroy(get_parents(data))
         util.spawn(action[2])
+    elseif type(action[2]) == "function" then
+        action[2]()
     end
 end
 
-- 
2.11.4.GIT