Merge branch 'projektile-master'

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

diff --git a/widgets/net.lua b/widgets/net.lua
index af97201143399d3e5c0408ab4b29b233658c017a..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 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 }
 local tostring     = tostring
 local string       = { format = string.format,
                        gsub   = string.gsub }


@@ -29,7 +29,7 @@ local net = {
 
 function net.get_device()
     f = io.popen("ip link show | cut -d' ' -f2,9")
 
 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
     f:close()
     ws = ws:match("%w+: UP")
     if ws ~= nil then


@@ -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 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('')
     local settings = args.settings or function() end
 
     net.widget = wibox.widget.textbox('')


@@ -76,7 +77,7 @@ local function worker(args)
         net.last_t = now_t
         net.last_r = now_r
 
         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
         then
             if helpers.get_map(iface)
             then


@@ -86,7 +87,8 @@ local function worker(args)
                     timeout  = 7,
                     position = "top_left",
                     icon     = helpers.icons_dir .. "no_net.png",
                     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
                 })
                 helpers.set_map(iface, false)
             end