]> 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
Stopped assuming all clients use theme.border_width
[etc/awesome.git] / widgets / calendar.lua
diff --git a/widgets/calendar.lua b/widgets/calendar.lua
index 57fadd946d03acff62d8828cbe40c5459ca9f34b..b811f705733fb2a62797c3e8bed1b1b028f53bd9 100644 (file)
--- a/widgets/calendar.lua
+++ b/widgets/calendar.lua
@@ -12,8 +12,9 @@ local awful        = require("awful")
 local beautiful    = require("beautiful")
 local naughty      = require("naughty")
 
 local beautiful    = require("beautiful")
 local naughty      = require("naughty")
 
-local io           = io
+local io           = { popen = io.popen }
 local os           = { date = os.date }
 local os           = { date = os.date }
+local mouse        = mouse
 local tonumber     = tonumber
 
 local setmetatable = setmetatable
 local tonumber     = tonumber
 
 local setmetatable = setmetatable
@@ -30,25 +31,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 = '/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 .. ' ' .. calendar.post_cal  .. ' ' ..
+        ' | sed -r -e "s/_\\x08//g" | sed -r -e "s/(^| )('
 
 
-    if offs == 0
-    then -- current month showing, today highlighted
-        if today >= 10
-        then
-           init_t = '/usr/bin/cal | sed -r -e "s/(^| )('
-        end
+    calendar.offset = calendar.offset + offs
 
 
+    if offs == 0 or calendar.offset == 0
+    then -- current month showing, today highlighted
         calendar.offset = 0
         calendar.notify_icon = calendar.icons .. today .. ".png"
 
         calendar.offset = 0
         calendar.notify_icon = calendar.icons .. today .. ".png"
 
@@ -64,7 +60,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
@@ -83,11 +78,11 @@ 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 .. ' ' ..
+            calendar.post_cal)
     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"
@@ -95,31 +90,54 @@ function calendar:show(t_out, inc_offset)
              .. "</span></tt>"
     f:close()
 
              .. "</span></tt>"
     f:close()
 
-    cal_notification = naughty.notify({ text = c_text,
-                                        icon = calendar.notify_icon,
-                                        position = calendar.position,
-                                        fg = calendar.fg,
-                                        bg = calendar.bg,
-                                        timeout = tims })
+    if calendar.followmouse then
+        scrp = mouse.screen
+    else
+        scrp = scr or calendar.scr_pos
+    end
+
+    cal_notification = naughty.notify({
+        text = c_text,
+        icon = calendar.notify_icon,
+        position = calendar.position,
+        fg = calendar.fg,
+        bg = calendar.bg,
+        timeout = tims,
+        screen = scrp
+    })
 end
 
 function calendar:attach(widget, args)
     local args = args or {}
 end
 
 function calendar:attach(widget, args)
     local args = args or {}
-    calendar.icons = args.icons or icons_dir .. "cal/white/"
-    calendar.font_size = tonumber(args.font_size) or 12
-    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.offset = 0
+    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.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 "#000000"
+    calendar.position    = args.position or "top_right"
+    calendar.scr_pos     = args.scr_pos or 1
+    calendar.followmouse = args.followmouse or false
+
+    calendar.fg = string.sub(calendar.fg, 1, 7)
+    calendar.bg = string.sub(calendar.bg, 1, 7)
+
+    calendar.offset      = 0
     calendar.notify_icon = nil
 
     calendar.notify_icon = nil
 
-    widget:connect_signal("mouse::enter", function () calendar:show() end)
+    widget:connect_signal("mouse::enter", function () calendar:show(0, 0, calendar.scr_pos) end)
     widget:connect_signal("mouse::leave", function () calendar:hide() end)
     widget:connect_signal("mouse::leave", function () calendar:hide() end)
-    widget:buttons(awful.util.table.join( awful.button({ }, 1, function ()
-                                              calendar:show(0, -1) end),
-                                          awful.button({ }, 3, function ()
-                                              calendar:show(0, 1) end) ))
+    widget:buttons(awful.util.table.join(awful.button({ }, 1, function ()
+                                             calendar:show(0, -1, calendar.scr_pos) end),
+                                         awful.button({ }, 3, function ()
+                                             calendar:show(0, 1, calendar.scr_pos) end),
+                                         awful.button({ }, 4, function ()
+                                             calendar:show(0, -1, calendar.scr_pos) end),
+                                         awful.button({ }, 5, function ()
+                                             calendar:show(0, 1, calendar.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.