contrib.kbdlayout: asynchronous

diff --git a/widgets/contrib/kbdlayout.lua b/widgets/contrib/kbdlayout.lua
index f57d2da2040f7408d1985b67c0f2cdede306ba41..cd753f6eb61d147b76be94db176507152c4eed77 100644 (file)
--- a/widgets/contrib/kbdlayout.lua
+++ b/widgets/contrib/kbdlayout.lua
@@ -6,13 +6,14 @@
                                                   
 --]]
 
                                                   
 --]]
 

-local newtimer     = require("lain.helpers").newtimer
-local read_pipe    = require("lain.helpers").read_pipe
+local helpers      = require("lain.helpers")

 
 

-local wibox        = require("wibox")

 local awful        = require("awful")
 local awful        = require("awful")

+local wibox        = require("wibox")

 
 

-local string       = { match = string.match }
+local string       = { format = string.format,
+                       match  = string.match }
+local execute      = os.execute

 
 local setmetatable = setmetatable
 
 
 local setmetatable = setmetatable
 


@@ -20,9 +21,7 @@ local setmetatable = setmetatable
 -- lain.widgets.contrib.kblayout
 
 local function worker(args)
 -- lain.widgets.contrib.kblayout
 
 local function worker(args)

-   local kbdlayout    = {}
-   kbdlayout.widget   = wibox.widget.textbox('')
-
+   local kbdlayout        = {}

    local layouts          = args.layouts
    local settings         = args.settings or function () end
    local add_us_secondary = true
    local layouts          = args.layouts
    local settings         = args.settings or function () end
    local add_us_secondary = true


@@ -31,40 +30,43 @@ local function worker(args)
 
    if args.add_us_secondary == false then add_us_secondary = false end
 
 
    if args.add_us_secondary == false then add_us_secondary = false end
 

+   kbdlayout.widget = wibox.widget.textbox()
+

    -- Mouse bindings
    kbdlayout.widget:buttons(awful.util.table.join(
                               awful.button({ }, 1, function () kbdlayout.next() end),
                               awful.button({ }, 3, function () kbdlayout.prev() end)))
 
    local function run_settings(layout, variant)
    -- Mouse bindings
    kbdlayout.widget:buttons(awful.util.table.join(
                               awful.button({ }, 1, function () kbdlayout.next() end),
                               awful.button({ }, 3, function () kbdlayout.prev() end)))
 
    local function run_settings(layout, variant)

-      widget = kbdlayout.widget
-      kbdlayout_now = { 
-          layout=string.match(layout, "[^,]+"), -- Make sure to match the primary layout only.
-          variant=variant
+      kbdlayout_now = {
+          layout  = string.match(layout, "[^,]+"), -- Make sure to match the primary layout only.
+          variant = variant

       }
       }

+      widget = kbdlayout.widget

       settings()
    end
 
    function kbdlayout.update()
       settings()
    end
 
    function kbdlayout.update()

-      local status = read_pipe('setxkbmap -query')
-
-      run_settings(string.match(status, "layout:%s*([^\n]*)"),
-                   string.match(status, "variant:%s*([^\n]*)"))
+      helpers.async(string.format("%s -c 'setxkbmap -query'", awful.util.shell),
+      function(status)
+          run_settings(string.match(status, "layout:%s*([^\n]*)"),
+          string.match(status, "variant:%s*([^\n]*)"))
+      end)

    end
 
    function kbdlayout.set(i)
       idx = ((i - 1) % #layouts) + 1 -- Make sure to wrap around as needed.
    end
 
    function kbdlayout.set(i)
       idx = ((i - 1) % #layouts) + 1 -- Make sure to wrap around as needed.

-      local to_execute = 'setxkbmap ' .. layouts[idx].layout
+      local to_execute = "setxkbmap " .. layouts[idx].layout

 
       if add_us_secondary and not string.match(layouts[idx].layout, ",?us,?") then
          to_execute = to_execute .. ",us"
       end
 
       if layouts[idx].variant then
 
       if add_us_secondary and not string.match(layouts[idx].layout, ",?us,?") then
          to_execute = to_execute .. ",us"
       end
 
       if layouts[idx].variant then

-         to_execute = to_execute .. ' ' .. layouts[idx].variant
+         to_execute = to_execute .. " " .. layouts[idx].variant

       end
 
       end
 

-      if os.execute(to_execute) then
+      if execute(to_execute) then

          run_settings(layouts[idx].layout, layouts[idx].variant)
       end
    end
          run_settings(layouts[idx].layout, layouts[idx].variant)
       end
    end


@@ -77,7 +79,8 @@ local function worker(args)
       kbdlayout.set(idx - 1)
    end
 
       kbdlayout.set(idx - 1)
    end
 

-   newtimer("kbdlayout", timeout, kbdlayout.update)
+   helpers.newtimer("kbdlayout", timeout, kbdlayout.update)
+

    return setmetatable(kbdlayout, { __index = kbdlayout.widget })
 end
 
    return setmetatable(kbdlayout, { __index = kbdlayout.widget })
 end
 

diff --git a/wiki b/wiki
index d975ff04346986b5ab24e7bc16321e438d3425b8..bfdf6d24310d0822bac3447c39bb93cb83a75f77 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit d975ff04346986b5ab24e7bc16321e438d3425b8
+Subproject commit bfdf6d24310d0822bac3447c39bb93cb83a75f77