diff options
| -rw-r--r-- | config.def.h | 20 | ||||
| -rw-r--r-- | vis.c | 14 |
2 files changed, 17 insertions, 17 deletions
diff --git a/config.def.h b/config.def.h index ba0c290..bab72f5 100644 --- a/config.def.h +++ b/config.def.h @@ -94,8 +94,8 @@ static KeyBinding basic_movement[] = { { { KEY(SLEFT) }, movement, { .i = MOVE_WORD_START_PREV } }, { { KEY(RIGHT) }, movement, { .i = MOVE_CHAR_NEXT } }, { { KEY(SRIGHT) }, movement, { .i = MOVE_WORD_START_NEXT } }, - { { KEY(UP) }, movement, { .i = MOVE_LINE_UP } }, - { { KEY(DOWN) }, movement, { .i = MOVE_LINE_DOWN } }, + { { KEY(UP) }, movement, { .i = MOVE_SCREEN_LINE_UP } }, + { { KEY(DOWN) }, movement, { .i = MOVE_SCREEN_LINE_DOWN } }, { { KEY(PPAGE) }, wscroll, { .i = -PAGE } }, { { KEY(NPAGE) }, wscroll, { .i = +PAGE } }, { { KEY(HOME) }, movement, { .i = MOVE_LINE_START } }, @@ -108,12 +108,12 @@ static KeyBinding vis_movements[] = { { { NONE('h') }, movement, { .i = MOVE_CHAR_PREV } }, { { NONE(' ') }, movement, { .i = MOVE_CHAR_NEXT } }, { { NONE('l') }, movement, { .i = MOVE_CHAR_NEXT } }, - { { NONE('k') }, movement, { .i = MOVE_LINE_UP } }, - { { CONTROL('P') }, movement, { .i = MOVE_LINE_UP } }, - { { NONE('j') }, movement, { .i = MOVE_LINE_DOWN } }, - { { CONTROL('J') }, movement, { .i = MOVE_LINE_DOWN } }, - { { CONTROL('N') }, movement, { .i = MOVE_LINE_DOWN } }, - { { KEY(ENTER) }, movement, { .i = MOVE_LINE_DOWN } }, + { { NONE('k') }, movement, { .i = MOVE_SCREEN_LINE_UP } }, + { { CONTROL('P') }, movement, { .i = MOVE_SCREEN_LINE_UP } }, + { { NONE('j') }, movement, { .i = MOVE_SCREEN_LINE_DOWN } }, + { { CONTROL('J') }, movement, { .i = MOVE_SCREEN_LINE_DOWN } }, + { { CONTROL('N') }, movement, { .i = MOVE_SCREEN_LINE_DOWN } }, + { { KEY(ENTER) }, movement, { .i = MOVE_SCREEN_LINE_DOWN } }, { { NONE('^') }, movement, { .i = MOVE_LINE_START } }, { { NONE('g'), NONE('_') }, movement, { .i = MOVE_LINE_FINISH } }, { { NONE('$') }, movement, { .i = MOVE_LINE_END } }, @@ -724,8 +724,8 @@ static KeyBinding nano_keys[] = { { { CONTROL('D') }, call, { .f = editor_delete_key } }, BACKSPACE( call, f, editor_backspace_key ), { { CONTROL('F') }, movement, { .i = MOVE_CHAR_NEXT } }, - { { CONTROL('P') }, movement, { .i = MOVE_LINE_UP } }, - { { CONTROL('N') }, movement, { .i = MOVE_LINE_DOWN } }, + { { CONTROL('P') }, movement, { .i = MOVE_SCREEN_LINE_UP } }, + { { CONTROL('N') }, movement, { .i = MOVE_SCREEN_LINE_DOWN } }, { { CONTROL('Y') }, wscroll, { .i = -PAGE } }, { { KEY(F(7)) }, wscroll, { .i = -PAGE } }, { { CONTROL('V') }, wscroll, { .i = +PAGE } }, @@ -187,8 +187,8 @@ static Operator ops[] = { /* these can be passed as int argument to movement(&(const Arg){ .i = MOVE_* }) */ enum { - MOVE_LINE_UP, - MOVE_LINE_DOWN, + MOVE_SCREEN_LINE_UP, + MOVE_SCREEN_LINE_DOWN, MOVE_LINE_PREV, MOVE_LINE_BEGIN, MOVE_LINE_START, @@ -251,8 +251,8 @@ static size_t window_line_middle(const Arg *arg); static size_t window_line_bottom(const Arg *arg); static Movement moves[] = { - [MOVE_LINE_UP] = { .win = window_line_up }, - [MOVE_LINE_DOWN] = { .win = window_line_down }, + [MOVE_SCREEN_LINE_UP] = { .win = window_line_up }, + [MOVE_SCREEN_LINE_DOWN]= { .win = window_line_down }, [MOVE_LINE_PREV] = { .txt = text_line_prev, .type = LINEWISE }, [MOVE_LINE_BEGIN] = { .txt = text_line_begin, .type = LINEWISE }, [MOVE_LINE_START] = { .txt = text_line_start, .type = LINEWISE }, @@ -334,8 +334,8 @@ static TextObject textobjs[] = { /* if some movements are forced to be linewise, they are translated to text objects */ static TextObject *moves_linewise[] = { - [MOVE_LINE_UP] = &textobjs[TEXT_OBJ_LINE_UP], - [MOVE_LINE_DOWN] = &textobjs[TEXT_OBJ_LINE_DOWN], + [MOVE_SCREEN_LINE_UP] = &textobjs[TEXT_OBJ_LINE_UP], + [MOVE_SCREEN_LINE_DOWN] = &textobjs[TEXT_OBJ_LINE_DOWN], }; /** functions to be called from keybindings */ @@ -689,7 +689,7 @@ static void operator(const Arg *arg) { /* hacky way to handle double operators i.e. things like * dd, yy etc where the second char isn't a movement */ action.linewise = true; - action.textobj = moves_linewise[MOVE_LINE_DOWN]; + action.textobj = moves_linewise[MOVE_SCREEN_LINE_DOWN]; action_do(&action); } else { action.op = op; |