]> 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:

projects / etc / awesome.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Update centerfair.lua
[etc/awesome.git] / widgets / calendar.lua
diff --git a/widgets/calendar.lua b/widgets/calendar.lua
index e5f6e88c02be51e946d08b5c5e7249eb6338b741..631b358eff5d00e8a15e30ab7e29a633b39bde62 100644 (file)
--- a/widgets/calendar.lua
+++ b/widgets/calendar.lua
@@ -12,8 +12,8 @@ local awful        = require("awful")
 local beautiful    = require("beautiful")
 local naughty      = require("naughty")
 
 local beautiful    = require("beautiful")
 local naughty      = require("naughty")
 
-local io           = io
-local os           = { date  = os.date }
+local io           = { popen = io.popen }
+local os           = { date = os.date }
 local tonumber     = tonumber
 
 local setmetatable = setmetatable
 local tonumber     = tonumber
 
 local setmetatable = setmetatable
@@ -21,45 +21,35 @@ local setmetatable = setmetatable
 -- Calendar notification
 -- lain.widgets.calendar
 local calendar = {}
 -- Calendar notification
 -- lain.widgets.calendar
 local calendar = {}
-local notification = nil
-
-local function create(foreground, background)
-    calendar.offset = 0
-    calendar.icons_dir = icons_dir .. "cal/white/" -- default
-    calendar.notify_icon = nil
-    calendar.font_size = 12
-    calendar.bg = background or beautiful.bg_normal or "#FFFFFF"
-    calendar.fg = foreground or beautiful.fg_focus or "#FFFFFF"
-end
+local cal_notification = nil
 
 function calendar:hide()
 
 function calendar:hide()
-    if notification ~= nil then
-        naughty.destroy(notification)
-        notification = nil
+    if cal_notification ~= nil then
+        naughty.destroy(cal_notification)
+        cal_notification = nil
     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 = '/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 = calendar.cal .. ' | sed -r -e "s/(^| )( '
+
+    calendar.offset = calendar.offset + offs
 
 
-    if offs == 0
+    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 = '/usr/bin/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
-        calendar.notify_icon = calendar.icons_dir .. today .. ".png"
+        calendar.notify_icon = calendar.icons .. today .. ".png"
 
         -- bg and fg inverted to highlight today
         f = io.popen( init_t .. today ..
 
         -- bg and fg inverted to highlight today
         f = io.popen( init_t .. today ..
@@ -73,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
@@ -92,33 +81,53 @@ function calendar:show(t_out, inc_offset)
 
        calendar.notify_icon = nil
 
 
        calendar.notify_icon = nil
 
-       f = io.popen('/usr/bin/cal ' .. month .. ' ' .. year)
+       f = io.popen(calendar.cal .. ' ' .. month .. ' ' .. year)
     end
 
     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"
-             .. f:read("*all"):gsub("\n*$", "")
+             .. f:read("*a"):gsub("\n*$", "")
              .. "</span></tt>"
     f:close()
 
              .. "</span></tt>"
     f:close()
 
-    notification = naughty.notify({ text = c_text,
-                                    icon = calendar.notify_icon,
-                                    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,
+        screen = scr or 1
+    })
 end
 
 end
 
-function calendar:attach(widget, foreground, background)
-    create(foreground, background)
-    widget:connect_signal("mouse::enter", function () calendar:show() end)
+function calendar:attach(widget, args)
+    local args = args or {}
+    calendar.cal       = args.cal or "/usr/bin/cal"
+    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.scr_pos   = args.scr_pos or 1
+
+    calendar.offset = 0
+    calendar.notify_icon = nil
+
+    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 ()
+                                              calendar:show(0, -1, scr_pos) end),
+                                          awful.button({ }, 5, function ()
+                                              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 })
awesome window-manager configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.