Merge pull request #214 from 0x0d/master

widgets enhancements: fs (notify-showpopup flags), task (popup font)

diff --git a/widgets/contrib/task.lua b/widgets/contrib/task.lua
index 946966a84b2622e751845577641015ad2fbff744..f721548fabe0870c9b76a3ff12645836d7776c8f 100644 (file)
--- a/widgets/contrib/task.lua
+++ b/widgets/contrib/task.lua
@@ -25,6 +25,11 @@ local task = {}
 
 local task_notification = nil
 
+function findLast(haystack, needle)
+    local i=haystack:match(".*"..needle.."()")
+    if i==nil then return nil else return i-1 end
+end
+
 function task:hide()
     if task_notification ~= nil then
         naughty.destroy(task_notification)
@@ -125,8 +130,8 @@ function task:attach(widget, args)
     local args       = args or {}
 
     task.font_size   = tonumber(args.font_size) or 12
-    task.font        = beautiful.font:sub(beautiful.font:find(""),
-                       beautiful.font:find(" "))
+    task.font        = args.font or beautiful.font:sub(beautiful.font:find(""),
+                       findLast(beautiful.font, " "))
     task.fg          = args.fg or beautiful.fg_normal or "#FFFFFF"
     task.bg          = args.bg or beautiful.bg_normal or "#FFFFFF"
     task.position    = args.position or "top_right"

diff --git a/widgets/fs.lua b/widgets/fs.lua
index 6ec8dac5edaef6f0113794fb413f5e5b3b7d4cef..5215c8632de1996283b3855a9e1ebb3f7a091911 100644 (file)
--- a/widgets/fs.lua
+++ b/widgets/fs.lua
@@ -58,6 +58,8 @@ local function worker(args)
     local args             = args or {}
     local timeout          = args.timeout or 600
     local partition        = args.partition or "/"
+    local showpopup        = args.showpopup or "on"
+    local notify           = args.notify or "on"
     local settings         = args.settings or function() end
 
     fs.followmouse         = args.followmouse or false
@@ -96,7 +98,7 @@ local function worker(args)
         widget = fs.widget
         settings()
 
-        if fs_now.used >= 99 and not helpers.get_map(partition)
+        if notify == "on" and fs_now.used >= 99 and not helpers.get_map(partition)
         then
             naughty.notify({
                 title = "warning",
@@ -111,8 +113,10 @@ local function worker(args)
         end
     end
 
-    fs.widget:connect_signal('mouse::enter', function () fs:show(0) end)
-    fs.widget:connect_signal('mouse::leave', function () fs:hide() end)
+    if showpopup == "on" then
+        fs.widget:connect_signal('mouse::enter', function () fs:show(0) end)
+        fs.widget:connect_signal('mouse::leave', function () fs:hide() end)
+    end
 
     helpers.newtimer(partition, timeout, update)