Added visual inside (vi<bracket>)

Author: Rob Pilling

README.md

@@ -1,3 +1,5 @@
 Micro Vi
 
 Similar commands to vi.
+
+See uvi.1

gui/base.c

@@ -764,6 +764,66 @@ static void colon(const char *initial)
 	free(in);
 }
 
+void visual_inside(int include)
+{
+	struct list *l;
+	char *s;
+	int i;
+	int start_y;
+	int bracket;
+
+	/* TODO: number */
+
+	bracket = gui_getch(GETCH_COOKED);
+	l = buffer_getindex(buffers_current(), gui_y());
+	s = l->data;
+
+	if(!isparen(bracket))
+		/* TODO: iw, ip (paragraph), etc - swap to a motion? */
+		return;
+
+	/* TODO: go forward if it's a close bracket, else go backward */
+
+	i = gui_x();
+	start_y = gui_y();
+	while(s[i] != bracket){
+		if(--i < 0){
+			l = l->prev;
+			start_y--;
+			if(!l)
+				return;
+			s = l->data;
+			i = strlen(s) - 1;
+		}
+	}
+
+	/* s[i] is the bracket, do a motion_percent on it and visual() */
+	{
+		/* TODO: distinguish between vi{ and va{ */
+		struct motion m;
+		struct bufferpos bp;
+		struct screeninfo si;
+		int x[2], y[2];
+
+		memset(&m, 0, sizeof m);
+		m.motion = MOTION_PAREN_MATCH;
+
+		si.top = gui_top();
+		si.height = gui_max_y();
+
+		x[0] = x[1] = i;
+		y[0] = y[1] = start_y;
+		bp.x = x + 1;
+		bp.y = y + 1;
+
+		if(motion_apply(&m, &bp, &si))
+			return;
+
+		/* highlight from {x,y][1] to {x,y}[0] */
+		visual_setpoints(x, y);
+	}
+}
+
 static int is_edit_char(int c)
 {
 	switch(c){
@@ -994,9 +1054,15 @@ void gui_run()
 				flag = 1;
 			case 'i':
 case_i:
-				insert(flag, 0, 0);
-				buffer_changed = 1;
-				SET_DOT();
+				if(visual_get() == VISUAL_NONE){
+					insert(flag, 0, 0);
+					buffer_changed = 1;
+					SET_DOT();
+				}else{
+					/* ibracket */
+					visual_inside(flag);
+					view_changed = 1;
+				}
 				break;
 			case 'I':
 				SET_MOTION(MOTION_LINE_START);

gui/visual.c

@@ -10,6 +10,15 @@ static enum  visual visual_state = VISUAL_NONE;
 static struct range visual_cursor;
 static struct range visual_anchor;
 
+void visual_setpoints(int x[2], int y[2])
+{
+	visual_cursor.start = y[0];
+	visual_cursor.end   = x[0];
+	visual_anchor.start = y[1];
+	visual_anchor.end   = x[1];
+	gui_move(visual_cursor.start, visual_cursor.end);
+}
+
 void visual_update(struct range *v)
 {
 	v->start = gui_y();

gui/visual.h

@@ -13,6 +13,8 @@ enum visual visual_get();
 void        visual_swap();
 void        visual_join();
 
+void        visual_setpoints(int x[2], int y[2]);
+
 const struct range *visual_get_start();
 const struct range *visual_get_end();
 const struct range *visual_get_col_start();

util/str.c

@@ -24,6 +24,20 @@ int isfnamechar(int c)
 	return !isspace(c) && !ispunct(c) && c != '"' && c != '\''; /* TODO: ignore trailing punctuation */
 }
 
+int isparen(int c)
+{
+	switch(c){
+		case '{':
+		case '(':
+		case '[':
+		case '}':
+		case ')':
+		case ']':
+			return 1;
+	}
+	return 0;
+}
+
 char *chars_at(const char *line, int x, int (*cmp)(int))
 {
 	const char *wordstart, *wordend;

util/str.h

@@ -10,6 +10,8 @@ char **words_begin(struct list *, const char *);
 
 int line_isspace(const char *s);
 
+int isparen(int);
+
 void  str_escape(char *arg);
 char *chr_expand(char *arg, char c, const char *rep);
 char *str_expand(char *str, const char *grow_from, const char *grow_to);