From: martin f. krafft Date: Sun, 25 Oct 2009 13:38:03 +0000 (+0100) Subject: changes with 3.4 X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/f44dc93752cdaec77f605651f57d542200808fbe changes with 3.4 --- diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index c727fa9..bb28643 100644 --- a/.config/awesome/rc.lua +++ b/.config/awesome/rc.lua @@ -1,6 +1,10 @@ -- Standard awesome library require("awful") +require("awful.autofocus") +require("awful.rules") +-- Theme handling library require("beautiful") +-- Notification library require("naughty") -- Load Debian menu entries @@ -37,6 +41,8 @@ layouts = awful.layout.suit.tile.top, awful.layout.suit.fair, awful.layout.suit.fair.horizontal, + awful.layout.suit.spiral, + awful.layout.suit.spiral.dwindle, awful.layout.suit.max, awful.layout.suit.max.fullscreen, awful.layout.suit.magnifier, @@ -92,31 +98,15 @@ use_titlebar = false -- }}} -- {{{ Tags --- Define tags table. +-- Define a tag table which hold all screen tags. tags = {} for s = 1, screen.count() do -- Each screen has its own tag table. - tags[s] = {} - -- Create 9 tags per screen. - for tagnumber = 1, 9 do - tags[s][tagnumber] = tag(tagnumber) - -- split at 0.5/50% exactly - tags[s][tagnumber].mwfact = 0.5 - -- Add tags to screen one by one - tags[s][tagnumber].screen = s - awful.layout.set(layouts[5], tags[s][tagnumber]) - end - -- I'm sure you want to see at least one tag. - tags[s][1].selected = true + tags[s] = awful.tag({ 1, 2, 3, 4, 5, 6, 7, 8, 9 }, s) end -- }}} --- {{{ Wibox --- Create a textbox widget -mytextbox = widget({ type = "textbox", align = "right" }) --- Set the default text in textbox -mytextbox.text = " " .. awesome.release .. " " - +-- {{{ Menu -- Create a laucher widget and a main menu myawesomemenu = { { "manual", terminal .. " -e man awesome" }, @@ -125,21 +115,22 @@ myawesomemenu = { { "quit", awesome.quit } } -mymainmenu = awful.menu.new({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon }, - { "open terminal", terminal }, - { "Debian", debian.menu.Debian_menu.Debian } - } - }) +mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon }, + { "Debian", debian.menu.Debian_menu.Debian }, + { "open terminal", terminal } + } + }) mylauncher = awful.widget.launcher({ image = image(beautiful.awesome_icon), menu = mymainmenu }) +-- }}} --- Create a systray -mysystray = widget({ type = "systray", align = "right" }) +-- {{{ Wibox +-- Create a textclock widget +mytextclock = awful.widget.textclock({ align = "right" }) --- Create textbox widgets -mytimebox = widget({ type = "textbox", name = "mytimebox", align = "right" }) -mybatterybox = widget({ type = "textbox", name = "mybatterybox", align = "right" }) +-- Create a systray +mysystray = widget({ type = "systray" }) -- Create a wibox for each screen and add it mywibox = {} @@ -149,7 +140,7 @@ mytaglist = {} mytaglist.buttons = awful.util.table.join( awful.button({ }, 1, awful.tag.viewonly), awful.button({ modkey }, 1, awful.client.movetotag), - awful.button({ }, 3, function (tag) tag.selected = not tag.selected end), + awful.button({ }, 3, awful.tag.viewtoggle), awful.button({ modkey }, 3, awful.client.toggletag), awful.button({ }, 4, awful.tag.viewnext), awful.button({ }, 5, awful.tag.viewprev) @@ -182,10 +173,10 @@ mytasklist.buttons = awful.util.table.join( for s = 1, screen.count() do -- Create a promptbox for each screen - mypromptbox[s] = awful.widget.prompt({ align = "left" }) + mypromptbox[s] = awful.widget.prompt({ layout = awful.widget.layout.horizontal.leftright }) -- Create an imagebox widget which will contains an icon indicating which layout we're using. -- We need one layoutbox per screen. - mylayoutbox[s] = widget({ type = "imagebox", align = "right" }) + mylayoutbox[s] = awful.widget.layoutbox(s) mylayoutbox[s]:buttons(awful.util.table.join( awful.button({ }, 1, function () awful.layout.inc(layouts, 1) end), awful.button({ }, 3, function () awful.layout.inc(layouts, -1) end), @@ -200,16 +191,21 @@ for s = 1, screen.count() do end, mytasklist.buttons) -- Create the wibox - mywibox[s] = wibox({ position = "top", fg = beautiful.fg_normal, bg = beautiful.bg_normal }) + mywibox[s] = awful.wibox({ position = "top", screen = s }) -- Add widgets to the wibox - order matters - mywibox[s].widgets = { mytaglist[s], - mytasklist[s], - mypromptbox[s], - mybatterybox, - mytimebox, - mylayoutbox[s], - s == screen.count() and mysystray or nil } - mywibox[s].screen = s + mywibox[s].widgets = { + { +-- mylauncher, + mytaglist[s], + mypromptbox[s], + layout = awful.widget.layout.horizontal.leftright + }, + mylayoutbox[s], + mytextclock, + s == 1 and mysystray or nil, + mytasklist[s], + layout = awful.widget.layout.horizontal.rightleft + } end -- }}} @@ -304,7 +300,6 @@ globalkeys = awful.util.table.join( end) ) --- Client awful tagging: this is useful to tag some clients and then do stuff like move to tag on them clientkeys = awful.util.table.join( awful.key({ modkey, }, "f", function (c) c.fullscreen = not c.fullscreen end), awful.key({ modkey, "Shift" }, "c", function (c) c:kill() end), @@ -312,12 +307,9 @@ clientkeys = awful.util.table.join( awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end), awful.key({ modkey, }, "o", awful.client.movetoscreen ), awful.key({ modkey, "Shift" }, "r", function (c) c:redraw() end), - awful.key({ modkey }, "t", awful.client.togglemarked), - awful.key({ modkey,}, "m", + awful.key({ modkey, }, "n", function (c) c.minimized = not c.minimized end), + awful.key({ modkey, }, "m", function (c) --- if not awful.client.floating then --- awful.client.floating.toggle() --- end c.maximized_horizontal = not c.maximized_horizontal c.maximized_vertical = not c.maximized_vertical end) @@ -329,45 +321,44 @@ for s = 1, screen.count() do keynumber = math.min(9, math.max(#tags[s], keynumber)); end +-- Bind all key numbers to tags. +-- 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, keynumber do globalkeys = awful.util.table.join(globalkeys, - awful.key({ modkey }, i, + awful.key({ modkey }, "#" .. i + 9, function () local screen = mouse.screen if tags[screen][i] then awful.tag.viewonly(tags[screen][i]) end end), - awful.key({ modkey, "Control" }, i, + awful.key({ modkey, "Control" }, "#" .. i + 9, function () local screen = mouse.screen if tags[screen][i] then - tags[screen][i].selected = not tags[screen][i].selected + awful.tag.viewtoggle(tags[screen][i]) end end), - awful.key({ modkey, "Shift" }, i, + awful.key({ modkey, "Shift" }, "#" .. i + 9, function () if client.focus and tags[client.focus.screen][i] then awful.client.movetotag(tags[client.focus.screen][i]) end end), - awful.key({ modkey, "Control", "Shift" }, i, + awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9, function () if client.focus and tags[client.focus.screen][i] then awful.client.toggletag(tags[client.focus.screen][i]) end - end), - awful.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)) 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)) + cmdmodkey = "Mod3" -- xmms2 & sound @@ -403,175 +394,56 @@ globalkeys = awful.util.table.join(globalkeys, root.keys(globalkeys) -- }}} --- {{{ Hooks --- Hook function to execute when focusing a client. -awful.hooks.focus.register(function (c) - if not awful.client.ismarked(c) then - c.border_color = beautiful.border_focus - end -end) - --- Hook function to execute when unfocusing a client. -awful.hooks.unfocus.register(function (c) - if not awful.client.ismarked(c) then - c.border_color = beautiful.border_normal - end -end) - --- Hook function to execute when marking a client -awful.hooks.marked.register(function (c) - c.border_color = beautiful.border_marked -end) - --- Hook function to execute when unmarking a client. -awful.hooks.unmarked.register(function (c) - c.border_color = beautiful.border_focus -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) ~= 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, 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 }) - end - -- Add mouse bindings - c:buttons(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) - )) - -- New client may not receive focus - -- if they're not focusable, so set border anyway. - c.border_width = beautiful.border_width - c.border_color = beautiful.border_normal - - -- Check if the application should be floating. - -- OVERRIDDEN, SEE tiledapps BELOW - local cls = c.class - local inst = c.instance - if floatapps[cls] then - awful.client.floating.set(c, floatapps[cls]) - elseif floatapps[inst] then - awful.client.floating.set(c, floatapps[inst]) - end - - -- Override with tiledapps - awful.client.floating.set(c, not (tiledapps[inst] or tiledapps[cls])) - - -- Check application->screen/tag mappings. - local target - if apptags[cls] then - target = apptags[cls] - elseif apptags[inst] then - target = apptags[inst] - end - if target then - c.screen = target.screen - awful.client.movetotag(tags[target.screen][target.tag], c) - end - - -- 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.size_hints_honor = true - - -- Maximise some - if maxapps[inst] or maxapps[cls] then - c.maximized_horizontal = not c.maximized_horizontal - c.maximized_vertical = not c.maximized_vertical - end -end) - --- Hook function to execute when arranging the screen. --- (tag switch, new client, etc) -awful.hooks.arrange.register(function (screen) - 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 - end +-- {{{ Rules +awful.rules.rules = { + -- All clients will match this rule. + { rule = { }, + properties = { border_width = beautiful.border_width, + border_color = beautiful.border_normal, + focus = true, + keys = clientkeys, + buttons = clientbuttons } }, + { rule = { class = "MPlayer" }, + properties = { floating = true } }, + { rule = { class = "pinentry" }, + properties = { floating = true } }, + { rule = { class = "gimp" }, + properties = { floating = true } }, + -- Set Firefox to always map on tags number 2 of screen 1. + -- { rule = { class = "Firefox" }, + -- properties = { tag = tags[1][2] } }, +} +-- }}} - -- Give focus to the latest client in history if no window has focus - -- or if the current window is a desktop or a dock one. - if not client.focus then - local c = awful.client.focus.history.get(screen, 0) - if c then client.focus = c end +-- {{{ Signals +-- Signal function to execute when a new client appears. +client.add_signal("manage", function (c, startup) + -- Add a titlebar + -- awful.titlebar.add(c, { modkey = modkey }) + + -- Enable sloppy focus + c:add_signal("mouse::enter", function(c) + if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier + and awful.client.focus.filter(c) then + client.focus = c + end + end) + + if not startup then + -- Set the windows at the slave, + -- i.e. put it at the end of others instead of setting it master. + -- awful.client.setslave(c) + + -- Put windows in a smart way, only if they does not set an initial position. + if not c.size_hints.user_position and not c.size_hints.program_position then + awful.placement.no_overlap(c) + awful.placement.no_offscreen(c) + end end end) --- Hook called every second -awful.hooks.timer.register(1, function () - mytimebox.text = os.date(" %a %d %b %H:%M:%S ") -end) - --- Hook called every sixty seconds -function hook_battery() - mybatterybox.text = " " .. get_acpibatt() .. " " -end - --- {{{ Statusbar battery --- -function get_acpibatt() - - local f = io.popen('acpi -b', 'r') - if not f then - return "acpi -b failed" - end - - local s = f:read('*l') - f:close() - if not s then - return '-'; - end - - -- Battery 0: Discharging, 89%, 00:02:14 remaining - -- Battery 0: Charging, 58%, 00:02:14 until charged - -- Battery 0: Full, 100% - -- so find the first bit first and then go look for the time - local st, en, status, percent = string.find(s, '%a+%s%d:%s(%a+),%s(%d+%%)'); - local st, en, time = string.find(s, ',%s(%d+:%d+):%d+%s%a+', en); - - if not status or not percent then -- time can be empty if we're full - return "couldn't parse line " .. s - end - - if not time then - return percent - end - - if status == 'Charging' then - return '↑ ' .. percent; - elseif status == 'Discharging' then - return '↓ '.. time; - else - return ''; - end -end +client.add_signal("focus", function(c) c.border_color = beautiful.border_focus end) +client.add_signal("unfocus", function(c) c.border_color = beautiful.border_normal end) -- }}} --{{{ batt hook