RemoteEditor/vim7: src/normal.c comparison

comparison src/normal.c @ 48:67300faee616 v7-3-618

v7-3-618

author	Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date	Wed, 01 Aug 2012 18:08:28 +0900
parents	c16898406ff2
children

comparison

equal deleted inserted replaced

-:6c0584ec21b1
+:67300faee616
 /*
 * The Visual area is remembered for reselection.
 */
 static int	resel_VIsual_mode = NUL;	/* 'v', 'V', or Ctrl-V */
 static linenr_T	resel_VIsual_line_count;	/* number of lines */
-static colnr_T	resel_VIsual_col;		/* nr of cols or end col */
+static colnr_T	resel_VIsual_vcol;		/* nr of cols or end col */
 static int	restart_VIsual_select = 0;
 #endif
+#ifdef FEAT_EVAL
+static void	set_vcount_ca __ARGS((cmdarg_T *cap, int *set_prevcount));
+#endif
 static int
-# ifdef __BORLANDC__
+#ifdef __BORLANDC__
 _RTLENTRYF
-# endif
+#endif
 		nv_compare __ARGS((const void *s1, const void *s2));
 static int	find_command __ARGS((int cmdchar));
 static void	op_colon __ARGS((oparg_T *oap));
 static void	op_function __ARGS((oparg_T *oap));
 #if defined(FEAT_MOUSE) && defined(FEAT_VISUAL)
 State = NORMAL_BUSY;
 #ifdef USE_ON_FLY_SCROLL
 dont_scroll = FALSE;	/* allow scrolling here */
 #endif
+#ifdef FEAT_EVAL
+/* Set v:count here, when called from main() and not a stuffed
+* command, so that v:count can be used in an expression mapping
+* when there is no count. */
+if (toplevel && stuff_empty())
+	set_vcount_ca(&ca, &set_prevcount);
+#endif
 /*
 * Get the command character from the user.
 */
 c = safe_vgetc();
 LANGMAP_ADJUST(c, TRUE);
 #ifdef FEAT_EVAL
 	    /* Set v:count here, when called from main() and not a stuffed
 	     * command, so that v:count can be used in an expression mapping
 	     * right after the count. */
 	    if (toplevel && stuff_empty())
-	    {
+		set_vcount_ca(&ca, &set_prevcount);
-		long count = ca.count0;
-		/* multiply with ca.opcount the same way as below */
-		if (ca.opcount != 0)
-		    count = ca.opcount * (count == 0 ? 1 : count);
-		set_vcount(count, count == 0 ? 1 : count, set_prevcount);
-		set_prevcount = FALSE;  /* only set v:prevcount once */
-	    }
 #endif
 	    if (ctrl_w)
 	    {
 		++no_mapping;
 		++allow_keys;		/* no mapping for nchar, but keys */
 	    && !oap->op_type
 	    && (idx < 0 || !(nv_cmds[idx].cmd_flags & NV_KEEPREG)))
 {
 	clearop(oap);
 #ifdef FEAT_EVAL
-	set_reg_var('"');
+	{
+	    int regname = 0;
+	    /* Adjust the register according to 'clipboard', so that when
+	     * "unnamed" is present it becomes '*' or '+' instead of '"'. */
+# ifdef FEAT_CLIPBOARD
+	    adjust_clip_reg(&regname);
+# endif
+	    set_reg_var(regname);
+	}
 #endif
 }
 #ifdef FEAT_VISUAL
 /* Get the length of mapped chars again after typing a count, second
 /* Save count before an operator for next time. */
 opcount = ca.opcount;
 }
+#ifdef FEAT_EVAL
+/*
+* Set v:count and v:count1 according to "cap".
+* Set v:prevcount only when "set_prevcount" is TRUE.
+*/
+static void
+set_vcount_ca(cap, set_prevcount)
+cmdarg_T	*cap;
+int		*set_prevcount;
+{
+long count = cap->count0;
+/* multiply with cap->opcount the same way as above */
+if (cap->opcount != 0)
+	count = cap->opcount * (count == 0 ? 1 : count);
+set_vcount(count, count == 0 ? 1 : count, *set_prevcount);
+*set_prevcount = FALSE;  /* only set v:prevcount once */
+}
+#endif
 /*
 * Handle an operator after visual mode or when the movement is finished
 */
 void
 do_pending_operator(cap, old_col, gui_yank)
 #ifdef FEAT_VISUAL
 /* The visual area is remembered for redo */
 static int	    redo_VIsual_mode = NUL; /* 'v', 'V', or Ctrl-V */
 static linenr_T redo_VIsual_line_count; /* number of lines */
-static colnr_T  redo_VIsual_col;	    /* number of cols or end column */
+static colnr_T  redo_VIsual_vcol;	    /* number of cols or end column */
 static long	    redo_VIsual_count;	    /* count for Visual operator */
 # ifdef FEAT_VIRTUALEDIT
 int		    include_line_break = FALSE;
 # endif
 #endif
 * on it and lose it forever.
 * Don't do it if a specific register was specified, so that ""x"*P works.
 * This could call do_pending_operator() recursively, but that's OK
 * because gui_yank will be TRUE for the nested call.
 */
-if (clip_star.available
+if ((clip_star.available || clip_plus.available)
 	    && oap->op_type != OP_NOP
 	    && !gui_yank
 # ifdef FEAT_VISUAL
 	    && VIsual_active
 	    && !redo_VIsual_busy
 	}
 #ifdef FEAT_VISUAL
 	if (redo_VIsual_busy)
 	{
+	    /* Redo of an operation on a Visual area. Use the same size from
+	     * redo_VIsual_line_count and redo_VIsual_vcol. */
 	    oap->start = curwin->w_cursor;
 	    curwin->w_cursor.lnum += redo_VIsual_line_count - 1;
 	    if (curwin->w_cursor.lnum > curbuf->b_ml.ml_line_count)
 		curwin->w_cursor.lnum = curbuf->b_ml.ml_line_count;
 	    VIsual_mode = redo_VIsual_mode;
-	    if (VIsual_mode == 'v')
+	    if (redo_VIsual_vcol == MAXCOL || VIsual_mode == 'v')
 	    {
-		if (redo_VIsual_line_count <= 1)
+		if (VIsual_mode == 'v')
-		    curwin->w_cursor.col += redo_VIsual_col - 1;
+		{
+		    if (redo_VIsual_line_count <= 1)
+		    {
+			validate_virtcol();
+			curwin->w_curswant =
+				     curwin->w_virtcol + redo_VIsual_vcol - 1;
+		    }
+		    else
+			curwin->w_curswant = redo_VIsual_vcol;
+		}
 		else
-		    curwin->w_cursor.col = redo_VIsual_col;
+		{
-	    }
+		    curwin->w_curswant = MAXCOL;
-	    if (redo_VIsual_col == MAXCOL)
+		}
-	    {
+		coladvance(curwin->w_curswant);
-		curwin->w_curswant = MAXCOL;
-		coladvance((colnr_T)MAXCOL);
 	    }
 	    cap->count0 = redo_VIsual_count;
 	    if (redo_VIsual_count != 0)
 		cap->count1 = redo_VIsual_count;
 	    else
 			if (end > oap->end_vcol)
 			    oap->end_vcol = end;
 		    }
 		}
 		else if (redo_VIsual_busy)
-		    oap->end_vcol = oap->start_vcol + redo_VIsual_col - 1;
+		    oap->end_vcol = oap->start_vcol + redo_VIsual_vcol - 1;
 		/*
 		 * Correct oap->end.col and oap->start.col to be the
 		 * upper-left and lower-right corner of the block area.
 		 *
 		 * (Actually, this does convert column positions into character
 		 * Prepare to reselect and redo Visual: this is based on the
 		 * size of the Visual text
 		 */
 		resel_VIsual_mode = VIsual_mode;
 		if (curwin->w_curswant == MAXCOL)
-		    resel_VIsual_col = MAXCOL;
+		    resel_VIsual_vcol = MAXCOL;
-		else if (VIsual_mode == Ctrl_V)
-		    resel_VIsual_col = oap->end_vcol - oap->start_vcol + 1;
-		else if (oap->line_count > 1)
-		    resel_VIsual_col = oap->end.col;
 		else
-		    resel_VIsual_col = oap->end.col - oap->start.col + 1;
+		{
+		    if (VIsual_mode != Ctrl_V)
+			getvvcol(curwin, &(oap->end),
+						  NULL, NULL, &oap->end_vcol);
+		    if (VIsual_mode == Ctrl_V || oap->line_count <= 1)
+		    {
+			if (VIsual_mode != Ctrl_V)
+			    getvvcol(curwin, &(oap->start),
+						&oap->start_vcol, NULL, NULL);
+			resel_VIsual_vcol = oap->end_vcol - oap->start_vcol + 1;
+		    }
+		    else
+			resel_VIsual_vcol = oap->end_vcol;
+		}
 		resel_VIsual_line_count = oap->line_count;
 	    }
 	    /* can't redo yank (unless 'y' is in 'cpoptions') and ":" */
 	    if ((vim_strchr(p_cpo, CPO_YANK) != NULL || oap->op_type != OP_YANK)
 		    && oap->motion_force == NUL
 		    )
 	    {
 		/* Prepare for redoing.  Only use the nchar field for "r",
 		 * otherwise it might be the second char of the operator. */
-		prep_redo(oap->regname, 0L, NUL, 'v',
+		if (cap->cmdchar == 'g' && (cap->nchar == 'n'
-				get_op_char(oap->op_type),
+							|| cap->nchar == 'N'))
-				get_extra_op_char(oap->op_type),
+		    /* "gn" and "gN" are a bit different */
-				oap->op_type == OP_REPLACE ? cap->nchar : NUL);
+		    prep_redo(oap->regname, 0L, NUL, cap->cmdchar, cap->nchar,
+					get_op_char(oap->op_type),
+					get_extra_op_char(oap->op_type));
+		else
+		    prep_redo(oap->regname, 0L, NUL, 'v',
+					get_op_char(oap->op_type),
+					get_extra_op_char(oap->op_type),
+					oap->op_type == OP_REPLACE
+							  ? cap->nchar : NUL);
 		if (!redo_VIsual_busy)
 		{
 		    redo_VIsual_mode = resel_VIsual_mode;
-		    redo_VIsual_col = resel_VIsual_col;
+		    redo_VIsual_vcol = resel_VIsual_vcol;
 		    redo_VIsual_line_count = resel_VIsual_line_count;
 		    redo_VIsual_count = cap->count0;
 		}
 	    }
 # endif
 			)
 		{
 		    oap->inclusive = FALSE;
 		    /* Try to include the newline, unless it's an operator
-		     * that works on lines only */
+		     * that works on lines only. */
-		    if (*p_sel != 'o'
+		    if (*p_sel != 'o' && !op_on_lines(oap->op_type))
-			    && !op_on_lines(oap->op_type)
-			    && oap->end.lnum < curbuf->b_ml.ml_line_count)
 		    {
-			++oap->end.lnum;
+			if (oap->end.lnum < curbuf->b_ml.ml_line_count)
-			oap->end.col = 0;
+			{
+			    ++oap->end.lnum;
+			    oap->end.col = 0;
 # ifdef FEAT_VIRTUALEDIT
-			oap->end.coladd = 0;
+			    oap->end.coladd = 0;
 # endif
-			++oap->line_count;
+			    ++oap->line_count;
+			}
+			else
+			{
+			    /* Cannot move below the last line, make the op
+			     * inclusive to tell the operation to include the
+			     * line break. */
+			    oap->inclusive = TRUE;
+			}
 		    }
 		}
 	    }
 	    redo_VIsual_busy = FALSE;
 	    if (curwin->w_cursor.lnum + oap->line_count - 1 >
 						   curbuf->b_ml.ml_line_count)
 		beep_flush();
 	    else
 	    {
-		(void)do_join(oap->line_count, oap->op_type == OP_JOIN, TRUE);
+		(void)do_join(oap->line_count, oap->op_type == OP_JOIN, TRUE, TRUE);
 		auto_format(FALSE, TRUE);
 	    }
 	    break;
 	case OP_DELETE:
 #ifdef FEAT_VISUAL
 	    VIsual_reselect = FALSE;	    /* don't reselect now */
 #endif
 	    if (empty_region_error)
+	    {
 		vim_beep();
+		CancelRedo();
+	    }
 	    else
 	    {
 		(void)op_delete(oap);
 		if (oap->motion_type == MLINE && has_format_option(FO_AUTO))
 		    u_save_cursor();	    /* cursor line wasn't saved yet */
 	case OP_YANK:
 	    if (empty_region_error)
 	    {
 		if (!gui_yank)
+		{
 		    vim_beep();
+		    CancelRedo();
+		}
 	    }
 	    else
 		(void)op_yank(oap, FALSE, !gui_yank);
 	    check_cursor_col();
 	    break;
 	case OP_CHANGE:
 #ifdef FEAT_VISUAL
 	    VIsual_reselect = FALSE;	    /* don't reselect now */
 #endif
 	    if (empty_region_error)
+	    {
 		vim_beep();
+		CancelRedo();
+	    }
 	    else
 	    {
 		/* This is a new edit command, not a restart.  Need to
 		 * remember it to make 'insertmode' work with mappings for
 		 * Visual mode.  But do this only once and not when typed and
 	case OP_TILDE:
 	case OP_UPPER:
 	case OP_LOWER:
 	case OP_ROT13:
 	    if (empty_region_error)
+	    {
 		vim_beep();
+		CancelRedo();
+	    }
 	    else
 		op_tilde(oap);
 	    check_cursor_col();
 	    break;
 #ifdef FEAT_VISUAL
 	    VIsual_reselect = FALSE;	/* don't reselect now */
 #endif
 #ifdef FEAT_VISUALEXTRA
 	    if (empty_region_error)
+	    {
 		vim_beep();
+		CancelRedo();
+	    }
 	    else
 	    {
 		/* This is a new edit command, not a restart.  Need to
 		 * remember it to make 'insertmode' work with mappings for
 		 * Visual mode.  But do this only once. */
 	    VIsual_reselect = FALSE;	/* don't reselect now */
 #endif
 #ifdef FEAT_VISUALEXTRA
 	    if (empty_region_error)
 #endif
+	    {
 		vim_beep();
+		CancelRedo();
+	    }
 #ifdef FEAT_VISUALEXTRA
 	    else
 		op_replace(oap, cap->nchar);
 #endif
 	    break;
 op_function(oap)
 oparg_T	*oap UNUSED;
 {
 #ifdef FEAT_EVAL
 char_u	*(argv[1]);
+int		save_virtual_op = virtual_op;
 if (*p_opfunc == NUL)
 	EMSG(_("E774: 'operatorfunc' is empty"));
 else
 {
 	    argv[0] = (char_u *)"block";
 	else if (oap->motion_type == MLINE)
 	    argv[0] = (char_u *)"line";
 	else
 	    argv[0] = (char_u *)"char";
+	/* Reset virtual_op so that 'virtualedit' can be changed in the
+	 * function. */
+	virtual_op = MAYBE;
 	(void)call_func_retnr(p_opfunc, 1, argv, FALSE);
+	virtual_op = save_virtual_op;
 }
 #else
 EMSG(_("E775: Eval feature not available"));
 #endif
 }
 		t = OK;
 	    }
 	    break;
 	}
 #ifdef FEAT_COMMENTS
-	if (get_leader_len(ml_get_curline(), NULL, FALSE) > 0)
+	if (get_leader_len(ml_get_curline(), NULL, FALSE, TRUE) > 0)
 	{
 	    /* Ignore this line, continue at start of next line. */
 	    ++curwin->w_cursor.lnum;
 	    curwin->w_cursor.col = 0;
 	    continue;
 		    retval = FAIL;
 		    break;
 		}
 		curwin->w_cursor.lnum++;
 		curwin->w_curswant %= width2;
+		linelen = linetabsize(ml_get_curline());
 	    }
 	}
 }
 #ifdef FEAT_VERTSPLIT
 }
 	     * multi-byte and the other way around.  Also handles adding
 	     * composing characters for utf-8. */
 	    for (n = cap->count1; n > 0; --n)
 	    {
 		State = REPLACE;
-		ins_char(cap->nchar);
+		if (cap->nchar == Ctrl_E || cap->nchar == Ctrl_Y)
+		{
+		    int c = ins_copychar(curwin->w_cursor.lnum
+					   + (cap->nchar == Ctrl_Y ? -1 : 1));
+		    if (c != NUL)
+			ins_char(c);
+		    else
+			/* will be decremented further down */
+			++curwin->w_cursor.col;
+		}
+		else
+		    ins_char(cap->nchar);
 		State = old_State;
 		if (cap->ncharC1 != 0)
 		    ins_char(cap->ncharC1);
 		if (cap->ncharC2 != 0)
 		    ins_char(cap->ncharC2);
 		 * Get ptr again, because u_save and/or showmatch() will have
 		 * released the line.  At the same time we let know that the
 		 * line will be changed.
 		 */
 		ptr = ml_get_buf(curbuf, curwin->w_cursor.lnum, TRUE);
-		ptr[curwin->w_cursor.col] = cap->nchar;
+		if (cap->nchar == Ctrl_E || cap->nchar == Ctrl_Y)
+		{
+		  int c = ins_copychar(curwin->w_cursor.lnum
+					   + (cap->nchar == Ctrl_Y ? -1 : 1));
+		  if (c != NUL)
+		    ptr[curwin->w_cursor.col] = c;
+		}
+		else
+		    ptr[curwin->w_cursor.col] = cap->nchar;
 		if (p_sm && msg_silent == 0)
 		    showmatch(cap->nchar);
 		++curwin->w_cursor.col;
 	    }
 #ifdef FEAT_NETBEANS_INTG
 	redraw_curbuf_later(INVERTED);	    /* update the inversion */
 }
 else		    /* start Visual mode */
 {
 	check_visual_highlight();
-	if (cap->count0)		    /* use previously selected part */
+	if (cap->count0 > 0 && resel_VIsual_mode != NUL)
 	{
-	    if (resel_VIsual_mode == NUL)   /* there is none */
+	    /* use previously selected part */
-	    {
-		beep_flush();
-		return;
-	    }
 	    VIsual = curwin->w_cursor;
 	    VIsual_active = TRUE;
 	    VIsual_reselect = TRUE;
 	    if (!cap->arg)
 	    }
 	    VIsual_mode = resel_VIsual_mode;
 	    if (VIsual_mode == 'v')
 	    {
 		if (resel_VIsual_line_count <= 1)
-		    curwin->w_cursor.col += resel_VIsual_col * cap->count0 - 1;
+		{
+		    validate_virtcol();
+		    curwin->w_curswant = curwin->w_virtcol
+					+ resel_VIsual_vcol * cap->count0 - 1;
+		}
 		else
-		    curwin->w_cursor.col = resel_VIsual_col;
+		    curwin->w_curswant = resel_VIsual_vcol;
-		check_cursor_col();
+		coladvance(curwin->w_curswant);
 	    }
-	    if (resel_VIsual_col == MAXCOL)
+	    if (resel_VIsual_vcol == MAXCOL)
 	    {
 		curwin->w_curswant = MAXCOL;
 		coladvance((colnr_T)MAXCOL);
 	    }
 	    else if (VIsual_mode == Ctrl_V)
 	    {
 		validate_virtcol();
 		curwin->w_curswant = curwin->w_virtcol
-					 + resel_VIsual_col * cap->count0 - 1;
+					+ resel_VIsual_vcol * cap->count0 - 1;
 		coladvance(curwin->w_curswant);
 	    }
 	    else
 		curwin->w_set_curswant = TRUE;
 	    redraw_curbuf_later(INVERTED);	/* show the inversion */
 	{
 	    if (!cap->arg)
 		/* start Select mode when 'selectmode' contains "cmd" */
 		may_start_select('c');
 	    n_start_visual_mode(cap->cmdchar);
+	    if (VIsual_mode != 'V' && *p_sel == 'e')
+		++cap->count1;  /* include one more char */
+	    if (cap->count0 > 0 && --cap->count1 > 0)
+	    {
+		/* With a count select that many characters or lines. */
+		if (VIsual_mode == 'v' || VIsual_mode == Ctrl_V)
+		    nv_right(cap);
+		else if (VIsual_mode == 'V')
+		    nv_down(cap);
+	    }
 	}
 }
 }
 /*
 	cap->arg = TRUE;
 	nv_visual(cap);
 	break;
 #endif /* FEAT_VISUAL */
+/* "gn", "gN" visually select next/previous search match
+* "gn" selects next match
+* "gN" selects previous match
+*/
+case 'N':
+case 'n':
+#ifdef FEAT_VISUAL
+	if (!current_search(cap->count1, cap->nchar == 'n'))
+#endif
+	    beep_flush();
+	break;
 /*
 * "gj" and "gk" two new funny movement keys -- up and down
 * movement based on *screen* line rather than *file* line.
 */
 case 'j':
 	break;
 #endif
 #ifdef FEAT_WINDOWS
 case 't':
-	goto_tabpage((int)cap->count0);
+	if (!checkclearop(oap))
+	    goto_tabpage((int)cap->count0);
 	break;
 case 'T':
-	goto_tabpage(-(int)cap->count1);
+	if (!checkclearop(oap))
+	    goto_tabpage(-(int)cap->count1);
 	break;
 #endif
 case '+':
 case '-': /* "g+" and "g-": undo or redo along the timeline */
 	curwin->w_curswant = (colnr_T)(cap->count0 - 1);
 }
 else
 	curwin->w_curswant = 0;
 /* keep curswant at the column where we wanted to go, not where
-we ended; differs if line is too short */
+* we ended; differs if line is too short */
 curwin->w_set_curswant = FALSE;
 }
 /*
 * Handle back-word command "b" and "B".
 #endif
 	if (pp->col > 0)
 	{
 	    --pp->col;
 #ifdef FEAT_MBYTE
-	    mb_adjustpos(pp);
+	    mb_adjustpos(curbuf, pp);
 #endif
 	}
 	else if (pp->lnum > 1)
 	{
 	    --pp->lnum;
 	    clearopbeep(cap->oap);  /* beyond last line */
 	else
 	{
 	    prep_redo(cap->oap->regname, cap->count0,
 			 NUL, cap->cmdchar, NUL, NUL, cap->nchar);
-	    (void)do_join(cap->count0, cap->nchar == NUL, TRUE);
+	    (void)do_join(cap->count0, cap->nchar == NUL, TRUE, TRUE);
 	}
 }
 }
 /*
 	    was_visual = TRUE;
 	    regname = cap->oap->regname;
 # ifdef FEAT_CLIPBOARD
 	    adjust_clip_reg(&regname);
 # endif
-	    if (regname == 0 || VIM_ISDIGIT(regname)
+	    if (regname == 0 || regname == '"' || VIM_ISDIGIT(regname)
 # ifdef FEAT_CLIPBOARD
 		    || (clip_unnamed && (regname == '*' || regname == '+'))
 # endif
 		    )

Mercurial > hg > RemoteEditor > vim7

comparison src/normal.c @ 48:67300faee616 v7-3-618