Merge remote-tracking branch 'refs/remotes/origin/master'

[dotfiles.git] / awesome / bindings.lua

diff --git a/awesome/bindings.lua b/awesome/bindings.lua
index 6e06e674babdacb188c282407b16ae1fc8e89802..d21b61606df1cedc3b520e9298541ed4dbc6b28f 100644 (file)
--- a/awesome/bindings.lua
+++ b/awesome/bindings.lua
@@ -17,12 +17,12 @@ globalkeys = awful.util.table.join(globalkeys,
     -- Awesome Keys {{{2
     awful.key({ modkey,           }, "j",
         function ()
-            awful.client.focus.byidx( 1)
+            awful.client.focus.byidx(-1)
             if client.focus then client.focus:raise() end
         end),
     awful.key({ modkey,           }, "k",
         function ()
-            awful.client.focus.byidx(-1)
+            awful.client.focus.byidx( 1)
             if client.focus then client.focus:raise() end
         end),
 
@@ -95,7 +95,9 @@ globalkeys = awful.util.table.join(globalkeys,
     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({ modkey }, "F12",  function () awful.util.spawn("ponymix increase 5") end),
+    -- Lock
+    awful.key({ modkey, "Control" }, "Escape", function () awful.util.spawn("xautolock -locknow") end)
 )
 
 -- Client keys {{{1
@@ -136,11 +138,15 @@ for i = 1, 9 do
     globalkeys = awful.util.table.join(globalkeys,
         awful.key({ modkey }, "#" .. i + 9,
                   function ()
-                        local screen = mouse.screen
-                        local tag = awful.tag.gettags(screen)[i]
-                        if tag then
-                           awful.tag.viewonly(tag)
-                        end
+                    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),
         awful.key({ modkey, "Control" }, "#" .. i + 9,
                   function ()