aboutsummaryrefslogtreecommitdiff
path: root/config.def.h
diff options
context:
space:
mode:
authorMarc André Tanner <mat@brain-dump.org>2015-04-22 11:47:38 +0200
committerMarc André Tanner <mat@brain-dump.org>2015-04-22 12:35:15 +0200
commit7318931acca4e6928a8014dd00dc66f6f061b6c4 (patch)
treeea8bc1b754f7cd2b609fc71ee69ff66a8e6a0eab /config.def.h
parent4d7c630ff37fd0609aa58f60d6bd08fe53e57533 (diff)
downloadvis-7318931acca4e6928a8014dd00dc66f6f061b6c4.tar.gz
vis-7318931acca4e6928a8014dd00dc66f6f061b6c4.tar.xz
More renames, no functional changes
Win -> View, window_* -> view_*
Diffstat (limited to 'config.def.h')
-rw-r--r--config.def.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/config.def.h b/config.def.h
index 28f1ae5..88c032c 100644
--- a/config.def.h
+++ b/config.def.h
@@ -410,9 +410,9 @@ static KeyBinding vis_mode_normal[] = {
{ { NONE(':') }, prompt_cmd, { .s = "" } },
{ { NONE('Z'), NONE('Z') }, cmd, { .s = "wq" } },
{ { NONE('Z'), NONE('Q') }, cmd, { .s = "q!" } },
- { { NONE('z'), NONE('t') }, window, { .w = window_redraw_top } },
- { { NONE('z'), NONE('z') }, window, { .w = window_redraw_center } },
- { { NONE('z'), NONE('b') }, window, { .w = window_redraw_bottom } },
+ { { NONE('z'), NONE('t') }, window, { .w = view_redraw_top } },
+ { { NONE('z'), NONE('z') }, window, { .w = view_redraw_center } },
+ { { NONE('z'), NONE('b') }, window, { .w = view_redraw_bottom } },
{ { NONE('q') }, macro_record, { NULL } },
{ { NONE('@') }, macro_replay, { NULL } },
{ /* empty last element, array terminator */ },
@@ -440,14 +440,14 @@ static KeyBinding vis_mode_visual[] = {
static void vis_mode_visual_enter(Mode *old) {
if (!old->visual) {
- window_selection_start(vis->win->view);
+ view_selection_start(vis->win->view);
vis_modes[VIS_MODE_OPERATOR].parent = &vis_modes[VIS_MODE_TEXTOBJ];
}
}
static void vis_mode_visual_leave(Mode *new) {
if (!new->visual) {
- window_selection_clear(vis->win->view);
+ view_selection_clear(vis->win->view);
vis_modes[VIS_MODE_OPERATOR].parent = &vis_modes[VIS_MODE_MOVE];
}
}
@@ -459,10 +459,10 @@ static KeyBinding vis_mode_visual_line[] = {
};
static void vis_mode_visual_line_enter(Mode *old) {
- Win *win = vis->win->view;
- window_cursor_to(win, text_line_begin(vis->win->file->text, window_cursor_get(win)));
+ View *view = vis->win->view;
+ view_cursor_to(view, text_line_begin(vis->win->file->text, view_cursor_get(view)));
if (!old->visual) {
- window_selection_start(vis->win->view);
+ view_selection_start(view);
vis_modes[VIS_MODE_OPERATOR].parent = &vis_modes[VIS_MODE_TEXTOBJ];
}
movement(&(const Arg){ .i = MOVE_LINE_END });
@@ -470,10 +470,10 @@ static void vis_mode_visual_line_enter(Mode *old) {
static void vis_mode_visual_line_leave(Mode *new) {
if (!new->visual) {
- window_selection_clear(vis->win->view);
+ view_selection_clear(vis->win->view);
vis_modes[VIS_MODE_OPERATOR].parent = &vis_modes[VIS_MODE_MOVE];
} else {
- window_cursor_to(vis->win->view, window_cursor_get(vis->win->view));
+ view_cursor_to(vis->win->view, view_cursor_get(vis->win->view));
}
}
@@ -573,7 +573,7 @@ static void vis_mode_insert_idle(void) {
static void vis_mode_insert_input(const char *str, size_t len) {
static size_t oldpos = EPOS;
- size_t pos = window_cursor_get(vis->win->view);
+ size_t pos = view_cursor_get(vis->win->view);
if (pos != oldpos)
buffer_truncate(&vis->buffer_repeat);
buffer_append(&vis->buffer_repeat, str, len);
@@ -595,7 +595,7 @@ static void vis_mode_replace_leave(Mode *old) {
static void vis_mode_replace_input(const char *str, size_t len) {
static size_t oldpos = EPOS;
- size_t pos = window_cursor_get(vis->win->view);
+ size_t pos = view_cursor_get(vis->win->view);
if (pos != oldpos)
buffer_truncate(&vis->buffer_repeat);
buffer_append(&vis->buffer_repeat, str, len);