]> git.madduck.net Git - etc/awesome.git/blobdiff - widgets/contrib/kbdlayout.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

(re)merged #142
[etc/awesome.git] / widgets / contrib / kbdlayout.lua
index 8b15475a8c2c51a5cc2da1d221b9741a3e6df47a..39857afd62acb450d6c2f226d7827291819d5926 100644 (file)
@@ -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
 --]]
 
 local newtimer     = require("lain.helpers").newtimer
@@ -22,10 +22,12 @@ local function worker (args)
 
    local layouts          = args.layouts
    local settings         = args.settings or function () end
 
    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
    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(
 
    -- Mouse bindings
    kbdlayout.widget:buttons(awful.util.table.join(
@@ -50,7 +52,7 @@ local function worker (args)
       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
 
-      if add_us_secondary then
+      if add_us_secondary and not string.match(layouts[idx].layout, ",?us,?") then
          to_execute = to_execute .. ",us"
       end
 
          to_execute = to_execute .. ",us"
       end