e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Mon Jan 31 10:50:09 PST 2000 

(Raster)


text compression works wiht multi-byte stuff now thanks to masahiko :)


SVN revision: 1999
This commit is contained in:
Carsten Haitzler 2000-01-31 18:50:27 +00:00
parent f44ec37f4b
commit ba0bfcb3ea
2 changed files with 58 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ChangeLog
View File

@ -4191,3 +4191,11 @@ Fri Jan 28 14:24:27 PST 2000
(KainX)
Fixed issues on platforms with unsigned chars.
-------------------------------------------------------------------------------
Mon Jan 31 10:50:09 PST 2000
(Raster)
text compression works wiht multi-byte stuff now thanks to masahiko :)

54
src/text.c
View File

@ -460,29 +460,75 @@ TextDraw(TextClass * tclass, Window win, int active, int sticky, int state,
char *new_line;
int nuke_count = 0;
int len;
wchar_t *wc_line;
int wc_len;
len = strlen(lines[i]);
new_line = Emalloc(len + 10);
wc_len = mbstowcs(NULL, lines[i], 0);
if (wc_len > 0)
{
wc_line = (wchar_t *) Emalloc((wc_len + 1) * sizeof(wchar_t));
mbstowcs(wc_line, lines[i], len);
wc_line[wc_len] = (wchar_t) '\0';
}
while (ret2.width > textwidth_limit)
{
nuke_count++;
if (nuke_count > len)
{
int mlen;
new_line[0] = 0;
strncat(new_line, lines[i], 1);
if (MB_CUR_MAX > 1 && wc_len > 0) /* if multibyte locale,... */
{
mlen = mblen(lines[i], MB_CUR_MAX);
if (mlen < 0)
mlen = 1;
}
else
mlen = 1;
strncat(new_line, lines[i], mlen);
strcat(new_line, "...");
break;
}
new_line[0] = 0;
strncat(new_line, lines[i], (len - nuke_count) / 2);
strcat(new_line, "...");
strcat(new_line,
if (MB_CUR_MAX > 1 && wc_len > 0)
{
int j, k, len_mb;
for (j = k = 0; k < (wc_len - nuke_count) / 2; k++)
{
len_mb = wctomb(new_line + j, wc_line[k]);
if (len_mb > 0)
j += len_mb;
}
new_line[j] = '\0';
strcat(new_line, "...");
j += 3;
len_mb = wcstombs(new_line + j,
wc_line + (wc_len - nuke_count) / 2 + nuke_count,
len + 10 - j);
if (len_mb > 0)
j += len_mb;
new_line[j] = '\0';
}
else
{
strncat(new_line, lines[i], (len - nuke_count) / 2);
strcat(new_line, "...");
strcat(new_line,
lines[i] + ((len - nuke_count) / 2) + nuke_count);
}
XmbTextExtents(ts->xfontset, new_line, strlen(new_line),
&ret1, &ret2);
}
Efree(lines[i]);
lines[i] = new_line;
if (wc_len > 0)
Efree(wc_line);
}
if (i == 0)
yy += ts->xfontset_ascent;