X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/c8d5858492d2340b9d769d52d888a4ea6bc81a18..2a8109419a96f7cf1a34ffce15ee5a41523b2a2d:/.config/awesome/rc.lua?ds=sidebyside diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index 5800242..0d63e5b 100644 --- a/.config/awesome/rc.lua +++ b/.config/awesome/rc.lua @@ -1,19 +1,25 @@ --- awesome 3 configuration file - -AWESOME_DATADIR = "/home/madduck/code/awesome" -package.path = AWESOME_DATADIR .. "/lib/?.lua;" .. package.path - --- Include awesome library, with lots of useful function! +-- Include awesome libraries, with lots of useful function! 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 = AWESOME_DATADIR .. "/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. @@ -29,8 +35,11 @@ layouts = "tileleft", "tilebottom", "tiletop", + "fairh", + "fairv", "magnifier", "max", + "fullscreen", -- "spiral", -- "dwindle", "floating" @@ -49,14 +58,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,14 +74,16 @@ maxapps = { ["Navigator"] = true, -- jpilot is -v - ["-v"] = true + ["-v"] = true, + ["Xpdf"] = true, + ["gscan2pdf"] = true } -- Applications to be moved to a pre-defined tag by class or instance. -- Use the screen and tags indices. apptags = { - ["Iceweasel"] = { screen = 1, tag = 9 }, + ["Navigator"] = { screen = 1, tag = 9 }, -- jpilot is -v ["-v"] = { screen = 1, tag = 8 }, } @@ -81,19 +92,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,7 +100,7 @@ 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[1] }) + tags[s][tagnumber] = tag({ name = tagnumber, layout = layouts[6] }) -- Add tags to screen one by one -- split at 0.5/50% exactly -- tags[s][tagnumber].mwfact = 0.5 @@ -113,47 +111,84 @@ for s = 1, screen.count() do end -- }}} --- {{{ Statusbar --- Create a taglist widget -mytaglist = widget({ type = "taglist", name = "mytaglist" }) -mytaglist:mouse_add(mouse({}, 1, function (object, tag) awful.tag.viewonly(tag) end)) -mytaglist:mouse_add(mouse({ modkey }, 1, function (object, tag) awful.client.movetotag(tag) end)) -mytaglist:mouse_add(mouse({}, 3, function (object, tag) tag.selected = not tag.selected end)) -mytaglist:mouse_add(mouse({ modkey }, 3, function (object, tag) awful.client.toggletag(tag) end)) -mytaglist:mouse_add(mouse({ }, 4, awful.tag.viewnext)) -mytaglist:mouse_add(mouse({ }, 5, awful.tag.viewprev)) -mytaglist.label = awful.widget.taglist.label.all - --- Create a tasklist widget -mytasklist = widget({ type = "tasklist", name = "mytasklist" }) -mytasklist:mouse_add(mouse({ }, 1, function (object, c) client.focus = c; c:raise() end)) -mytasklist:mouse_add(mouse({ }, 4, function () awful.client.focusbyidx(1) end)) -mytasklist:mouse_add(mouse({ }, 5, function () awful.client.focusbyidx(-1) end)) -mytasklist.label = awful.widget.tasklist.label.currenttags - +-- {{{ Wibox -- 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 an iconbox widget -myiconbox = widget({ type = "textbox", name = "myiconbox", align = "left" }) -myiconbox.text = "" +mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon, + menu = mymainmenu }) -- Create a systray -mysystray = widget({ type = "systray", name = "mysystray", align = "right" }) +mysystray = widget({ type = "systray", align = "right" }) --- Create an iconbox widget which will contains an icon indicating which layout we're using. --- We need one layoutbox per screen. +-- Create textbox widgets +mytimebox = widget({ type = "textbox", name = "mytimebox", align = "right" }) +mybatterybox = widget({ type = "textbox", name = "mybatterybox", align = "right" }) + +-- 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) client.focus = c; c:raise() end), + button({ }, 3, function () 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 = "textbox", name = "mylayoutbox", align = "right" }) - mylayoutbox[s]:mouse_add(mouse({ }, 1, function () awful.layout.inc(layouts, 1) end)) - mylayoutbox[s]:mouse_add(mouse({ }, 3, function () awful.layout.inc(layouts, -1) end)) - mylayoutbox[s]:mouse_add(mouse({ }, 4, function () awful.layout.inc(layouts, 1) end)) - mylayoutbox[s]:mouse_add(mouse({ }, 5, function () awful.layout.inc(layouts, -1) end)) - mylayoutbox[s].text = "" + -- 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' }) @@ -175,30 +210,13 @@ batterywidget:bar_properties_set('bat', { }) -- }}} --- Create a statusbar for each screen and add it -mystatusbar = {} -for s = 1, screen.count() do - mystatusbar[s] = statusbar({ position = "top", name = "mystatusbar" .. s, - fg = beautiful.fg_normal, bg = beautiful.bg_normal }) - -- Add widgets to the statusbar - order matters - mystatusbar[s]:widgets({ - mytaglist, - mytasklist, - mypromptbox, --- batterywidget, - mybatterybox, - mytimebox, - mylayoutbox[s], - s == screen.count() and mysystray or nil - }) - mystatusbar[s].screen = s -end --- }}} -- {{{ Mouse bindings -awesome.mouse_add(mouse({ }, 3, function () awful.spawn(terminal) end)) -awesome.mouse_add(mouse({ }, 4, awful.tag.viewnext)) -awesome.mouse_add(mouse({ }, 5, awful.tag.viewprev)) +awesome.buttons({ + button({ }, 3, function () mymainmenu:toggle() end), + button({ }, 4, awful.tag.viewnext), + button({ }, 5, awful.tag.viewprev) +}) -- }}} -- {{{ Key bindings @@ -227,19 +245,17 @@ for i = 1, keynumber do end):add() keybinding({ modkey, "Shift" }, i, function () - local sel = client.focus - if sel then - if tags[sel.screen][i] then - awful.client.movetotag(tags[sel.screen][i]) + 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 () - local sel = client.focus - if sel then - if tags[sel.screen][i] then - awful.client.toggletag(tags[sel.screen][i]) + if client.focus then + if tags[client.focus.screen][i] then + awful.client.toggletag(tags[client.focus.screen][i]) end end end):add() @@ -250,26 +266,30 @@ keybinding({ modkey }, "Right", awful.tag.viewnext):add() keybinding({ modkey }, "Escape", awful.tag.history.restore):add() -- Standard program -keybinding({ modkey }, "Return", function () awful.spawn(terminal) end):add() +keybinding({ modkey }, "Return", function () awful.util.spawn(terminal) end):add() -keybinding({ modkey, "Control" }, "r", awesome.restart):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, "Shift" }, "c", function () client.focus:kill() end):add() -keybinding({ modkey }, "j", function () awful.client.focusbyidx(1); client.focus:raise() end):add() -keybinding({ modkey }, "k", function () awful.client.focusbyidx(-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 }, "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 () client.focus:swap(awful.client.master()) end):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 () client.focus:redraw() end):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() @@ -283,29 +303,34 @@ keybinding({ modkey, "Shift" }, "space", function () awful.layout.inc(layouts, - -- Prompt keybinding({ modkey }, "F1", function () - awful.prompt.run({ prompt = "Run: " }, mypromptbox, awful.spawn, awful.completion.bash, -os.getenv("HOME") .. "/.cache/awesome/history") end):add() + 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, awful.eval, awful.prompt.bash, -os.getenv("HOME") .. "/.cache/awesome/history_eval") end):add() + 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 () - if mypromptbox.text then - mypromptbox.text = nil - else - mypromptbox.text = nil + 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.text = "Class: " .. client.focus.class .. " " + mypromptbox[s].text = "Class: " .. client.focus.class .. " " end if client.focus.instance then - mypromptbox.text = mypromptbox.text .. "Instance: ".. client.focus.instance .. " " + mypromptbox[s].text = mypromptbox[s].text .. "Instance: ".. client.focus.instance .. " " end if client.focus.role then - mypromptbox.text = mypromptbox.text .. "Role: ".. client.focus.role + 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) @@ -367,54 +392,54 @@ end -- {{{ Hooks -- Hook function to execute when focusing a client. -function hook_focus(c) +awful.hooks.focus.register(function (c) if not awful.client.ismarked(c) then c.border_color = beautiful.border_focus end -end +end) -- Hook function to execute when unfocusing a client. -function hook_unfocus(c) +awful.hooks.unfocus.register(function (c) if not awful.client.ismarked(c) then c.border_color = beautiful.border_normal end -end +end) -- Hook function to execute when marking a client -function hook_marked(c) +awful.hooks.marked.register(function (c) c.border_color = beautiful.border_marked -end +end) --- Hook function to execute when unmarking a client -function hook_unmarked(c) +-- Hook function to execute when unmarking a client. +awful.hooks.unmarked.register(function (c) c.border_color = beautiful.border_focus -end +end) --- Hook function to execute when the mouse is over a client. -function hook_mouseover(c) +-- 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" then + if awful.layout.get(c.screen) ~= "magnifier" + and awful.client.focus.filter(c) then client.focus = c end -end +end) -- Hook function to execute when a new client appears. -function hook_manage(c) - -- Set floating placement to be smart! - c.floating_placement = "smart" +awful.hooks.manage.register(function (c) if use_titlebar then -- Add a titlebar awful.titlebar.add(c, { modkey = modkey }) end -- Add mouse bindings - c:mouse_add(mouse({ }, 1, function (c) client.focus = c; c:raise() end)) - c:mouse_add(mouse({ modkey }, 1, function (c) c:mouse_move() end)) - c:mouse_add(mouse({ modkey }, 3, function (c) c:mouse_resize() end)) + 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) + }) -- 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 @@ -427,7 +452,7 @@ function hook_manage(c) end -- Override with tiledapps - c.floating = not tiledapps[inst] + c.floating = not (tiledapps[inst] or tiledapps[cls]) -- Check application->screen/tag mappings. local target @@ -441,27 +466,34 @@ function hook_manage(c) awful.client.movetotag(tags[target.screen][target.tag], c) end - -- Honor size hints + -- Do this after tag mapping, so you don't see it on the wrong tag for a split second. + client.focus = c + + -- 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 -- Maximise some - if maxapps[inst] then + if maxapps[inst] or maxapps[cls] then awful.client.maximize(c) end -end +end) --- Hook function to execute when arranging the screen +-- Hook function to execute when arranging the screen. -- (tag switch, new client, etc) -function hook_arrange(screen) +awful.hooks.arrange.register(function (screen) local layout = awful.layout.get(screen) if layout then - mylayoutbox[screen].text = - "" - else - mylayoutbox[screen].text = "No layout." + mylayoutbox[screen].image = image(beautiful["layout_" .. layout]) + else + mylayoutbox[screen].image = nil end - -- If no window has focus, give focus to the latest in history + -- 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 @@ -469,9 +501,8 @@ function hook_arrange(screen) -- Uncomment if you want mouse warping --[[ - local sel = client.focus - if sel then - local c_c = sel:coords() + if client.focus then + 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 @@ -482,15 +513,15 @@ function hook_arrange(screen) end end ]] -end +end) -- Hook called every second -function hook_timer() +awful.hooks.timer.register(1, function () -- For unix time_t lovers -- mytextbox.text = " " .. os.time() .. " time_t " -- Otherwise use: mytimebox.text = " " .. os.date() .. " " -end +end) -- Hook called every sixty seconds function hook_battery() @@ -509,7 +540,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 @@ -532,7 +563,7 @@ function get_acpibatt() elseif status == 'Discarching' then status = 'd'; else - status = ''; + status = '-'; end return percent; -- .. ' (' .. status .. ')'; -- .. ' ' .. time .. ' left'; @@ -557,14 +588,6 @@ end --}}} -- Set up some hooks -awful.hooks.focus.register(hook_focus) -awful.hooks.unfocus.register(hook_unfocus) -awful.hooks.marked.register(hook_marked) -awful.hooks.unmarked.register(hook_unmarked) -awful.hooks.manage.register(hook_manage) -awful.hooks.mouseover.register(hook_mouseover) -awful.hooks.arrange.register(hook_arrange) -awful.hooks.timer.register(1, hook_timer) awful.hooks.timer.register(120, hook_battery) -- awful.hooks.timer.register(5, get_bat) -- }}} @@ -572,27 +595,27 @@ awful.hooks.timer.register(120, hook_battery) cmdmodkey = "Mod3" -- xmms2 & sound -keybinding({ cmdmodkey }, "Prior", function () awful.spawn("amixer set Master 2+") end):add() -keybinding({ cmdmodkey }, "Next", function () awful.spawn("amixer set Master 2-") end):add() -keybinding({ cmdmodkey }, "Up", function () awful.spawn("amixer set PCM 2+") end):add() -keybinding({ cmdmodkey }, "Down", function () awful.spawn("amixer set PCM 2-") end):add() -keybinding({ cmdmodkey }, "Home", function () awful.spawn("amixer set Mic toggle") end):add() -keybinding({ cmdmodkey }, "End", function () awful.spawn("amixer set Master toggle") end):add() -keybinding({ cmdmodkey }, "Left", function () awful.spawn("xmms2 prev") end):add() -keybinding({ cmdmodkey }, "Right", function () awful.spawn("xmms2 next") end):add() -keybinding({ cmdmodkey }, "space", function () awful.spawn("xmms2 toggleplay") end):add() -keybinding({ cmdmodkey }, "backslash", function () awful.spawn("xmms2 current | head -1 | xmessage -nearmouse -timeout 5 -file -") end):add() -keybinding({ cmdmodkey, "Shift" }, "backslash", function () awful.spawn("xmms2 list | xmessage -nearmouse -timeout 5 -file -") end):add() +keybinding({ cmdmodkey }, "Prior", function () awful.util.spawn("amixer set Master 2+") end):add() +keybinding({ cmdmodkey }, "Next", function () awful.util.spawn("amixer set Master 2-") end):add() +keybinding({ cmdmodkey }, "Up", function () awful.util.spawn("amixer set PCM 2+") end):add() +keybinding({ cmdmodkey }, "Down", function () awful.util.spawn("amixer set PCM 2-") end):add() +keybinding({ cmdmodkey }, "Home", function () awful.util.spawn("amixer set Mic toggle") end):add() +keybinding({ cmdmodkey }, "End", function () awful.util.spawn("amixer set Master toggle") end):add() +keybinding({ cmdmodkey }, "Left", function () awful.util.spawn("xmms2 prev") end):add() +keybinding({ cmdmodkey }, "Right", function () awful.util.spawn("xmms2 next") end):add() +keybinding({ cmdmodkey }, "space", function () awful.util.spawn("xmms2 toggleplay") end):add() +keybinding({ cmdmodkey }, "backslash", function () awful.util.spawn("xmms2 current | head -1 | xmessage -nearmouse -timeout 5 -file -") end):add() +keybinding({ cmdmodkey, "Shift" }, "backslash", function () awful.util.spawn("xmms2 list | xmessage -nearmouse -timeout 5 -file -") end):add() -- misc apps -keybinding({ cmdmodkey }, "n", function () awful.spawn("sensible-browser") end):add() -keybinding({ cmdmodkey }, "m", function () awful.spawn(terminal .. " -e mutt -f =store") end):add() -keybinding({ cmdmodkey }, "t", function () awful.spawn(terminal) end):add() -keybinding({ cmdmodkey }, "c", function () awful.spawn(terminal .. " -e python") end):add() -keybinding({ cmdmodkey }, "r", function () awful.spawn("gmrun") end):add() -keybinding({ cmdmodkey }, "j", function () awful.spawn("jpilot") end):add() -keybinding({ cmdmodkey }, "x", function () awful.spawn("/sbin/start-stop-daemon --start --background --exec /usr/bin/xscreensaver; xscreensaver-command -lock") end):add() -keybinding({ cmdmodkey, "Shift" }, "x", function () awful.spawn("xscreensaver-command -exit") end):add() +keybinding({ cmdmodkey }, "n", function () awful.util.spawn("sensible-browser") end):add() +keybinding({ cmdmodkey }, "m", function () awful.util.spawn(terminal .. " -e mutt -f =store") end):add() +keybinding({ cmdmodkey }, "t", function () awful.util.spawn(terminal) end):add() +keybinding({ cmdmodkey }, "c", function () awful.util.spawn(terminal .. " -e python") end):add() +keybinding({ cmdmodkey }, "r", function () awful.util.spawn("gmrun") end):add() +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 @@ -604,3 +627,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) +})