diff options
-rw-r--r-- | bindings.lua | 10 | ||||
-rw-r--r-- | rc.lua | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/bindings.lua b/bindings.lua index 2599cde..8b3a6eb 100644 --- a/bindings.lua +++ b/bindings.lua @@ -1,13 +1,15 @@ local M = {} local awful = require("awful") +local gears = require("gears") + local commondefs = require("commondefs") local utils = require("utils") function M.create(workspace) local modkey = commondefs.modkey - local globalkeys = awful.util.table.join( + local globalkeys = gears.table.join( awful.key({ modkey, "Mod1" }, "Delete", awesome.restart), awful.key({ modkey }, "Pause", function () awful.spawn("xscreensaver-command -lock") end), @@ -98,7 +100,7 @@ function M.create(workspace) -- Be careful: we use keycodes to make it works on any keyboard layout. -- This should map on the top row of your keyboard, usually 1 to 9. for i = 1, 10 do - globalkeys = awful.util.table.join(globalkeys, + globalkeys = gears.table.join(globalkeys, -- View tag only. awful.key({ modkey }, "#" .. i + 9, function () @@ -123,7 +125,7 @@ function M.create(workspace) end for i = 1, 12 do - globalkeys = awful.util.table.join(globalkeys, + globalkeys = gears.table.join(globalkeys, -- View tag only. awful.key({ modkey }, "#" .. i + 66, function () @@ -143,7 +145,7 @@ function M.create(workspace) end)) end - local clientkeys = awful.util.table.join( + local clientkeys = gears.table.join( 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 ), @@ -79,7 +79,7 @@ for s in screen do -- Create an imagebox widget which will contains an icon indicating which layout we're using. local layoutbox = awful.widget.layoutbox(s) - layoutbox:buttons(awful.util.table.join( + layoutbox:buttons(gears.table.join( awful.button({ }, 1, function () awful.layout.inc(layouts, 1) end), awful.button({ }, 3, function () awful.layout.inc(layouts, -1) end), awful.button({ }, 4, function () awful.layout.inc(layouts, 1) end), @@ -120,14 +120,14 @@ end -- }}} -- {{{ Mouse bindings -root.buttons(awful.util.table.join( +root.buttons(gears.table.join( awful.button({ }, 4, awful.tag.viewnext), awful.button({ }, 5, awful.tag.viewprev) )) -- }}} -clientbuttons = awful.util.table.join( +clientbuttons = gears.table.join( awful.button({ }, 1, function (c) client.focus = c; c:raise() end), awful.button({ commondefs.modkey }, 1, awful.mouse.client.move), awful.button({ commondefs.modkey }, 3, awful.mouse.client.resize)) |