Merge pull request #173 from guotsuan/master

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

diff --git a/widgets/contrib/kbdlayout.lua b/widgets/contrib/kbdlayout.lua
index f9342a05c526877812d41ee6843ce000900373d1..64ea6b30fa83b93bd059d5c47f9ad1771abfc1da 100644 (file)
--- a/widgets/contrib/kbdlayout.lua
+++ b/widgets/contrib/kbdlayout.lua
@@ -1,9 +1,9 @@
 
 --[[
-
-     Licensed under GNU General Public License v2
-      * (c) 2015, Dario Gjorgjevski
-
+                                                  
+     Licensed under GNU General Public License v2 
+      * (c) 2015, Dario Gjorgjevski               
+                                                  
 --]]
 
 local newtimer     = require("lain.helpers").newtimer
@@ -16,17 +16,21 @@ local string       = { match = string.match }
 
 local setmetatable = setmetatable
 
+-- Keyboard layout switcher
+-- lain.widgets.contrib.kblayout
+
 local function worker (args)
    local kbdlayout    = {}
    kbdlayout.widget   = wibox.widget.textbox('')
 
    local layouts          = args.layouts
    local settings         = args.settings or function () end
-   local add_us_secondary = args.add_us_secondary or true
+   local add_us_secondary = true
    local timeout          = args.timeout or 5
-
    local idx              = 1
 
+   if args.add_us_secondary == false then add_us_secondary = false end
+
    -- Mouse bindings
    kbdlayout.widget:buttons(awful.util.table.join(
                               awful.button({ }, 1, function () kbdlayout.next() end),