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

InputHandler: minor code cleanup

Browse Source
This commit is contained in:
Maxime Coste 2013-01-17 14:22:24 +01:00
parent 6c46dab035
commit d1f15123e4
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/input_handler.cc
View File

@ -545,7 +545,7 @@ public:
m_insert_reg = false; m_insert_reg = false;
return; return;
} }
bool reset_completer = true; bool update_completions = true;
bool moved = false; bool moved = false;
if (key == Key::Escape or key == Key{ Key::Modifiers::Control, 'c' }) if (key == Key::Escape or key == Key{ Key::Modifiers::Control, 'c' })
{ {
@ -556,7 +556,10 @@ public:
else if (key == Key::Backspace) else if (key == Key::Backspace)
m_inserter.erase(); m_inserter.erase();
else if (key == Key::Left) else if (key == Key::Left)
{
m_inserter.move_cursors(-1_char); m_inserter.move_cursors(-1_char);
moved = true;
}
else if (key == Key::Right) else if (key == Key::Right)
{ {
m_inserter.move_cursors(1_char); m_inserter.move_cursors(1_char);
@ -573,9 +576,7 @@ public:
moved = true; moved = true;
} }
else if (key.modifiers == Key::Modifiers::None) else if (key.modifiers == Key::Modifiers::None)
{
m_inserter.insert(codepoint_to_str(key.key)); m_inserter.insert(codepoint_to_str(key.key));
}
else if (key == Key{ Key::Modifiers::Control, 'r' }) else if (key == Key{ Key::Modifiers::Control, 'r' })
m_insert_reg = true; m_insert_reg = true;
else if ( key == Key{ Key::Modifiers::Control, 'm' }) else if ( key == Key{ Key::Modifiers::Control, 'm' })
@ -585,19 +586,16 @@ public:
else if ( key == Key{ Key::Modifiers::Control, 'n' }) else if ( key == Key{ Key::Modifiers::Control, 'n' })
{ {
m_completer.select(context, 1); m_completer.select(context, 1);
reset_completer = false; update_completions = false;
} }
else if ( key == Key{ Key::Modifiers::Control, 'p' }) else if ( key == Key{ Key::Modifiers::Control, 'p' })
{ {
m_completer.select(context, -1); m_completer.select(context, -1);
reset_completer = false; update_completions = false;
} }
if (reset_completer) if (update_completions)
{
// m_completer.reset(context);
m_idle_timer.set_next_date(Clock::now() + idle_timeout); m_idle_timer.set_next_date(Clock::now() + idle_timeout);
}
if (moved) if (moved)
context.hooks().run_hook("InsertMove", "", context); context.hooks().run_hook("InsertMove", "", context);
} }