aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

updated for version 7.1-093

Browse Source
This commit is contained in:
Bram Moolenaar
2007-08-30 11:53:22 +00:00
parent ec8317364b
commit 367329ba08
6 changed files with 68 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/globals.h
View File

@@ -801,7 +801,7 @@ EXTERN int (*mb_char2len) __ARGS((int c)) INIT(= latin_char2len);
EXTERN int (*mb_char2bytes) __ARGS((int c, char_u *buf)) INIT(= latin_char2bytes); EXTERN int (*mb_char2bytes) __ARGS((int c, char_u *buf)) INIT(= latin_char2bytes);
EXTERN int (*mb_ptr2cells) __ARGS((char_u *p)) INIT(= latin_ptr2cells); EXTERN int (*mb_ptr2cells) __ARGS((char_u *p)) INIT(= latin_ptr2cells);
EXTERN int (*mb_char2cells) __ARGS((int c)) INIT(= latin_char2cells); EXTERN int (*mb_char2cells) __ARGS((int c)) INIT(= latin_char2cells);
EXTERN int (*mb_off2cells) __ARGS((unsigned off)) INIT(= latin_off2cells); EXTERN int (*mb_off2cells) __ARGS((unsigned off, unsigned max_off)) INIT(= latin_off2cells);
EXTERN int (*mb_ptr2char) __ARGS((char_u *p)) INIT(= latin_ptr2char); EXTERN int (*mb_ptr2char) __ARGS((char_u *p)) INIT(= latin_ptr2char);
EXTERN int (*mb_head_off) __ARGS((char_u *base, char_u *p)) INIT(= latin_head_off); EXTERN int (*mb_head_off) __ARGS((char_u *base, char_u *p)) INIT(= latin_head_off);

3
src/gui.c
View File

@@ -1080,7 +1080,8 @@ gui_update_cursor(force, clear_selection)
cur_width = gui.char_width; cur_width = gui.char_width;
} }
#ifdef FEAT_MBYTE #ifdef FEAT_MBYTE
if (has_mbyte && (*mb_off2cells)(LineOffset[gui.row] + gui.col) > 1) if (has_mbyte && (*mb_off2cells)(LineOffset[gui.row] + gui.col,
LineOffset[gui.row] + screen_Columns) > 1)
{ {
/* Double wide character. */ /* Double wide character. */
if (shape_table[idx].shape != SHAPE_VER) if (shape_table[idx].shape != SHAPE_VER)

25
src/mbyte.c
View File

@@ -1310,20 +1310,26 @@ dbcs_char2cells(c)
/* /*
* mb_off2cells() function pointer. * mb_off2cells() function pointer.
* Return number of display cells for char at ScreenLines[off]. * Return number of display cells for char at ScreenLines[off].
* Caller must make sure "off" and "off + 1" are valid! * We make sure that the offset used is less than "max_off".
*/ */
/*ARGSUSED*/ /*ARGSUSED*/
int int
latin_off2cells(off) latin_off2cells(off, max_off)
unsigned off; unsigned off;
unsigned max_off;
{ {
return 1; return 1;
} }
int int
dbcs_off2cells(off) dbcs_off2cells(off, max_off)
unsigned off; unsigned off;
unsigned max_off;
{ {
/* never check beyond end of the line */
if (off >= max_off)
return 1;
/* Number of cells is equal to number of bytes, except for euc-jp when /* Number of cells is equal to number of bytes, except for euc-jp when
* the first byte is 0x8e. */ * the first byte is 0x8e. */
if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e)
@@ -1332,10 +1338,11 @@ dbcs_off2cells(off)
} }
int int
utf_off2cells(off) utf_off2cells(off, max_off)
unsigned off; unsigned off;
unsigned max_off;
{ {
return ScreenLines[off + 1] == 0 ? 2 : 1; return (off + 1 < max_off && ScreenLines[off + 1] == 0) ? 2 : 1;
} }
/* /*
@@ -2899,12 +2906,8 @@ mb_lefthalve(row, col)
if (composing_hangul) if (composing_hangul)
return TRUE; return TRUE;
#endif #endif
if (enc_dbcs != 0) return (*mb_off2cells)(LineOffset[row] + col,
return dbcs_off2cells(LineOffset[row] + col) > 1; LineOffset[row] + screen_Columns) > 1;
if (enc_utf8)
return (col + 1 < Columns
&& ScreenLines[LineOffset[row] + col + 1] == 0);
return FALSE;
} }
# if defined(FEAT_CLIPBOARD) || defined(FEAT_GUI) || defined(FEAT_RIGHTLEFT) \ # if defined(FEAT_CLIPBOARD) || defined(FEAT_GUI) || defined(FEAT_RIGHTLEFT) \

6
src/proto/mbyte.pro
View File

@@ -12,9 +12,9 @@ int latin_ptr2cells __ARGS((char_u *p));
int utf_ptr2cells __ARGS((char_u *p)); int utf_ptr2cells __ARGS((char_u *p));
int dbcs_ptr2cells __ARGS((char_u *p)); int dbcs_ptr2cells __ARGS((char_u *p));
int latin_char2cells __ARGS((int c)); int latin_char2cells __ARGS((int c));
int latin_off2cells __ARGS((unsigned off)); int latin_off2cells __ARGS((unsigned off, unsigned max_off));
int dbcs_off2cells __ARGS((unsigned off)); int dbcs_off2cells __ARGS((unsigned off, unsigned max_off));
int utf_off2cells __ARGS((unsigned off)); int utf_off2cells __ARGS((unsigned off, unsigned max_off));
int latin_ptr2char __ARGS((char_u *p)); int latin_ptr2char __ARGS((char_u *p));
int utf_ptr2char __ARGS((char_u *p)); int utf_ptr2char __ARGS((char_u *p));
int mb_ptr2char_adv __ARGS((char_u **pp)); int mb_ptr2char_adv __ARGS((char_u **pp));

67
src/screen.c
View File

@@ -1024,7 +1024,7 @@ win_update(wp)
type = VALID; type = VALID;
} }
/* Trick: we want to avoid clearning the screen twice. screenclear() will /* Trick: we want to avoid clearing the screen twice. screenclear() will
* set "screen_cleared" to TRUE. The special value MAYBE (which is still * set "screen_cleared" to TRUE. The special value MAYBE (which is still
* non-zero and thus not FALSE) will indicate that screenclear() was not * non-zero and thus not FALSE) will indicate that screenclear() was not
* called. */ * called. */
@@ -4632,7 +4632,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
/* /*
* At end of screen line and there is more to come: Display the line * At end of screen line and there is more to come: Display the line
* so far. If there is no more to display it is catched above. * so far. If there is no more to display it is caught above.
*/ */
if (( if ((
#ifdef FEAT_RIGHTLEFT #ifdef FEAT_RIGHTLEFT
@@ -4709,9 +4709,13 @@ win_line(wp, lnum, startrow, endrow, nochange)
#endif #endif
#ifdef FEAT_MBYTE #ifdef FEAT_MBYTE
&& !(has_mbyte && !(has_mbyte
&& ((*mb_off2cells)(LineOffset[screen_row]) == 2 && ((*mb_off2cells)(LineOffset[screen_row],
LineOffset[screen_row] + screen_Columns)
== 2
|| (*mb_off2cells)(LineOffset[screen_row - 1] || (*mb_off2cells)(LineOffset[screen_row - 1]
+ (int)Columns - 2) == 2)) + (int)Columns - 2,
LineOffset[screen_row] + screen_Columns)
== 2))
#endif #endif
) )
{ {
@@ -4871,6 +4875,10 @@ screen_line(row, coloff, endcol, clear_width
{ {
unsigned off_from; unsigned off_from;
unsigned off_to; unsigned off_to;
#ifdef FEAT_MBYTE
unsigned max_off_from;
unsigned max_off_to;
#endif
int col = 0; int col = 0;
#if defined(FEAT_GUI) || defined(UNIX) || defined(FEAT_VERTSPLIT) #if defined(FEAT_GUI) || defined(UNIX) || defined(FEAT_VERTSPLIT)
int hl; int hl;
@@ -4897,6 +4905,10 @@ screen_line(row, coloff, endcol, clear_width
off_from = (unsigned)(current_ScreenLine - ScreenLines); off_from = (unsigned)(current_ScreenLine - ScreenLines);
off_to = LineOffset[row] + coloff; off_to = LineOffset[row] + coloff;
#ifdef FEAT_MBYTE
max_off_from = off_from + screen_Columns;
max_off_to = LineOffset[row] + screen_Columns;
#endif
#ifdef FEAT_RIGHTLEFT #ifdef FEAT_RIGHTLEFT
if (rlflag) if (rlflag)
@@ -4931,7 +4943,7 @@ screen_line(row, coloff, endcol, clear_width
{ {
#ifdef FEAT_MBYTE #ifdef FEAT_MBYTE
if (has_mbyte && (col + 1 < endcol)) if (has_mbyte && (col + 1 < endcol))
char_cells = (*mb_off2cells)(off_from); char_cells = (*mb_off2cells)(off_from, max_off_from);
else else
char_cells = 1; char_cells = 1;
#endif #endif
@@ -5008,7 +5020,7 @@ screen_line(row, coloff, endcol, clear_width
* ScreenLinesUC[] is sufficient. */ * ScreenLinesUC[] is sufficient. */
if (char_cells == 1 if (char_cells == 1
&& col + 1 < endcol && col + 1 < endcol
&& (*mb_off2cells)(off_to) > 1) && (*mb_off2cells)(off_to, max_off_to) > 1)
{ {
/* Writing a single-cell character over a double-cell /* Writing a single-cell character over a double-cell
* character: need to redraw the next cell. */ * character: need to redraw the next cell. */
@@ -5017,8 +5029,8 @@ screen_line(row, coloff, endcol, clear_width
} }
else if (char_cells == 2 else if (char_cells == 2
&& col + 2 < endcol && col + 2 < endcol
&& (*mb_off2cells)(off_to) == 1 && (*mb_off2cells)(off_to, max_off_to) == 1
&& (*mb_off2cells)(off_to + 1) > 1) && (*mb_off2cells)(off_to + 1, max_off_to) > 1)
{ {
/* Writing the second half of a double-cell character over /* Writing the second half of a double-cell character over
* a double-cell character: need to redraw the second * a double-cell character: need to redraw the second
@@ -5037,10 +5049,10 @@ screen_line(row, coloff, endcol, clear_width
* char over the left halve of an existing one. */ * char over the left halve of an existing one. */
if (has_mbyte && col + char_cells == endcol if (has_mbyte && col + char_cells == endcol
&& ((char_cells == 1 && ((char_cells == 1
&& (*mb_off2cells)(off_to) > 1) && (*mb_off2cells)(off_to, max_off_to) > 1)
|| (char_cells == 2 || (char_cells == 2
&& (*mb_off2cells)(off_to) == 1 && (*mb_off2cells)(off_to, max_off_to) == 1
&& (*mb_off2cells)(off_to + 1) > 1))) && (*mb_off2cells)(off_to + 1, max_off_to) > 1)))
clear_next = TRUE; clear_next = TRUE;
#endif #endif
@@ -5180,10 +5192,11 @@ screen_line(row, coloff, endcol, clear_width
/* find previous character by counting from first /* find previous character by counting from first
* column and get its width. */ * column and get its width. */
unsigned off = LineOffset[row]; unsigned off = LineOffset[row];
unsigned max_off = LineOffset[row] + screen_Columns;
while (off < off_to) while (off < off_to)
{ {
prev_cells = (*mb_off2cells)(off); prev_cells = (*mb_off2cells)(off, max_off);
off += prev_cells; off += prev_cells;
} }
} }
@@ -5369,7 +5382,7 @@ static int status_match_len __ARGS((expand_T *xp, char_u *s));
static int skip_status_match_char __ARGS((expand_T *xp, char_u *s)); static int skip_status_match_char __ARGS((expand_T *xp, char_u *s));
/* /*
* Get the lenght of an item as it will be shown in the status line. * Get the length of an item as it will be shown in the status line.
*/ */
static int static int
status_match_len(xp, s) status_match_len(xp, s)
@@ -5435,7 +5448,7 @@ win_redr_status_matches(xp, num_matches, matches, match, showtail)
int row; int row;
char_u *buf; char_u *buf;
int len; int len;
int clen; /* lenght in screen cells */ int clen; /* length in screen cells */
int fillchar; int fillchar;
int attr; int attr;
int i; int i;
@@ -6187,6 +6200,7 @@ screen_puts_len(text, len, row, col, attr)
char_u *ptr = text; char_u *ptr = text;
int c; int c;
#ifdef FEAT_MBYTE #ifdef FEAT_MBYTE
unsigned max_off;
int mbyte_blen = 1; int mbyte_blen = 1;
int mbyte_cells = 1; int mbyte_cells = 1;
int u8c = 0; int u8c = 0;
@@ -6203,6 +6217,9 @@ screen_puts_len(text, len, row, col, attr)
return; return;
off = LineOffset[row] + col; off = LineOffset[row] + col;
#ifdef FEAT_MBYTE
max_off = LineOffset[row] + screen_Columns;
#endif
while (col < screen_Columns while (col < screen_Columns
&& (len < 0 || (int)(ptr - text) < len) && (len < 0 || (int)(ptr - text) < len)
&& *ptr != NUL) && *ptr != NUL)
@@ -6326,19 +6343,19 @@ screen_puts_len(text, len, row, col, attr)
else if (has_mbyte else if (has_mbyte
&& (len < 0 ? ptr[mbyte_blen] == NUL && (len < 0 ? ptr[mbyte_blen] == NUL
: ptr + mbyte_blen >= text + len) : ptr + mbyte_blen >= text + len)
&& ((mbyte_cells == 1 && (*mb_off2cells)(off) > 1) && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1)
|| (mbyte_cells == 2 || (mbyte_cells == 2
&& (*mb_off2cells)(off) == 1 && (*mb_off2cells)(off, max_off) == 1
&& (*mb_off2cells)(off + 1) > 1))) && (*mb_off2cells)(off + 1, max_off) > 1)))
clear_next_cell = TRUE; clear_next_cell = TRUE;
/* Make sure we never leave a second byte of a double-byte behind, /* Make sure we never leave a second byte of a double-byte behind,
* it confuses mb_off2cells(). */ * it confuses mb_off2cells(). */
if (enc_dbcs if (enc_dbcs
&& ((mbyte_cells == 1 && (*mb_off2cells)(off) > 1) && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1)
|| (mbyte_cells == 2 || (mbyte_cells == 2
&& (*mb_off2cells)(off) == 1 && (*mb_off2cells)(off, max_off) == 1
&& (*mb_off2cells)(off + 1) > 1))) && (*mb_off2cells)(off + 1, max_off) > 1)))
ScreenLines[off + mbyte_blen] = 0; ScreenLines[off + mbyte_blen] = 0;
#endif #endif
ScreenLines[off] = c; ScreenLines[off] = c;
@@ -6924,6 +6941,9 @@ screen_draw_rectangle(row, col, height, width, invert)
{ {
int r, c; int r, c;
int off; int off;
#ifdef FEAT_MBYTE
int max_off;
#endif
/* Can't use ScreenLines unless initialized */ /* Can't use ScreenLines unless initialized */
if (ScreenLines == NULL) if (ScreenLines == NULL)
@@ -6934,10 +6954,13 @@ screen_draw_rectangle(row, col, height, width, invert)
for (r = row; r < row + height; ++r) for (r = row; r < row + height; ++r)
{ {
off = LineOffset[r]; off = LineOffset[r];
#ifdef FEAT_MBYTE
max_off = off + screen_Columns;
#endif
for (c = col; c < col + width; ++c) for (c = col; c < col + width; ++c)
{ {
#ifdef FEAT_MBYTE #ifdef FEAT_MBYTE
if (enc_dbcs != 0 && dbcs_off2cells(off + c) > 1) if (enc_dbcs != 0 && dbcs_off2cells(off + c, max_off) > 1)
{ {
screen_char_2(off + c, r, c); screen_char_2(off + c, r, c);
++c; ++c;
@@ -6947,7 +6970,7 @@ screen_draw_rectangle(row, col, height, width, invert)
{ {
screen_char(off + c, r, c); screen_char(off + c, r, c);
#ifdef FEAT_MBYTE #ifdef FEAT_MBYTE
if (utf_off2cells(off + c) > 1) if (utf_off2cells(off + c, max_off) > 1)
++c; ++c;
#endif #endif
} }

2
src/version.c
View File

@@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
93,
/**/ /**/
92, 92,
/**/ /**/