alsa, alsabar: make amixer call customizable; fixes #111 in general

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

diff --git a/widgets/calendar.lua b/widgets/calendar.lua
index 631b358eff5d00e8a15e30ab7e29a633b39bde62..cc0ebe74b40469780fab3ef9a51f9ab8d7ea165a 100644 (file)
--- a/widgets/calendar.lua
+++ b/widgets/calendar.lua
@@ -37,17 +37,13 @@ function calendar:show(t_out, inc_offset, scr)
     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 = calendar.cal .. ' | sed -r -e "s/(^| )( '
+    local init_t = calendar.cal .. ' ' .. calendar.post_cal  .. ' ' .. 
+        ' | sed -r -e "s/_\\x08//g" | sed -r -e "s/(^| )('

 
     calendar.offset = calendar.offset + offs
 
     if offs == 0 or calendar.offset == 0
     then -- current month showing, today highlighted
 
     calendar.offset = calendar.offset + offs
 
     if offs == 0 or calendar.offset == 0
     then -- current month showing, today highlighted

-        if today >= 10
-        then
-           init_t = calendar.cal .. ' | sed -r -e "s/_\\x08//g" | sed -r -e "s/(^| )('
-        end
-

         calendar.offset = 0
         calendar.notify_icon = calendar.icons .. today .. ".png"
 
         calendar.offset = 0
         calendar.notify_icon = calendar.icons .. today .. ".png"
 


@@ -81,7 +77,8 @@ function calendar:show(t_out, inc_offset, scr)
 
        calendar.notify_icon = nil
 
 
        calendar.notify_icon = nil
 

-       f = io.popen(calendar.cal .. ' ' .. month .. ' ' .. year)
+       f = io.popen(calendar.cal .. ' ' .. month .. ' ' .. year .. ' ' .. 
+            calendar.post_cal)

     end
 
     c_text = "<tt><span font='" .. calendar.font .. " "
     end
 
     c_text = "<tt><span font='" .. calendar.font .. " "


@@ -106,6 +103,7 @@ end
 function calendar:attach(widget, args)
     local args = args or {}
     calendar.cal       = args.cal or "/usr/bin/cal"
 function calendar:attach(widget, args)
     local args = args or {}
     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.icons     = args.icons or icons_dir .. "cal/white/"
     calendar.font      = args.font or beautiful.font:sub(beautiful.font:find(""),
                          beautiful.font:find(" "))