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

Add <C-d> and <C-u> for scroll down/up half a page

Browse Source 
Fixes #606
This commit is contained in:
Maxime Coste 2016-02-29 14:00:09 +00:00
parent 1138264a83
commit b0e12f2bcb
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/normal.cc
View File

@ -182,7 +182,11 @@ void goto_commands(Context& context, NormalParams params)
if (not buffer_dir.empty()) if (not buffer_dir.empty())
paths.insert(paths.begin(), buffer_dir.str()); paths.insert(paths.begin(), buffer_dir.str());
const auto& suffixes = context.options()["suffixes"].get<Vector<String, MemoryDomain::Options>>();
String path = find_file(filename, paths); String path = find_file(filename, paths);
for (auto it = suffixes.begin(); path.empty() and it != suffixes.end(); ++it)
path = find_file(filename + *it, paths);
if (path.empty()) if (path.empty())
throw runtime_error(format("unable to find file '{}'", filename)); throw runtime_error(format("unable to find file '{}'", filename));
@ -1015,24 +1019,22 @@ void select_object(Context& context, NormalParams params)
":: prompt for object \n"); ":: prompt for object \n");
} }
template<Key::NamedKey key> template<Direction direction, bool half = false>
void scroll(Context& context, NormalParams) void scroll(Context& context, NormalParams)
{ {
static_assert(key == Key::PageUp or key == Key::PageDown,
"scrool only implements PageUp and PageDown");
Window& window = context.window(); Window& window = context.window();
Buffer& buffer = context.buffer(); Buffer& buffer = context.buffer();
CharCoord position = window.position(); CharCoord position = window.position();
LineCount cursor_line = 0; LineCount cursor_line = 0;
if (key == Key::PageUp) if (direction == Backward)
{ {
position.line -= (window.dimensions().line - 2); position.line -= (window.dimensions().line - 2) / (half ? 2 : 1);
cursor_line = position.line; cursor_line = position.line;
} }
else if (key == Key::PageDown) else if (direction == Forward)
{ {
position.line += (window.dimensions().line - 2); position.line += (window.dimensions().line - 2) / (half ? 2 : 1);
cursor_line = position.line + window.dimensions().line - 1; cursor_line = position.line + window.dimensions().line - 1;
} }
auto cursor_pos = utf8::advance(buffer.iterator_at(position.line), auto cursor_pos = utf8::advance(buffer.iterator_at(position.line),
@ -1725,11 +1727,13 @@ static NormalCmdDesc cmds[] =
{ Key::Up, "move up", move<LineCount, Backward> }, { Key::Up, "move up", move<LineCount, Backward> },
{ Key::Right, "move right", move<CharCount, Forward> }, { Key::Right, "move right", move<CharCount, Forward> },
{ ctrl('b'), "scroll one page up", scroll<Key::PageUp> }, { ctrl('b'), "scroll one page up", scroll<Backward > },
{ ctrl('f'), "scroll one page down", scroll<Key::PageDown> }, { ctrl('f'), "scroll one page down", scroll<Forward> },
{ ctrl('u'), "scroll half a page up", scroll<Backward, true> },
{ ctrl('d'), "scroll half a page down", scroll<Forward, true> },
{ Key::PageUp, "scroll one page up", scroll<Key::PageUp> }, { Key::PageUp, "scroll one page up", scroll<Backward> },
{ Key::PageDown, "scroll one page down", scroll<Key::PageDown> }, { Key::PageDown, "scroll one page down", scroll<Forward> },
{ 'z', "restore selections", restore_selections<false> }, { 'z', "restore selections", restore_selections<false> },
{ alt('z'), "append saved selections", restore_selections<true> }, { alt('z'), "append saved selections", restore_selections<true> },