X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/52deb6911957f840a0191f73c8a9626bd9ff5086..06621e5bdd737749cda8adf1c84d72a2ba468475:/widgets/calendar.lua

diff --git a/widgets/calendar.lua b/widgets/calendar.lua
index 2ed26a0..4714a54 100644
--- a/widgets/calendar.lua
+++ b/widgets/calendar.lua
@@ -91,9 +91,9 @@ function calendar:show(t_out, inc_offset, scr)
     f:close()
 
     if calendar.followmouse then
-        local scrp = mouse.screen
+        scrp = mouse.screen
     else
-        local scrp = scr or calendar.scr_pos
+        scrp = scr or calendar.scr_pos
     end
 
     cal_notification = naughty.notify({
@@ -113,15 +113,17 @@ function calendar:attach(widget, args)
     calendar.cal         = args.cal or "/usr/bin/cal"
     calendar.post_cal    = args.post_cal or ""
     calendar.icons       = args.icons or icons_dir .. "cal/white/"
-    calendar.font        = args.font or beautiful.font:sub(beautiful.font:find(""),
-                           beautiful.font:find(" "))
+    calendar.font        = args.font or beautiful.font:gsub(" %d.*", "")
     calendar.font_size   = tonumber(args.font_size) or 11
     calendar.fg          = args.fg or beautiful.fg_normal or "#FFFFFF"
-    calendar.bg          = args.bg or beautiful.bg_normal or "#FFFFFF"
+    calendar.bg          = args.bg or beautiful.bg_normal or "#000000"
     calendar.position    = args.position or "top_right"
     calendar.scr_pos     = args.scr_pos or 1
     calendar.followmouse = args.followmouse or false
 
+    calendar.fg = string.sub(calendar.fg, 1, 7)
+    calendar.bg = string.sub(calendar.bg, 1, 7)
+
     calendar.offset      = 0
     calendar.notify_icon = nil