From: martin f. krafft Date: Mon, 23 Feb 2009 10:47:28 +0000 (+0100) Subject: follow config changes to 3.2~rc3-1 X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/f1dc38e8804dea3d52e8496f5f3b3580250d152c?hp=40004c643ae4e814039aa9062720f3b0abcf2918 follow config changes to 3.2~rc3-1 --- diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index 7d798cf..8631b6a 100644 --- a/.config/awesome/rc.lua +++ b/.config/awesome/rc.lua @@ -1,4 +1,4 @@ --- Include awesome libraries, with lots of useful function! +-- Standard awesome library require("awful") require("beautiful") require("naughty") @@ -31,18 +31,16 @@ modkey = "Mod4" -- Table of layouts to cover with awful.layout.inc, order matters. layouts = { - "tile", - "tileleft", - "tilebottom", - "tiletop", - "fairh", - "fairv", - "magnifier", - "max", - "fullscreen", --- "spiral", --- "dwindle", - "floating" + awful.layout.suit.tile, + awful.layout.suit.tile.left, + awful.layout.suit.tile.bottom, + awful.layout.suit.tile.top, + awful.layout.suit.fair, + awful.layout.suit.fair.horizontal, + awful.layout.suit.max, + awful.layout.suit.max.fullscreen, + awful.layout.suit.magnifier, + awful.layout.suit.floating } -- Table of clients that should be set floating. The index may be either @@ -100,11 +98,12 @@ for s = 1, screen.count() do tags[s] = {} -- Create 9 tags per screen. for tagnumber = 1, 9 do - tags[s][tagnumber] = tag({ name = tagnumber, layout = layouts[6] }) + tags[s][tagnumber] = tag(tagnumber) -- Add tags to screen one by one -- split at 0.5/50% exactly -- tags[s][tagnumber].mwfact = 0.5 tags[s][tagnumber].screen = s + awful.layout.set(layouts[6], tags[s][tagnumber]) end -- I'm sure you want to see at least one tag. tags[s][1].selected = true @@ -131,7 +130,7 @@ mymainmenu = awful.menu.new({ items = { { "awesome", myawesomemenu, beautiful.aw } }) -mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon, +mylauncher = awful.widget.launcher({ image = image(beautiful.awesome_icon), menu = mymainmenu }) -- Create a systray @@ -153,8 +152,14 @@ mytaglist.buttons = { button({ }, 1, awful.tag.viewonly), button({ }, 4, awful.tag.viewnext), button({ }, 5, awful.tag.viewprev) } mytasklist = {} -mytasklist.buttons = { button({ }, 1, function (c) client.focus = c; c:raise() end), - button({ }, 3, function () awful.menu.clients({ width=250 }) end), +mytasklist.buttons = { button({ }, 1, function (c) + if not c:isvisible() then + awful.tag.viewonly(c:tags()[1]) + end + client.focus = c + c:raise() + end), + button({ }, 3, function () if instance then instance:hide() end instance = awful.menu.clients({ width=250 }) end), button({ }, 4, function () awful.client.focus.byidx(1) end), button({ }, 5, function () awful.client.focus.byidx(-1) end) } @@ -212,7 +217,7 @@ batterywidget:bar_properties_set('bat', { -- {{{ Mouse bindings -awesome.buttons({ +root.buttons({ button({ }, 3, function () mymainmenu:toggle() end), button({ }, 4, awful.tag.viewnext), button({ }, 5, awful.tag.viewprev) @@ -220,6 +225,85 @@ awesome.buttons({ -- }}} -- {{{ Key bindings +globalkeys = +{ + key({ modkey, }, "Left", awful.tag.viewprev ), + key({ modkey, }, "Right", awful.tag.viewnext ), + key({ modkey, }, "Escape", awful.tag.history.restore), + + key({ modkey, }, "j", + function () + awful.client.focus.byidx( 1) + if client.focus then client.focus:raise() end + end), + key({ modkey, }, "k", + function () + awful.client.focus.byidx(-1) + if client.focus then client.focus:raise() end + end), + + -- Layout manipulation + key({ modkey, "Shift" }, "j", function () awful.client.swap.byidx( 1) end), + key({ modkey, "Shift" }, "k", function () awful.client.swap.byidx( -1) end), + key({ modkey, "Control" }, "j", function () awful.screen.focus( 1) end), + key({ modkey, "Control" }, "k", function () awful.screen.focus(-1) end), + key({ modkey, }, "u", awful.client.urgent.jumpto), + key({ modkey, }, "Tab", + function () + awful.client.focus.history.previous() + if client.focus then + client.focus:raise() + end + end), + + -- Standard program + key({ modkey, }, "Return", function () awful.util.spawn(terminal) end), + key({ modkey, "Control" }, "r", awesome.restart), + key({ modkey, "Shift" }, "q", awesome.quit), + + key({ modkey, }, "l", function () awful.tag.incmwfact( 0.05) end), + key({ modkey, }, "h", function () awful.tag.incmwfact(-0.05) end), + key({ modkey, "Shift" }, "h", function () awful.tag.incnmaster( 1) end), + key({ modkey, "Shift" }, "l", function () awful.tag.incnmaster(-1) end), + key({ modkey, "Control" }, "h", function () awful.tag.incncol( 1) end), + key({ modkey, "Control" }, "l", function () awful.tag.incncol(-1) end), + key({ modkey, }, "space", function () awful.layout.inc(layouts, 1) end), + key({ modkey, "Shift" }, "space", function () awful.layout.inc(layouts, -1) end), + + -- Prompt + key({ modkey }, "F1", + function () + awful.prompt.run({ prompt = "Run: " }, + mypromptbox[mouse.screen], + awful.util.spawn, awful.completion.bash, + awful.util.getdir("cache") .. "/history") + end), + + key({ modkey }, "F4", + function () + awful.prompt.run({ prompt = "Run Lua code: " }, + mypromptbox[mouse.screen], + awful.util.eval, awful.prompt.bash, + awful.util.getdir("cache") .. "/history_eval") + end), +} + +-- Client awful tagging: this is useful to tag some clients and then do stuff like move to tag on them +clientkeys = +{ + key({ modkey, }, "f", function (c) c.fullscreen = not c.fullscreen end), + key({ modkey, "Shift" }, "c", function (c) c:kill() end), + key({ modkey, "Control" }, "space", awful.client.floating.toggle ), + key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end), + key({ modkey, }, "o", awful.client.movetoscreen ), + key({ modkey, "Shift" }, "r", function (c) c:redraw() end), + key({ modkey }, "t", awful.client.togglemarked), + key({ modkey,}, "m", + function (c) + c.maximized_horizontal = not c.maximized_horizontal + c.maximized_vertical = not c.maximized_vertical + end), +} -- Bind keyboard digits -- Compute the maximum number of digit we need, limited to 9 @@ -229,165 +313,53 @@ for s = 1, screen.count() do end for i = 1, keynumber do - keybinding({ modkey }, i, - function () - local screen = mouse.screen - if tags[screen][i] then - awful.tag.viewonly(tags[screen][i]) - end - end):add() - keybinding({ modkey, "Control" }, i, - function () - local screen = mouse.screen - if tags[screen][i] then - tags[screen][i].selected = not tags[screen][i].selected - end - end):add() - keybinding({ modkey, "Shift" }, i, - function () - if client.focus then - if tags[client.focus.screen][i] then - awful.client.movetotag(tags[client.focus.screen][i]) - end - end - end):add() - keybinding({ modkey, "Control", "Shift" }, i, - function () - if client.focus then - if tags[client.focus.screen][i] then - awful.client.toggletag(tags[client.focus.screen][i]) - end - end - end):add() + table.insert(globalkeys, + key({ modkey }, i, + function () + local screen = mouse.screen + if tags[screen][i] then + awful.tag.viewonly(tags[screen][i]) + end + end)) + table.insert(globalkeys, + key({ modkey, "Control" }, i, + function () + local screen = mouse.screen + if tags[screen][i] then + tags[screen][i].selected = not tags[screen][i].selected + end + end)) + table.insert(globalkeys, + key({ modkey, "Shift" }, i, + function () + if client.focus and tags[client.focus.screen][i] then + awful.client.movetotag(tags[client.focus.screen][i]) + end + end)) + table.insert(globalkeys, + key({ modkey, "Control", "Shift" }, i, + function () + if client.focus and tags[client.focus.screen][i] then + awful.client.toggletag(tags[client.focus.screen][i]) + end + end)) end -keybinding({ modkey }, "Left", awful.tag.viewprev):add() -keybinding({ modkey }, "Right", awful.tag.viewnext):add() -keybinding({ modkey }, "Escape", awful.tag.history.restore):add() - --- Standard program -keybinding({ modkey }, "Return", function () awful.util.spawn(terminal) end):add() - -keybinding({ modkey, "Control" }, "r", function () - mypromptbox[mouse.screen].text = - awful.util.escape(awful.util.restart()) - end):add() -keybinding({ modkey, "Shift" }, "q", awesome.quit):add() - --- Client manipulation -keybinding({ modkey }, "m", awful.client.maximize):add() -keybinding({ modkey }, "f", function () if client.focus then client.focus.fullscreen = not client.focus.fullscreen end end):add() -keybinding({ modkey, "Shift" }, "c", function () if client.focus then client.focus:kill() end end):add() -keybinding({ modkey }, "j", function () awful.client.focus.byidx(1); if client.focus then client.focus:raise() end end):add() -keybinding({ modkey }, "k", function () awful.client.focus.byidx(-1); if client.focus then client.focus:raise() end end):add() -keybinding({ modkey, "Shift" }, "j", function () awful.client.swap.byidx(1) end):add() -keybinding({ modkey, "Shift" }, "k", function () awful.client.swap.byidx(-1) end):add() -keybinding({ modkey, "Control" }, "j", function () awful.screen.focus(1) end):add() -keybinding({ modkey, "Control" }, "k", function () awful.screen.focus(-1) end):add() -keybinding({ modkey, "Control" }, "space", awful.client.togglefloating):add() -keybinding({ modkey, "Control" }, "Return", function () if client.focus then client.focus:swap(awful.client.getmaster()) end end):add() -keybinding({ modkey }, "o", awful.client.movetoscreen):add() -keybinding({ modkey }, "Tab", awful.client.focus.history.previous):add() -keybinding({ modkey }, "u", awful.client.urgent.jumpto):add() -keybinding({ modkey, "Shift" }, "r", function () if client.focus then client.focus:redraw() end end):add() - --- Layout manipulation -keybinding({ modkey }, "l", function () awful.tag.incmwfact(0.05) end):add() -keybinding({ modkey }, "h", function () awful.tag.incmwfact(-0.05) end):add() -keybinding({ modkey, "Shift" }, "h", function () awful.tag.incnmaster(1) end):add() -keybinding({ modkey, "Shift" }, "l", function () awful.tag.incnmaster(-1) end):add() -keybinding({ modkey, "Control" }, "h", function () awful.tag.incncol(1) end):add() -keybinding({ modkey, "Control" }, "l", function () awful.tag.incncol(-1) end):add() -keybinding({ modkey }, "space", function () awful.layout.inc(layouts, 1) end):add() -keybinding({ modkey, "Shift" }, "space", function () awful.layout.inc(layouts, -1) end):add() - --- Prompt -keybinding({ modkey }, "F1", function () - awful.prompt.run({ prompt = "Run: " }, mypromptbox[mouse.screen], awful.util.spawn, awful.completion.bash, - awful.util.getdir("cache") .. "/history") - end):add() -keybinding({ modkey }, "F4", function () - awful.prompt.run({ prompt = "Run Lua code: " }, mypromptbox[mouse.screen], awful.util.eval, awful.prompt.bash, - awful.util.getdir("cache") .. "/history_eval") - end):add() - -keybinding({ modkey, "Ctrl" }, "i", function () - local s = mouse.screen - if mypromptbox[s].text then - mypromptbox[s].text = nil - elseif client.focus then - mypromptbox[s].text = nil - if client.focus.class then - mypromptbox[s].text = "Class: " .. client.focus.class .. " " - end - if client.focus.instance then - mypromptbox[s].text = mypromptbox[s].text .. "Instance: ".. client.focus.instance .. " " - end - if client.focus.role then - mypromptbox[s].text = mypromptbox[s].text .. "Role: ".. client.focus.role - end - end - end):add() - ---- Tabulous, tab manipulation -require("tabulous") -keybinding({ modkey, "Control" }, "y", function () - local tabbedview = tabulous.tabindex_get() - local nextclient = awful.client.next(1) - - if not tabbedview then - tabbedview = tabulous.tabindex_get(nextclient) - - if not tabbedview then - tabbedview = tabulous.tab_create() - tabulous.tab(tabbedview, nextclient) - else - tabulous.tab(tabbedview, client.focus) - end - else - tabulous.tab(tabbedview, nextclient) - end -end):add() - -keybinding({ modkey, "Shift" }, "y", tabulous.untab):add() - -keybinding({ modkey }, "y", function () - local tabbedview = tabulous.tabindex_get() - - if tabbedview then - local n = tabulous.next(tabbedview) - tabulous.display(tabbedview, n) - end -end):add() - --- Client awful tagging: this is useful to tag some clients and then do stuff like move to tag on them -keybinding({ modkey }, "t", awful.client.togglemarked):add() -keybinding({ modkey, 'Shift' }, "t", function () - local tabbedview = tabulous.tabindex_get() - local clients = awful.client.getmarked() - - if not tabbedview then - tabbedview = tabulous.tab_create(clients[1]) - table.remove(clients, 1) - end - - for k,c in pairs(clients) do - tabulous.tab(tabbedview, c) - end - -end):add() for i = 1, keynumber do - keybinding({ modkey, "Shift" }, "F" .. i, - function () - local screen = mouse.screen - if tags[screen][i] then - for k, c in pairs(awful.client.getmarked()) do - awful.client.movetotag(tags[screen][i], c) - end - end - end):add() + table.insert(globalkeys, key({ modkey, "Shift" }, "F" .. i, + function () + local screen = mouse.screen + if tags[screen][i] then + for k, c in pairs(awful.client.getmarked()) do + awful.client.movetotag(tags[screen][i], c) + end + end + end)) end + +-- Set keys +root.keys(globalkeys) -- }}} -- {{{ Hooks @@ -418,14 +390,21 @@ end) -- Hook function to execute when the mouse enters a client. awful.hooks.mouse_enter.register(function (c) -- Sloppy focus, but disabled for magnifier layout - if awful.layout.get(c.screen) ~= "magnifier" + if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier and awful.client.focus.filter(c) then client.focus = c end end) -- Hook function to execute when a new client appears. -awful.hooks.manage.register(function (c) +awful.hooks.manage.register(function (c, startup) + -- If we are not managing this application at startup, + -- move it to the screen where the mouse is. + -- We only do it for filtered windows (i.e. no dock, etc). + if not startup and awful.client.focus.filter(c) then + c.screen = mouse.screen + end + if use_titlebar then -- Add a titlebar awful.titlebar.add(c, { modkey = modkey }) @@ -433,8 +412,8 @@ awful.hooks.manage.register(function (c) -- Add mouse bindings c:buttons({ button({ }, 1, function (c) client.focus = c; c:raise() end), - button({ modkey }, 1, function (c) c:mouse_move() end), - button({ modkey }, 3, function (c) c:mouse_resize() end) + button({ modkey }, 1, awful.mouse.client.move), + button({ modkey }, 3, awful.mouse.client.resize) }) -- New client may not receive focus -- if they're not focusable, so set border anyway. @@ -446,13 +425,13 @@ awful.hooks.manage.register(function (c) local cls = c.class local inst = c.instance if floatapps[cls] then - c.floating = floatapps[cls] + awful.client.floating.set(c, floatapps[cls]) elseif floatapps[inst] then - c.floating = floatapps[inst] + awful.client.floating.set(c, floatapps[inst]) end -- Override with tiledapps - c.floating = not (tiledapps[inst] or tiledapps[cls]) + awful.client.floating.set(c, not (tiledapps[inst] or tiledapps[cls])) -- Check application->screen/tag mappings. local target @@ -469,12 +448,15 @@ awful.hooks.manage.register(function (c) -- Do this after tag mapping, so you don't see it on the wrong tag for a split second. client.focus = c + -- Set key bindings + c:keys(clientkeys) + -- Set the windows at the slave, -- i.e. put it at the end of others instead of setting it master. -- awful.client.setslave(c) -- Honor size hints: if you want to drop the gaps between windows, set this to false. - c.honorsizehints = true + c.size_hints_honor = true -- Maximise some if maxapps[inst] or maxapps[cls] then @@ -485,8 +467,8 @@ end) -- Hook function to execute when arranging the screen. -- (tag switch, new client, etc) awful.hooks.arrange.register(function (screen) - local layout = awful.layout.get(screen) - if layout then + local layout = awful.layout.getname(awful.layout.get(screen)) + if layout and beautiful["layout_" ..layout] then mylayoutbox[screen].image = image(beautiful["layout_" .. layout]) else mylayoutbox[screen].image = nil