]> git.madduck.net Git - etc/awesome.git/blobdiff - widgets/calendar.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

weather.forecast_update: forgot to add check on err
[etc/awesome.git] / widgets / calendar.lua
index f9aed39820f38e6484825bb7779cf5912e63b97d..3e65f38bb8596e8114cb2071c92d814f72a8649f 100644 (file)
@@ -30,24 +30,20 @@ function calendar:hide()
     end
 end
 
     end
 end
 
-function calendar:show(t_out, inc_offset)
+function calendar:show(t_out, inc_offset, scr)
     calendar:hide()
 
     local offs = inc_offset or 0
     local tims = t_out or 0
     local f, c_text
     local today = tonumber(os.date('%d'))
     calendar:hide()
 
     local offs = inc_offset or 0
     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)
 
        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 .. " "
@@ -99,12 +96,14 @@ function calendar:show(t_out, inc_offset)
         fg = calendar.fg,
         bg = calendar.bg,
         timeout = tims,
         fg = calendar.fg,
         bg = calendar.bg,
         timeout = tims,
+        screen = scr or 1
     })
 end
 
 function calendar:attach(widget, args)
     local args = args or {}
     calendar.cal       = args.cal or "/usr/bin/cal"
     })
 end
 
 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(" "))
@@ -112,20 +111,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 })