rfivet/uemacs
1
0
Fork 0
mirror of https://github.com/rfivet/uemacs.git synced 2024-06-26 11:45:28 +00:00
Code Releases Activity

backward char movement consistent with mixed byte/UTF-8 content.

Browse Source
This commit is contained in:
Renaud 2015-02-08 19:11:26 +08:00
parent 356a003194
commit 135238106c
1 changed files with 42 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
line.c
View File

@ -32,10 +32,6 @@ int tabmask = 0x07 ; /* tabulator mask */
static int ldelnewline( void) ; static int ldelnewline( void) ;
static inline int is_beginning_utf8( unsigned char c) {
return (c & 0xc0) != 0x80;
}
/* The editor holds deleted text chunks in the struct kill buffer. The /* The editor holds deleted text chunks in the struct kill buffer. The
* kill buffer is logically a stream of ascii characters, however * kill buffer is logically a stream of ascii characters, however
* due to its unpredicatable size, it gets implemented as a linked * due to its unpredicatable size, it gets implemented as a linked
@ -96,29 +92,51 @@ char *getkill( void) {
* location. Error if you try and move out of the buffer. Set the flag if the * location. Error if you try and move out of the buffer. Set the flag if the
* line pointer for dot changes. * line pointer for dot changes.
*/ */
int backchar(int f, int n) int backchar( int f, int n) {
{
struct line *lp;
if( n < 0) if( n < 0)
return forwchar( f, -n) ; return forwchar( f, -n) ;
while( n--) { while( n--) {
if( curwp->w_doto == 0) { if( curwp->w_doto == 0) {
if ((lp = lback(curwp->w_dotp)) == curbp->b_linep) struct line *lp ;
lp = lback( curwp->w_dotp) ;
if( lp == curbp->b_linep)
return FALSE ; return FALSE ;
curwp->w_dotp = lp ; curwp->w_dotp = lp ;
curwp->w_doto = llength( lp) ; curwp->w_doto = llength( lp) ;
curwp->w_flag |= WFMOVE ; curwp->w_flag |= WFMOVE ;
} else { } else {
do { unsigned pos ;
pos = curwp->w_doto -= 1 ;
if( pos > 0) {
unsigned char *p ;
p = (unsigned char *) &( (curwp->w_dotp)->l_text[ pos]) ;
if( (*p & 0xC0) == 0x80) {
unsigned char c ; unsigned char c ;
curwp->w_doto--; int delta = 0 ;
c = lgetc(curwp->w_dotp, curwp->w_doto);
if (is_beginning_utf8(c)) c = *--p ;
break; if( (c & 0xE0) == 0xC0) /* valid 2 bytes unicode seq */
} while (curwp->w_doto); delta = 1 ;
else if( ((c & 0xC0) == 0x80) && (pos > 1)) {
c = *--p ;
if( (c & 0xF0) == 0xE0) /* valid 3 bytes unicode seq */
delta = 2 ;
else if( ((c & 0xC0) == 0x80) && (pos > 2))
if( (p[ -1] & 0xF8) == 0xF0) /* valid 4 bytes unicode seq */
delta = 3 ;
}
curwp->w_doto -= delta ;
} }
} }
}
}
return TRUE ; return TRUE ;
} }