awesome: update bindings

diff --git a/awesome/bindings.lua b/awesome/bindings.lua
index 47b4288db31315c9c100058b35b99435befe749a..a482d3628114baae7221e0924e7bbfcd32b92519 100644 (file)
--- a/awesome/bindings.lua
+++ b/awesome/bindings.lua
@@ -1,3 +1,5 @@
+local hotkeys_popup = require("awful.hotkeys_popup").widget
+

 -- Default modkey.
 modkey = "Mod4"
 altkey = "Mod1"
 -- Default modkey.
 modkey = "Mod4"
 altkey = "Mod1"


@@ -7,49 +9,104 @@ root.buttons(awful.util.table.join(
     awful.button({ }, 3, function () mymainmenu:toggle() end)
 ))
 
     awful.button({ }, 3, function () mymainmenu:toggle() end)
 ))
 

-clientbuttons = awful.util.table.join(
-    awful.button({ }, 1, function (c) client.focus = c; c:raise() end),
-    awful.button({ modkey }, 1, awful.mouse.client.move),
-    awful.button({ modkey }, 3, awful.mouse.client.resize))
-

 -- Global Keys {{{1
 globalkeys = awful.util.table.join(globalkeys,
 -- Global Keys {{{1
 globalkeys = awful.util.table.join(globalkeys,

-    -- Awesome Keys {{{2
-    awful.key({ modkey,           }, "j",
-        function ()
-            awful.client.focus.byidx(-1)
-            if client.focus then client.focus:raise() end
-        end),
+    awful.key({ modkey,           }, "s",      hotkeys_popup.show_help,
+              {description="show help", group="awesome"}),
+    awful.key({ modkey,           }, "Left",   awful.tag.viewprev,
+              {description = "view previous", group = "tag"}),
+    awful.key({ modkey,           }, "Down",   awful.tag.viewprev,
+              {description = "view previous", group = "tag"}),
+    awful.key({ modkey,           }, "Right",  awful.tag.viewnext,
+              {description = "view next", group = "tag"}),
+    awful.key({ modkey,           }, "Up",  awful.tag.viewnext,
+              {description = "view next", group = "tag"}),
+    awful.key({ modkey,           }, "Escape", awful.tag.history.restore,
+              {description = "go back", group = "tag"}),
+

     awful.key({ modkey,           }, "k",
         function ()
             awful.client.focus.byidx( 1)
     awful.key({ modkey,           }, "k",
         function ()
             awful.client.focus.byidx( 1)

-            if client.focus then client.focus:raise() end
-        end),
+        end,
+        {description = "focus next by index", group = "client"}
+    ),
+    awful.key({ modkey,           }, "j",
+        function ()
+            awful.client.focus.byidx(-1)
+        end,
+        {description = "focus previous by index", group = "client"}
+    ),
+    awful.key({ modkey,           }, "w", function () mymainmenu:show({ coords = { x = 0, y = 0}}) end,
+              {description = "show main menu", group = "awesome"}),

 
     -- Layout manipulation
 
     -- Layout manipulation

-    awful.key({ modkey, "Shift"   }, "j", function () awful.client.swap.byidx(  1)    end),
-    awful.key({ modkey, "Shift"   }, "k", function () awful.client.swap.byidx( -1)    end),
-    awful.key({ modkey,           }, "u", awful.client.urgent.jumpto),
+    awful.key({ modkey, "Shift"   }, "j", function () awful.client.swap.byidx(  1)    end,
+              {description = "swap with next client by index", group = "client"}),
+    awful.key({ modkey, "Shift"   }, "k", function () awful.client.swap.byidx( -1)    end,
+              {description = "swap with previous client by index", group = "client"}),
+    awful.key({ modkey,         }, "#49",     function () awful.screen.focus_relative( 1) end, -- that's the key left of 1 (chronos)
+              {description = "focus the next screen", group = "screen"}),
+    awful.key({ modkey,           }, "=",     function () awful.screen.focus_relative( 1) end, -- that's the key left of 1 (kinesis)
+              {description = "focus the next screen", group = "screen"}),
+    awful.key({ modkey, "Control" }, "Right", function () awful.screen.focus_relative(-1) end,
+              {description = "focus the next screen", group = "screen"}),
+    awful.key({ modkey, "Control" }, "Left",  function () awful.screen.focus_relative(-1) end,
+              {description = "focus the previous screen", group = "screen"}),
+    awful.key({ modkey,           }, "u", awful.client.urgent.jumpto,
+              {description = "jump to urgent client", group = "client"}),

     awful.key({ modkey,           }, "Tab",
         function ()
             awful.client.focus.history.previous()
             if client.focus then
                 client.focus:raise()
             end
     awful.key({ modkey,           }, "Tab",
         function ()
             awful.client.focus.history.previous()
             if client.focus then
                 client.focus:raise()
             end

-        end),
+        end,
+        {description = "go back", group = "client"}),

 
     -- Standard program
 
     -- Standard program

-    awful.key({ modkey,           }, "Return", function () awful.util.spawn(terminal) end),
-    awful.key({ modkey, "Control" }, "r", awesome.restart),
+    awful.key({ modkey,           }, "Return", function () awful.spawn(terminal) end,
+              {description = "open a terminal", group = "launcher"}),
+    awful.key({ modkey, "Control" }, "r", awesome.restart,
+              {description = "reload awesome", group = "awesome"}),
+
+    awful.key({ modkey,           }, "h",     function () awful.tag.incmwfact(-0.05)          end,
+              {description = "increase master width factor", group = "layout"}),
+    awful.key({ modkey,           }, "l",     function () awful.tag.incmwfact( 0.05)          end,
+              {description = "decrease master width factor", group = "layout"}),
+    awful.key({ modkey, "Shift"   }, "h",     function () awful.tag.incnmaster( 1, nil, true) end,
+              {description = "increase the number of master clients", group = "layout"}),
+    awful.key({ modkey, "Shift"   }, "l",     function () awful.tag.incnmaster(-1, nil, true) end,
+              {description = "decrease the number of master clients", group = "layout"}),
+    awful.key({ modkey, "Control" }, "h",     function () awful.tag.incncol( 1, nil, true)    end,
+              {description = "increase the number of columns", group = "layout"}),
+    awful.key({ modkey, "Control" }, "l",     function () awful.tag.incncol(-1, nil, true)    end,
+              {description = "decrease the number of columns", group = "layout"}),
+    -- resize slave
+    awful.key({ modkey, "Control" }, "j",     function () awful.client.incwfact( 0.05)  end,
+              {description = "increase focused client window factor", group = "layout"}),
+    awful.key({ modkey, "Control" }, "k",     function () awful.client.incwfact(-0.05)  end,
+              {description = "decrease focused client window factor", group = "layout"}),

 
 

-    awful.key({ modkey,           }, "h",     function () awful.tag.incmwfact(-0.05)    end),
-    awful.key({ modkey,           }, "l",     function () awful.tag.incmwfact( 0.05)    end),
-    awful.key({ modkey, "Shift"   }, "h",     function () awful.tag.incnmaster( 1)      end),
-    awful.key({ modkey, "Shift"   }, "l",     function () awful.tag.incnmaster(-1)      end),
-    awful.key({ modkey, "Control" }, "h",     function () awful.tag.incncol( 1)         end),
-    awful.key({ modkey, "Control" }, "l",     function () awful.tag.incncol(-1)         end),
+    -- switch between layouts
+    awful.key({ modkey,           }, "]", function () awful.layout.inc( 1)                end,
+              {description = "select next", group = "layout"}),
+    awful.key({ modkey,           }, "[", function () awful.layout.inc(-1)                end,
+              {description = "select previous", group = "layout"}),

 
 

-    awful.key({ modkey, "Control" }, "n", awful.client.restore),
+    awful.key({ modkey, "Control" }, "n",
+              function ()
+                  local c = awful.client.restore()
+                  -- Focus restored client
+                  if c then
+                      client.focus = c
+                      c:raise()
+                  end
+              end,
+              {description = "restore minimized", group = "client"}),
+
+    -- Prompt
+    awful.key({ modkey },            "space",     function () awful.screen.focused().mypromptbox:run() end,
+              {description = "run prompt", group = "launcher"}),

 
     awful.key({ modkey }, "x",
               function ()
 
     awful.key({ modkey }, "x",
               function ()


@@ -61,43 +118,26 @@ globalkeys = awful.util.table.join(globalkeys,
                   }
               end,
               {description = "lua execute prompt", group = "awesome"}),
                   }
               end,
               {description = "lua execute prompt", group = "awesome"}),

-    -- Menubar
-    -- awful.key({ modkey }, "p", function() menubar.show() end),

 
 

-    -- My Keys {{{2
-    awful.key({ modkey,           }, "Left",   awful.tag.viewprev       ),
-    awful.key({ modkey,           }, "Down",   awful.tag.viewprev       ),
-    awful.key({ modkey,           }, "Right",  awful.tag.viewnext       ),
-    awful.key({ modkey,           }, "Up",     awful.tag.viewnext       ),
-
-    -- Menu
-    awful.key({ modkey }, "w", function () mymainmenu:show({ coords = { x = 0, y = 0}}) end),
-    -- Prompt
-    awful.key({ modkey }, "space", function () awful.screen.focused().mypromptbox:run() end),
-    -- switch layout
-    awful.key({ modkey }, "]", function () awful.layout.inc( 1, mouse.screen, layouts) end),
-    awful.key({ modkey }, "[", function () awful.layout.inc(-1, mouse.screen, layouts) end),
-    -- resize slave
-    awful.key({ modkey, "Control" }, "j",      function () awful.client.incwfact( 0.05)  end),
-    awful.key({ modkey, "Control" }, "k",      function () awful.client.incwfact(-0.05)  end),
+    -- Applications {{{2

     -- Ksnapshot
     awful.key({        }, "F13",   function () awful.util.spawn("ksnapshot") end),
     awful.key({        }, "Print", function () awful.util.spawn("ksnapshot") end),
     -- ranger
     awful.key({ modkey }, "r", function () awful.util.spawn(terminal .. " -e ranger") end),
     -- Ksnapshot
     awful.key({        }, "F13",   function () awful.util.spawn("ksnapshot") end),
     awful.key({        }, "Print", function () awful.util.spawn("ksnapshot") end),
     -- ranger
     awful.key({ modkey }, "r", function () awful.util.spawn(terminal .. " -e ranger") end),

-    -- Layout manipulation
-    awful.key({ modkey,           }, "Escape", awful.tag.history.restore),
-    awful.key({ modkey,           }, "#49",    function () awful.screen.focus_relative( 1) end), -- that's the key left of 1 (chronos)
-    awful.key({ modkey,           }, "=",      function () awful.screen.focus_relative( 1) end), -- that's the key left of 1 (kinesis)
-    awful.key({ modkey, "Control" }, "Left",   function () awful.screen.focus_relative( 1) end),
-    awful.key({ modkey, "Control" }, "Right",  function () awful.screen.focus_relative(-1) end),

     -- Volume
     -- Volume

-    awful.key({ }, "XF86AudioRaiseVolume",  function () awful.util.spawn("ponymix increase 5") end),
-    awful.key({ }, "XF86AudioLowerVolume",  function () awful.util.spawn("ponymix decrease 5") end),
-    awful.key({ }, "XF86AudioMute",         function () awful.util.spawn("ponymix toggle")     end),
-    awful.key({ modkey }, "F10",  function () awful.util.spawn("ponymix toggle")     end),
-    awful.key({ modkey }, "F11",  function () awful.util.spawn("ponymix decrease 5") end),
-    awful.key({ modkey }, "F12",  function () awful.util.spawn("ponymix increase 5") end),
+    awful.key({        }, "XF86AudioMute",        function () awful.util.spawn("ponymix toggle")     end,
+              {description = "toggle mute", group = "volume"}),
+    awful.key({        }, "XF86AudioLowerVolume", function () awful.util.spawn("ponymix decrease 5") end,
+              {description = "decrease volume", group = "volume"}),
+    awful.key({        }, "XF86AudioRaiseVolume", function () awful.util.spawn("ponymix increase 5") end,
+              {description = "increase volume", group = "volume"}),
+    awful.key({ modkey }, "F10",                  function () awful.util.spawn("ponymix toggle")     end,
+              {description = "toggle mute", group = "volume"}),
+    awful.key({ modkey }, "F11",                  function () awful.util.spawn("ponymix decrease 5") end,
+              {description = "decrease volume", group = "volume"}),
+    awful.key({ modkey }, "F12",                  function () awful.util.spawn("ponymix increase 5") end,
+              {description = "increase volume", group = "volume"}),

     -- Lock
     awful.key({ modkey, "Control" }, "Escape", function () awful.util.spawn("xautolock -locknow") end),
     -- VimWiki
     -- Lock
     awful.key({ modkey, "Control" }, "Escape", function () awful.util.spawn("xautolock -locknow") end),
     -- VimWiki


@@ -108,32 +148,43 @@ globalkeys = awful.util.table.join(globalkeys,
 
 -- Client keys {{{1
 clientkeys = awful.util.table.join(
 
 -- Client keys {{{1
 clientkeys = awful.util.table.join(

-    -- Awesome Client Keys {{{2
-    awful.key({ modkey,           }, "f",      function (c) c.fullscreen = not c.fullscreen  end),
-    awful.key({ modkey, "Shift"   }, "c",      function (c) c:kill()                         end),
-    awful.key({ modkey, "Control" }, "space",  awful.client.floating.toggle                     ),
-    awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end),
+    awful.key({ modkey,           }, "f",
+        function (c)
+            c.fullscreen = not c.fullscreen
+            c:raise()
+        end,
+        {description = "toggle fullscreen", group = "client"}),
+    awful.key({ modkey, "Shift"   }, "c",      function (c) c:kill()                         end,
+              {description = "close", group = "client"}),
+    awful.key({ modkey, "Control" }, "space",  awful.client.floating.toggle                     ,
+              {description = "toggle floating", group = "client"}),
+    awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end,
+              {description = "move to master", group = "client"}),
+    awful.key({ modkey,           }, "t",      function (c) c.ontop = not c.ontop            end,
+              {description = "toggle keep on top", group = "client"}),
+    awful.key({ modkey,           }, "b",      function (c) c.below = not c.below            end,
+              {description = "toggle keep below", group = "client"}),

     awful.key({ modkey,           }, "n",
         function (c)
             -- The client currently has the input focus, so it cannot be
             -- minimized, since minimized clients can't have the focus.
             c.minimized = true
     awful.key({ modkey,           }, "n",
         function (c)
             -- The client currently has the input focus, so it cannot be
             -- minimized, since minimized clients can't have the focus.
             c.minimized = true

-        end),
+        end ,
+        {description = "minimize", group = "client"}),

     awful.key({ modkey,           }, "m",
         function (c)
     awful.key({ modkey,           }, "m",
         function (c)

-            c.maximized_horizontal = not c.maximized_horizontal
-            c.maximized_vertical   = not c.maximized_vertical
-        end),
+            c.maximized = not c.maximized
+            c:raise()
+        end ,
+        {description = "maximize", group = "client"}),

 
 

-    -- My Client Keys {{{2

     -- Move client to screen
     -- Move client to screen

-    awful.key({ modkey, "Shift" }, "#94",      awful.client.movetoscreen ),
-    awful.key({ modkey, "Shift" }, "#49",      awful.client.movetoscreen ),
-    awful.key({ modkey, "Shift" }, "=",        awful.client.movetoscreen ), -- kinesis
-    -- ontop and below
-    awful.key({ modkey,           }, "t",      function (c) c.ontop = not c.ontop            end),
-    awful.key({ modkey,           }, "b",      function (c) c.below = not c.below            end)
-    -- }}}
+    awful.key({ modkey, "Shift" }, "#94",      function (c) c:move_to_screen()               end,
+              {description = "move to screen", group = "client"}),
+    awful.key({ modkey, "Shift" }, "#49",      function (c) c:move_to_screen()               end,
+              {description = "move to screen", group = "client"}),
+    awful.key({ modkey, "Shift" }, "=",        function (c) c:move_to_screen()               end,
+              {description = "move to screen", group = "client"})

 )
 
 -- Tags {{{1
 )
 
 -- Tags {{{1


@@ -142,38 +193,57 @@ clientkeys = awful.util.table.join(
 -- This should map on the top row of your keyboard, usually 1 to 9.
 for i = 1, 9 do
     globalkeys = awful.util.table.join(globalkeys,
 -- This should map on the top row of your keyboard, usually 1 to 9.
 for i = 1, 9 do
     globalkeys = awful.util.table.join(globalkeys,

+        -- View tag only.

         awful.key({ modkey }, "#" .. i + 9,
                   function ()
         awful.key({ modkey }, "#" .. i + 9,
                   function ()

-                    local screen = mouse.screen
-                    local tag = awful.tag.gettags(screen)[i]
-                    if tag then
-                      if tag == awful.tag.selected(screen) then
-                        awful.tag.history.restore(screen)
-                      else
-                        awful.tag.viewonly(tag)
-                      end
-                    end
-                  end),
+                        local screen = awful.screen.focused()
+                        local tag = screen.tags[i]
+                        if tag then
+                            if tag.selected then
+                                awful.tag.history.restore(screen)
+                            else
+                                tag:view_only()
+                            end
+                        end
+                  end,
+                  {description = "view tag #"..i, group = "tag"}),
+        -- Toggle tag display.

         awful.key({ modkey, "Control" }, "#" .. i + 9,
                   function ()
         awful.key({ modkey, "Control" }, "#" .. i + 9,
                   function ()

-                      local screen = mouse.screen
-                      local tag = awful.tag.gettags(screen)[i]
+                      local screen = awful.screen.focused()
+                      local tag = screen.tags[i]

                       if tag then
                          awful.tag.viewtoggle(tag)
                       end
                       if tag then
                          awful.tag.viewtoggle(tag)
                       end

-                  end),
+                  end,
+                  {description = "toggle tag #" .. i, group = "tag"}),
+        -- Move client to tag.

         awful.key({ modkey, "Shift" }, "#" .. i + 9,
                   function ()
         awful.key({ modkey, "Shift" }, "#" .. i + 9,
                   function ()

-                      local tag = awful.tag.gettags(client.focus.screen)[i]
-                      if client.focus and tag then
-                          awful.client.movetotag(tag)
+                      if client.focus then
+                          local tag = client.focus.screen.tags[i]
+                          if tag then
+                              client.focus:move_to_tag(tag)
+                          end

                      end
                      end

-                  end),
+                  end,
+                  {description = "move focused client to tag #"..i, group = "tag"}),
+        -- Toggle tag on focused client.

         awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9,
                   function ()
         awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9,
                   function ()

-                      local tag = awful.tag.gettags(client.focus.screen)[i]
-                      if client.focus and tag then
-                          awful.client.toggletag(tag)
+                      if client.focus then
+                          local tag = client.focus.screen.tags[i]
+                          if tag then
+                              client.focus:toggle_tag(tag)
+                          end

                       end
                       end

-                  end))
+                  end,
+                  {description = "toggle focused client on tag #" .. i, group = "tag"})
+    )

 end
 end

+
+-- Client Buttons {{{1
+clientbuttons = awful.util.table.join(
+    awful.button({ }, 1, function (c) client.focus = c; c:raise() end),
+    awful.button({ modkey }, 1, awful.mouse.client.move),
+    awful.button({ modkey }, 3, awful.mouse.client.resize))