Merge branch '0.7.x'

This commit is contained in:
Andrzej Rybczak
2016-04-23 13:59:32 +02:00
4 changed files with 14 additions and 2 deletions

View File

@@ -126,7 +126,7 @@ LyricsFetcher::Result LyricwikiFetcher::fetch(const std::string &artist, const s
return result;
}
auto lyrics = getContent("<div class='lyricbox'><script>.*?</script>(.*?)<!--", data);
auto lyrics = getContent("<div class='lyricbox'>(.*?)<!--", data);
if (lyrics.empty())
{

View File

@@ -819,6 +819,11 @@ Key::Type Window::getInputChar(int key)
return Key::Right;
case 'D':
return Key::Left;
// terminator
case 'F':
return Key::End;
case 'H':
return Key::Home;
// rxvt
case 'a':
return Key::Ctrl | Key::Up;