Merge pull request #286 from aajjbb/fix-alsa-channel

[etc/awesome.git] / widgets / contrib / kbdlayout.lua

diff --git a/widgets/contrib/kbdlayout.lua b/widgets/contrib/kbdlayout.lua
index cd753f6eb61d147b76be94db176507152c4eed77..da3084c0e1131f70285ca3ded36a6612980e21b5 100644 (file)
--- a/widgets/contrib/kbdlayout.lua
+++ b/widgets/contrib/kbdlayout.lua
@@ -7,22 +7,20 @@
 --]]
 
 local helpers      = require("lain.helpers")
 --]]
 
 local helpers      = require("lain.helpers")

-

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

-

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

-

 local setmetatable = setmetatable
 
 -- Keyboard layout switcher
 -- lain.widgets.contrib.kblayout
 local setmetatable = setmetatable
 
 -- Keyboard layout switcher
 -- lain.widgets.contrib.kblayout

+local kbdlayout = helpers.make_widget_textbox()

 
 local function worker(args)
 
 local function worker(args)

-   local kbdlayout        = {}
-   local layouts          = args.layouts
+   local args             = args or {}
+   local layouts          = args.layouts or {}

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


@@ -30,14 +28,7 @@ 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)
+   local function kbd_run_settings(layout, variant)

       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


@@ -47,14 +38,14 @@ local function worker(args)
    end
 
    function kbdlayout.update()
    end
 
    function kbdlayout.update()

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

           string.match(status, "variant:%s*([^\n]*)"))
       end)
    end
 
    function kbdlayout.set(i)
           string.match(status, "variant:%s*([^\n]*)"))
       end)
    end
 
    function kbdlayout.set(i)

+      if #layouts == 0 then return end

       idx = ((i - 1) % #layouts) + 1 -- Make sure to wrap around as needed.
       local to_execute = "setxkbmap " .. layouts[idx].layout
 
       idx = ((i - 1) % #layouts) + 1 -- Make sure to wrap around as needed.
       local to_execute = "setxkbmap " .. layouts[idx].layout
 


@@ -67,17 +58,17 @@ local function worker(args)
       end
 
       if execute(to_execute) then
       end
 
       if execute(to_execute) then

-         run_settings(layouts[idx].layout, layouts[idx].variant)
+         kbd_run_settings(layouts[idx].layout, layouts[idx].variant)

       end
    end
 
       end
    end
 

-   function kbdlayout.next()
-      kbdlayout.set(idx + 1)
-   end
+   function kbdlayout.next() kbdlayout.set(idx + 1) end
+   function kbdlayout.prev() kbdlayout.set(idx - 1) end

 
 

-   function kbdlayout.prev()
-      kbdlayout.set(idx - 1)
-   end
+   -- Mouse bindings
+   kbdlayout.widget:buttons(awful.util.table.join(
+                              awful.button({ }, 1, function () kbdlayout.next() end),
+                              awful.button({ }, 3, function () kbdlayout.prev() end)))

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