X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/93bc739eb28a479240d52cc112e63b2cee7c2688..c2fb4b601269388d7846814b1299e3272f799d7b:/.config/awesome/rc.lua?ds=sidebyside diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index 3f21875..ddd3a27 100644 --- a/.config/awesome/rc.lua +++ b/.config/awesome/rc.lua @@ -1,16 +1,25 @@ --- awesome 3 configuration file - --- Include awesome library, with lots of useful function! +-- Standard awesome library require("awful") -require("tabulous") require("beautiful") +require("naughty") + +-- Load Debian menu entries +require("debian.menu") -- {{{ Variable definitions --- This is a file path to a theme file which will defines colors. -theme_path = "/home/madduck/code/awesome/share/awesome/themes/default" +-- Themes define colours, icons, and wallpapers +-- The default is a dark theme +theme_path = "/usr/share/awesome/themes/default/theme" +-- Uncommment this for a lighter theme +-- theme_path = "/usr/share/awesome/themes/sky/theme" --- This is used later as the default terminal to run. +-- Actually load theme +beautiful.init(theme_path) + +-- This is used later as the default terminal and editor to run. terminal = "x-terminal-emulator" +editor = os.getenv("EDITOR") or "editor" +editor_cmd = terminal .. " -e " .. editor -- Default modkey. -- Usually, Mod4 is the key with a logo between Control and Alt. @@ -22,17 +31,16 @@ modkey = "Mod4" -- Table of layouts to cover with awful.layout.inc, order matters. layouts = { - "tile", - "tileleft", - "tilebottom", - "tiletop", - "fairh", - "fairv", - "magnifier", - "max", --- "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 @@ -48,14 +56,14 @@ floatapps = ["GIMP"] = true, ["twinkle"] = true, ["Add-ons"] = true, - ["Play stream"] = true + ["Play stream"] = true, } -- Applications that should never float, assuming everything else floats -- (by instance) tiledapps = { - ["urxvt"] = true + ["urxvt"] = true, } -- Applications that should be maximised @@ -65,7 +73,8 @@ maxapps = ["Navigator"] = true, -- jpilot is -v ["-v"] = true, - ["Xpdf"] = true + ["Xpdf"] = true, + ["gscan2pdf"] = true } -- Applications to be moved to a pre-defined tag by class or instance. @@ -81,19 +90,6 @@ apptags = use_titlebar = false -- }}} --- {{{ Initialization --- Initialize theme (colors). -beautiful.init(theme_path) - --- Register theme in awful. --- This allows to not pass plenty of arguments to each function --- to inform it about colors we want it to draw. -awful.beautiful.register(beautiful) - --- Uncomment this to activate autotabbing --- tabulous.autotab_start() --- }}} - -- {{{ Tags -- Define tags table. tags = {} @@ -102,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[5], tags[s][tagnumber]) end -- I'm sure you want to see at least one tag. tags[s][1].selected = true @@ -114,53 +111,89 @@ end -- }}} -- {{{ Wibox --- Create a taglist widget -mytaglist = widget({ type = "taglist", name = "mytaglist" }) -mytaglist:buttons({ - button({ }, 1, function (object, tag) awful.tag.viewonly(tag) end), - button({ modkey }, 1, function (object, tag) awful.client.movetotag(tag) end), - button({ }, 3, function (object, tag) tag.selected = not tag.selected end), - button({ modkey }, 3, function (object, tag) awful.client.toggletag(tag) end), - button({ }, 4, awful.tag.viewnext), - button({ }, 5, awful.tag.viewprev) -}) -mytaglist.label = awful.widget.taglist.label.all - --- Create a tasklist widget -mytasklist = widget({ type = "tasklist", name = "mytasklist" }) -mytasklist:buttons({ - button({ }, 1, function (object, c) client.focus = c; c:raise() end), - button({ }, 4, function () awful.client.focusbyidx(1) end), - button({ }, 5, function () awful.client.focusbyidx(-1) end) -}) -mytasklist.label = awful.widget.tasklist.label.currenttags - -- Create a textbox widget -mytimebox = widget({ type = "textbox", name = "mytimebox", align = "right" }) -mybatterybox = widget({ type = "textbox", name = "mybatterybox", align = "right" }) -mypromptbox = widget({ type = "textbox", name = "mypromptbox", align = "left" }) +mytextbox = widget({ type = "textbox", align = "right" }) +-- Set the default text in textbox +mytextbox.text = " " .. AWESOME_RELEASE .. " " + +-- Create a laucher widget and a main menu +myawesomemenu = { + { "manual", terminal .. " -e man awesome" }, + { "edit config", editor_cmd .. " " .. awful.util.getdir("config") .. "/rc.lua" }, + { "restart", awesome.restart }, + { "quit", awesome.quit } +} + +mymainmenu = awful.menu.new({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon }, + { "open terminal", terminal }, + { "Debian", debian.menu.Debian_menu.Debian } + } + }) --- Create a laucher widget -mylauncher = awful.widget.launcher({ name = "mylauncher", - image = "/home/madduck/code/awesome/share/awesome/icons/awesome16.png", - command = terminal .. " -e man awesome"}) +mylauncher = awful.widget.launcher({ image = image(beautiful.awesome_icon), + menu = mymainmenu }) -- Create a systray -mysystray = widget({ type = "systray", name = "mysystray", align = "right" }) +mysystray = widget({ type = "systray", align = "right" }) + +-- Create textbox widgets +mytimebox = widget({ type = "textbox", name = "mytimebox", align = "right" }) +mybatterybox = widget({ type = "textbox", name = "mybatterybox", align = "right" }) --- Create an iconbox widget which will contains an icon indicating which layout we're using. --- We need one layoutbox per screen. +-- Create a wibox for each screen and add it +mywibox = {} +mypromptbox = {} mylayoutbox = {} +mytaglist = {} +mytaglist.buttons = { button({ }, 1, awful.tag.viewonly), + button({ modkey }, 1, awful.client.movetotag), + button({ }, 3, function (tag) tag.selected = not tag.selected end), + button({ modkey }, 3, awful.client.toggletag), + button({ }, 4, awful.tag.viewnext), + button({ }, 5, awful.tag.viewprev) } +mytasklist = {} +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) } + for s = 1, screen.count() do - mylayoutbox[s] = widget({ type = "imagebox", name = "mylayoutbox", align = "right" }) - mylayoutbox[s]:buttons({ - button({ }, 1, function () awful.layout.inc(layouts, 1) end), - button({ }, 3, function () awful.layout.inc(layouts, -1) end), - button({ }, 4, function () awful.layout.inc(layouts, 1) end), - button({ }, 5, function () awful.layout.inc(layouts, -1) end) - }) - mylayoutbox[s].image = image("/home/madduck/code/awesome/share/awesome/icons/layouts/tilew.png") + -- Create a promptbox for each screen + mypromptbox[s] = widget({ type = "textbox", align = "left" }) + -- 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]:buttons({ button({ }, 1, function () awful.layout.inc(layouts, 1) end), + button({ }, 3, function () awful.layout.inc(layouts, -1) end), + button({ }, 4, function () awful.layout.inc(layouts, 1) end), + button({ }, 5, function () awful.layout.inc(layouts, -1) end) }) + -- Create a taglist widget + mytaglist[s] = awful.widget.taglist.new(s, awful.widget.taglist.label.all, mytaglist.buttons) + + -- Create a tasklist widget + mytasklist[s] = awful.widget.tasklist.new(function(c) + return awful.widget.tasklist.label.currenttags(c, s) + end, mytasklist.buttons) + + -- Create the wibox + mywibox[s] = wibox({ position = "top", fg = beautiful.fg_normal, bg = beautiful.bg_normal }) + -- 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 end +-- }}} --Battery widget batterywidget = widget({ type = 'progressbar', name = 'batterywidget' }) @@ -182,35 +215,95 @@ batterywidget:bar_properties_set('bat', { }) -- }}} --- Create a wibox for each screen and add it -mywibox = {} -for s = 1, screen.count() do - mywibox[s] = wibox({ position = "top", name = "mywibox" .. s, - fg = beautiful.fg_normal, bg = beautiful.bg_normal }) - -- Add widgets to the wibox - order matters - mywibox[s]:widgets({ - mytaglist, - mytasklist, - mypromptbox, --- batterywidget, --- mybatterybox, - mytimebox, - mylayoutbox[s], - s == screen.count() and mysystray or nil - }) - mywibox[s].screen = s -end --- }}} -- {{{ Mouse bindings -awesome.buttons({ - button({ }, 3, function () awful.util.spawn(terminal) end), +root.buttons({ + button({ }, 3, function () mymainmenu:toggle() end), button({ }, 4, awful.tag.viewnext), button({ }, 5, awful.tag.viewprev) }) -- }}} -- {{{ 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 @@ -220,160 +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.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 () client.focus.fullscreen = not client.focus.fullscreen end):add() -keybinding({ modkey, "Shift" }, "c", function () client.focus:kill() end):add() -keybinding({ modkey }, "j", function () awful.client.focus.byidx(1); client.focus:raise() end):add() -keybinding({ modkey }, "k", function () awful.client.focus.byidx(-1); client.focus:raise() end):add() -keybinding({ modkey, "Shift" }, "j", function () awful.client.swap(1) end):add() -keybinding({ modkey, "Shift" }, "k", function () awful.client.swap(-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 () client.focus:swap(awful.client.master()) 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 () client.focus:redraw() 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, awful.util.spawn, awful.completion.bash, -os.getenv("HOME") .. "/.cache/awesome/history") end):add() -keybinding({ modkey }, "F4", function () - awful.prompt.run({ prompt = "Run Lua code: " }, mypromptbox, awful.eval, awful.prompt.bash, -os.getenv("HOME") .. "/.cache/awesome/history_eval") end):add() -keybinding({ modkey, "Ctrl" }, "i", function () - if mypromptbox.text then - mypromptbox.text = nil - else - mypromptbox.text = nil - if client.focus.class then - mypromptbox.text = "Class: " .. client.focus.class .. " " - end - if client.focus.instance then - mypromptbox.text = mypromptbox.text .. "Instance: ".. client.focus.instance .. " " - end - if client.focus.role then - mypromptbox.text = mypromptbox.text .. "Role: ".. client.focus.role - end - end - end):add() - ---- Tabulous, tab manipulation -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 @@ -396,22 +382,29 @@ awful.hooks.marked.register(function (c) c.border_color = beautiful.border_marked end) --- Hook function to execute when unmarking a client +-- 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 is over a client. +-- 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 }) @@ -419,27 +412,26 @@ 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. c.border_width = beautiful.border_width c.border_color = beautiful.border_normal - client.focus = c -- Check if the application should be floating. -- OVERRIDDEN, SEE tiledapps BELOW 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 @@ -453,12 +445,18 @@ awful.hooks.manage.register(function (c) 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. | if maxapps[inst] or maxapps[cls] then - c.honorsizehints = true + -- 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 @@ -466,12 +464,12 @@ awful.hooks.manage.register(function (c) end end) --- Hook function to execute when arranging the screen +-- 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 - mylayoutbox[screen].image = image("/home/madduck/code/awesome/share/awesome/icons/layouts/" .. layout .. "w.png") + 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 @@ -486,7 +484,7 @@ awful.hooks.arrange.register(function (screen) -- Uncomment if you want mouse warping --[[ if client.focus then - local c_c = client.focus:coords() + local c_c = client.focus:fullgeometry() local m_c = mouse.coords() if m_c.x < c_c.x or m_c.x >= c_c.x + c_c.width or @@ -524,7 +522,7 @@ function get_acpibatt() local s = f:read('*l') f:close() if not s then - return laststring; + return '-'; end -- Battery 0: Discharging, 89%, 00:02:14 remaining @@ -547,7 +545,7 @@ function get_acpibatt() elseif status == 'Discarching' then status = 'd'; else - status = ''; + status = '-'; end return percent; -- .. ' (' .. status .. ')'; -- .. ' ' .. time .. ' left'; @@ -601,8 +599,8 @@ keybinding({ cmdmodkey }, "j", function () awful.util.spawn("jpilot") end):add() keybinding({ cmdmodkey }, "x", function () awful.util.spawn("/sbin/start-stop-daemon --start --background --exec /usr/bin/xscreensaver; xscreensaver-command -lock") end):add() keybinding({ cmdmodkey, "Shift" }, "x", function () awful.util.spawn("xscreensaver-command -exit") end):add() --- Highlight statusbars on the screen that has focus, --- set this to false if you only have one screen or +-- Highlight statusbars on the screen that has focus, +-- set this to false if you only have one screen or -- you don't like it :P if screen.count() > 1 then statusbar_highlight_focus = true @@ -611,3 +609,87 @@ else end hook_battery() + +function displayMonth(month,year,weekStart) + local t,wkSt=os.time{year=year, month=month+1, day=0},weekStart or 1 + local d=os.date("*t",t) + local mthDays,stDay=d.day,(d.wday-d.day-wkSt+1)%7 + + local lines = {} + + for x=0,6 do + lines[x+1] = os.date("%a ",os.time{year=2006,month=1,day=x+wkSt}) + end + lines[8] = " " + + local writeLine = 1 + while writeLine < (stDay + 1) do + lines[writeLine] = lines[writeLine] .. " " + writeLine = writeLine + 1 + end + + for x=1,mthDays do + if writeLine == 8 then + writeLine = 1 + end + if writeLine == 1 or x == 1 then + lines[8] = lines[8] .. os.date(" %V",os.time{year=year,month=month,day=x}) + end + if (#(tostring(x)) == 1) then + x = " " .. x + end + lines[writeLine] = lines[writeLine] .. " " .. x + writeLine = writeLine + 1 + end + local header = os.date("%B %Y\n",os.time{year=year,month=month,day=1}) + header = string.rep(" ", math.floor((#(lines[1]) - #header) / 2 )) .. header + + return header .. table.concat(lines, '\n') +end + +local calendar = {} +function switchNaughtyMonth(switchMonths) + if (#calendar < 3) then return end + local swMonths = switchMonths or 1 + calendar[1] = calendar[1] + swMonths + calendar[3].box.widgets[2].text = displayMonth(calendar[1], calendar[2], 2) +end + +mytimebox.mouse_enter = function () + local month, year = os.date('%m'), os.date('%Y') + calendar = { month, year, + naughty.notify({ + text = displayMonth(month, year, 2), + timeout = 0, hover_timeout = 0.5, + width = 200, screen = mouse.screen + }) + } +end +mytimebox.mouse_leave = function () naughty.destroy(calendar[3]) end + +mytimebox:buttons({ + button({ }, 1, function() + switchNaughtyMonth(-1) + end), + button({ }, 3, function() + switchNaughtyMonth(1) + end), + button({ }, 4, function() + switchNaughtyMonth(-1) + end), + button({ }, 5, function() + switchNaughtyMonth(1) + end), + button({ 'Shift' }, 1, function() + switchNaughtyMonth(-12) + end), + button({ 'Shift' }, 3, function() + switchNaughtyMonth(12) + end), + button({ 'Shift' }, 4, function() + switchNaughtyMonth(-12) + end), + button({ 'Shift' }, 5, function() + switchNaughtyMonth(12) + end) +})