#263: followtag default to true; changing quake definition

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

diff --git a/widgets/calendar.lua b/widgets/calendar.lua
index 1a481cab64243a792c9c81fbabedf543d8244744..76faca493e224d3aa2fa839f7fe85bafd5ab8fb4 100644 (file)
--- a/widgets/calendar.lua
+++ b/widgets/calendar.lua
@@ -14,7 +14,6 @@ local naughty      = require("naughty")
 
 local io           = { popen = io.popen }
 local os           = { date = os.date }
 
 local io           = { popen = io.popen }
 local os           = { date = os.date }

-local mouse        = mouse

 local string       = { format = string.format,
                        sub    = string.sub,
                        gsub   = string.gsub }
 local string       = { format = string.format,
                        sub    = string.sub,
                        gsub   = string.gsub }


@@ -27,15 +26,15 @@ local setmetatable = setmetatable
 local calendar = {}
 local cal_notification = nil
 
 local calendar = {}
 local cal_notification = nil
 

-function calendar:hide()
+function calendar.hide()

     if cal_notification ~= nil then
         naughty.destroy(cal_notification)
         cal_notification = nil
     end
 end
 
     if cal_notification ~= nil then
         naughty.destroy(cal_notification)
         cal_notification = nil
     end
 end
 

-function calendar:show(t_out, inc_offset, scr)
-    calendar:hide()
+function calendar.show(t_out, inc_offset, scr)
+    calendar.hide()

 
     local f, c_text
     local offs  = inc_offset or 0
 
     local f, c_text
     local offs  = inc_offset or 0


@@ -47,13 +46,13 @@ function calendar:show(t_out, inc_offset, scr)
     if offs == 0 or calendar.offset == 0
     then -- current month showing, today highlighted
         calendar.offset = 0
     if offs == 0 or calendar.offset == 0
     then -- current month showing, today highlighted
         calendar.offset = 0

-        calendar.notify_icon = calendar.icons .. today .. ".png"
+        calendar.notify_icon = string.format("%s%s.png", calendar.icons, today)

 
         -- bg and fg inverted to highlight today
         f = io.popen(calendar.cal_format(today))
     else -- no current month showing, no day to highlight
        local month = tonumber(os.date('%m'))
 
         -- bg and fg inverted to highlight today
         f = io.popen(calendar.cal_format(today))
     else -- no current month showing, no day to highlight
        local month = tonumber(os.date('%m'))

-       local year = tonumber(os.date('%Y'))
+       local year  = tonumber(os.date('%Y'))

 
        month = month + calendar.offset
 
 
        month = month + calendar.offset
 


@@ -79,8 +78,8 @@ function calendar:show(t_out, inc_offset, scr)
              .. "</span></tt>"
     f:close()
 
              .. "</span></tt>"
     f:close()
 

-    if calendar.followmouse then
-        scrp = mouse.screen
+    if calendar.followtag then
+        scrp = awful.screen.focused()

     else
         scrp = scr or calendar.scr_pos
     end
     else
         scrp = scr or calendar.scr_pos
     end


@@ -96,7 +95,7 @@ function calendar:show(t_out, inc_offset, scr)
     })
 end
 
     })
 end
 

-function calendar:attach(widget, args)
+function calendar.attach(widget, args)

     local args = args or {}
 
     calendar.cal         = args.cal or "/usr/bin/cal"
     local args = args or {}
 
     calendar.cal         = args.cal or "/usr/bin/cal"


@@ -111,21 +110,21 @@ function calendar:attach(widget, args)
     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.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.followtag   = args.followtag or false

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

-    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::enter", function () calendar.show(0, 0, calendar.scr_pos) end)
+    widget:connect_signal("mouse::leave", function () calendar.hide() end)

     widget:buttons(awful.util.table.join(awful.button({ }, 1, function ()
     widget:buttons(awful.util.table.join(awful.button({ }, 1, function ()

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

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

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

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

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

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

-                                             calendar:show(0, 1, calendar.scr_pos) end)))
+                                             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 })