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

Update re lenormf's comments

Browse Source
This commit is contained in:
Jay McCarthy 2018-11-29 13:42:47 -05:00
parent af5d2d9523
commit 4cac29d98c
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/ncurses_ui.cc
View File

@ -26,6 +26,7 @@ namespace Kakoune
using std::min;
using std::max;
using std::function;
struct NCursesWin : WINDOW {};
@ -671,11 +672,12 @@ Optional<Key> NCursesUI::get_next_key()
const Codepoint c2 = wgetch(m_window);
if ( c2 != ';' )
{
ungetch(c2); ungetch(c1); break;
ungetch(c2); ungetch(c1);
break;
}
const Codepoint c3 = wgetch(m_window);
Key (*f)(Key) = NULL;
function<Key(Key)> f = nullptr;
switch (c3)
{
case '2': f = shift; break;
@ -686,9 +688,10 @@ Optional<Key> NCursesUI::get_next_key()
case '7': f = alt_ctrl; break;
case '8': f = shift_alt_ctrl; break;
}
if ( f == NULL )
if ( f == nullptr )
{
ungetch(c3); ungetch(c2); ungetch(c1); break;
ungetch(c3); ungetch(c2); ungetch(c1);
break;
}
const Codepoint c4 = wgetch(m_window);
@ -702,10 +705,12 @@ Optional<Key> NCursesUI::get_next_key()
case 'F': return f(Key::End);
}
ungetch(c4); ungetch(c3); ungetch(c2); ungetch(c1); break;
ungetch(c4); ungetch(c3); ungetch(c2); ungetch(c1);
break;
}
default:
ungetch(c1); break;
ungetch(c1);
break;
}
}
wtimeout(m_window, -1);