X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/6603c641c6ce675b010ca1977423747ca55d8795..6f7dae29dc64fb5adc5677d24eaba90ea54510f9:/widgets/contrib/kbdlayout.lua

diff --git a/widgets/contrib/kbdlayout.lua b/widgets/contrib/kbdlayout.lua
index 8d13a74..f8164ce 100644
--- a/widgets/contrib/kbdlayout.lua
+++ b/widgets/contrib/kbdlayout.lua
@@ -1,15 +1,16 @@
 
 --[[
-
+                                                  
      Licensed under GNU General Public License v2 
-      * (c) 2015, Dario Gjorgjevski
-
+      * (c) 2015, Dario Gjorgjevski               
+                                                  
 --]]
 
 local newtimer     = require("lain.helpers").newtimer
 local read_pipe    = require("lain.helpers").read_pipe
 
 local wibox        = require("wibox")
+local awful        = require("awful")
 
 local string       = { match = string.match }
 
@@ -22,36 +23,43 @@ local function worker (args)
    local layouts          = args.layouts
    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(
+                              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
-   
+
    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
 
-      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
-	 to_execute = to_execute .. ' ' .. layouts[idx].variant
+         to_execute = to_execute .. ' ' .. layouts[idx].variant
       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
 
@@ -63,7 +71,7 @@ local function worker (args)
       kbdlayout.set(idx - 1)
    end
 
-   newtimer("kbdlayout", args.timeout or 10, kbdlayout.update)
+   newtimer("kbdlayout", timeout, kbdlayout.update)
    return setmetatable(kbdlayout, { __index = kbdlayout.widget })
 end