layout: fixed spaces

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

diff --git a/widgets/fs.lua b/widgets/fs.lua
index 60b112cbaedb76c10b830a8cfda0f3d17ad8588d..f578f8bb240bfe150c354f2363e7fd5f692509a2 100644 (file)
--- a/widgets/fs.lua
+++ b/widgets/fs.lua
@@ -11,12 +11,12 @@
 local helpers      = require("lain.helpers")
 
 local beautiful    = require("beautiful")
 local helpers      = require("lain.helpers")
 
 local beautiful    = require("beautiful")

+local focused      = require("awful.screen").focused

 local wibox        = require("wibox")
 local naughty      = require("naughty")
 
 local io           = { popen  = io.popen }
 local pairs        = pairs
 local wibox        = require("wibox")
 local naughty      = require("naughty")
 
 local io           = { popen  = io.popen }
 local pairs        = pairs

-local mouse        = mouse

 local string       = { match  = string.match,
                        format = string.format }
 local tonumber     = tonumber
 local string       = { match  = string.match,
                        format = string.format }
 local tonumber     = tonumber


@@ -35,14 +35,14 @@ function fs.hide()
     end
 end
 
     end
 end
 

-function fs.show(seconds, options, scr)
+function fs.show(seconds, scr)

     fs.hide()
 
     fs.hide()
 

-    local cmd = (options and string.format("dfs %s", options)) or "dfs"
+    local cmd = (fs.options and string.format("dfs %s", fs.options)) or "dfs"

     local ws = helpers.read_pipe(helpers.scripts_dir .. cmd):gsub("\n*$", "")
 
     local ws = helpers.read_pipe(helpers.scripts_dir .. cmd):gsub("\n*$", "")
 

-    if fs.followmouse then
-        fs.notification_preset.screen = mouse.screen
+    if fs.followtag then
+        fs.notification_preset.screen = focused()

     elseif scr then
         fs.notification_preset.screen = scr
     end
     elseif scr then
         fs.notification_preset.screen = scr
     end


@@ -65,7 +65,8 @@ local function worker(args)
     local notify           = args.notify or "on"
     local settings         = args.settings or function() end
 
     local notify           = args.notify or "on"
     local settings         = args.settings or function() end
 

-    fs.followmouse         = args.followmouse or false
+    fs.options             = args.options
+    fs.followtag           = args.followtag or false

     fs.notification_preset = args.notification_preset or { fg = beautiful.fg_normal }
 
     fs.widget = wibox.widget.textbox('')
     fs.notification_preset = args.notification_preset or { fg = beautiful.fg_normal }
 
     fs.widget = wibox.widget.textbox('')


@@ -85,6 +86,8 @@ local function worker(args)
             if u and m then -- Handle 1st line and broken regexp
                 fs_info[m .. " size_mb"]  = string.format("%.1f", tonumber(s) / unit["mb"])
                 fs_info[m .. " size_gb"]  = string.format("%.1f", tonumber(s) / unit["gb"])
             if u and m then -- Handle 1st line and broken regexp
                 fs_info[m .. " size_mb"]  = string.format("%.1f", tonumber(s) / unit["mb"])
                 fs_info[m .. " size_gb"]  = string.format("%.1f", tonumber(s) / unit["gb"])

+                fs_info[m .. " used_mb"]  = string.format("%.1f", tonumber(u) / unit["mb"])
+                fs_info[m .. " used_gb"]  = string.format("%.1f", tonumber(u) / unit["gb"])

                 fs_info[m .. " used_p"]   = tonumber(p)
                 fs_info[m .. " avail_p"]  = 100 - tonumber(p)
             end
                 fs_info[m .. " used_p"]   = tonumber(p)
                 fs_info[m .. " avail_p"]  = 100 - tonumber(p)
             end


@@ -92,10 +95,12 @@ local function worker(args)
 
         f:close()
 
 
         f:close()
 

-        fs_now.used      = tonumber(fs_info[partition .. " used_p"])  or 0

         fs_now.available = tonumber(fs_info[partition .. " avail_p"]) or 0
         fs_now.size_mb   = tonumber(fs_info[partition .. " size_mb"]) or 0
         fs_now.size_gb   = tonumber(fs_info[partition .. " size_gb"]) or 0
         fs_now.available = tonumber(fs_info[partition .. " avail_p"]) or 0
         fs_now.size_mb   = tonumber(fs_info[partition .. " size_mb"]) or 0
         fs_now.size_gb   = tonumber(fs_info[partition .. " size_gb"]) or 0

+        fs_now.used      = tonumber(fs_info[partition .. " used_p"])  or 0
+        fs_now.used_mb   = tonumber(fs_info[partition .. " used_mb"]) or 0
+        fs_now.used_gb   = tonumber(fs_info[partition .. " used_gb"]) or 0

 
         notification_preset = fs.notification_preset
         widget = fs.widget
 
         notification_preset = fs.notification_preset
         widget = fs.widget