X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/6603c641c6ce675b010ca1977423747ca55d8795..b8adf932213faa797fcd69df28bb8bf9451cf5df:/widgets/contrib/kbdlayout.lua diff --git a/widgets/contrib/kbdlayout.lua b/widgets/contrib/kbdlayout.lua index 8d13a74..23dc6e3 100644 --- a/widgets/contrib/kbdlayout.lua +++ b/widgets/contrib/kbdlayout.lua @@ -1,69 +1,81 @@ --[[ - + 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 } local setmetatable = setmetatable -local function worker (args) +-- 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 - - local function run_settings (layout, variant) + + 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), + 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 () + + 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) + 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 - function kbdlayout.next () + function kbdlayout.next() kbdlayout.set(idx + 1) end - function kbdlayout.prev () + function kbdlayout.prev() 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