base: update subfuction added; contrib/brightness removed because now redundant

[etc/awesome.git] / widgets / calendar.lua

diff --git a/widgets/calendar.lua b/widgets/calendar.lua
index 57fadd946d03acff62d8828cbe40c5459ca9f34b..d0df17c6f9fd290442067bdbce1aa79bfbeaecdb 100644 (file)
--- a/widgets/calendar.lua
+++ b/widgets/calendar.lua
@@ -37,10 +37,7 @@ function calendar:show(t_out, inc_offset)
     local tims = t_out or 0
     local f, c_text
     local today = tonumber(os.date('%d'))
     local tims = t_out or 0
     local f, c_text
     local today = tonumber(os.date('%d'))

-    local init_t = '/usr/bin/cal | sed -r -e "s/(^| )( '
-    -- let's take font only, font size is set in calendar table
-    local font = beautiful.font:sub(beautiful.font:find(""),
-                 beautiful.font:find(" "))
+    local init_t = '/usr/bin/cal --color=never | sed -r -e "s/(^| )( '

 
     if offs == 0
     then -- current month showing, today highlighted
 
     if offs == 0
     then -- current month showing, today highlighted


@@ -86,8 +83,7 @@ function calendar:show(t_out, inc_offset)
        f = io.popen('/usr/bin/cal ' .. month .. ' ' .. year)
     end
 
        f = io.popen('/usr/bin/cal ' .. month .. ' ' .. year)
     end
 

-
-    c_text = "<tt><span font='" .. font .. " "
+    c_text = "<tt><span font='" .. calendar.font .. " "

              .. calendar.font_size .. "'><b>"
              .. f:read() .. "</b>\n\n"
              .. f:read() .. "\n"
              .. calendar.font_size .. "'><b>"
              .. f:read() .. "</b>\n\n"
              .. f:read() .. "\n"


@@ -95,21 +91,25 @@ function calendar:show(t_out, inc_offset)
              .. "</span></tt>"
     f:close()
 
              .. "</span></tt>"
     f:close()
 

-    cal_notification = naughty.notify({ text = c_text,
-                                        icon = calendar.notify_icon,
-                                        position = calendar.position,
-                                        fg = calendar.fg,
-                                        bg = calendar.bg,
-                                        timeout = tims })
+    cal_notification = naughty.notify({
+        text = c_text,
+        icon = calendar.notify_icon,
+        position = calendar.position,
+        fg = calendar.fg,
+        bg = calendar.bg,
+        timeout = tims
+    })

 end
 
 function calendar:attach(widget, args)
     local args = args or {}
 end
 
 function calendar:attach(widget, args)
     local args = args or {}

-    calendar.icons = args.icons or icons_dir .. "cal/white/"
-    calendar.font_size = tonumber(args.font_size) or 12
-    calendar.fg = args.fg or beautiful.fg_normal or "#FFFFFF"
-    calendar.bg = args.bg or beautiful.bg_normal or "#FFFFFF"
-    calendar.position = args.position or "top_right"
+    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_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.position  = args.position or "top_right"

 
     calendar.offset = 0
     calendar.notify_icon = nil
 
     calendar.offset = 0
     calendar.notify_icon = nil