X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/8af4a03c754fa1bcac24736633f1b3be8ce8888c..60febfc4dd6018ec8ead920f173b404412316473:/widgets/net.lua?ds=sidebyside

diff --git a/widgets/net.lua b/widgets/net.lua
index d79e117..84751b6 100644
--- 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")
+    ws = ws:match("%w+: UP") or ws:match("ppp%w+: UNKNOWN")
     if ws ~= nil then
-        return ws:gsub(": UP", "")
+        return ws:match("(%w+):")
     else
-        return ""
+        return "network off"
     end
 end
 
@@ -44,6 +44,8 @@ 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 screen = args.screen or 1
     local settings = args.settings or function() end
 
     net.widget = wibox.widget.textbox('')
@@ -76,19 +78,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   = screen
                 })
                 helpers.set_map(iface, false)
             end