From: konn Date: Sun, 6 Jul 2008 19:19:59 +0000 (+0000) Subject: * Added -wap-input-format property to textarea for CHTML4.0 converter. X-Git-Tag: v0.13.0~4^2~1525 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ea5bd03cdb471e7cbeda74acaabc3f121c08be9a;p=modchxj%2Fmod_chxj.git * Added -wap-input-format property to textarea for CHTML4.0 converter. * Added test code of the textarea with CSS for CHTML4.0 converter. git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/sandbox@2815 1a406e8e-add9-4483-a2c8-d8cac5b7c224 --- diff --git a/src/chxj_chtml40.c b/src/chxj_chtml40.c index 3039a165..5fec9595 100644 --- a/src/chxj_chtml40.c +++ b/src/chxj_chtml40.c @@ -119,6 +119,8 @@ static char *s_chtml40_link_tag (void *pdoc, Node *node); static void s_init_chtml40(chtml40_t *chtml, Doc *doc, request_rec *r, device_table *spec); static int s_chtml40_search_emoji(chtml40_t *chtml, char *txt, char **rslt); +static css_prop_list_t *s_chtml40_push_and_get_now_style(void *pdoc, Node *node); +static css_prop_list_t *s_chtml40_nopush_and_get_now_style(void *pdoc, Node *node); tag_handler chtml40_handler[] = { @@ -462,6 +464,11 @@ chxj_convert_chtml40( #ifdef DUMP_LOG chxj_dump_out("[src] CHTML -> CHTML4.0", ss, srclen); #endif + if (IS_CSS_ON(chtml40.entryp)) { + /* current property list */ + chtml40.css_prop_stack = chxj_new_prop_list_stack(&doc); + } + chxj_buffered_write_init(r->pool, &doc.buf); qs_parse_string(&doc,ss, strlen(ss)); @@ -2690,6 +2697,11 @@ s_chtml40_start_textarea_tag(void *pdoc, Node *node) Doc *doc; request_rec *r; Attr *attr; + char *attr_accesskey = NULL; + char *attr_name = NULL; + char *attr_rows = NULL; + char *attr_cols = NULL; + char *attr_istyle = NULL; chtml40 = GET_CHTML40(pdoc); doc = chtml40->doc; @@ -2697,38 +2709,72 @@ s_chtml40_start_textarea_tag(void *pdoc, Node *node) chtml40->textarea_flag++; - W_L("next; cur != wap_input_format; cur = cur->next) { + if (strcasecmp(cur->value, "*") == 0) { + attr_istyle = "4"; + } + else if (strcasecmp(cur->value, "*") == 0) { + attr_istyle = "3"; + } + else if (strcasecmp(cur->value, "*") == 0) { + attr_istyle = "2"; + } + else if (strcasecmp(cur->value, "*") == 0) { + attr_istyle = "1"; + } } } + W_L(""); return chtml40->out; } @@ -3313,6 +3359,50 @@ s_chtml40_link_tag(void *pdoc, Node *node) return chtml40->out; } + +static css_prop_list_t * +s_chtml40_push_and_get_now_style(void *pdoc, Node *node) +{ + chtml40_t *chtml40 = GET_CHTML40(pdoc); + Doc *doc = chtml40->doc; + css_prop_list_t *last_css = NULL; + if (IS_CSS_ON(chtml40->entryp)) { + css_prop_list_t *dup_css; + css_selector_t *selector; + + last_css = chxj_css_get_last_prop_list(chtml40->css_prop_stack); + dup_css = chxj_dup_css_prop_list(doc, last_css); + selector = chxj_css_find_selector(doc, chtml40->style, node); + if (selector) { + chxj_css_prop_list_merge_property(doc, dup_css, selector); + } + chxj_css_push_prop_list(chtml40->css_prop_stack, dup_css); + last_css = chxj_css_get_last_prop_list(chtml40->css_prop_stack); + } + return last_css; +} + + +static css_prop_list_t * +s_chtml40_nopush_and_get_now_style(void *pdoc, Node *node) +{ + chtml40_t *chtml40 = GET_CHTML40(pdoc); + Doc *doc = chtml40->doc; + css_prop_list_t *last_css = NULL; + if (IS_CSS_ON(chtml40->entryp)) { + css_prop_list_t *dup_css; + css_selector_t *selector; + + last_css = chxj_css_get_last_prop_list(chtml40->css_prop_stack); + dup_css = chxj_dup_css_prop_list(doc, last_css); + selector = chxj_css_find_selector(doc, chtml40->style, node); + if (selector) { + chxj_css_prop_list_merge_property(doc, dup_css, selector); + } + last_css = dup_css; + } + return last_css; +} /* * vim:ts=2 et */ diff --git a/test/chxj_chtml40/Makefile b/test/chxj_chtml40/Makefile index 376d3d18..3e0b377d 100644 --- a/test/chxj_chtml40/Makefile +++ b/test/chxj_chtml40/Makefile @@ -9,7 +9,8 @@ INC_DIR=-I$(TOP_DIR)/include \ -I/usr/include/apache2 \ -I/usr/include/apr-1.0 \ -I$(TOP_DIR)/src \ - -I$(TOP_DIR)/src/serf + -I$(TOP_DIR)/src/serf \ + -I$(TOP_DIR)/src/css/include all:test @@ -19,7 +20,7 @@ test: $(TARGET) ./$(TARGET) $(TARGET): $(TARGET).c - gcc -g -o $@ -Wall -lcunit $< $(INC_DIR) -DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -lapr-1 -laprutil-1 `croco-0.6-config --cflags` `croco-0.6-config --libs` $(TOP_DIR)/src/serf/.libs/libserf-0.a -lpcre + gcc -g -o $@ -Wall -lcunit $< $(INC_DIR) -DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -lapr-1 -laprutil-1 $(TOP_DIR)/src/serf/.libs/libserf-0.a -lpcre $(TOP_DIR)/src/css/src/.libs/libscss.a clean: diff --git a/test/chxj_chtml40/test_chxj_chtml40.c b/test/chxj_chtml40/test_chxj_chtml40.c index 743cfb77..4a7626c3 100644 --- a/test/chxj_chtml40/test_chxj_chtml40.c +++ b/test/chxj_chtml40/test_chxj_chtml40.c @@ -503,6 +503,11 @@ void test_chtml40_link_009(); void test_chtml40_html_tag_with_css_001(); void test_chtml40_meta_tag_with_css_001(); + +void test_chtml40_textarea_tag_with_css_001(); +void test_chtml40_textarea_tag_with_css_002(); +void test_chtml40_textarea_tag_with_css_003(); +void test_chtml40_textarea_tag_with_css_004(); /* pend */ int @@ -968,6 +973,11 @@ main() CU_add_test(chtml40_suite, "test html with css 001", test_chtml40_html_tag_with_css_001); CU_add_test(chtml40_suite, "test meta with css 001", test_chtml40_meta_tag_with_css_001); + + CU_add_test(chtml40_suite, "test textarea with css 001", test_chtml40_textarea_tag_with_css_001); + CU_add_test(chtml40_suite, "test textarea with css 002", test_chtml40_textarea_tag_with_css_002); + CU_add_test(chtml40_suite, "test textarea with css 003", test_chtml40_textarea_tag_with_css_003); + CU_add_test(chtml40_suite, "test textarea with css 004", test_chtml40_textarea_tag_with_css_004); /* aend */ CU_basic_run_tests(); @@ -13150,6 +13160,194 @@ void test_chtml40_meta_tag_with_css_001() #undef TEST_STRING #undef RESULT_STRING } + + +/******************************************************************************/ +/* TEXTAREA with CSS */ +/******************************************************************************/ +char *test_chxj_serf_get004(request_rec *r, apr_pool_t *ppool, const char *uri_path, int ss, apr_size_t *len) +{ + static char *css = "a:focus { display: none }\n" + "a:link { display: none }\n" + "a { display: none }\n" + "hr { display: none }\n" + "a:visited { display:none }\n" + "textarea { -wap-input-format: "*<ja:h>" }\n"; + *len = strlen(css); + call_check = 1; + return css; +} +void test_chtml40_textarea_tag_with_css_001() +{ +#define TEST_STRING "" \ + "" +#define RESULT_STRING "" + char *ret; + char *tmp; + device_table spec; + chxjconvrule_entry entry; + cookie_t cookie; + apr_size_t destlen; + APR_INIT; + chxj_serf_get = test_chxj_serf_get004; + call_check = 0; + + COOKIE_INIT(cookie); + + SPEC_INIT(spec); + destlen = sizeof(TEST_STRING)-1; + entry.action |= CONVRULE_CSS_ON_BIT; + + tmp = chxj_encoding(&r, TEST_STRING, &destlen); + ret = chxj_convert_chtml40(&r, &spec, tmp, destlen, &destlen, &entry, &cookie); + ret = chxj_rencoding(&r, ret, &destlen); + CU_ASSERT(ret != NULL); + CU_ASSERT(strcmp(RESULT_STRING, ret) == 0); + CU_ASSERT(destlen == sizeof(RESULT_STRING)-1); + CU_ASSERT(call_check == 1); + + APR_TERM; +#undef TEST_STRING +#undef RESULT_STRING +} +char *test_chxj_serf_get005(request_rec *r, apr_pool_t *ppool, const char *uri_path, int ss, apr_size_t *len) +{ + static char *css = "a:focus { display: none }\n" + "a:link { display: none }\n" + "a { display: none }\n" + "hr { display: none }\n" + "a:visited { display:none }\n" + "textarea { -wap-input-format: "*<ja:hk>" }\n"; + *len = strlen(css); + call_check = 1; + return css; +} +void test_chtml40_textarea_tag_with_css_002() +{ +#define TEST_STRING "" \ + "" +#define RESULT_STRING "" + char *ret; + char *tmp; + device_table spec; + chxjconvrule_entry entry; + cookie_t cookie; + apr_size_t destlen; + APR_INIT; + chxj_serf_get = test_chxj_serf_get005; + call_check = 0; + + COOKIE_INIT(cookie); + + SPEC_INIT(spec); + destlen = sizeof(TEST_STRING)-1; + entry.action |= CONVRULE_CSS_ON_BIT; + + tmp = chxj_encoding(&r, TEST_STRING, &destlen); + ret = chxj_convert_chtml40(&r, &spec, tmp, destlen, &destlen, &entry, &cookie); + ret = chxj_rencoding(&r, ret, &destlen); + CU_ASSERT(ret != NULL); + CU_ASSERT(strcmp(RESULT_STRING, ret) == 0); + CU_ASSERT(destlen == sizeof(RESULT_STRING)-1); + CU_ASSERT(call_check == 1); + + APR_TERM; +#undef TEST_STRING +#undef RESULT_STRING +} + +char *test_chxj_serf_get006(request_rec *r, apr_pool_t *ppool, const char *uri_path, int ss, apr_size_t *len) +{ + static char *css = "a:focus { display: none }\n" + "a:link { display: none }\n" + "a { display: none }\n" + "hr { display: none }\n" + "a:visited { display:none }\n" + "textarea { -wap-input-format: "*<ja:en>" }\n"; + *len = strlen(css); + call_check = 1; + return css; +} +void test_chtml40_textarea_tag_with_css_003() +{ +#define TEST_STRING "" \ + "" +#define RESULT_STRING "" + char *ret; + char *tmp; + device_table spec; + chxjconvrule_entry entry; + cookie_t cookie; + apr_size_t destlen; + APR_INIT; + chxj_serf_get = test_chxj_serf_get006; + call_check = 0; + + COOKIE_INIT(cookie); + + SPEC_INIT(spec); + destlen = sizeof(TEST_STRING)-1; + entry.action |= CONVRULE_CSS_ON_BIT; + + tmp = chxj_encoding(&r, TEST_STRING, &destlen); + ret = chxj_convert_chtml40(&r, &spec, tmp, destlen, &destlen, &entry, &cookie); + ret = chxj_rencoding(&r, ret, &destlen); + CU_ASSERT(ret != NULL); + CU_ASSERT(strcmp(RESULT_STRING, ret) == 0); + CU_ASSERT(destlen == sizeof(RESULT_STRING)-1); + CU_ASSERT(call_check == 1); + + APR_TERM; +#undef TEST_STRING +#undef RESULT_STRING +} + +char *test_chxj_serf_get007(request_rec *r, apr_pool_t *ppool, const char *uri_path, int ss, apr_size_t *len) +{ + static char *css = "a:focus { display: none }\n" + "a:link { display: none }\n" + "a { display: none }\n" + "hr { display: none }\n" + "a:visited { display:none }\n" + "textarea { -wap-input-format: "*<ja:n>"; }\n" + "br { display: none }\n"; + *len = strlen(css); + call_check = 1; + return css; +} +void test_chtml40_textarea_tag_with_css_004() +{ +#define TEST_STRING "" \ + "" +#define RESULT_STRING "" + char *ret; + char *tmp; + device_table spec; + chxjconvrule_entry entry; + cookie_t cookie; + apr_size_t destlen; + APR_INIT; + chxj_serf_get = test_chxj_serf_get007; + call_check = 0; + + COOKIE_INIT(cookie); + + SPEC_INIT(spec); + destlen = sizeof(TEST_STRING)-1; + entry.action |= CONVRULE_CSS_ON_BIT; + + tmp = chxj_encoding(&r, TEST_STRING, &destlen); + ret = chxj_convert_chtml40(&r, &spec, tmp, destlen, &destlen, &entry, &cookie); + ret = chxj_rencoding(&r, ret, &destlen); + CU_ASSERT(ret != NULL); + CU_ASSERT(strcmp(RESULT_STRING, ret) == 0); + CU_ASSERT(destlen == sizeof(RESULT_STRING)-1); + CU_ASSERT(call_check == 1); + + APR_TERM; +#undef TEST_STRING +#undef RESULT_STRING +} /* * vim:ts=2 et */