cirno/plan9port
1
0
Fork 0
mirror of https://github.com/9fans/plan9port.git synced 2025-01-12 11:10:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

better \r handling

Browse source
This commit is contained in:
rsc 2004-04-20 06:49:32 +00:00
parent 7703861002
commit 0e25d6094f
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/cmd/9term/9term.c
View file

@ -88,7 +88,7 @@ void doreshape(void);
void runewrite(Rune*, int); void runewrite(Rune*, int);
void consread(void); void consread(void);
void conswrite(char*, int); void conswrite(char*, int);
int bswidth(Rune c); int bswidth(Rune c, uint start, int eatnl);
void cut(void); void cut(void);
void paste(Rune*, int, int); void paste(Rune*, int, int);
void snarfupdate(void); void snarfupdate(void);
@ -888,7 +888,7 @@ key(Rune r)
case 0x15: /* ^U: erase line */ case 0x15: /* ^U: erase line */
case 0x17: /* ^W: erase word */ case 0x17: /* ^W: erase word */
if (t.q0 != 0 && t.q0 != t.qh) if (t.q0 != 0 && t.q0 != t.qh)
t.q0 -= bswidth(r); t.q0 -= bswidth(r, t.q0, 1);
cut(); cut();
break; break;
default: default:
@ -900,7 +900,7 @@ key(Rune r)
} }
int int
bswidth(Rune c) bswidth(Rune c, uint start, int eatnl)
{ {
uint q, eq, stop; uint q, eq, stop;
Rune r; Rune r;
@ -909,7 +909,7 @@ bswidth(Rune c)
/* there is known to be at least one character to erase */ /* there is known to be at least one character to erase */
if(c == 0x08) /* ^H: erase character */ if(c == 0x08) /* ^H: erase character */
return 1; return 1;
q = t.q0; q = start;
stop = 0; stop = 0;
if(q > t.qh) if(q > t.qh)
stop = t.qh; stop = t.qh;
@ -917,7 +917,7 @@ bswidth(Rune c)
while(q > stop){ while(q > stop){
r = t.r[q-1]; r = t.r[q-1];
if(r == '\n'){ /* eat at most one more character */ if(r == '\n'){ /* eat at most one more character */
if(q == t.q0) /* eat the newline */ if(q == start && eatnl) /* eat the newline */
--q; --q;
break; break;
} }
@ -930,7 +930,7 @@ bswidth(Rune c)
} }
--q; --q;
} }
return t.q0-q; return start-q;
} }
int int
@ -1069,6 +1069,15 @@ runewrite(Rune *r, int n)
initial++; initial++;
else else
--q; --q;
} else if(*p == '\r') { /* treat like ^U */
/* convert CR without NL into erased line */
/* i feel really sleazy about this but it helps */
if(i<n-1 && *(p+1) != '\n'){
while(q > r && *(q-1) != '\n')
q--;
if(q==r)
initial = bswidth(0x15, t.qh, 0);
}
} else if(*p) } else if(*p)
*q++ = *p; *q++ = *p;
p++; p++;