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

Support 'V' for locked view control

Browse Source 
Fixes #343
This commit is contained in:
Maxime Coste 2015-11-05 13:39:29 +00:00
parent 05f7337eb0
commit 33253a8fd5
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.asciidoc
View File

@ -386,6 +386,8 @@ view.
* `vk`: scroll the window count line upward * `vk`: scroll the window count line upward
* `vl`: scroll the window count columns right * `vl`: scroll the window count columns right
Using `V` will lock view mode until `<esc>` is hit
Marks Marks
~~~~~ ~~~~~

21
src/normal.cc
View File

@ -229,10 +229,18 @@ void goto_commands(Context& context, NormalParams params)
} }
} }
template<bool lock>
void view_commands(Context& context, NormalParams params) void view_commands(Context& context, NormalParams params)
{ {
const int count = params.count;
on_next_key_with_autoinfo(context, KeymapMode::View, on_next_key_with_autoinfo(context, KeymapMode::View,
[params](Key key, Context& context) { [count](Key key, Context& context) {
if (key == Key::Escape)
return;
if (lock)
view_commands<true>(context, {});
auto cp = key.codepoint(); auto cp = key.codepoint();
if (not cp or not context.has_window()) if (not cp or not context.has_window())
return; return;
@ -256,16 +264,16 @@ void view_commands(Context& context, NormalParams params)
context.window().display_line_at(cursor.line, window.dimensions().line-1); context.window().display_line_at(cursor.line, window.dimensions().line-1);
break; break;
case 'h': case 'h':
context.window().scroll(-std::max<CharCount>(1, params.count)); context.window().scroll(-std::max<CharCount>(1, count));
break; break;
case 'j': case 'j':
context.window().scroll( std::max<LineCount>(1, params.count)); context.window().scroll( std::max<LineCount>(1, count));
break; break;
case 'k': case 'k':
context.window().scroll(-std::max<LineCount>(1, params.count)); context.window().scroll(-std::max<LineCount>(1, count));
break; break;
case 'l': case 'l':
context.window().scroll( std::max<CharCount>(1, params.count)); context.window().scroll( std::max<CharCount>(1, count));
break; break;
} }
}, "view", }, "view",
@ -1496,7 +1504,8 @@ static NormalCmdDesc cmds[] =
{ 'g', "go to location", goto_commands<SelectMode::Replace> }, { 'g', "go to location", goto_commands<SelectMode::Replace> },
{ 'G', "extend to location", goto_commands<SelectMode::Extend> }, { 'G', "extend to location", goto_commands<SelectMode::Extend> },
{ 'v', "move view", view_commands }, { 'v', "move view", view_commands<false> },
{ 'V', "move view (locked)", view_commands<true> },
{ 'y', "yank selected text", yank }, { 'y', "yank selected text", yank },
{ 'p', "paste after selected text", repeated<paste<InsertMode::Append>> }, { 'p', "paste after selected text", repeated<paste<InsertMode::Append>> },