Merge pull request #63 from daineseh/master

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

diff --git a/widgets/net.lua b/widgets/net.lua
index d79e117c2c4007cbf3e8ae7017a7b203ad1f34c6..957500069de4cdb572dcd74b6372e400d890fd0a 100644 (file)
--- a/widgets/net.lua
+++ b/widgets/net.lua
@@ -13,7 +13,7 @@ local notify_fg    = require("beautiful").fg_focus
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
-local io           = io
+local io           = { popen  = io.popen }
 local tostring     = tostring
 local string       = { format = string.format,
                        gsub   = string.gsub }
@@ -29,13 +29,13 @@ local net = {
 
 function net.get_device()
     f = io.popen("ip link show | cut -d' ' -f2,9")
-    ws = f:read("*all")
+    ws = f:read("*a")
     f:close()
     ws = ws:match("%w+: UP")
     if ws ~= nil then
         return ws:gsub(": UP", "")
     else
-        return ""
+        return "network off"
     end
 end
 
@@ -44,6 +44,7 @@ local function worker(args)
     local timeout = args.timeout or 2
     local iface = args.iface or net.get_device()
     local units = args.units or 1024 --kb
+    local notify = args.notify or "on"
     local settings = args.settings or function() end
 
     net.widget = wibox.widget.textbox('')
@@ -76,19 +77,18 @@ local function worker(args)
         net.last_t = now_t
         net.last_r = now_r
 
-        if net_now.carrier ~= "1"
+        if net_now.carrier ~= "1" and notify == "on"
         then
             if helpers.get_map(iface)
             then
-                n_title = iface
-                if n_title == "" then n_title = "network" end
                 naughty.notify({
-                    title    = n_title,
+                    title    = iface,
                     text     = "no carrier",
                     timeout  = 7,
                     position = "top_left",
                     icon     = helpers.icons_dir .. "no_net.png",
-                    fg       = notify_fg or "#FFFFFF"
+                    fg       = notify_fg or "#FFFFFF",
+                    screen = client.focus and client.focus.screen or 1
                 })
                 helpers.set_map(iface, false)
             end