]> git.madduck.net Git - etc/awesome.git/commitdiff

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:

clean a little bit
authorJan Xie <jan.h.xie@gmail.com>
Wed, 25 Sep 2013 02:03:11 +0000 (10:03 +0800)
committercopycat-killer <dada@archlinux.info>
Wed, 5 Aug 2015 11:30:30 +0000 (13:30 +0200)
widgets/task.lua

index 31499f177fa8c1e3fa6d27e3abcdbd4c94c4ebb0..cf84cbcd131e2763933ebcaaf80c89d17f5e42ea 100644 (file)
@@ -30,10 +30,9 @@ function task:hide()
     end
 end
 
     end
 end
 
-function task:show(t_out, inc_offset)
+function task:show(t_out)
     task:hide()
 
     task:hide()
 
-    local offs = inc_offset or 0
     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'))
@@ -42,50 +41,23 @@ function task:show(t_out, inc_offset)
     local font = beautiful.font:sub(beautiful.font:find(""),
                  beautiful.font:find(" "))
 
     local font = beautiful.font:sub(beautiful.font:find(""),
                  beautiful.font:find(" "))
 
-    if offs == 0
-    then -- current month showing, today highlighted
-        if today >= 10
-        then
-           init_t = '/usr/bin/cal | sed -r -e "s/(^| )('
-        end
-
-        task.offset = 0
-        task.notify_icon = task.icons .. today .. ".png"
-
-        -- bg and fg inverted to highlight today
-        f = io.popen( init_t .. today ..
-                      ')($| )/\\1<b><span foreground=\\"'
-                      .. task.bg ..
-                      '\\" background=\\"'
-                      .. task.fg ..
-                      '\\">\\2<\\/span><\\/b>\\3/"' )
-
-    else -- no current month showing, no day to highlight
-       local month = tonumber(os.date('%m'))
-       local year = tonumber(os.date('%Y'))
-
-       task.offset = task.offset + offs
-       month = month + task.offset
-
-       if month > 12 then
-           month = month % 12
-           year = year + 1
-           if month <= 0 then
-               month = 12
-           end
-       elseif month < 1 then
-           month = month + 12
-           year = year - 1
-           if month <= 0 then
-               month = 1
-           end
-       end
-
-       task.notify_icon = nil
-
-       f = io.popen('/usr/bin/cal ' .. month .. ' ' .. year)
+    if today >= 10
+    then
+       init_t = '/usr/bin/cal | sed -r -e "s/(^| )('
     end
 
     end
 
+    task.offset = 0
+    --task.notify_icon = task.icons .. today .. ".png"
+
+    -- bg and fg inverted to highlight today
+    --f = io.popen( init_t .. today ..
+                  --')($| )/\\1<b><span foreground=\\"'
+                  --.. task.bg ..
+                  --'\\" background=\\"'
+                  --.. task.fg ..
+                  --'\\">\\2<\\/span><\\/b>\\3/"' )
+
+
 
     --c_text = "<tt><span font='" .. font .. " "
              --.. task.font_size .. "'><b>"
 
     --c_text = "<tt><span font='" .. font .. " "
              --.. task.font_size .. "'><b>"
@@ -94,13 +66,13 @@ function task:show(t_out, inc_offset)
              --.. f:read("*all"):gsub("\n*$", "")
              --.. "</span></tt>"
     c_text = "hello tasks!"
              --.. f:read("*all"):gsub("\n*$", "")
              --.. "</span></tt>"
     c_text = "hello tasks!"
-    f:close()
+    --f:close()
 
     task_notification = naughty.notify({ text = c_text,
 
     task_notification = naughty.notify({ text = c_text,
-                                        icon = task.notify_icon,
-                                        position = task.position,
-                                        fg = task.fg,
-                                        bg = task.bg,
+                                        --icon = task.notify_icon,
+                                        --position = task.position,
+                                        --fg = task.fg,
+                                        --bg = task.bg,
                                         timeout = tims })
 end
 
                                         timeout = tims })
 end