aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-11-04 08:17:17 -05:00
Code

Replaced utf8_len with cells.

Browse Source
This commit is contained in:
Pavol Babincak 2006-04-09 19:07:43 +02:00 committed by Pavol Babincak
parent 161ccf9eae
commit dd05c89d49
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/document/html/renderer.c
View File

@ -1264,7 +1264,7 @@ done_link_state_info(void)
#ifdef CONFIG_UTF_8 #ifdef CONFIG_UTF_8
static inline void static inline void
process_link(struct html_context *html_context, enum link_state link_state, process_link(struct html_context *html_context, enum link_state link_state,
unsigned char *chars, int charslen, int utf8_len) unsigned char *chars, int charslen, int cells)
#else #else
static inline void static inline void
process_link(struct html_context *html_context, enum link_state link_state, process_link(struct html_context *html_context, enum link_state link_state,
@ -1322,7 +1322,7 @@ process_link(struct html_context *html_context, enum link_state link_state,
charslen -= x_offset; charslen -= x_offset;
chars += x_offset; chars += x_offset;
#ifdef CONFIG_UTF_8 #ifdef CONFIG_UTF_8
utf8_len -= x_offset; cells -= x_offset;
#endif /* CONFIG_UTF_8 */ #endif /* CONFIG_UTF_8 */
} }
@ -1339,7 +1339,7 @@ process_link(struct html_context *html_context, enum link_state link_state,
/* Add new canvas positions to the link. */ /* Add new canvas positions to the link. */
#ifdef CONFIG_UTF_8 #ifdef CONFIG_UTF_8
if (realloc_points(link, link->npoints + utf8_len)) if (realloc_points(link, link->npoints + cells))
#else #else
if (realloc_points(link, link->npoints + charslen)) if (realloc_points(link, link->npoints + charslen))
#endif /* CONFIG_UTF_8 */ #endif /* CONFIG_UTF_8 */
@ -1349,9 +1349,9 @@ process_link(struct html_context *html_context, enum link_state link_state,
int y = Y(part->cy); int y = Y(part->cy);
#ifdef CONFIG_UTF_8 #ifdef CONFIG_UTF_8
link->npoints += utf8_len; link->npoints += cells;
for (; utf8_len > 0; utf8_len--, point++, x++) for (; cells > 0; cells--, point++, x++)
#else #else
for (; charslen > 0; charslen--, point++, x++) for (; charslen > 0; charslen--, point++, x++)
#endif /* CONFIG_UTF_8 */ #endif /* CONFIG_UTF_8 */
@ -1408,7 +1408,7 @@ put_chars(struct html_context *html_context, unsigned char *chars, int charslen)
int update_after_subscript = renderer_context.subscript; int update_after_subscript = renderer_context.subscript;
struct part *part; struct part *part;
#ifdef CONFIG_UTF_8 #ifdef CONFIG_UTF_8
int utf8_len; int cells;
#endif /* CONFIG_UTF_8 */ #endif /* CONFIG_UTF_8 */
assert(html_context); assert(html_context);
@ -1469,7 +1469,7 @@ put_chars(struct html_context *html_context, unsigned char *chars, int charslen)
put_link_number(html_context); put_link_number(html_context);
} }
#ifdef CONFIG_UTF_8 #ifdef CONFIG_UTF_8
utf8_len = cells =
#endif /* CONFIG_UTF_8 */ #endif /* CONFIG_UTF_8 */
set_hline(html_context, chars, charslen, link_state); set_hline(html_context, chars, charslen, link_state);
@ -1495,7 +1495,7 @@ put_chars(struct html_context *html_context, unsigned char *chars, int charslen)
#ifdef CONFIG_UTF_8 #ifdef CONFIG_UTF_8
process_link(html_context, link_state, chars, charslen, process_link(html_context, link_state, chars, charslen,
utf8_len); cells);
#else #else
process_link(html_context, link_state, chars, charslen); process_link(html_context, link_state, chars, charslen);
#endif /* CONFIG_UTF_8 */ #endif /* CONFIG_UTF_8 */
@ -1503,10 +1503,10 @@ put_chars(struct html_context *html_context, unsigned char *chars, int charslen)
#ifdef CONFIG_UTF_8 #ifdef CONFIG_UTF_8
if (renderer_context.nowrap if (renderer_context.nowrap
&& part->cx + utf8_len > overlap(par_format)) && part->cx + cells > overlap(par_format))
return; return;
part->cx += utf8_len; part->cx += cells;
#else #else
if (renderer_context.nowrap if (renderer_context.nowrap
&& part->cx + charslen > overlap(par_format)) && part->cx + charslen > overlap(par_format))
@ -1531,7 +1531,7 @@ put_chars(struct html_context *html_context, unsigned char *chars, int charslen)
assert(charslen > 0); assert(charslen > 0);
#ifdef CONFIG_UTF_8 #ifdef CONFIG_UTF_8
part->xa += utf8_len; part->xa += cells;
#else #else
part->xa += charslen; part->xa += charslen;
#endif /* CONFIG_UTF_8 */ #endif /* CONFIG_UTF_8 */