Merge branch 'master' of https://github.com/copycat-killer/lain

[etc/awesome.git] / asyncshell.lua

diff --git a/asyncshell.lua b/asyncshell.lua
index 51885e8179715e2d832b2261a32773b6b863691e..36ccc47a916b80feb77c06f20a8adb8479d274b2 100644 (file)
--- a/asyncshell.lua
+++ b/asyncshell.lua
@@ -11,9 +11,9 @@
 -- ...asynchronously:
 -- asyncshell.request('wscript -Kiev', function(f) wwidget.text = f:read("*l") end)
 -- ...synchronously
 -- ...asynchronously:
 -- asyncshell.request('wscript -Kiev', function(f) wwidget.text = f:read("*l") end)
 -- ...synchronously

--- wwidget.text = asyncshell.demand('wscript -Kiev', 5):read("*l") or "Error"
+-- widget:set_text(asyncshell.demand('wscript -Kiev', 5):read("*l") or "Error")

 
 

--- This makes things faster, but puts weight on sysload and is more cpu demanding.
+-- This is more cpu demanding, but makes things faster.

 
 local spawn = require('awful.util').spawn
 
 
 local spawn = require('awful.util').spawn
 


@@ -39,13 +39,12 @@ end
 function asyncshell.request(command, callback)
    local id = next_id()
    local tmpfname = asyncshell.file_template .. id
 function asyncshell.request(command, callback)
    local id = next_id()
    local tmpfname = asyncshell.file_template .. id

-   asyncshell.request_table[id] = {callback = callback}
+   asyncshell.request_table[id] = { callback = callback }

    local req =
       string.format("sh -c '%s > %s; " ..
                     'echo "asyncshell.deliver(%s)" | ' ..
                     "awesome-client' 2> /dev/null",
    local req =
       string.format("sh -c '%s > %s; " ..
                     'echo "asyncshell.deliver(%s)" | ' ..
                     "awesome-client' 2> /dev/null",

-                    string.gsub(command, "'", "'\\''"), tmpfname,
-                    id, tmpfname)
+                    string.gsub(command, "'", "'\\''"), tmpfname, id)

    spawn(req, false)
    return id
 end
    spawn(req, false)
    return id
 end