update Makefile with new files

[dotfiles.git] / awesome / bindings.lua

diff --git a/awesome/bindings.lua b/awesome/bindings.lua
index bede8e7bc3408f965831e2bda8f7f0e5a597f80f..20e81a76c5de4f9e3d81c71675be7bb6fce5f0f6 100644 (file)
--- a/awesome/bindings.lua
+++ b/awesome/bindings.lua
@@ -33,8 +33,6 @@ globalkeys = awful.util.table.join(
     -- 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),
     -- 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, "Control" }, "j", function () awful.screen.focus_relative( 1) end),
-    awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end),

     awful.key({ modkey,           }, "u", awful.client.urgent.jumpto),
     awful.key({ modkey,           }, "Tab",
         function ()
     awful.key({ modkey,           }, "u", awful.client.urgent.jumpto),
     awful.key({ modkey,           }, "Tab",
         function ()


@@ -55,14 +53,9 @@ globalkeys = awful.util.table.join(
     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),
     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),

-    awful.key({ modkey,           }, "space", function () awful.layout.inc(layouts,  1) end),
-    awful.key({ modkey, "Shift"   }, "space", function () awful.layout.inc(layouts, -1) end),

 
     awful.key({ modkey, "Control" }, "n", awful.client.restore),
 
 
     awful.key({ modkey, "Control" }, "n", awful.client.restore),
 

-    -- Prompt
-    awful.key({ modkey },            "r",     function () mypromptbox[mouse.screen]:run() end),
-

     awful.key({ modkey }, "x",
               function ()
                   awful.prompt.run({ prompt = "Run Lua code: " },
     awful.key({ modkey }, "x",
               function ()
                   awful.prompt.run({ prompt = "Run Lua code: " },


@@ -75,11 +68,16 @@ globalkeys = awful.util.table.join(
     -- }}}
 
     -- {{{ My Keys
     -- }}}
 
     -- {{{ My Keys

-    awful.key({        }, "F19", function () myshutdownmenu:show() end),
-    awful.key({ modkey }, "F1",  function () myshutdownmenu:show() end),
+    -- Prompt
+    awful.key({ modkey }, "space", function () mypromptbox[mouse.screen]:run() end),
+    -- switch layout
+    awful.key({ modkey }, "]", function () awful.layout.inc(layouts,  1) end),
+    awful.key({ modkey }, "[", function () awful.layout.inc(layouts, -1) end),
+    -- Ksnapshot
+    awful.key({        }, "F13", function () awful.util.spawn("ksnapshot") end),

     -- Layout manipulation
     -- Layout manipulation

-    awful.key({ modkey,           }, "#94", function () awful.screen.focus_relative( 1) end), -- that's the key left of 1
-    awful.key({ modkey, "Control" }, "Left", function () awful.screen.focus_relative( 1) end),
+    awful.key({ modkey,           }, "#94",   function () awful.screen.focus_relative( 1) end), -- that's the key left of 1
+    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
     awful.key({ }, "XF86AudioRaiseVolume",  function () awful.util.spawn("ponymix increase 5") end),
     awful.key({ modkey, "Control" }, "Right", function () awful.screen.focus_relative(-1) end),
     -- Volume
     awful.key({ }, "XF86AudioRaiseVolume",  function () awful.util.spawn("ponymix increase 5") end),


@@ -93,6 +91,7 @@ globalkeys = awful.util.table.join(
     awful.key({ "Shift" }, "XF86AudioLowerVolume",  function () awful.util.spawn("clementine --volume-decrease-by 5") end)
     -- }}}
 )
     awful.key({ "Shift" }, "XF86AudioLowerVolume",  function () awful.util.spawn("clementine --volume-decrease-by 5") end)
     -- }}}
 )

+-- }}}

 
 -- {{{ Client keys
 clientkeys = awful.util.table.join(
 
 -- {{{ Client keys
 clientkeys = awful.util.table.join(


@@ -101,8 +100,6 @@ clientkeys = awful.util.table.join(
     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, "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,           }, "o",      awful.client.movetoscreen                        ),
-    awful.key({ modkey,           }, "t",      function (c) c.ontop = not c.ontop            end),

     awful.key({ modkey,           }, "n",
         function (c)
             -- The client currently has the input focus, so it cannot be
     awful.key({ modkey,           }, "n",
         function (c)
             -- The client currently has the input focus, so it cannot be


@@ -113,7 +110,18 @@ clientkeys = awful.util.table.join(
         function (c)
             c.maximized_horizontal = not c.maximized_horizontal
             c.maximized_vertical   = not c.maximized_vertical
         function (c)
             c.maximized_horizontal = not c.maximized_horizontal
             c.maximized_vertical   = not c.maximized_vertical

-        end)
+        end),
+    -- }}}
+
+    -- {{{ My Client Keys
+    -- Move client to screen
+    awful.key({ modkey, "Shift" }, "#94",      awful.client.movetoscreen ),
+    -- 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),
+    -- resize slave
+    awful.key({ modkey, "Control" }, "j",      function (c) awful.client.incwfact( 0.05, c)  end),
+    awful.key({ modkey, "Control" }, "k",      function (c) awful.client.incwfact(-0.05, c)  end)

     -- }}}
 )
 -- }}}
     -- }}}
 )
 -- }}}