TildeClub/ex-vi
1
0
Fork 0
mirror of https://github.com/tildeclub/ex-vi.git synced 2026-01-24 02:10:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

* The handling of multicolumn characters was fixed for terminals without the

Browse Source 
IM (insert mode) capability. It is unlikely that such terminals actually
  exist, but vi will use the corresponding code for open mode if a termcap
  entry is not available.
This commit is contained in:
Gunnar Ritter
2005-01-11 15:05:25 +00:00
parent 4d481fff00
commit 68f1c288d4
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Changes
View File

@@ -11,6 +11,10 @@ Release ...
the end of the new text. the end of the new text.
* Visual 'U' followed by 'u' lead to garbage on the screen when multibyte * Visual 'U' followed by 'u' lead to garbage on the screen when multibyte
characters were present on the changed line. characters were present on the changed line.
* The handling of multicolumn characters was fixed for terminals without the
IM (insert mode) capability. It is unlikely that such terminals actually
exist, but vi will use the corresponding code for open mode if a termcap
entry is not available.
* The '\u', '\l', '\U', and '\L' substitution sequences work with multibyte * The '\u', '\l', '\U', and '\L' substitution sequences work with multibyte
characters now. characters now.
* Handle character case conversions with the '~' vi command correctly if the * Handle character case conversions with the '~' vi command correctly if the

15
ex_vput.c
View File

@@ -73,7 +73,7 @@
#ifndef lint #ifndef lint
#ifdef DOSCCS #ifdef DOSCCS
static char sccsid[] = "@(#)ex_vput.c 1.39 (gritter) 1/11/05"; static char sccsid[] = "@(#)ex_vput.c 1.40 (gritter) 1/11/05";
#endif #endif
#endif #endif
@@ -587,6 +587,7 @@ vinschar(int c)
char *OIM; char *OIM;
bool OXN; bool OXN;
insmc1 = colsc(c) - 1;
if ((!IM || !EI) && ((hold & HOLDQIK) || !value(REDRAW) || value(SLOWOPEN))) { if ((!IM || !EI) && ((hold & HOLDQIK) || !value(REDRAW) || value(SLOWOPEN))) {
int (*OO)() = Outchar; int (*OO)() = Outchar;
/* /*
@@ -606,6 +607,8 @@ vinschar(int c)
Outchar = NULL; Outchar = NULL;
vputchar(c); vputchar(c);
Outchar = OO; Outchar = OO;
if (insmc1 == 0 && (vtube0[destcol]&(TRIM|MULTICOL))==MULTICOL)
vtube0[destcol] = INVBIT;
if (DEPTH(vcline) * WCOLS + !value(REDRAW) > if (DEPTH(vcline) * WCOLS + !value(REDRAW) >
(destline - LINE(vcline)) * WCOLS + destcol) (destline - LINE(vcline)) * WCOLS + destcol)
return c; return c;
@@ -630,7 +633,6 @@ vinschar(int c)
} }
return c; return c;
} }
insmc1 = colsc(c) - 1;
/* /*
* Compute the number of positions in the line image of the * Compute the number of positions in the line image of the
* current line. This is done from the physical image * current line. This is done from the physical image
@@ -1080,12 +1082,13 @@ viin(int c)
* *
* You asked for it, you get it. * You asked for it, you get it.
*/ */
tp = vtube0 + inscol + doomed; tp = vtube0 + inscol + insmc0 + doomed;
for (i = inscol + doomed; i < tabstart; i++) for (i = inscol + insmc0 + doomed; i < tabstart; i++)
vputchar(*tp++); vputchar(*tp++);
hold = oldhold; hold = oldhold;
vigotoCL(tabstart + inssiz - doomed); vigotoCL(tabstart + inssiz + insmc0 - doomed);
for (i = tabsize - (inssiz - doomed) + shft; i > 0; i--) for (i = tabsize - (inssiz - insmc0 - doomed) + shft;
i > 0; i--)
vputchar(' ' | QUOTE); vputchar(' ' | QUOTE);
} else { } else {
if (!IN) { if (!IN) {