aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2025-05-18 00:48:57 -04:00
Code

Refactor is_cp_special to is_cp_utf8

Browse Source
This commit is contained in:
Witold Filipczyk 2006-07-18 17:51:03 +02:00 committed by Witold Filipczyk
parent 681cfc4ae5
commit 44c74ac389
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dialogs/options.c
View File

@ -60,7 +60,7 @@ charset_list(struct terminal *term, void *xxx, void *ses_)
if (!name) break; if (!name) break;
#ifndef CONFIG_UTF_8 #ifndef CONFIG_UTF_8
if (is_cp_special(i)) continue; if (is_cp_utf8(i)) continue;
#endif /* CONFIG_UTF_8 */ #endif /* CONFIG_UTF_8 */
add_to_menu(&mi, name, NULL, ACT_MAIN_NONE, add_to_menu(&mi, name, NULL, ACT_MAIN_NONE,

2
src/document/dom/renderer.c
View File

@ -1016,7 +1016,7 @@ render_dom_document(struct cache_entry *cached, struct document *document,
document->bgcolor = document->options.default_bg; document->bgcolor = document->options.default_bg;
#ifdef CONFIG_UTF_8 #ifdef CONFIG_UTF_8
document->options.utf8 = is_cp_special(document->options.cp); document->options.utf8 = is_cp_utf8(document->options.cp);
#endif /* CONFIG_UTF_8 */ #endif /* CONFIG_UTF_8 */
if (document->options.plain) if (document->options.plain)

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

@ -2182,7 +2182,7 @@ render_html_document(struct cache_entry *cached, struct document *document,
&document->cp_status, &document->cp_status,
document->options.hard_assume); document->options.hard_assume);
#ifdef CONFIG_UTF_8 #ifdef CONFIG_UTF_8
html_context->options->utf8 = is_cp_special(document->options.cp); html_context->options->utf8 = is_cp_utf8(document->options.cp);
#endif /* CONFIG_UTF_8 */ #endif /* CONFIG_UTF_8 */
if (title.length) { if (title.length) {

2
src/document/plain/renderer.c
View File

@ -648,7 +648,7 @@ render_plain_document(struct cache_entry *cached, struct document *document,
document->bgcolor = document->options.default_bg; document->bgcolor = document->options.default_bg;
document->width = 0; document->width = 0;
#ifdef CONFIG_UTF_8 #ifdef CONFIG_UTF_8
document->options.utf8 = is_cp_special(document->options.cp); document->options.utf8 = is_cp_utf8(document->options.cp);
#endif /* CONFIG_UTF_8 */ #endif /* CONFIG_UTF_8 */
/* Setup the style */ /* Setup the style */

2
src/intl/charsets.c
View File

@ -1142,7 +1142,7 @@ get_cp_mime_name(int cp_index)
} }
int int
is_cp_special(int cp_index) is_cp_utf8(int cp_index)
{ {
cp_index &= ~SYSTEM_CHARSET_FLAG; cp_index &= ~SYSTEM_CHARSET_FLAG;
return codepages[cp_index].table == table_utf_8; return codepages[cp_index].table == table_utf_8;

2
src/intl/charsets.h
View File

@ -51,7 +51,7 @@ unsigned char *convert_string(struct conv_table *convert_table,
int get_cp_index(unsigned char *); int get_cp_index(unsigned char *);
unsigned char *get_cp_name(int); unsigned char *get_cp_name(int);
unsigned char *get_cp_mime_name(int); unsigned char *get_cp_mime_name(int);
int is_cp_special(int); int is_cp_utf8(int);
void free_conv_table(void); void free_conv_table(void);
#ifdef CONFIG_UTF_8 #ifdef CONFIG_UTF_8
inline unsigned char *encode_utf_8(unicode_val_T); inline unsigned char *encode_utf_8(unicode_val_T);

4
src/viewer/dump/dump.c
View File

@ -324,7 +324,7 @@ add_document_to_string(struct string *string, struct document *document)
if_assert_failed return NULL; if_assert_failed return NULL;
#ifdef CONFIG_UTF_8 #ifdef CONFIG_UTF_8
if (is_cp_special(document->options.cp)) if (is_cp_utf8(document->options.cp))
goto utf_8; goto utf_8;
#endif /* CONFIG_UTF_8 */ #endif /* CONFIG_UTF_8 */
@ -427,7 +427,7 @@ dump_to_file(struct document *document, int fd)
if (!buf) return -1; if (!buf) return -1;
#ifdef CONFIG_UTF_8 #ifdef CONFIG_UTF_8
if (is_cp_special(document->options.cp)) if (is_cp_utf8(document->options.cp))
goto utf_8; goto utf_8;
#endif /* CONFIG_UTF_8 */ #endif /* CONFIG_UTF_8 */

6
src/viewer/text/search.c
View File

@ -580,7 +580,7 @@ is_in_range(struct document *document, int y, int height,
if_assert_failed return -1; if_assert_failed return -1;
#ifdef CONFIG_UTF_8 #ifdef CONFIG_UTF_8
utf8 = is_cp_special(document->options.cp); utf8 = is_cp_utf8(document->options.cp);
#endif #endif
*min = INT_MAX, *max = 0; *min = INT_MAX, *max = 0;
textlen = strlen_u(text, utf8); textlen = strlen_u(text, utf8);
@ -778,7 +778,7 @@ draw_searched(struct terminal *term, struct document_view *doc_view)
return; return;
#ifdef CONFIG_UTF_8 #ifdef CONFIG_UTF_8
utf8 = is_cp_special(doc_view->document->options.cp); utf8 = is_cp_utf8(doc_view->document->options.cp);
#endif #endif
get_searched(doc_view, &pt, &len, utf8); get_searched(doc_view, &pt, &len, utf8);
if (len) { if (len) {
@ -945,7 +945,7 @@ find_next_link_in_search(struct document_view *doc_view, int direction)
int len; int len;
int utf8 = 0; int utf8 = 0;
#ifdef CONFIG_UTF_8 #ifdef CONFIG_UTF_8
utf8 = is_cp_special(doc_view->document->options.cp); utf8 = is_cp_utf8(doc_view->document->options.cp);
#endif #endif
nt: nt: