aboutsummaryrefslogtreecommitdiff
path: root/config.def.h
diff options
context:
space:
mode:
authorMarc André Tanner <mat@brain-dump.org>2014-09-25 20:24:42 +0200
committerMarc André Tanner <mat@brain-dump.org>2014-09-25 20:24:42 +0200
commit46b8671b8fa61a291b498db11c4bb3f4a50e2329 (patch)
tree214bcf1e7e691bc3f2a5c2c1038fbf1bce7d3a5b /config.def.h
parent62682f0d351890f3050b3251d5d26448bf922109 (diff)
downloadvis-46b8671b8fa61a291b498db11c4bb3f4a50e2329.tar.gz
vis-46b8671b8fa61a291b498db11c4bb3f4a50e2329.tar.xz
Realign a few code blocks, no functional changes
Diffstat (limited to 'config.def.h')
-rw-r--r--config.def.h206
1 files changed, 103 insertions, 103 deletions
diff --git a/config.def.h b/config.def.h
index 035f7c9..474657c 100644
--- a/config.def.h
+++ b/config.def.h
@@ -92,69 +92,69 @@ static bool vis_keypress(Key *key) {
}
static KeyBinding basic_movement[] = {
- { { KEY(LEFT) }, movement, { .i = MOVE_CHAR_PREV } },
- { { KEY(SLEFT) }, movement, { .i = MOVE_LONGWORD_START_PREV } },
- { { KEY(RIGHT) }, movement, { .i = MOVE_CHAR_NEXT } },
- { { KEY(SRIGHT) }, movement, { .i = MOVE_LONGWORD_START_NEXT } },
- { { 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 } },
- { { KEY(END) }, movement, { .i = MOVE_LINE_FINISH } },
- { /* empty last element, array terminator */ },
+ { { KEY(LEFT) }, movement, { .i = MOVE_CHAR_PREV } },
+ { { KEY(SLEFT) }, movement, { .i = MOVE_LONGWORD_START_PREV } },
+ { { KEY(RIGHT) }, movement, { .i = MOVE_CHAR_NEXT } },
+ { { KEY(SRIGHT) }, movement, { .i = MOVE_LONGWORD_START_NEXT } },
+ { { 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 } },
+ { { KEY(END) }, movement, { .i = MOVE_LINE_FINISH } },
+ { /* empty last element, array terminator */ },
};
static KeyBinding vis_movements[] = {
- BACKSPACE( movement, i, MOVE_CHAR_PREV ),
- { { 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_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_LASTCHAR } },
- { { NONE('%') }, movement, { .i = MOVE_BRACKET_MATCH } },
- { { NONE('b') }, movement, { .i = MOVE_LONGWORD_START_PREV } },
- { { NONE('B') }, movement, { .i = MOVE_LONGWORD_START_PREV } },
- { { NONE('w') }, movement, { .i = MOVE_LONGWORD_START_NEXT } },
- { { NONE('W') }, movement, { .i = MOVE_LONGWORD_START_NEXT } },
- { { NONE('g'), NONE('e') }, movement, { .i = MOVE_LONGWORD_END_PREV } },
- { { NONE('g'), NONE('E') }, movement, { .i = MOVE_LONGWORD_END_PREV } },
- { { NONE('e') }, movement, { .i = MOVE_LONGWORD_END_NEXT } },
- { { NONE('E') }, movement, { .i = MOVE_LONGWORD_END_NEXT } },
- { { NONE('{') }, movement, { .i = MOVE_PARAGRAPH_PREV } },
- { { NONE('}') }, movement, { .i = MOVE_PARAGRAPH_NEXT } },
- { { NONE('(') }, movement, { .i = MOVE_SENTENCE_PREV } },
- { { NONE(')') }, movement, { .i = MOVE_SENTENCE_NEXT } },
- { { NONE('g'), NONE('g') }, gotoline, { .i = -1 } },
- { { NONE('g'), NONE('0') }, movement, { .i = MOVE_SCREEN_LINE_BEGIN } },
- { { NONE('g'), NONE('m') }, movement, { .i = MOVE_SCREEN_LINE_MIDDLE} },
- { { NONE('g'), NONE('$') }, movement, { .i = MOVE_SCREEN_LINE_END } },
- { { NONE('G') }, gotoline, { .i = +1 } },
- { { NONE('|') }, movement, { .i = MOVE_COLUMN } },
- { { NONE('n') }, movement, { .i = MOVE_SEARCH_FORWARD } },
- { { NONE('N') }, movement, { .i = MOVE_SEARCH_BACKWARD } },
- { { NONE('H') }, movement, { .i = MOVE_WINDOW_LINE_TOP } },
- { { NONE('M') }, movement, { .i = MOVE_WINDOW_LINE_MIDDLE} },
- { { NONE('L') }, movement, { .i = MOVE_WINDOW_LINE_BOTTOM} },
- { { NONE('*') }, movement, { .i = MOVE_SEARCH_WORD } },
- { { NONE('f') }, movement_key, { .i = MOVE_RIGHT_TO } },
- { { NONE('F') }, movement_key, { .i = MOVE_LEFT_TO } },
- { { NONE('t') }, movement_key, { .i = MOVE_RIGHT_TILL } },
- { { NONE('T') }, movement_key, { .i = MOVE_LEFT_TILL } },
- { { NONE('/') }, prompt, { .s = "/" } },
- { { NONE('?') }, prompt, { .s = "?" } },
- { /* empty last element, array terminator */ },
+ BACKSPACE( movement, i, MOVE_CHAR_PREV ),
+ { { 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_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_LASTCHAR } },
+ { { NONE('%') }, movement, { .i = MOVE_BRACKET_MATCH } },
+ { { NONE('b') }, movement, { .i = MOVE_LONGWORD_START_PREV } },
+ { { NONE('B') }, movement, { .i = MOVE_LONGWORD_START_PREV } },
+ { { NONE('w') }, movement, { .i = MOVE_LONGWORD_START_NEXT } },
+ { { NONE('W') }, movement, { .i = MOVE_LONGWORD_START_NEXT } },
+ { { NONE('g'), NONE('e') }, movement, { .i = MOVE_LONGWORD_END_PREV } },
+ { { NONE('g'), NONE('E') }, movement, { .i = MOVE_LONGWORD_END_PREV } },
+ { { NONE('e') }, movement, { .i = MOVE_LONGWORD_END_NEXT } },
+ { { NONE('E') }, movement, { .i = MOVE_LONGWORD_END_NEXT } },
+ { { NONE('{') }, movement, { .i = MOVE_PARAGRAPH_PREV } },
+ { { NONE('}') }, movement, { .i = MOVE_PARAGRAPH_NEXT } },
+ { { NONE('(') }, movement, { .i = MOVE_SENTENCE_PREV } },
+ { { NONE(')') }, movement, { .i = MOVE_SENTENCE_NEXT } },
+ { { NONE('g'), NONE('g') }, gotoline, { .i = -1 } },
+ { { NONE('g'), NONE('0') }, movement, { .i = MOVE_SCREEN_LINE_BEGIN } },
+ { { NONE('g'), NONE('m') }, movement, { .i = MOVE_SCREEN_LINE_MIDDLE } },
+ { { NONE('g'), NONE('$') }, movement, { .i = MOVE_SCREEN_LINE_END } },
+ { { NONE('G') }, gotoline, { .i = +1 } },
+ { { NONE('|') }, movement, { .i = MOVE_COLUMN } },
+ { { NONE('n') }, movement, { .i = MOVE_SEARCH_FORWARD } },
+ { { NONE('N') }, movement, { .i = MOVE_SEARCH_BACKWARD } },
+ { { NONE('H') }, movement, { .i = MOVE_WINDOW_LINE_TOP } },
+ { { NONE('M') }, movement, { .i = MOVE_WINDOW_LINE_MIDDLE } },
+ { { NONE('L') }, movement, { .i = MOVE_WINDOW_LINE_BOTTOM } },
+ { { NONE('*') }, movement, { .i = MOVE_SEARCH_WORD } },
+ { { NONE('f') }, movement_key, { .i = MOVE_RIGHT_TO } },
+ { { NONE('F') }, movement_key, { .i = MOVE_LEFT_TO } },
+ { { NONE('t') }, movement_key, { .i = MOVE_RIGHT_TILL } },
+ { { NONE('T') }, movement_key, { .i = MOVE_LEFT_TILL } },
+ { { NONE('/') }, prompt, { .s = "/" } },
+ { { NONE('?') }, prompt, { .s = "?" } },
+ { /* empty last element, array terminator */ },
};
static KeyBinding vis_textobjs[] = {
- { { NONE('a'), NONE('w') }, textobj, { .i = TEXT_OBJ_LONGWORD } },
+ { { NONE('a'), NONE('w') }, textobj, { .i = TEXT_OBJ_LONGWORD } },
{ { NONE('a'), NONE('s') }, textobj, { .i = TEXT_OBJ_SENTENCE } },
{ { NONE('a'), NONE('p') }, textobj, { .i = TEXT_OBJ_PARAGRAPH } },
{ { NONE('a'), NONE('[') }, textobj, { .i = TEXT_OBJ_OUTER_SQUARE_BRACKET } },
@@ -299,35 +299,35 @@ static KeyBinding vis_marks[] = {
};
static KeyBinding vis_marks_line[] = {
- { { NONE('\''), NONE('a') }, mark_line, { .i = MARK_a } },
- { { NONE('\''), NONE('b') }, mark_line, { .i = MARK_b } },
- { { NONE('\''), NONE('c') }, mark_line, { .i = MARK_c } },
- { { NONE('\''), NONE('d') }, mark_line, { .i = MARK_d } },
- { { NONE('\''), NONE('e') }, mark_line, { .i = MARK_e } },
- { { NONE('\''), NONE('f') }, mark_line, { .i = MARK_f } },
- { { NONE('\''), NONE('g') }, mark_line, { .i = MARK_g } },
- { { NONE('\''), NONE('h') }, mark_line, { .i = MARK_h } },
- { { NONE('\''), NONE('i') }, mark_line, { .i = MARK_i } },
- { { NONE('\''), NONE('j') }, mark_line, { .i = MARK_j } },
- { { NONE('\''), NONE('k') }, mark_line, { .i = MARK_k } },
- { { NONE('\''), NONE('l') }, mark_line, { .i = MARK_l } },
- { { NONE('\''), NONE('m') }, mark_line, { .i = MARK_m } },
- { { NONE('\''), NONE('n') }, mark_line, { .i = MARK_n } },
- { { NONE('\''), NONE('o') }, mark_line, { .i = MARK_o } },
- { { NONE('\''), NONE('p') }, mark_line, { .i = MARK_p } },
- { { NONE('\''), NONE('q') }, mark_line, { .i = MARK_q } },
- { { NONE('\''), NONE('r') }, mark_line, { .i = MARK_r } },
- { { NONE('\''), NONE('s') }, mark_line, { .i = MARK_s } },
- { { NONE('\''), NONE('t') }, mark_line, { .i = MARK_t } },
- { { NONE('\''), NONE('u') }, mark_line, { .i = MARK_u } },
- { { NONE('\''), NONE('v') }, mark_line, { .i = MARK_v } },
- { { NONE('\''), NONE('w') }, mark_line, { .i = MARK_w } },
- { { NONE('\''), NONE('x') }, mark_line, { .i = MARK_x } },
- { { NONE('\''), NONE('y') }, mark_line, { .i = MARK_y } },
- { { NONE('\''), NONE('z') }, mark_line, { .i = MARK_z } },
+ { { NONE('\''), NONE('a') }, mark_line, { .i = MARK_a } },
+ { { NONE('\''), NONE('b') }, mark_line, { .i = MARK_b } },
+ { { NONE('\''), NONE('c') }, mark_line, { .i = MARK_c } },
+ { { NONE('\''), NONE('d') }, mark_line, { .i = MARK_d } },
+ { { NONE('\''), NONE('e') }, mark_line, { .i = MARK_e } },
+ { { NONE('\''), NONE('f') }, mark_line, { .i = MARK_f } },
+ { { NONE('\''), NONE('g') }, mark_line, { .i = MARK_g } },
+ { { NONE('\''), NONE('h') }, mark_line, { .i = MARK_h } },
+ { { NONE('\''), NONE('i') }, mark_line, { .i = MARK_i } },
+ { { NONE('\''), NONE('j') }, mark_line, { .i = MARK_j } },
+ { { NONE('\''), NONE('k') }, mark_line, { .i = MARK_k } },
+ { { NONE('\''), NONE('l') }, mark_line, { .i = MARK_l } },
+ { { NONE('\''), NONE('m') }, mark_line, { .i = MARK_m } },
+ { { NONE('\''), NONE('n') }, mark_line, { .i = MARK_n } },
+ { { NONE('\''), NONE('o') }, mark_line, { .i = MARK_o } },
+ { { NONE('\''), NONE('p') }, mark_line, { .i = MARK_p } },
+ { { NONE('\''), NONE('q') }, mark_line, { .i = MARK_q } },
+ { { NONE('\''), NONE('r') }, mark_line, { .i = MARK_r } },
+ { { NONE('\''), NONE('s') }, mark_line, { .i = MARK_s } },
+ { { NONE('\''), NONE('t') }, mark_line, { .i = MARK_t } },
+ { { NONE('\''), NONE('u') }, mark_line, { .i = MARK_u } },
+ { { NONE('\''), NONE('v') }, mark_line, { .i = MARK_v } },
+ { { NONE('\''), NONE('w') }, mark_line, { .i = MARK_w } },
+ { { NONE('\''), NONE('x') }, mark_line, { .i = MARK_x } },
+ { { NONE('\''), NONE('y') }, mark_line, { .i = MARK_y } },
+ { { NONE('\''), NONE('z') }, mark_line, { .i = MARK_z } },
{ { NONE('\''), NONE('<') }, mark_line, { .i = MARK_SELECTION_START } },
{ { NONE('\''), NONE('>') }, mark_line, { .i = MARK_SELECTION_END } },
- { /* empty last element, array terminator */ },
+ { /* empty last element, array terminator */ },
};
static KeyBinding vis_marks_set[] = {
@@ -402,19 +402,19 @@ static KeyBinding vis_mode_normal[] = {
};
static KeyBinding vis_mode_visual[] = {
- { { NONE(ESC) }, switchmode, { .i = VIS_MODE_NORMAL } },
- { { CONTROL('c') }, switchmode, { .i = VIS_MODE_NORMAL } },
- { { NONE('v') }, switchmode, { .i = VIS_MODE_NORMAL } },
- { { NONE('V') }, switchmode, { .i = VIS_MODE_VISUAL_LINE } },
- BACKSPACE( operator, i, OP_DELETE ),
- { { CONTROL('H') }, operator, { .i = OP_DELETE } },
- { { NONE('d') }, operator, { .i = OP_DELETE } },
- { { NONE('x') }, operator, { .i = OP_DELETE } },
- { { NONE('y') }, operator, { .i = OP_YANK } },
- { { NONE('c') }, operator, { .i = OP_CHANGE } },
- { { NONE('r') }, operator, { .i = OP_CHANGE } },
- { { NONE('s') }, operator, { .i = OP_CHANGE } },
- { /* empty last element, array terminator */ },
+ BACKSPACE( operator, i, OP_DELETE ),
+ { { NONE(ESC) }, switchmode, { .i = VIS_MODE_NORMAL } },
+ { { CONTROL('c') }, switchmode, { .i = VIS_MODE_NORMAL } },
+ { { NONE('v') }, switchmode, { .i = VIS_MODE_NORMAL } },
+ { { NONE('V') }, switchmode, { .i = VIS_MODE_VISUAL_LINE } },
+ { { CONTROL('H') }, operator, { .i = OP_DELETE } },
+ { { NONE('d') }, operator, { .i = OP_DELETE } },
+ { { NONE('x') }, operator, { .i = OP_DELETE } },
+ { { NONE('y') }, operator, { .i = OP_YANK } },
+ { { NONE('c') }, operator, { .i = OP_CHANGE } },
+ { { NONE('r') }, operator, { .i = OP_CHANGE } },
+ { { NONE('s') }, operator, { .i = OP_CHANGE } },
+ { /* empty last element, array terminator */ },
};
static void vis_mode_visual_enter(Mode *old) {
@@ -447,13 +447,13 @@ static void vis_mode_visual_line_leave(Mode *new) {
}
static KeyBinding vis_mode_readline[] = {
- { { NONE(ESC) }, switchmode, { .i = VIS_MODE_NORMAL } },
- { { CONTROL('c') }, switchmode, { .i = VIS_MODE_NORMAL } },
- BACKSPACE( call, f, editor_backspace_key ),
- { { CONTROL('D') }, call, { .f = editor_delete_key } },
+ BACKSPACE( call, f, editor_backspace_key ),
+ { { NONE(ESC) }, switchmode, { .i = VIS_MODE_NORMAL } },
+ { { CONTROL('c') }, switchmode, { .i = VIS_MODE_NORMAL } },
+ { { CONTROL('D') }, call, { .f = editor_delete_key } },
{ { CONTROL('W') }, delete, { .i = MOVE_LONGWORD_START_PREV } },
- { { CONTROL('U') }, delete, { .i = MOVE_LINE_BEGIN } },
- { /* empty last element, array terminator */ },
+ { { CONTROL('U') }, delete, { .i = MOVE_LINE_BEGIN } },
+ { /* empty last element, array terminator */ },
};
static KeyBinding vis_mode_prompt[] = {