xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for parsing multiple modifiers in keys

Browse Source 
<ca-key> means control+alt key, <ac-key> works as well.
Fixes #1311
This commit is contained in:
Maxime Coste 2017-04-10 21:19:56 +01:00
parent f6eea456d4
commit a4b82131e5
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/keys.cc
View File

@ -78,18 +78,27 @@ KeyList parse_keys(StringView str)
Key::Modifiers modifier = Key::Modifiers::None; Key::Modifiers modifier = Key::Modifiers::None;
StringView desc{it.base()+1, end_it.base()}; StringView desc{it.base()+1, end_it.base()};
if (desc.length() > 2 and desc[1_byte] == '-') auto dash = find(desc, '-');
if (dash != desc.end())
{ {
switch(to_lower(desc[0_byte])) if (dash == desc.begin())
throw runtime_error("unable to parse modifier in " +
StringView{it.base(), end_it.base()+1});
for (auto c : StringView{desc.begin(), dash})
{ {
case 'c': modifier = Key::Modifiers::Control; break; switch(to_lower(c))
case 'a': modifier = Key::Modifiers::Alt; break; {
default: case 'c': modifier |= Key::Modifiers::Control; break;
throw runtime_error("unable to parse modifier in " + case 'a': modifier |= Key::Modifiers::Alt; break;
StringView{it.base(), end_it.base()+1}); default:
throw runtime_error("unable to parse modifier in " +
StringView{it.base(), end_it.base()+1});
}
} }
desc = desc.substr(2_byte); desc = StringView{dash+1, desc.end()};
} }
auto name_it = find_if(keynamemap, [&desc](const KeyAndName& item) auto name_it = find_if(keynamemap, [&desc](const KeyAndName& item)
{ return item.name == desc; }); { return item.name == desc; });
if (name_it != end(keynamemap)) if (name_it != end(keynamemap))
@ -158,8 +167,9 @@ String key_to_str(Key key)
switch (key.modifiers) switch (key.modifiers)
{ {
case Key::Modifiers::Control: res = "c-" + res; named = true; break; case Key::Modifiers::Control: res = "c-" + res; named = true; break;
case Key::Modifiers::Alt: res = "a-" + res; named = true; break; case Key::Modifiers::Alt: res = "a-" + res; named = true; break;
case Key::Modifiers::ControlAlt: res = "ca-" + res; named = true; break;
default: break; default: break;
} }
if (named) if (named)