view: remove view_cursors_multiple

microamp · Jun 15, 2017 · 318837f · 318837f
1 parent 2fa1bea
commit 318837f
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 17 deletions.
diff --git a/main.c b/main.c
@@ -1345,7 +1345,7 @@ static const char *cursors_align_indent(Vis *vis, const char *keys, const Arg *a
 
 static const char *cursors_clear(Vis *vis, const char *keys, const Arg *arg) {
 	View *view = vis_view(vis);
-	if (view_cursors_multiple(view))
+	if (view_cursors_count(view) > 1)
 		view_cursors_clear(view);
 	else
 		view_cursors_selection_clear(view_cursors_primary_get(view));
@@ -1422,7 +1422,7 @@ static const char *cursors_remove_column(Vis *vis, const char *keys, const Arg *
 	int column = vis_count_get_default(vis, arg->i) - 1;
 	if (column >= max)
 		column = max - 1;
-	if (!view_cursors_multiple(view)) {
+	if (view_cursors_count(view) == 1) {
 		vis_mode_switch(vis, VIS_MODE_NORMAL);
 		return keys;
 	}
@@ -1442,7 +1442,7 @@ static const char *cursors_remove_column_except(Vis *vis, const char *keys, cons
 	int column = vis_count_get_default(vis, arg->i) - 1;
 	if (column >= max)
 		column = max - 1;
-	if (!view_cursors_multiple(view)) {
+	if (view_cursors_count(view) == 1) {
 		vis_redraw(vis);
 		return keys;
 	}
@@ -1463,7 +1463,7 @@ static const char *cursors_remove_column_except(Vis *vis, const char *keys, cons
 
 static const char *cursors_navigate(Vis *vis, const char *keys, const Arg *arg) {
 	View *view = vis_view(vis);
-	if (!view_cursors_multiple(view))
+	if (view_cursors_count(view) == 1)
 		return wscroll(vis, keys, arg);
 	Cursor *c = view_cursors_primary_get(view);
 	VisCountIterator it = vis_count_iterator_get(vis, 1);
@@ -1710,7 +1710,7 @@ static const char *undo(Vis *vis, const char *keys, const Arg *arg) {
 	size_t pos = text_undo(vis_text(vis));
 	if (pos != EPOS) {
 		View *view = vis_view(vis);
-		if (!view_cursors_multiple(view))
+		if (view_cursors_count(view) == 1)
 			view_cursor_to(view, pos);
 		/* redraw all windows in case some display the same file */
 		vis_draw(vis);
@@ -1722,7 +1722,7 @@ static const char *redo(Vis *vis, const char *keys, const Arg *arg) {
 	size_t pos = text_redo(vis_text(vis));
 	if (pos != EPOS) {
 		View *view = vis_view(vis);
-		if (!view_cursors_multiple(view))
+		if (view_cursors_count(view) == 1)
 			view_cursor_to(view, pos);
 		/* redraw all windows in case some display the same file */
 		vis_draw(vis);

diff --git a/sam.c b/sam.c
@@ -1437,7 +1437,7 @@ static bool cmd_select(Vis *vis, Win *win, Command *cmd, const char *argv[], Cur
 	bool ret = true;
 	View *view = win->view;
 	Text *txt = win->file->text;
-	bool multiple_cursors = view_cursors_multiple(view);
+	bool multiple_cursors = view_cursors_count(view) > 1;
 	Cursor *primary = view_cursors_primary_get(view);
 
 	if (vis->mode->visual)

diff --git a/view.c b/view.c
@@ -998,10 +998,6 @@ Cursor *view_cursors_column_next(Cursor *c, int column) {
 	return cursors_column_next(c->view, c, column);
 }
 
-bool view_cursors_multiple(View *view) {
-	return view->cursors && view->cursors->next;
-}
-
 static void view_cursors_free(Cursor *c) {
 	if (!c)
 		return;

diff --git a/view.h b/view.h
@@ -222,8 +222,6 @@ bool view_selection_anchored(Cursor*);
  * @defgroup view_props
  * @{
  */
-/** TODO remove */
-bool view_cursors_multiple(View*);
 /** Get position of selection cursor. */
 size_t view_cursors_pos(Cursor*);
 /** Get 1-based line number of selection cursor. */

diff --git a/vis-prompt.c b/vis-prompt.c
@@ -117,7 +117,7 @@ static const char *prompt_enter(Vis *vis, const char *keys, const Arg *arg) {
 
 static const char *prompt_esc(Vis *vis, const char *keys, const Arg *arg) {
 	Win *prompt = vis->win;
-	if (view_cursors_multiple(prompt->view)) {
+	if (view_cursors_count(prompt->view) > 1) {
 		view_cursors_clear(prompt->view);
 	} else {
 		prompt_restore(prompt);

diff --git a/vis.c b/vis.c
@@ -311,7 +311,7 @@ static void window_draw_cursorline(Win *win) {
 		return;
 	if (vis->mode->visual || vis->win != win)
 		return;
-	if (view_cursors_multiple(view))
+	if (view_cursors_count(view) > 1)
 		return;
 
 	int width = view_width_get(view);
@@ -398,7 +398,7 @@ static void window_draw_cursor(Win *win, Cursor *cur, CellStyle *style, CellStyl
 static void window_draw_cursors(Win *win) {
 	View *view = win->view;
 	Filerange viewport = view_viewport_get(view);
-	bool multiple_cursors = view_cursors_multiple(view);
+	bool multiple_cursors = view_cursors_count(view) > 1;
 	Cursor *cursor = view_cursors_primary_get(view);
 	CellStyle style_cursor = win->ui->style_get(win->ui, UI_STYLE_CURSOR);
 	CellStyle style_cursor_primary = win->ui->style_get(win->ui, UI_STYLE_CURSOR_PRIMARY);
@@ -830,7 +830,7 @@ void vis_do(Vis *vis) {
 	if (a->op == &vis_operators[VIS_OP_MODESWITCH])
 		count = 1; /* count should apply to inserted text not motion */
 	bool repeatable = a->op && !vis->macro_operator && !vis->win->parent;
-	bool multiple_cursors = view_cursors_multiple(view);
+	bool multiple_cursors = view_cursors_count(view) > 1;
 	bool linewise = !(a->type & CHARWISE) && (
 		a->type & LINEWISE || (a->movement && a->movement->type & LINEWISE) ||
 		vis->mode == &vis_modes[VIS_MODE_VISUAL_LINE]);