pass -M to amixer in alsabar

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

diff --git a/widgets/calendar.lua b/widgets/calendar.lua
index f83b9662546a0c68ff3ce5350ad63aacd203d979..4e6eda764447ec15408d4ebe1d1277d7be2e6e56 100644 (file)
--- a/widgets/calendar.lua
+++ b/widgets/calendar.lua
@@ -39,11 +39,13 @@ function calendar:show(t_out, inc_offset)
     local today = tonumber(os.date('%d'))
     local init_t = calendar.cal .. ' | sed -r -e "s/(^| )( '
 
     local today = tonumber(os.date('%d'))
     local init_t = calendar.cal .. ' | sed -r -e "s/(^| )( '
 

-    if offs == 0
+    calendar.offset = calendar.offset + offs
+
+    if offs == 0 or calendar.offset == 0

     then -- current month showing, today highlighted
         if today >= 10
         then
     then -- current month showing, today highlighted
         if today >= 10
         then

-           init_t = calendar.cal .. ' | sed -r -e "s/(^| )('
+           init_t = calendar.cal .. ' | sed -r -e "s/_\\x08//g" | sed -r -e "s/(^| )('

         end
 
         calendar.offset = 0
         end
 
         calendar.offset = 0


@@ -61,7 +63,6 @@ function calendar:show(t_out, inc_offset)
        local month = tonumber(os.date('%m'))
        local year = tonumber(os.date('%Y'))
 
        local month = tonumber(os.date('%m'))
        local year = tonumber(os.date('%Y'))
 

-       calendar.offset = calendar.offset + offs

        month = month + calendar.offset
 
        if month > 12 then
        month = month + calendar.offset
 
        if month > 12 then


@@ -97,7 +98,8 @@ function calendar:show(t_out, inc_offset)
         position = calendar.position,
         fg = calendar.fg,
         bg = calendar.bg,
         position = calendar.position,
         fg = calendar.fg,
         bg = calendar.bg,

-        timeout = tims
+        timeout = tims,
+        screen = client.focus and client.focus.screen or 1

     })
 end
 
     })
 end