madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

#195: magnify_client can now behave like magnifier layout
authorcopycat-killer <dada@archlinux.info>
Sun, 8 May 2016 17:57:21 +0000 (19:57 +0200)
committercopycat-killer <dada@archlinux.info>
Sun, 8 May 2016 17:57:21 +0000 (19:57 +0200)
util/init.lua
widgets/net.lua

index ac3afec9e5238bb888cd24b110dee9e13467913c..70d8e52aa717f27b493a73557a4e3ab100a29413 100644 (file)
@@ -74,32 +74,37 @@ function util.menu_clients_current_tags(menu, args)
 end
 
 -- Magnify a client: Set it to "float" and resize it.
+local magnified_client = nil
 function util.magnify_client(c)
-    if not awful.client.floating.get(c) then
-        awful.client.floating.set(c, true)
-
-        local mg = screen[mouse.screen].geometry
-        local tag = awful.tag.selected(mouse.screen)
-        local mwfact = awful.tag.getmwfact(tag)
-        local g = {}
-        g.width = math.sqrt(mwfact) * mg.width
-        g.height = math.sqrt(mwfact) * mg.height
-        g.x = mg.x + (mg.width - g.width) / 2
-        g.y = mg.y + (mg.height - g.height) / 2
-        c:geometry(g)
+    if c and not awful.client.floating.get(c) then
+        util.mc(c)
+        magnified_client = c
     else
         awful.client.floating.set(c, false)
+        magnified_client = nil
     end
 end
 
+-- https://github.com/copycat-killer/lain/issues/195
+function util.mc(c)
+    c = c or magnified_client
+    if not c then return end
+    awful.client.floating.set(c, true)
+    local mg = screen[mouse.screen].geometry
+    local tag = awful.tag.selected(mouse.screen)
+    local mwfact = awful.tag.getmwfact(tag)
+    local g = {}
+    g.width = math.sqrt(mwfact) * mg.width
+    g.height = math.sqrt(mwfact) * mg.height
+    g.x = mg.x + (mg.width - g.width) / 2
+    g.y = mg.y + (mg.height - g.height) / 2
+    c:geometry(g)
+end
+
 -- Read the nice value of pid from /proc.
 local function get_nice_value(pid)
     local n = first_line('/proc/' .. pid .. '/stat')
-    if n == nil
-    then
-        -- This should not happen. But I don't want to crash, either.
-        return 0
-    end
+    if not n then return 0 end
 
     -- Remove pid and tcomm. This is necessary because tcomm may contain
     -- nasty stuff such as whitespace or additional parentheses...
index da2130f8e11ea031a9dae902cda4da8b90cca7f9..ed1cf4ccc2ec71fae0806d06b1cc32e4ae28a437 100644 (file)
@@ -23,11 +23,11 @@ local setmetatable = setmetatable
 local function worker(args)
     local net = { last_t = 0, last_r = 0 }
 
-    function net.get_device()
+    function net.get_first_device()
         local ws = helpers.read_pipe("ip link show | cut -d' ' -f2,9")
         ws = ws:match("%w+: UP") or ws:match("ppp%w+: UNKNOWN")
-        if ws  then return ws:match("(%w+):")
-        else return "network off" end
+        if ws then return { ws:match("(%w+):") }
+        else return {} end
     end
 
     local args     = args or {}
@@ -36,53 +36,79 @@ local function worker(args)
     local notify   = args.notify or "on"
     local screen   = args.screen or 1
     local settings = args.settings or function() end
-    local iface    = args.iface or net.get_device()
+    local iface    = args.iface or net.get_first_device()
 
     net.widget = wibox.widget.textbox('')
 
-    helpers.set_map(iface, true)
+    -- Compatibility with old API where iface was a string corresponding to 1 interface
+    if type(iface) == "string" then
+        iftable = {iface}
+    else
+        iftable = iface
+    end
+
+    -- Mark all devices as initially online/active
+    for i, dev in ipairs(iftable) do
+        helpers.set_map(dev, true)
+    end
 
     function update()
-        net_now = {}
+        -- These are the totals over all specified interfaces
+        net_now = {
+            sent     = 0,
+            received = 0
+        }
+
+        -- Total bytes transfered
+        local total_t = 0
+        local total_r = 0
+
+        for i, dev in ipairs(iftable) do
+            local dev_now = {}
+            local dev_before = net_now[dev] or net
+
+            dev_now.carrier  = helpers.first_line(string.format('/sys/class/net/%s/carrier', dev)) or '0'
+            dev_now.state    = helpers.first_line(string.format('/sys/class/net/%s/operstate', dev)) or 'down'
+
+            local now_t      = tonumber(helpers.first_line(string.format('/sys/class/net/%s/statistics/tx_bytes', dev)) or 0)
+            local now_r      = tonumber(helpers.first_line(string.format('/sys/class/net/%s/statistics/rx_bytes', dev)) or 0)
+
+            if now_t ~= dev_before.last_t or now_r ~= dev_before.last_r then
+                dev_now.sent     = (now_t - (dev_before.last_t or 0)) / timeout / units
+                net_now.sent     = net_now.sent + dev_now.sent
+                dev_now.sent     = string.gsub(string.format('%.1f', dev_now.sent), ',', '.')
+                dev_now.received = (now_r - (dev_before.last_r or 0)) / timeout / units
+                net_now.received = net_now.received + dev_now.received
+                dev_now.received = string.gsub(string.format('%.1f', dev_now.received), ',', '.')
+            end
 
-        if iface == "" or string.match(iface, "network off")
-        then
-            iface = net.get_device()
-        end
+            total_t  = total_t + now_t
+            total_r  = total_r + now_r
 
-        net_now.carrier  = helpers.first_line(string.format('/sys/class/net/%s/carrier', iface)) or '0'
-        net_now.state    = helpers.first_line(string.format('/sys/class/net/%s/operstate', iface)) or 'down'
+            net_now[dev] = dev_now
 
-        local now_t      = helpers.first_line(string.format('/sys/class/net/%s/statistics/tx_bytes', iface)) or 0
-        local now_r      = helpers.first_line(string.format('/sys/class/net/%s/statistics/rx_bytes', iface)) or 0
+            if string.match(dev_now.carrier, "0") and notify == "on" and helpers.get_map(dev) then
+                naughty.notify({
+                    title    = dev,
+                    text     = "no carrier",
+                    icon     = helpers.icons_dir .. "no_net.png",
+                    screen   = screen
+                })
+                helpers.set_map(dev, false)
+            else
+                helpers.set_map(dev, true)
+            end
+        end
 
-        if now_t ~= net.last_t or now_r ~= net.last_r then
-            net_now.sent     = (now_t - net.last_t) / timeout / units
+        if total_t ~= net.last_t or total_r ~= net.last_r then
             net_now.sent     = string.gsub(string.format('%.1f', net_now.sent), ',', '.')
-            net_now.received = (now_r - net.last_r) / timeout / units
             net_now.received = string.gsub(string.format('%.1f', net_now.received), ',', '.')
 
             widget = net.widget
             settings()
 
-            net.last_t = now_t
-            net.last_r = now_r
-        end
-
-        if not string.match(net_now.carrier, "1") and notify == "on"
-        then
-            if helpers.get_map(iface)
-            then
-                naughty.notify({
-                    title    = iface,
-                    text     = "no carrier",
-                    icon     = helpers.icons_dir .. "no_net.png",
-                    screen   = screen
-                })
-                helpers.set_map(iface, false)
-            end
-        else
-            helpers.set_map(iface, true)
+            net.last_t = total_t
+            net.last_r = total_r
         end
     end