X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/0ef82f83e0baaa2936b6204a24ee3b3b638fd409..b9e2596cbddd1d932aa4b6bbd2226a6016b1004e:/widgets/net.lua?ds=sidebyside

diff --git a/widgets/net.lua b/widgets/net.lua
index d692df1..1e59731 100644
--- a/widgets/net.lua
+++ b/widgets/net.lua
@@ -35,7 +35,7 @@ function net.get_device()
     if ws ~= nil then
         return ws:gsub(": UP", "")
     else
-        return ""
+        return "network off"
     end
 end
 
@@ -44,29 +44,32 @@ 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('')
 
     helpers.set_map(iface, true)
 
-    function net.update() 
+    function update()
+        net_now = {}
+
         if iface == "" then iface = net.get_device() end
 
-        carrier = helpers.first_line('/sys/class/net/' .. iface ..
+        net_now.carrier = helpers.first_line('/sys/class/net/' .. iface ..
                                            '/carrier') or "0"
-        state = helpers.first_line('/sys/class/net/' .. iface ..
+        net_now.state = helpers.first_line('/sys/class/net/' .. iface ..
                                            '/operstate') or "down"
         local now_t = helpers.first_line('/sys/class/net/' .. iface ..
                                            '/statistics/tx_bytes') or 0
         local now_r = helpers.first_line('/sys/class/net/' .. iface ..
                                            '/statistics/rx_bytes') or 0
 
-        sent = tostring((now_t - net.last_t) / timeout / units)
-        sent = string.gsub(string.format('%.1f', sent), ",", ".")
+        net_now.sent = tostring((now_t - net.last_t) / timeout / units)
+        net_now.sent = string.gsub(string.format('%.1f', net_now.sent), ",", ".")
 
-        received = tostring((now_r - net.last_r) / timeout / units)
-        received = string.gsub(string.format('%.1f', received), ",", ".")
+        net_now.received = tostring((now_r - net.last_r) / timeout / units)
+        net_now.received = string.gsub(string.format('%.1f', net_now.received), ",", ".")
 
         widget = net.widget
         settings()
@@ -74,19 +77,18 @@ local function worker(args)
         net.last_t = now_t
         net.last_r = now_r
 
-        if 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
@@ -95,8 +97,7 @@ local function worker(args)
         end
     end
 
-    helpers.newtimer(iface, timeout, net.update)
-
+    helpers.newtimer(iface, timeout, update)
     return net.widget
 end