aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--main.c60
-rw-r--r--vis.c44
-rw-r--r--vis.h4
3 files changed, 48 insertions, 60 deletions
diff --git a/main.c b/main.c
index 0708e02..89f649a 100644
--- a/main.c
+++ b/main.c
@@ -25,12 +25,6 @@ static const char *suspend(Vis*, const char *keys, const Arg *arg);
static const char *switchmode(Vis*, const char *keys, const Arg *arg);
/* set mark indicated by arg->i to current cursor position */
static const char *mark_set(Vis*, const char *keys, const Arg *arg);
-/* insert arg->s at the current cursor position */
-static const char *insert(Vis*, const char *keys, const Arg *arg);
-/* insert a tab or the needed amount of spaces at the current cursor position */
-static const char *insert_tab(Vis*, const char *keys, const Arg *arg);
-/* inserts a newline (either \n or \r\n depending on file type) */
-static const char *insert_newline(Vis*, const char *keys, const Arg *arg);
/* add a new line either before or after the one where the cursor currently is */
static const char *openline(Vis*, const char *keys, const Arg *arg);
/* join lines from current cursor position to movement indicated by arg */
@@ -710,12 +704,12 @@ static KeyAction vis_action[] = {
[VIS_ACTION_INSERT_NEWLINE] = {
"insert-newline",
"Insert a line break (depending on file type)",
- insert_newline,
+ call, { .f = vis_insert_nl }
},
[VIS_ACTION_INSERT_TAB] = {
"insert-tab",
"Insert a tab (might be converted to spaces)",
- insert_tab,
+ call, { .f = vis_insert_tab }
},
[VIS_ACTION_INSERT_VERBATIM] = {
"insert-verbatim",
@@ -1514,59 +1508,13 @@ static const char *window(Vis *vis, const char *keys, const Arg *arg) {
return keys;
}
-static const char *insert(Vis *vis, const char *keys, const Arg *arg) {
- vis_insert_key(vis, arg->s, arg->s ? strlen(arg->s) : 0);
- return keys;
-}
-
-static const char *insert_tab(Vis *vis, const char *keys, const Arg *arg) {
- insert(vis, keys, &(const Arg){ .s = vis_expandtab(vis) });
- return keys;
-}
-
-static void copy_indent_from_previous_line(Win *win) {
- View *view = win->view;
- Text *text = win->file->text;
- size_t pos = view_cursor_get(view);
- size_t prev_line = text_line_prev(text, pos);
- if (pos == prev_line)
- return;
- size_t begin = text_line_begin(text, prev_line);
- size_t start = text_line_start(text, begin);
- size_t len = start-begin;
- char *buf = malloc(len);
- if (!buf)
- return;
- len = text_bytes_get(text, begin, len, buf);
- vis_insert_key(win->editor, buf, len);
- free(buf);
-}
-
-static const char *insert_newline(Vis *vis, const char *keys, const Arg *arg) {
- const char *nl;
- switch (text_newline_type(vis->win->file->text)) {
- case TEXT_NEWLINE_CRNL:
- nl = "\r\n";
- break;
- default:
- nl = "\n";
- break;
- }
-
- insert(vis, keys, &(const Arg){ .s = nl });
-
- if (vis->autoindent)
- copy_indent_from_previous_line(vis->win);
- return keys;
-}
-
static const char *openline(Vis *vis, const char *keys, const Arg *arg) {
if (arg->i == MOVE_LINE_NEXT) {
vis_motion(vis, MOVE_LINE_END);
- insert_newline(vis, keys, NULL);
+ vis_insert_nl(vis);
} else {
vis_motion(vis, MOVE_LINE_BEGIN);
- insert_newline(vis, keys, NULL);
+ vis_insert_nl(vis);
vis_motion(vis, MOVE_LINE_PREV);
}
vis_mode_switch(vis, VIS_MODE_INSERT);
diff --git a/vis.c b/vis.c
index 5b96062..f690ec1 100644
--- a/vis.c
+++ b/vis.c
@@ -1083,7 +1083,7 @@ static size_t op_put(Vis *vis, Text *txt, OperatorContext *c) {
return pos;
}
-const char *vis_expandtab(Vis *vis) {
+static const char *expandtab(Vis *vis) {
static char spaces[9];
int tabwidth = tabwidth_get(vis);
tabwidth = MIN(tabwidth, LENGTH(spaces) - 1);
@@ -1095,7 +1095,7 @@ const char *vis_expandtab(Vis *vis) {
static size_t op_shift_right(Vis *vis, Text *txt, OperatorContext *c) {
size_t pos = text_line_begin(txt, c->range.end), prev_pos;
- const char *tab = vis_expandtab(vis);
+ const char *tab = expandtab(vis);
size_t tablen = strlen(tab);
/* if range ends at the begin of a line, skip line break */
@@ -3035,3 +3035,43 @@ void vis_exit(Vis *vis, int status) {
const char *vis_mode_status(Vis *vis) {
return vis->mode->status;
}
+
+void vis_insert_tab(Vis *vis) {
+ const char *tab = expandtab(vis);
+ vis_insert_key(vis, tab, strlen(tab));
+}
+
+static void copy_indent_from_previous_line(Win *win) {
+ View *view = win->view;
+ Text *text = win->file->text;
+ size_t pos = view_cursor_get(view);
+ size_t prev_line = text_line_prev(text, pos);
+ if (pos == prev_line)
+ return;
+ size_t begin = text_line_begin(text, prev_line);
+ size_t start = text_line_start(text, begin);
+ size_t len = start-begin;
+ char *buf = malloc(len);
+ if (!buf)
+ return;
+ len = text_bytes_get(text, begin, len, buf);
+ vis_insert_key(win->editor, buf, len);
+ free(buf);
+}
+
+void vis_insert_nl(Vis *vis) {
+ const char *nl;
+ switch (text_newline_type(vis->win->file->text)) {
+ case TEXT_NEWLINE_CRNL:
+ nl = "\r\n";
+ break;
+ default:
+ nl = "\n";
+ break;
+ }
+
+ vis_insert_key(vis, nl, strlen(nl));
+
+ if (vis->autoindent)
+ copy_indent_from_previous_line(vis->win);
+}
diff --git a/vis.h b/vis.h
index dee4072..c427d06 100644
--- a/vis.h
+++ b/vis.h
@@ -96,6 +96,8 @@ void vis_replace_key(Vis*, const char *data, size_t len);
void vis_insert(Vis*, size_t pos, const char *data, size_t len);
void vis_delete(Vis*, size_t pos, size_t len);
void vis_replace(Vis*, size_t pos, const char *data, size_t len);
+void vis_insert_tab(Vis*);
+void vis_insert_nl(Vis*);
int vis_run(Vis*, int argc, char *argv[]);
void vis_exit(Vis*, int status);
@@ -329,8 +331,6 @@ bool vis_prompt_cmd(Vis *vis, char type, const char *cmd);
const char *vis_key_next(Vis*, const char *keys);
const char *vis_keys(Vis*, const char *input);
-const char *vis_expandtab(Vis*);
-
bool vis_signal_handler(Vis*, int signum, const siginfo_t *siginfo,
const void *context);
You can read more about the author.