awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'keyboardlayout_no_layout_entry' of https://github.com/psychon/awesome

This commit is contained in:
Uli Schlachter 2015-08-12 09:40:12 +02:00
parent fe027345de 008cae50b2
commit a166f86864
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,17 +19,17 @@ local keyboardlayout = { mt = {} }
-- Callback for updaing current layout -- Callback for updaing current layout
local function update_status (keyboardlayout) local function update_status (keyboardlayout)
keyboardlayout.current = awesome.xkb_get_layout_group(); keyboardlayout._current = awesome.xkb_get_layout_group();
local text = "" local text = ""
if (#keyboardlayout.layout > 0) then if (#keyboardlayout._layout > 0) then
text = (" " .. keyboardlayout.layout[keyboardlayout.current] .. " ") text = (" " .. keyboardlayout._layout[keyboardlayout._current] .. " ")
end end
keyboardlayout.widget:set_text(text) keyboardlayout.widget:set_text(text)
end end
-- Callback for updating list of layouts -- Callback for updating list of layouts
local function update_layout(keyboardlayout) local function update_layout(keyboardlayout)
keyboardlayout.layout = {}; keyboardlayout._layout = {};
local group_names = awesome.xkb_get_group_names(); local group_names = awesome.xkb_get_group_names();
-- A typical layout string looks like "pc+us+ru:2+de:3+ba:4+inet", -- A typical layout string looks like "pc+us+ru:2+de:3+ba:4+inet",
@ -41,11 +41,11 @@ local function update_layout(keyboardlayout)
error ("Failed to get list of keyboard groups"); error ("Failed to get list of keyboard groups");
return; return;
end end
keyboardlayout.layout[0] = first_group; keyboardlayout._layout[0] = first_group;
for name, number_str in string.gmatch(group_names, "+(%a+):(%d)") do for name, number_str in string.gmatch(group_names, "+(%a+):(%d)") do
group = tonumber(number_str); group = tonumber(number_str);
keyboardlayout.layout[group - 1] = name; keyboardlayout._layout[group - 1] = name;
end end
update_status(keyboardlayout) update_status(keyboardlayout)
end end
@ -61,14 +61,14 @@ function keyboardlayout.new()
update_layout(keyboardlayout); update_layout(keyboardlayout);
keyboardlayout.next_layout = function() keyboardlayout.next_layout = function()
new_layout = (keyboardlayout.current + 1) % (#keyboardlayout.layout + 1) new_layout = (keyboardlayout._current + 1) % (#keyboardlayout._layout + 1)
keyboardlayout.set_layout(new_layout) keyboardlayout.set_layout(new_layout)
end end
keyboardlayout.set_layout = function(group_number) keyboardlayout.set_layout = function(group_number)
if (0 > group_number) or (group_number > #keyboardlayout.layout) then if (0 > group_number) or (group_number > #keyboardlayout._layout) then
error("Invalid group number: " .. group_number .. error("Invalid group number: " .. group_number ..
"expected number from 0 to " .. #keyboardlayout.layout) "expected number from 0 to " .. #keyboardlayout._layout)
return; return;
end end
awesome.xkb_set_layout_group(group_number); awesome.xkb_set_layout_group(group_number);