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

NCursesUI::get_key returns the codepoint

Browse Source
This commit is contained in:
Maxime Coste 2012-10-09 14:30:35 +02:00
parent ba50d853b3
commit c0db3b81be
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ncurses.cc
View File

@ -180,10 +180,16 @@ void NCursesUI::draw_window(Window& window)
redraw(m_menu_win); redraw(m_menu_win);
} }
struct getch_iterator
{
int operator*() { return getch(); }
getch_iterator& operator++() { return *this; }
getch_iterator& operator++(int) { return *this; }
};
Key NCursesUI::get_key() Key NCursesUI::get_key()
{ {
const utf8::Codepoint c = getch(); const unsigned c = getch();
if (c > 0 and c < 27) if (c > 0 and c < 27)
{ {
return {Key::Modifiers::Control, c - 1 + 'a'}; return {Key::Modifiers::Control, c - 1 + 'a'};
@ -209,7 +215,9 @@ Key NCursesUI::get_key()
case KEY_NPAGE: return Key::PageDown; case KEY_NPAGE: return Key::PageDown;
case KEY_BTAB: return Key::BackTab; case KEY_BTAB: return Key::BackTab;
} }
return c;
ungetch(c);
return utf8::codepoint(getch_iterator{});
} }
void NCursesUI::print_status(const String& status, CharCount cursor_pos) void NCursesUI::print_status(const String& status, CharCount cursor_pos)