add freedesktop menu

[etc/awesome.git] / .config / awesome / rc.lua

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 5fa82cb1254acf340fcce2d261df76c742db0e56..08cb946765ad15ab8202e6e69f9aee2fb1456885 100644 (file)
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -14,6 +14,7 @@ local hotkeys_popup = require("awful.hotkeys_popup").widget
 local lain = require("lain")
 local dkjson = require("lain.util").dkjson
 local math = require("math")
+local freedesktop = require("freedesktop")
 -- }}}
 
 -- {{{ Error handling
@@ -178,10 +179,14 @@ myawesomemenu = {
    { "quit", awesome.quit }
 }
 
-mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon },
-                                    { "open terminal", terminal }
-                                  }
-                        })
+mymainmenu = freedesktop.menu.build({
+    before = {
+        { "awesome", myawesomemenu, beautiful.awesome_icon },
+        { "terminal", terminal },
+    },
+    after = {
+    }
+})
 
 mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon,
                                      menu = mymainmenu })
@@ -480,6 +485,8 @@ clientkeys = awful.util.table.join(
     awful.key({ modkey,           }, "m",
         function (c)
             c.maximized = not c.maximized
+            c.maximized_horizontal = false
+            c.maximized_vertical = false
             c:raise()
         end ,
         {description = "maximize", group = "client"})
@@ -551,7 +558,7 @@ awful.key({ cmdkey }, "g", function () awful.spawn("gscan2pdf") end),
 awful.key({ cmdkey }, "v", function () awful.spawn("virt-manager") end),
 awful.key({ cmdkey }, "l", function () awful.spawn("libreoffice") end),
 awful.key({ cmdkey }, "f", function () awful.spawn("thunar") end),
-awful.key({ cmdkey }, "i", function () awful.spawn(terminal .. " -name irc -e env MOSH_TITLE_NOPREFIX=true mosh -4 -- irc-host tmux new -DAs irc irssi") end),
+awful.key({ cmdkey }, "i", function () awful.spawn(terminal .. " -name irc -e env MOSH_TITLE_NOPREFIX=true mosh -4 -- irc-host tmux new -As irc irssi") end),
 awful.key({ cmdkey }, "x", function () awful.spawn.with_shell("/sbin/start-stop-daemon --start --background --exec /usr/bin/xscreensaver -- -no-capture-stderr; sleep 2; xscreensaver-command -lock") end),
 awful.key({ cmdkey, "Shift" }, "x", function () awful.spawn("xscreensaver-command -exit") end),
 
@@ -670,6 +677,16 @@ awful.rules.rules = {
                    floating = true,
                },
            },
+    { rule = { class = "Pinentry", instance = "pinentry" },
+               properties = {
+                   floating = true,
+               },
+           },
+    { rule = { class = "Gxmessage" },
+               properties = {
+                   floating = true,
+               },
+           },
 }
 -- }}}
 
@@ -686,6 +703,9 @@ client.connect_signal("manage", function (c)
         -- Prevent clients from being unreachable after screen count changes.
         awful.placement.no_offscreen(c)
     end
+
+    c.maximized_horizontal = false
+    c.maximized_vertical = false
 end)
 
 -- Add a titlebar if titlebars_enabled is set to true in the rules.
@@ -742,7 +762,7 @@ client.connect_signal("focus", function(c) c.border_color = beautiful.border_foc
 client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
 
 awful.ewmh.add_activate_filter(function(c, context, hints)
-    if context == "ewmh" and c.class == "Firefox-esr" or c.class == "Firefox" then return false end
+    if context == "ewmh" and (c.class == "Firefox-esr" or c.class == "Firefox") then return false end
 end)
 
 -- vim:ft=lua:sw=4:sts=4:ts=4:et