Fixes for the silly case where a client's borders are bigger than its allotted space

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

diff --git a/widgets/contrib/kbdlayout.lua b/widgets/contrib/kbdlayout.lua
index 1c2464718e0e6d28599ccb5a57c23ca4d6bdbe2a..f8164ce1d648cd6a57cf18f85bcacba15db263ad 100644 (file)
--- a/widgets/contrib/kbdlayout.lua
+++ b/widgets/contrib/kbdlayout.lua
@@ -1,9 +1,9 @@
 
 --[[
 
 --[[

-
+                                                  

      Licensed under GNU General Public License v2 
      Licensed under GNU General Public License v2 

-      * (c) 2015, Dario Gjorgjevski
-
+      * (c) 2015, Dario Gjorgjevski               
+                                                  

 --]]
 
 local newtimer     = require("lain.helpers").newtimer
 --]]
 
 local newtimer     = require("lain.helpers").newtimer


@@ -24,42 +24,42 @@ local function worker (args)
    local settings         = args.settings or function () end
    local add_us_secondary = args.add_us_secondary or true
    local timeout          = args.timeout or 5
    local settings         = args.settings or function () end
    local add_us_secondary = args.add_us_secondary or true
    local timeout          = args.timeout or 5

-   
+

    local idx              = 1
 
    -- Mouse bindings
    kbdlayout.widget:buttons(awful.util.table.join(
    local idx              = 1
 
    -- Mouse bindings
    kbdlayout.widget:buttons(awful.util.table.join(

-                              awful.button({ }, 1, function () kbdlayout.next() end),
-                              awful.button({ }, 3, function () kbdlayout.prev() end)))
-   
+                              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 }
       settings()
    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 }
       settings()
    end

-   
+

    function kbdlayout.update ()
       local status = read_pipe('setxkbmap -query')
 
       run_settings(string.match(status, "layout:%s*([^\n]*)"),
    function kbdlayout.update ()
       local status = read_pipe('setxkbmap -query')
 
       run_settings(string.match(status, "layout:%s*([^\n]*)"),

-                  string.match(status, "variant:%s*([^\n]*)"))
+                   string.match(status, "variant:%s*([^\n]*)"))

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

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

       end
 
       if layouts[idx].variant then
       end
 
       if layouts[idx].variant then

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

       end
 
       if os.execute(to_execute) then
       end
 
       if os.execute(to_execute) then

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

       end
    end
 
       end
    end