yawn: fair/windy icon added

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

diff --git a/widgets/calendar.lua b/widgets/calendar.lua
index bada79e90a6b01fd2e40d5e3603b7adae0b42cb6..cbba67649b5d8679d191e575f479ef5f0797a30c 100644 (file)
--- a/widgets/calendar.lua
+++ b/widgets/calendar.lua
@@ -37,17 +37,12 @@ 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 .. ' | 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"
 


@@ -113,20 +108,21 @@ function calendar:attach(widget, args)
     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.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.scr_pos   = args.scr_pos or 1

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

-    widget:connect_signal("mouse::enter", function () calendar:show() end)
+    widget:connect_signal("mouse::enter", function () calendar:show(0, 0, scr_pos) end)

     widget:connect_signal("mouse::leave", function () calendar:hide() end)
     widget:buttons(awful.util.table.join( awful.button({ }, 1, function ()
     widget:connect_signal("mouse::leave", function () calendar:hide() end)
     widget:buttons(awful.util.table.join( awful.button({ }, 1, function ()

-                                              calendar:show(0, -1) end),
+                                              calendar:show(0, -1, scr_pos) end),

                                           awful.button({ }, 3, function ()
                                           awful.button({ }, 3, function ()

-                                              calendar:show(0, 1) end),
+                                              calendar:show(0, 1, scr_pos) end),

                                           awful.button({ }, 4, function ()
                                           awful.button({ }, 4, function ()

-                                              calendar:show(0, -1) end),
+                                              calendar:show(0, -1, scr_pos) end),

                                           awful.button({ }, 5, function ()
                                           awful.button({ }, 5, function ()

-                                              calendar:show(0, 1) end)))
+                                              calendar:show(0, 1, scr_pos) end)))

 end
 
 return setmetatable(calendar, { __call = function(_, ...) return create(...) end })
 end
 
 return setmetatable(calendar, { __call = function(_, ...) return create(...) end })