wiki updated #254; other fixes

diff --git a/README.rst b/README.rst
index 6c7bb01c0f863c14ac4840e8837f22fae3e3c733..a0cd369c7f81c41af06a0c2afa346f9d600d87f9 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -10,11 +10,14 @@ Layouts, widgets and utilities for Awesome WM 4.x
 :License: GNU-GPL2_
 :Source: https://github.com/copycat-killer/lain
 
 :License: GNU-GPL2_
 :Source: https://github.com/copycat-killer/lain
 

+Warning
+-------
+
+The update to 4.x is still in progress: if you experience issues, please report them in order to speed up the process.
+

 Description
 -----------
 
 Description
 -----------
 

-**Note:** the update to 4.x is still in progress: if you experience issues, please report them in order to speed up the process.
-

 Successor of awesome-vain_, this module provides new layouts, a set of widgets and utility functions, with the aim of improving Awesome_ usability and configurability.
 
 Read the wiki_ for all the info.
 Successor of awesome-vain_, this module provides new layouts, a set of widgets and utility functions, with the aim of improving Awesome_ usability and configurability.
 
 Read the wiki_ for all the info.

diff --git a/helpers.lua b/helpers.lua
index 6a47738e56ded7fb130a5f2bf33a8692dbc6b271..50254c1651d59959252afa12a2f363066d4d7a83 100644 (file)
--- a/helpers.lua
+++ b/helpers.lua
@@ -9,7 +9,7 @@
 local debug  = require("debug")
 
 local assert = assert
 local debug  = require("debug")
 
 local assert = assert

-local capi   = { timer = (type(timer) == 'table' and timer or require ("gears.timer")) }
+local capi   = { timer = require ("gears.timer") }

 local io     = { open  = io.open,
                  lines = io.lines,
                  popen = io.popen }
 local io     = { open  = io.open,
                  lines = io.lines,
                  popen = io.popen }

diff --git a/init.lua b/init.lua
index 155d6ccd17b997ac65f102343d30ebb79229dedf..5640861cde7050353acaf418e2918d5bc15be1fa 100644 (file)
--- a/init.lua
+++ b/init.lua
@@ -9,11 +9,8 @@
                                                    
 --]]
 
                                                    
 --]]
 

-local lain =
-{
+return {

     layout  = require("lain.layout"),
     util    = require("lain.util"),
     widgets = require("lain.widgets")
 }
     layout  = require("lain.layout"),
     util    = require("lain.util"),
     widgets = require("lain.widgets")
 }

-
-return lain

diff --git a/widgets/contrib/redshift.lua b/widgets/contrib/redshift.lua
index 69247ee7716b2a55038e9630d41fc53db39d99ec..3c4f749428cd06ad436a34c147cc0b247c7edbad 100644 (file)
--- a/widgets/contrib/redshift.lua
+++ b/widgets/contrib/redshift.lua
@@ -8,7 +8,6 @@
 
 local awful        = require("awful")
 local os           = os
 
 local awful        = require("awful")
 local os           = os

-local spawn        = awful.util.spawn_with_shell

 
 local setmetatable = setmetatable
 
 
 local setmetatable = setmetatable
 


@@ -26,9 +25,9 @@ local function init()
     -- toggled off (i.e Awesome on-the-fly restart), kill redshift to make sure
     os.execute("pkill redshift")
     -- Remove existing color adjustment
     -- toggled off (i.e Awesome on-the-fly restart), kill redshift to make sure
     os.execute("pkill redshift")
     -- Remove existing color adjustment

-    spawn("redshift -x")
+    awful.spawn_with_shell("redshift -x")

     -- (Re)start redshift
     -- (Re)start redshift

-    spawn("redshift")
+    awful.spawn_with_shell("redshift")

     running = true
     active = true
 end
     running = true
     active = true
 end

diff --git a/widgets/fs.lua b/widgets/fs.lua
index 4d05df518aeaa8fd4c3fdd5aa93a10d2f609c2fa..49cb8f0f0dc8dce17ef853e91923c7a9d2ed9e3f 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


@@ -41,8 +41,8 @@ function fs.show(seconds, options, scr)
     local cmd = (options and string.format("dfs %s", options)) or "dfs"
     local ws = helpers.read_pipe(helpers.scripts_dir .. cmd):gsub("\n*$", "")
 
     local cmd = (options and string.format("dfs %s", options)) or "dfs"
     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,7 @@ 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.followta  g         = 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('')


@@ -94,11 +94,11 @@ 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_mb   = tonumber(fs_info[partition .. " used_mb"]) 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
         fs_now.used_gb   = tonumber(fs_info[partition .. " used_gb"]) or 0
 
         notification_preset = fs.notification_preset

diff --git a/widgets/mpd.lua b/widgets/mpd.lua
index 5a4e53432a4f11cfd439c7679a88fc19223074e4..3e2eaf53b48cdc5c831ec55f2841d30b71c3968a 100644 (file)
--- a/widgets/mpd.lua
+++ b/widgets/mpd.lua
@@ -11,6 +11,7 @@ local helpers      = require("lain.helpers")
 local async        = require("lain.asyncshell")
 
 local escape_f     = require("awful.util").escape
 local async        = require("lain.asyncshell")
 
 local escape_f     = require("awful.util").escape

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

 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 


@@ -118,7 +119,7 @@ local function worker(args)
                     end
 
                     if followtag then
                     end
 
                     if followtag then

-                        mpd_notification_preset.screen = awful.screen.focused()
+                        mpd_notification_preset.screen = focused()

                     end
 
                     mpd.id = naughty.notify({
                     end
 
                     mpd.id = naughty.notify({

diff --git a/wiki b/wiki
index ad794d1fea2d2d8082d62e75997329e66276ebfb..42ecadbcd535153aa7229b8afed660a3bd349b78 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit ad794d1fea2d2d8082d62e75997329e66276ebfb
+Subproject commit 42ecadbcd535153aa7229b8afed660a3bd349b78