Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make keyboard layout naming function easily overridable

This commit is contained in:
Abdo Roig-Maranges 2016-03-30 14:37:18 +02:00
parent 1879966556
commit cb46f09361
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/awful/widget/keyboardlayout.lua
View File

@ -241,10 +241,7 @@ local function update_layout(self)
layouts[1].group_idx = 0 layouts[1].group_idx = 0
end end
for _, v in ipairs(layouts) do for _, v in ipairs(layouts) do
local layout_name = v.file local layout_name = self.layout_name(v)
if v.section ~= nil then
layout_name = layout_name .. "(" .. v.section .. ")"
end
-- Please note that numbers of groups reported by xkb_get_group_names -- Please note that numbers of groups reported by xkb_get_group_names
-- is greater by one than the real group number. -- is greater by one than the real group number.
self._layout[v.group_idx - 1] = layout_name self._layout[v.group_idx - 1] = layout_name
@ -260,7 +257,13 @@ function keyboardlayout.new()
self.widget = widget self.widget = widget
update_layout(self); self.layout_name = function(v)
local name = v.file
if v.section ~= nil then
name = name .. "(" .. v.section .. ")"
end
return name
end
self.next_layout = function() self.next_layout = function()
self.set_layout((self._current + 1) % (#self._layout + 1)) self.set_layout((self._current + 1) % (#self._layout + 1))
@ -275,6 +278,8 @@ function keyboardlayout.new()
awesome.xkb_set_layout_group(group_number); awesome.xkb_set_layout_group(group_number);
end end
update_layout(self);
-- callback for processing layout changes -- callback for processing layout changes
capi.awesome.connect_signal("xkb::map_changed", capi.awesome.connect_signal("xkb::map_changed",
function () update_layout(self) end) function () update_layout(self) end)