bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

evas utf8 patch broke e17's about box. revert 

SVN revision: 26897
This commit is contained in:
Carsten Haitzler 2006-11-01 12:56:12 +00:00
parent 2b06fffc26
commit 2742499473
1 changed files with 74 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
legacy/evas/src/lib/engines/common/evas_font_main.c
View File

@ -120,34 +120,34 @@ evas_common_font_utf8_get_next(unsigned char *buf, int *iindex)
* the decoded code point at iindex offset, and advances iindex * the decoded code point at iindex offset, and advances iindex
* to the next code point after this. * to the next code point after this.
* *
* Returns 0 to indicate there is no next char * Returns 0 to indicate an error (e.g. invalid UTF8)
*/ */
int index = *iindex, len, r; int index = *iindex, r;
unsigned char d, d2, d3, d4; unsigned char d, d2, d3, d4;
d = buf[index++]; d = buf[index++];
if (!d) if (!d)
return 0; return 0;
if (d < 0x80)
while (buf[index] && ((buf[index] & 0xc0) == 0x80))
index++;
len = index - *iindex;
if (len == 1)
r = d;
else if (len == 2)
{ {
/* 2 bytes */ *iindex = index;
d2 = buf[*iindex + 1]; return d;
}
if ((d & 0xe0) == 0xc0)
{
/* 2 byte */
if (((d2 = buf[index++]) & 0xc0) != 0x80)
return 0;
r = d & 0x1f; /* copy lower 5 */ r = d & 0x1f; /* copy lower 5 */
r <<= 6; r <<= 6;
r |= (d2 & 0x3f); /* copy lower 6 */ r |= (d2 & 0x3f); /* copy lower 6 */
} }
else if (len == 3) else if ((d & 0xf0) == 0xe0)
{ {
/* 3 bytes */ /* 3 byte */
d2 = buf[*iindex + 1]; if (((d2 = buf[index++]) & 0xc0) != 0x80 ||
d3 = buf[*iindex + 2]; ((d3 = buf[index++]) & 0xc0) != 0x80)
return 0;
r = d & 0x0f; /* copy lower 4 */ r = d & 0x0f; /* copy lower 4 */
r <<= 6; r <<= 6;
r |= (d2 & 0x3f); r |= (d2 & 0x3f);
@ -156,10 +156,11 @@ evas_common_font_utf8_get_next(unsigned char *buf, int *iindex)
} }
else else
{ {
/* 4 bytes */ /* 4 byte */
d2 = buf[*iindex + 1]; if (((d2 = buf[index++]) & 0xc0) != 0x80 ||
d3 = buf[*iindex + 2]; ((d3 = buf[index++]) & 0xc0) != 0x80 ||
d4 = buf[*iindex + 3]; ((d4 = buf[index++]) & 0xc0) != 0x80)
return 0;
r = d & 0x0f; /* copy lower 4 */ r = d & 0x0f; /* copy lower 4 */
r <<= 6; r <<= 6;
r |= (d2 & 0x3f); r |= (d2 & 0x3f);
@ -168,7 +169,6 @@ evas_common_font_utf8_get_next(unsigned char *buf, int *iindex)
r <<= 6; r <<= 6;
r |= (d4 & 0x3f); r |= (d4 & 0x3f);
} }
*iindex = index; *iindex = index;
return r; return r;
} }
@ -177,37 +177,37 @@ EAPI int
evas_common_font_utf8_get_prev(unsigned char *buf, int *iindex) evas_common_font_utf8_get_prev(unsigned char *buf, int *iindex)
{ {
/* Reads UTF8 bytes from @buf, starting at *@index and returns /* Reads UTF8 bytes from @buf, starting at *@index and returns
* the decoded code point at iindex offset, and advances iindex * the decoded code point at iindex offset, and advances iidnex
* to the prev code point after this. * to the next code point after this.
* *
* Returns 0 to indicate there is no prev char * Returns 0 to indicate an error (e.g. invalid UTF8)
*/ */
int index = *iindex, len, r; int index = *iindex, r, istart = *iindex;
unsigned char d, d2, d3, d4; unsigned char d, d2, d3, d4;
if (iindex <= 0) d = buf[index++];
return 0; if (d < 0x80)
d = buf[index--];
while ((index >= 0) && ((buf[index] & 0xc0) == 0x80))
index--;
len = index - *iindex;
if (len == 1)
r = d;
else if (len == 2)
{ {
/* 2 bytes */ r = d;
d2 = buf[*iindex + 1]; }
else if ((d & 0xe0) == 0xc0)
{
/* 2 byte */
d2 = buf[index++];
if ((d2 & 0xc0) != 0x80)
return 0;
r = d & 0x1f; /* copy lower 5 */ r = d & 0x1f; /* copy lower 5 */
r <<= 6; r <<= 6;
r |= (d2 & 0x3f); /* copy lower 6 */ r |= (d2 & 0x3f); /* copy lower 6 */
} }
else if (len == 3) else if ((d & 0xf0) == 0xe0)
{ {
/* 3 bytes */ /* 3 byte */
d2 = buf[*iindex + 1]; d2 = buf[index++];
d3 = buf[*iindex + 2]; d3 = buf[index++];
if ((d2 & 0xc0) != 0x80 ||
(d3 & 0xc0) != 0x80)
return 0;
r = d & 0x0f; /* copy lower 4 */ r = d & 0x0f; /* copy lower 4 */
r <<= 6; r <<= 6;
r |= (d2 & 0x3f); r |= (d2 & 0x3f);
@ -216,10 +216,14 @@ evas_common_font_utf8_get_prev(unsigned char *buf, int *iindex)
} }
else else
{ {
/* 4 bytes */ /* 4 byte */
d2 = buf[*iindex + 1]; d2 = buf[index++];
d3 = buf[*iindex + 2]; d3 = buf[index++];
d4 = buf[*iindex + 3]; d4 = buf[index++];
if ((d2 & 0xc0) != 0x80 ||
(d3 & 0xc0) != 0x80 ||
(d4 & 0xc0) != 0x80)
return 0;
r = d & 0x0f; /* copy lower 4 */ r = d & 0x0f; /* copy lower 4 */
r <<= 6; r <<= 6;
r |= (d2 & 0x3f); r |= (d2 & 0x3f);
@ -228,8 +232,30 @@ evas_common_font_utf8_get_prev(unsigned char *buf, int *iindex)
r <<= 6; r <<= 6;
r |= (d4 & 0x3f); r |= (d4 & 0x3f);
} }
if (istart > 0)
*iindex = index; {
index = istart - 1;
d = buf[index];
if (!(d & 0x80))
*iindex = index;
else
{
while (index > 0)
{
index--;
d = buf[index];
if ((d & 0xc0) != 0x80)
{
*iindex = index;
return r;
}
}
}
}
else
{
*iindex = -1;
}
return r; return r;
} }