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:
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
local setmetatable = setmetatable
local setmetatable = setmetatable
+-- 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 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 timeout = args.timeout or 5
+ 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(
- 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)