]> 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:

wiki updated
[etc/awesome.git] / widgets / contrib / kbdlayout.lua
index c5242c18e814824fde7547318ccc8849939f3fb7..08e7bd06a3002f013712a42af88c5e99efa74b2d 100644 (file)
@@ -1,58 +1,80 @@
 
-local newtimer     = require("lain.helpers").newtimer
+--[[
+                                                  
+     Licensed under GNU General Public License v2 
+      * (c) 2015, Dario Gjorgjevski               
+                                                  
+--]]
+
+local helpers      = require("lain.helpers")
+local awful        = require("awful")
 local wibox        = require("wibox")
+local string       = { format = string.format,
+                       match  = string.match }
+local execute      = os.execute
+local setmetatable = setmetatable
 
-local string       = { match = string.match }
-local io           = { popen = io.popen }
+-- Keyboard layout switcher
+-- lain.widgets.contrib.kblayout
+local kbdlayout = {}
 
-local setmetatable = setmetatable
+local function worker(args)
+   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 idx              = 1
 
-local function worker (args)
-   local kbdlayout    = {}
-   kbdlayout.widget   = wibox.widget.textbox('')
+   if args.add_us_secondary == false then add_us_secondary = false end
 
-   local settings     = args.settings or function () end
-   local layouts      = args.layouts
-   local idx          = 1
-   
-   local function run_settings (layout, variant)
+   kbdlayout.widget = wibox.widget.textbox()
+
+   local function kbd_run_settings(layout, variant)
+      kbdlayout_now = {
+          layout  = string.match(layout, "[^,]+"), -- Make sure to match the primary layout only.
+          variant = variant
+      }
       widget = kbdlayout.widget
-      kbdlayout_now = { layout=layout, variant=variant }
       settings()
    end
-   
-   function kbdlayout.update ()
-      local file   = assert(io.popen('setxkbmap -query'))
-      local status = file:read('*all')
-      file:close()
-
-      run_settings(string.match(status, "layout:%s*([^\n]*)%s*"),
-                  string.match(status, "variant:%s*([^\n]*)%s*"))
+
+   function kbdlayout.update()
+      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)
+   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
+      local to_execute = "setxkbmap " .. layouts[idx].layout
+
+      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)
+      if execute(to_execute) then
+         kbd_run_settings(layouts[idx].layout, layouts[idx].variant)
       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)
 
-   newtimer("kbdlayout", args.timeout or 10, kbdlayout.update)
-   return setmetatable(kbdlayout, { __index = kbdlayout.widget })
+   return kbdlayout
 end
 
 return setmetatable({}, { __call = function (_, ...) return worker(...) end })