jackdanielz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=2eaea57288d01bd8349dcb16a771c2a665f11af9
commit 2eaea57288d01bd8349dcb16a771c2a665f11af9 Author: Daniel Zaoui <[email protected]> Date: Thu Apr 3 09:55:49 2014 +0300 Eolian: Integration of Web2 --- src/lib/elm_web2.c | 933 ++++++++++------------------------------------------- 1 file changed, 163 insertions(+), 770 deletions(-) diff --git a/src/lib/elm_web2.c b/src/lib/elm_web2.c index 24418e4..2d9305a 100644 --- a/src/lib/elm_web2.c +++ b/src/lib/elm_web2.c @@ -10,8 +10,6 @@ #if defined(HAVE_ELEMENTARY_WEB) && defined(USE_WEBKIT2) #include <EWebKit2.h> -EAPI Eo_Op ELM_OBJ_WEB_BASE_ID = EO_NOOP; - #define MY_CLASS ELM_OBJ_WEB_CLASS #define MY_CLASS_NAME "Elm_Web" @@ -230,8 +228,8 @@ elm_need_web(void) return EINA_TRUE; } -static void -_elm_web_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) +EOLIAN static void +_elm_web_evas_smart_add(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED) { #ifdef HAVE_ELEMENTARY_WEB Evas_Object *resize_obj; @@ -250,8 +248,8 @@ _elm_web_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) #endif } -static void -_elm_web_smart_del(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) +EOLIAN static void +_elm_web_evas_smart_del(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED) { eo_do_super(obj, MY_CLASS, evas_obj_smart_del()); } @@ -265,11 +263,9 @@ elm_web_add(Evas_Object *parent) return obj; } -static void -_constructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED) +EOLIAN static void +_elm_web_eo_base_constructor(Eo *obj, Elm_Web_Data *sd) { - - Elm_Web_Smart_Data *sd = _pd; sd->obj = obj; eo_do_super(obj, MY_CLASS, eo_constructor()); eo_do(obj, @@ -277,61 +273,23 @@ _constructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED) evas_obj_smart_callbacks_descriptions_set(_elm_web_smart_callbacks, NULL)); } -EAPI Evas_Object * -elm_web_webkit_view_get(const Evas_Object *obj) -{ - ELM_WEB_CHECK(obj) NULL; - Evas_Object *ret = NULL; - eo_do((Eo *) obj, elm_obj_web_webkit_view_get(&ret)); - return ret; -} - -static void -_webkit_view_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) -{ - Evas_Object **ret = va_arg(*list, Evas_Object **); - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); - *ret = wd->resize_obj; -} - -EAPI void -elm_web_window_create_hook_set(Evas_Object *obj, - Elm_Web_Window_Open func, - void *data) +EOLIAN static Evas_Object* +_elm_web_webkit_view_get(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED) { - ELM_WEB_CHECK(obj); - - eo_do(obj, elm_obj_web_window_create_hook_set(func, data)); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); + return wd->resize_obj; } -static void -_window_create_hook_set(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static void +_elm_web_window_create_hook_set(Eo *obj EINA_UNUSED, Elm_Web_Data *sd, Elm_Web_Window_Open func, void *data) { - Elm_Web_Window_Open func = va_arg(*list, Elm_Web_Window_Open); - void *data = va_arg(*list, void *); - - Elm_Web_Smart_Data *sd = _pd; - sd->hook.window_create = func; sd->hook.window_create_data = data; } -EAPI void -elm_web_dialog_alert_hook_set(Evas_Object *obj, - Elm_Web_Dialog_Alert func, - void *data) +EOLIAN static void +_elm_web_dialog_alert_hook_set(Eo *obj EINA_UNUSED, Elm_Web_Data *_pd EINA_UNUSED, Elm_Web_Dialog_Alert func, void *data) { - ELM_WEB_CHECK(obj); - - eo_do(obj, elm_obj_web_dialog_alert_hook_set(func, data)); -} - -static void -_dialog_alert_hook_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - Elm_Web_Dialog_Alert func = va_arg(*list, Elm_Web_Dialog_Alert); - void *data = va_arg(*list, void *); - #ifdef HAVE_ELEMENTARY_WEB (void)func; (void)data; @@ -343,22 +301,9 @@ _dialog_alert_hook_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) #endif } -EAPI void -elm_web_dialog_confirm_hook_set(Evas_Object *obj, - Elm_Web_Dialog_Confirm func, - void *data) +EOLIAN static void +_elm_web_dialog_confirm_hook_set(Eo *obj EINA_UNUSED, Elm_Web_Data *_pd EINA_UNUSED, Elm_Web_Dialog_Confirm func, void *data) { - ELM_WEB_CHECK(obj); - - eo_do(obj, elm_obj_web_dialog_confirm_hook_set(func, data)); -} - -static void -_dialog_confirm_hook_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - Elm_Web_Dialog_Confirm func = va_arg(*list, Elm_Web_Dialog_Confirm); - void *data = va_arg(*list, void *); - #ifdef HAVE_ELEMENTARY_WEB (void)func; (void)data; @@ -370,21 +315,9 @@ _dialog_confirm_hook_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) #endif } -EAPI void -elm_web_dialog_prompt_hook_set(Evas_Object *obj, - Elm_Web_Dialog_Prompt func, - void *data) -{ - ELM_WEB_CHECK(obj); - - eo_do(obj, elm_obj_web_dialog_prompt_hook_set(func, data)); -} - -static void -_dialog_prompt_hook_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) +EOLIAN static void +_elm_web_dialog_prompt_hook_set(Eo *obj EINA_UNUSED, Elm_Web_Data *_pd EINA_UNUSED, Elm_Web_Dialog_Prompt func, void *data) { - Elm_Web_Dialog_Prompt func = va_arg(*list, Elm_Web_Dialog_Prompt); - void *data = va_arg(*list, void *); #ifdef HAVE_ELEMENTARY_WEB (void)func; (void)data; @@ -396,21 +329,9 @@ _dialog_prompt_hook_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) #endif } -EAPI void -elm_web_dialog_file_selector_hook_set(Evas_Object *obj, - Elm_Web_Dialog_File_Selector func, - void *data) +EOLIAN static void +_elm_web_dialog_file_selector_hook_set(Eo *obj EINA_UNUSED, Elm_Web_Data *_pd EINA_UNUSED, Elm_Web_Dialog_File_Selector func, void *data) { - ELM_WEB_CHECK(obj); - - eo_do(obj, elm_obj_web_dialog_file_selector_hook_set(func, data)); -} - -static void -_dialog_file_selector_hook_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - Elm_Web_Dialog_File_Selector func = va_arg(*list, Elm_Web_Dialog_File_Selector); - void *data = va_arg(*list, void *); #ifdef HAVE_ELEMENTARY_WEB (void)func; (void)data; @@ -422,22 +343,9 @@ _dialog_file_selector_hook_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) #endif } -EAPI void -elm_web_console_message_hook_set(Evas_Object *obj, - Elm_Web_Console_Message func, - void *data) -{ - ELM_WEB_CHECK(obj); - - eo_do(obj, elm_obj_web_console_message_hook_set(func, data)); -} - -static void -_console_message_hook_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) +EOLIAN static void +_elm_web_console_message_hook_set(Eo *obj EINA_UNUSED, Elm_Web_Data *_pd EINA_UNUSED, Elm_Web_Console_Message func, void *data) { - Elm_Web_Console_Message func = va_arg(*list, Elm_Web_Console_Message); - void *data = va_arg(*list, void *); - #ifdef HAVE_ELEMENTARY_WEB (void)func; (void)data; @@ -449,20 +357,9 @@ _console_message_hook_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) #endif } -EAPI void -elm_web_useragent_set(Evas_Object *obj, - const char *user_agent) +EOLIAN static void +_elm_web_useragent_set(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED, const char *user_agent) { - ELM_WEB_CHECK(obj); - - eo_do(obj, elm_obj_web_useragent_set(user_agent)); -} - -static void -_useragent_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list) -{ - const char *user_agent = va_arg(*list, const char *); - #ifdef HAVE_ELEMENTARY_WEB ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -473,27 +370,16 @@ _useragent_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list) #endif } -EAPI const char * -elm_web_useragent_get(const Evas_Object *obj) +EOLIAN static const char* +_elm_web_useragent_get(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED) { - ELM_WEB_CHECK(obj) NULL; - const char *ret = NULL; - eo_do((Eo *) obj, elm_obj_web_useragent_get(&ret)); - return ret; -} - -static void -_useragent_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) -{ - const char **ret = va_arg(*list, const char **); - #ifdef HAVE_ELEMENTARY_WEB - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); - *ret = ewk_view_user_agent_get(wd->resize_obj); + return ewk_view_user_agent_get(wd->resize_obj); #else - *ret = NULL; (void)obj; + return NULL; #endif } @@ -507,116 +393,39 @@ elm_web_uri_set(Evas_Object *obj, return ret; } -EAPI Eina_Bool -elm_web_url_set(Evas_Object *obj, - const char *url) +EOLIAN static Eina_Bool +_elm_web_url_set(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED, const char *url) { - ELM_WEB_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do(obj, elm_obj_web_url_set(url, &ret)); - return ret; + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); + return ewk_view_url_set(wd->resize_obj, url); } -static void -_url_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static const char* +_elm_web_url_get(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED) { - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); - - const char *url = va_arg(*list, const char *); - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - if (ret) *ret = EINA_FALSE; - Eina_Bool int_ret = EINA_FALSE; - int_ret = ewk_view_url_set(wd->resize_obj, url); - if (ret) *ret = int_ret; + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); + return ewk_view_url_get(wd->resize_obj); } -EAPI const char * -elm_web_uri_get(const Evas_Object *obj) +EOLIAN static Eina_Bool +_elm_web_html_string_load(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED, const char *html, const char *base_url, const char *unreachable_url) { - ELM_WEB_CHECK(obj) NULL; - const char *ret = NULL; - eo_do((Eo *) obj, elm_obj_web_url_get(&ret)); - return ret; -} + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); -EAPI const char * -elm_web_url_get(const Evas_Object *obj) -{ - ELM_WEB_CHECK(obj) NULL; - const char *ret = NULL; - eo_do((Eo *) obj, elm_obj_web_url_get(&ret)); - return ret; -} - -static void -_url_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) -{ - const char **ret = va_arg(*list, const char **); - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); - *ret = ewk_view_url_get(wd->resize_obj); -} - -EAPI Eina_Bool -elm_web_html_string_load(Evas_Object *obj, const char *html, const char *base_url, const char *unreachable_url) -{ - ELM_WEB_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do(obj, elm_obj_web_html_string_load(html, base_url, unreachable_url, &ret)); - return ret; -} - -static void -_html_string_load(Eo *obj, void *_pd EINA_UNUSED, va_list *list) -{ - const char *html = va_arg(*list, const char *); - const char *base_url = va_arg(*list, const char *); - const char *unreachable_url = va_arg(*list, const char *); - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - - if (ret) *ret = EINA_FALSE; - - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); - - if (ret) *ret = ewk_view_html_string_load(wd->resize_obj, + return ewk_view_html_string_load(wd->resize_obj, html, base_url, unreachable_url); } -EAPI const char * -elm_web_title_get(const Evas_Object *obj) +EOLIAN static const char* +_elm_web_title_get(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED) { - ELM_WEB_CHECK(obj) NULL; - const char *ret = NULL; - eo_do((Eo *) obj, elm_obj_web_title_get(&ret)); - return ret; + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); + return ewk_view_title_get(wd->resize_obj); } -static void -_title_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static void +_elm_web_bg_color_set(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED, int r, int g, int b, int a) { - const char **ret = va_arg(*list, const char **); - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); - *ret = ewk_view_title_get(wd->resize_obj); -} - -EAPI void -elm_web_bg_color_set(Evas_Object *obj, - int r, - int g, - int b, - int a) -{ - ELM_WEB_CHECK(obj); - - eo_do(obj, elm_obj_web_bg_color_set(r, g, b, a)); -} - -static void -_bg_color_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list) -{ - int r = va_arg(*list, int); - int g = va_arg(*list, int); - int b = va_arg(*list, int); - int a = va_arg(*list, int); #ifdef HAVE_ELEMENTARY_WEB (void)obj; (void)r; @@ -632,26 +441,9 @@ _bg_color_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list) #endif } -EAPI void -elm_web_bg_color_get(const Evas_Object *obj, - int *r, - int *g, - int *b, - int *a) -{ - ELM_WEB_CHECK(obj); - - eo_do((Eo *) obj, elm_obj_web_bg_color_get(r, g, b, a)); -} - -static void -_bg_color_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static void +_elm_web_bg_color_get(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED, int *r, int *g, int *b, int *a) { - int *r = va_arg(*list, int *); - int *g = va_arg(*list, int *); - int *b = va_arg(*list, int *); - int *a = va_arg(*list, int *); - if (r) *r = 0; if (g) *g = 0; if (b) *b = 0; @@ -663,41 +455,21 @@ _bg_color_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) #endif } -EAPI const char * -elm_web_selection_get(const Evas_Object *obj) +EOLIAN static const char* +_elm_web_selection_get(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED) { - ELM_WEB_CHECK(obj) NULL; - const char *ret = NULL; - eo_do((Eo *) obj, elm_obj_web_selection_get(&ret)); - return ret; -} - -static void -_selection_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) -{ - const char **ret = va_arg(*list, const char **); #ifdef HAVE_ELEMENTARY_WEB - *ret = NULL; (void)obj; + return NULL; #else - *ret = NULL; (void)obj; + return NULL; #endif } -EAPI void -elm_web_popup_selected_set(Evas_Object *obj, - int idx) +EOLIAN static void +_elm_web_popup_selected_set(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED, int idx) { - ELM_WEB_CHECK(obj); - - eo_do(obj, elm_obj_web_popup_selected_set(idx)); -} - -static void -_popup_selected_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list) -{ - int idx = va_arg(*list, int); #ifdef HAVE_ELEMENTARY_WEB (void)idx; (void)obj; @@ -707,50 +479,21 @@ _popup_selected_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list) #endif } -EAPI Eina_Bool -elm_web_popup_destroy(Evas_Object *obj) -{ - ELM_WEB_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do(obj, elm_obj_web_popup_destroy(&ret)); - return ret; -} - -static void -_popup_destroy(Eo *obj, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static Eina_Bool +_elm_web_popup_destroy(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED) { - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - if (ret) *ret = EINA_FALSE; #ifdef HAVE_ELEMENTARY_WEB (void)obj; #else (void)obj; #endif -} -EAPI Eina_Bool -elm_web_text_search(const Evas_Object *obj, - const char *string, - Eina_Bool case_sensitive, - Eina_Bool forward, - Eina_Bool wrap) -{ - ELM_WEB_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do((Eo *) obj, elm_obj_web_text_search(string, case_sensitive, forward, wrap, &ret)); - return ret; + return EINA_FALSE; } -static void -_text_search(Eo *obj, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static Eina_Bool +_elm_web_text_search(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED, const char *string, Eina_Bool case_sensitive, Eina_Bool forward, Eina_Bool wrap) { - const char *string = va_arg(*list, const char *); - Eina_Bool case_sensitive = va_arg(*list, int); - Eina_Bool forward = va_arg(*list, int); - Eina_Bool wrap = va_arg(*list, int); - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - if (ret) *ret = EINA_FALSE; - #ifdef HAVE_ELEMENTARY_WEB (void)string; (void)case_sensitive; @@ -764,31 +507,13 @@ _text_search(Eo *obj, void *_pd EINA_UNUSED, va_list *list) (void)wrap; (void)obj; #endif -} -EAPI unsigned int -elm_web_text_matches_mark(Evas_Object *obj, - const char *string, - Eina_Bool case_sensitive, - Eina_Bool highlight, - unsigned int limit) -{ - ELM_WEB_CHECK(obj) 0; - unsigned int ret = 0; - eo_do(obj, elm_obj_web_text_matches_mark(string, case_sensitive, highlight, limit, &ret)); - return ret; + return EINA_FALSE; } -static void -_text_matches_mark(Eo *obj, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static unsigned int +_elm_web_text_matches_mark(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED, const char *string, Eina_Bool case_sensitive, Eina_Bool highlight, unsigned int limit) { - const char *string = va_arg(*list, const char *); - Eina_Bool case_sensitive = va_arg(*list, int); - Eina_Bool highlight = va_arg(*list, int); - unsigned int limit = va_arg(*list, unsigned int); - unsigned int *ret = va_arg(*list, unsigned int *); - if (ret) *ret = 0; - #ifdef HAVE_ELEMENTARY_WEB (void)string; (void)case_sensitive; @@ -802,48 +527,25 @@ _text_matches_mark(Eo *obj, void *_pd EINA_UNUSED, va_list *list) (void)limit; (void)obj; #endif -} - -EAPI Eina_Bool -elm_web_text_matches_unmark_all(Evas_Object *obj) -{ - ELM_WEB_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do(obj, elm_obj_web_text_matches_unmark_all(&ret)); - return ret; + return 0; } -static void -_text_matches_unmark_all(Eo *obj, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static Eina_Bool +_elm_web_text_matches_unmark_all(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED) { - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - if (ret) *ret = EINA_FALSE; #ifdef HAVE_ELEMENTARY_WEB (void)obj; #else (void)obj; #endif -} -EAPI Eina_Bool -elm_web_text_matches_highlight_set(Evas_Object *obj, - Eina_Bool highlight) -{ - ELM_WEB_CHECK(obj) EINA_FALSE; - - Eina_Bool ret = EINA_FALSE; - eo_do(obj, elm_obj_web_text_matches_highlight_set(highlight, &ret)); - return ret; + return EINA_FALSE; } -static void -_text_matches_highlight_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static Eina_Bool +_elm_web_text_matches_highlight_set(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED, Eina_Bool highlight) { - Eina_Bool highlight = va_arg(*list, int); - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - if (ret) *ret = EINA_FALSE; - #ifdef HAVE_ELEMENTARY_WEB (void)obj; (void)highlight; @@ -851,332 +553,216 @@ _text_matches_highlight_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list) (void)obj; (void)highlight; #endif -} -EAPI Eina_Bool -elm_web_text_matches_highlight_get(const Evas_Object *obj) -{ - ELM_WEB_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do((Eo *)obj, elm_obj_web_text_matches_highlight_get(&ret)); - return ret; + return EINA_FALSE; } -static void -_text_matches_highlight_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static Eina_Bool +_elm_web_text_matches_highlight_get(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED) { - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - if (ret) *ret = EINA_FALSE; #ifdef HAVE_ELEMENTARY_WEB (void)obj; #else (void)obj; #endif -} -EAPI double -elm_web_load_progress_get(const Evas_Object *obj) -{ - ELM_WEB_CHECK(obj) - 1.0; - double ret = - 1.0; - eo_do((Eo *) obj, elm_obj_web_load_progress_get(&ret)); - return ret; + return EINA_FALSE; } -static void -_load_progress_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static double +_elm_web_load_progress_get(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED) { - double *ret = va_arg(*list, double *); - *ret = -1.0; + double ret; + ret = -1.0; #ifdef HAVE_ELEMENTARY_WEB - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ret); - *ret = ewk_view_load_progress_get(wd->resize_obj); + ret = ewk_view_load_progress_get(wd->resize_obj); #else (void)obj; #endif -} -EAPI Eina_Bool -elm_web_stop(Evas_Object *obj) -{ - ELM_WEB_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do(obj, elm_obj_web_stop(&ret)); return ret; } -static void -_stop(Eo *obj, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static Eina_Bool +_elm_web_stop(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED) { - Eina_Bool int_ret = EINA_FALSE; - Eina_Bool *ret = va_arg(*list, Eina_Bool *); + Eina_Bool ret = EINA_FALSE; #ifdef HAVE_ELEMENTARY_WEB - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ret); - int_ret = ewk_view_stop(wd->resize_obj); + ret = ewk_view_stop(wd->resize_obj); #else (void)obj; #endif - if (ret) *ret = int_ret; -} - -EAPI Eina_Bool -elm_web_reload(Evas_Object *obj) -{ - ELM_WEB_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do(obj, elm_obj_web_reload(&ret)); return ret; } -static void -_reload(Eo *obj, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static Eina_Bool +_elm_web_reload(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED) { - Eina_Bool int_ret = EINA_FALSE; - Eina_Bool *ret = va_arg(*list, Eina_Bool *); + Eina_Bool ret = EINA_FALSE; #ifdef HAVE_ELEMENTARY_WEB - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ret); - int_ret = ewk_view_reload(wd->resize_obj); + ret = ewk_view_reload(wd->resize_obj); #else (void)obj; #endif - if (ret) *ret = int_ret; -} - -EAPI Eina_Bool -elm_web_reload_full(Evas_Object *obj) -{ - ELM_WEB_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do(obj, elm_obj_web_reload_full(&ret)); return ret; } -static void -_reload_full(Eo *obj, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static Eina_Bool +_elm_web_reload_full(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED) { - Eina_Bool int_ret = EINA_FALSE; - Eina_Bool *ret = va_arg(*list, Eina_Bool *); + Eina_Bool ret = EINA_FALSE; #ifdef HAVE_ELEMENTARY_WEB - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ret); - int_ret = ewk_view_reload_bypass_cache(wd->resize_obj); + ret = ewk_view_reload_bypass_cache(wd->resize_obj); #else (void)obj; #endif - if (ret) *ret = int_ret; -} - -EAPI Eina_Bool -elm_web_back(Evas_Object *obj) -{ - ELM_WEB_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do(obj, elm_obj_web_back(&ret)); return ret; } -static void -_back(Eo *obj, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static Eina_Bool +_elm_web_back(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED) { - Eina_Bool int_ret = EINA_FALSE; - Eina_Bool *ret = va_arg(*list, Eina_Bool *); + Eina_Bool ret = EINA_FALSE; #ifdef HAVE_ELEMENTARY_WEB - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ret); - int_ret = ewk_view_back(wd->resize_obj); + ret = ewk_view_back(wd->resize_obj); #else (void)obj; #endif - if (ret) *ret = int_ret; -} - -EAPI Eina_Bool -elm_web_forward(Evas_Object *obj) -{ - ELM_WEB_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do(obj, elm_obj_web_forward(&ret)); return ret; } -static void -_forward(Eo *obj, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static Eina_Bool +_elm_web_forward(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED) { - Eina_Bool int_ret = EINA_FALSE; - Eina_Bool *ret = va_arg(*list, Eina_Bool *); + Eina_Bool ret = EINA_FALSE; #ifdef HAVE_ELEMENTARY_WEB - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); - int_ret = ewk_view_forward(wd->resize_obj); + ret = ewk_view_forward(wd->resize_obj); #else (void)obj; #endif - if (ret) *ret = int_ret; -} - -EAPI Eina_Bool -elm_web_navigate(Evas_Object *obj, - int steps) -{ - ELM_WEB_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do(obj, elm_obj_web_navigate(steps, &ret)); return ret; } -static void -_navigate(Eo *obj, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static Eina_Bool +_elm_web_navigate(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED, int steps) { - Eina_Bool int_ret = EINA_FALSE; - - int steps = va_arg(*list, int); - Eina_Bool *ret = va_arg(*list, Eina_Bool *); + Eina_Bool ret = EINA_FALSE; #ifdef HAVE_ELEMENTARY_WEB Ewk_Back_Forward_List *history; Ewk_Back_Forward_List_Item *item = NULL; - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ret); history = ewk_view_back_forward_list_get(wd->resize_obj); if (history) { item = ewk_back_forward_list_item_at_index_get(history, steps); - if (item) int_ret = ewk_view_navigate_to(wd->resize_obj, item); + if (item) ret = ewk_view_navigate_to(wd->resize_obj, item); } #else (void)steps; (void)obj; #endif - if (ret) *ret = int_ret; -} - -EAPI Eina_Bool -elm_web_back_possible_get(Evas_Object *obj) -{ - ELM_WEB_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do(obj, elm_obj_web_back_possible_get(&ret)); return ret; } -static void -_back_possible_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static Eina_Bool +_elm_web_back_possible_get(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED) { - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - *ret = EINA_FALSE; + Eina_Bool ret; + ret = EINA_FALSE; #ifdef HAVE_ELEMENTARY_WEB - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ret); - *ret = ewk_view_back_possible(wd->resize_obj); + ret = ewk_view_back_possible(wd->resize_obj); #else (void)obj; #endif -} -EAPI Eina_Bool -elm_web_forward_possible_get(Evas_Object *obj) -{ - ELM_WEB_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do(obj, elm_obj_web_forward_possible_get(&ret)); return ret; } -static void -_forward_possible_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static Eina_Bool +_elm_web_forward_possible_get(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED) { - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - *ret = EINA_FALSE; + Eina_Bool ret; + ret = EINA_FALSE; #ifdef HAVE_ELEMENTARY_WEB - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ret); - *ret = ewk_view_forward_possible(wd->resize_obj); + ret = ewk_view_forward_possible(wd->resize_obj); #else (void)obj; #endif -} -EAPI Eina_Bool -elm_web_navigate_possible_get(Evas_Object *obj, - int steps) -{ - ELM_WEB_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do(obj, elm_obj_web_navigate_possible_get(steps, &ret)); return ret; } -static void -_navigate_possible_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static Eina_Bool +_elm_web_navigate_possible_get(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED, int steps) { - int steps = va_arg(*list, int); - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - *ret = EINA_FALSE; + Eina_Bool ret; + ret = EINA_FALSE; #ifdef HAVE_ELEMENTARY_WEB Ewk_Back_Forward_List *history; - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ret); history = ewk_view_back_forward_list_get(wd->resize_obj); if (history && ewk_back_forward_list_item_at_index_get(history, steps)) - *ret = EINA_TRUE; + ret = EINA_TRUE; #else (void)steps; (void)obj; #endif -} -EAPI Eina_Bool -elm_web_history_enabled_get(const Evas_Object *obj) -{ - ELM_WEB_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do((Eo *) obj, elm_obj_web_history_enabled_get(&ret)); return ret; } -static void -_history_enabled_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static Eina_Bool +_elm_web_history_enabled_get(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED) { - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - *ret = EINA_FALSE; + Eina_Bool ret; + ret = EINA_FALSE; #ifdef HAVE_ELEMENTARY_WEB (void)obj; #else (void)obj; #endif -} -EAPI void -elm_web_history_enabled_set(Evas_Object *obj, - Eina_Bool enable) -{ - ELM_WEB_CHECK(obj); - eo_do(obj, elm_obj_web_history_enabled_set(enable)); + return ret; } -static void -_history_enabled_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static void +_elm_web_history_enabled_set(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED, Eina_Bool enable) { - Eina_Bool enable = va_arg(*list, int); #ifdef HAVE_ELEMENTARY_WEB (void)enable; (void)obj; @@ -1186,19 +772,9 @@ _history_enabled_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list) #endif } -EAPI void -elm_web_zoom_set(Evas_Object *obj, - double zoom) +EOLIAN static void +_elm_web_zoom_set(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED, double zoom) { - ELM_WEB_CHECK(obj); - eo_do(obj, elm_obj_web_zoom_set(zoom)); -} - -static void -_zoom_set(Eo *obj, void *_pd, va_list *list) -{ - double zoom = va_arg(*list, double); - #ifdef HAVE_ELEMENTARY_WEB (void)obj; (void)_pd; @@ -1210,40 +786,23 @@ _zoom_set(Eo *obj, void *_pd, va_list *list) #endif } -EAPI double -elm_web_zoom_get(const Evas_Object *obj) -{ - ELM_WEB_CHECK(obj) - 1.0; - double ret = - 1.0; - eo_do((Eo *) obj, elm_obj_web_zoom_get(&ret)); - return ret; -} - -static void -_zoom_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) +EOLIAN static double +_elm_web_zoom_get(Eo *obj EINA_UNUSED, Elm_Web_Data *_pd EINA_UNUSED) { - double *ret = va_arg(*list, double *); - *ret = -1.0; + double ret; + ret = -1.0; #ifdef HAVE_ELEMENTARY_WEB (void)_pd; #else (void)_pd; #endif -} -EAPI void -elm_web_zoom_mode_set(Evas_Object *obj, - Elm_Web_Zoom_Mode mode) -{ - ELM_WEB_CHECK(obj); - eo_do(obj, elm_obj_web_zoom_mode_set(mode)); + return ret; } -static void -_zoom_mode_set(Eo *obj, void *_pd, va_list *list) +EOLIAN static void +_elm_web_zoom_mode_set(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED, Elm_Web_Zoom_Mode mode) { - Elm_Web_Zoom_Mode mode = va_arg(*list, Elm_Web_Zoom_Mode); - #ifdef HAVE_ELEMENTARY_WEB (void)obj; (void)_pd; @@ -1255,45 +814,23 @@ _zoom_mode_set(Eo *obj, void *_pd, va_list *list) #endif } -EAPI Elm_Web_Zoom_Mode -elm_web_zoom_mode_get(const Evas_Object *obj) +EOLIAN static Elm_Web_Zoom_Mode +_elm_web_zoom_mode_get(Eo *obj EINA_UNUSED, Elm_Web_Data *_pd EINA_UNUSED) { - ELM_WEB_CHECK(obj) ELM_WEB_ZOOM_MODE_LAST; - Elm_Web_Zoom_Mode ret = ELM_WEB_ZOOM_MODE_LAST; - eo_do((Eo *) obj, elm_obj_web_zoom_mode_get(&ret)); - return ret; -} - -static void -_zoom_mode_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - Elm_Web_Zoom_Mode *ret = va_arg(*list, Elm_Web_Zoom_Mode *); - *ret = ELM_WEB_ZOOM_MODE_LAST; + Elm_Web_Zoom_Mode ret; + ret = ELM_WEB_ZOOM_MODE_LAST; #ifdef HAVE_ELEMENTARY_WEB (void)_pd; #else (void)_pd; #endif -} -EAPI void -elm_web_region_show(Evas_Object *obj, - int x, - int y, - int w EINA_UNUSED, - int h EINA_UNUSED) -{ - ELM_WEB_CHECK(obj); - eo_do(obj, elm_obj_web_region_show(x, y, w, h)); + return ret; } -static void -_region_show(Eo *obj, void *_pd, va_list *list) +EOLIAN static void +_elm_web_region_show(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED, int x, int y, int w, int h) { - int x = va_arg(*list, int); - int y = va_arg(*list, int); - int w = va_arg(*list, int); - int h = va_arg(*list, int); (void)w; (void)h; @@ -1310,24 +847,9 @@ _region_show(Eo *obj, void *_pd, va_list *list) #endif } -EAPI void -elm_web_region_bring_in(Evas_Object *obj, - int x, - int y, - int w EINA_UNUSED, - int h EINA_UNUSED) -{ - ELM_WEB_CHECK(obj); - eo_do(obj, elm_obj_web_region_bring_in(x, y, w, h)); -} - -static void -_region_bring_in(Eo *obj, void *_pd, va_list *list) +EOLIAN static void +_elm_web_region_bring_in(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED, int x, int y, int w, int h) { - int x = va_arg(*list, int); - int y = va_arg(*list, int); - int w = va_arg(*list, int); - int h = va_arg(*list, int); (void)w; (void)h; @@ -1344,18 +866,9 @@ _region_bring_in(Eo *obj, void *_pd, va_list *list) #endif } -EAPI void -elm_web_inwin_mode_set(Evas_Object *obj, - Eina_Bool value) +EOLIAN static void +_elm_web_inwin_mode_set(Eo *obj EINA_UNUSED, Elm_Web_Data *_pd EINA_UNUSED, Eina_Bool value) { - ELM_WEB_CHECK(obj); - eo_do(obj, elm_obj_web_inwin_mode_set(value)); -} - -static void -_inwin_mode_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - Eina_Bool value = va_arg(*list, int); #ifdef HAVE_ELEMENTARY_WEB (void)_pd; (void)value; @@ -1365,25 +878,18 @@ _inwin_mode_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) #endif } -EAPI Eina_Bool -elm_web_inwin_mode_get(const Evas_Object *obj) +EOLIAN static Eina_Bool +_elm_web_inwin_mode_get(Eo *obj EINA_UNUSED, Elm_Web_Data *_pd EINA_UNUSED) { - ELM_WEB_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do((Eo *) obj, elm_obj_web_inwin_mode_get(&ret)); - return ret; -} - -static void -_inwin_mode_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - *ret = EINA_FALSE; + Eina_Bool ret; + ret = EINA_FALSE; #ifdef HAVE_ELEMENTARY_WEB (void)_pd; #else (void)_pd; #endif + + return ret; } EAPI void @@ -1439,124 +945,11 @@ elm_web_window_features_region_get(const Elm_Web_Window_Features *wf, } static void -_class_constructor(Eo_Class *klass) -{ - const Eo_Op_Func_Description func_desc[] = { - EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), - - EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_web_smart_add), - EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_web_smart_del), - - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_WEBKIT_VIEW_GET), _webkit_view_get), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_WINDOW_CREATE_HOOK_SET), _window_create_hook_set), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_DIALOG_ALERT_HOOK_SET), _dialog_alert_hook_set), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_DIALOG_CONFIRM_HOOK_SET), _dialog_confirm_hook_set), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_DIALOG_PROMPT_HOOK_SET), _dialog_prompt_hook_set), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_DIALOG_FILE_SELECTOR_HOOK_SET), _dialog_file_selector_hook_set), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_CONSOLE_MESSAGE_HOOK_SET), _console_message_hook_set), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_USERAGENT_SET), _useragent_set), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_USERAGENT_GET), _useragent_get), - - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_URL_SET), _url_set), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_URL_GET), _url_get), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_HTML_STRING_LOAD), _html_string_load), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_TITLE_GET), _title_get), - - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_BG_COLOR_SET), _bg_color_set), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_BG_COLOR_GET), _bg_color_get), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_SELECTION_GET), _selection_get), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_POPUP_SELECTED_SET), _popup_selected_set), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_POPUP_DESTROY), _popup_destroy), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_TEXT_SEARCH), _text_search), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_TEXT_MATCHES_MARK), _text_matches_mark), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_TEXT_MATCHES_UNMARK_ALL), _text_matches_unmark_all), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_TEXT_MATCHES_HIGHLIGHT_SET), _text_matches_highlight_set), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_TEXT_MATCHES_HIGHLIGHT_GET), _text_matches_highlight_get), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_LOAD_PROGRESS_GET), _load_progress_get), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_STOP), _stop), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_RELOAD), _reload), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_RELOAD_FULL), _reload_full), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_BACK), _back), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_FORWARD), _forward), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_NAVIGATE), _navigate), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_BACK_POSSIBLE_GET), _back_possible_get), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_FORWARD_POSSIBLE_GET), _forward_possible_get), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_NAVIGATE_POSSIBLE_GET), _navigate_possible_get), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_HISTORY_ENABLED_GET), _history_enabled_get), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_HISTORY_ENABLED_SET), _history_enabled_set), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_ZOOM_SET), _zoom_set), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_ZOOM_GET), _zoom_get), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_ZOOM_MODE_SET), _zoom_mode_set), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_ZOOM_MODE_GET), _zoom_mode_get), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_REGION_SHOW), _region_show), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_REGION_BRING_IN), _region_bring_in), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_INWIN_MODE_SET), _inwin_mode_set), - EO_OP_FUNC(ELM_OBJ_WEB_ID(ELM_OBJ_WEB_SUB_ID_INWIN_MODE_GET), _inwin_mode_get), - EO_OP_FUNC_SENTINEL - }; - eo_class_funcs_set(klass, func_desc); - +_elm_web_class_constructor(Eo_Class *klass) +{ evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); } -static const Eo_Op_Description op_desc[] = { - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_WEBKIT_VIEW_GET, "Get internal ewk_view object from web object."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_WINDOW_CREATE_HOOK_SET, "Sets the function to call when a new window is requested."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_DIALOG_ALERT_HOOK_SET, "Sets the function to call when an alert dialog."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_DIALOG_CONFIRM_HOOK_SET, "Sets the function to call when an confirm dialog."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_DIALOG_PROMPT_HOOK_SET, "Sets the function to call when an prompt dialog."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_DIALOG_FILE_SELECTOR_HOOK_SET, "Sets the function to call when an file selector dialog."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_CONSOLE_MESSAGE_HOOK_SET, "Sets the function to call when a console message is emitted from JS."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_USERAGENT_SET, "Change useragent of a elm_web object."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_USERAGENT_GET, "Return current useragent of elm_web object."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_TAB_PROPAGATE_GET, "Get the status of the tab propagation."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_TAB_PROPAGATE_SET, "Sets whether to use tab propagation."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_URL_SET, "Sets the URL for the web object."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_URL_GET, "Get the current URL for the object."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_HTML_STRING_LOAD, "Loads the specified html string as the content of the object."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_TITLE_GET, "Get the current title."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_BG_COLOR_SET, "Sets the background color to be used by the web object."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_BG_COLOR_GET, "Get the background color to be used by the web object."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_SELECTION_GET, "Get a copy of the currently selected text."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_POPUP_SELECTED_SET, "Tells the web object which index in the currently open popup was selected."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_POPUP_DESTROY, "Dismisses an open dropdown popup."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_TEXT_SEARCH, "Searches the given string in a document."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_TEXT_MATCHES_MARK, "Marks matches of the given string in a document."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_TEXT_MATCHES_UNMARK_ALL, "Clears all marked matches in the document."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_TEXT_MATCHES_HIGHLIGHT_SET, "Sets whether to highlight the matched marks."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_TEXT_MATCHES_HIGHLIGHT_GET, "Get whether highlighting marks is enabled."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_LOAD_PROGRESS_GET, "Get the overall loading progress of the page."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_STOP, "Stops loading the current page."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_RELOAD, "Requests a reload of the current document in the object."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_RELOAD_FULL, "Requests a reload of the current document, avoiding any existing caches."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_BACK, "Goes back one step in the browsing history."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_FORWARD, "Goes forward one step in the browsing history."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_NAVIGATE, "Jumps the given number of steps in the browsing history."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_BACK_POSSIBLE_GET, "Queries whether it's possible to go back in history."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_FORWARD_POSSIBLE_GET, "Queries whether it's possible to go forward in history."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_NAVIGATE_POSSIBLE_GET, "Queries whether it's possible to jump the given number of steps."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_HISTORY_ENABLED_GET, "Get whether browsing history is enabled for the given object."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_HISTORY_ENABLED_SET, "Enables or disables the browsing history."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_ZOOM_SET, "Sets the zoom level of the web object."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_ZOOM_GET, "Get the current zoom level set on the web object."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_ZOOM_MODE_SET, "Sets the zoom mode to use."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_ZOOM_MODE_GET, "Get the currently set zoom mode."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_REGION_SHOW, "Shows the given region in the web object."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_REGION_BRING_IN, "Brings in the region to the visible area."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_INWIN_MODE_SET, "Sets the default dialogs to use an Inwin instead of a normal window."), - EO_OP_DESCRIPTION(ELM_OBJ_WEB_SUB_ID_INWIN_MODE_GET, "Get whether Inwin mode is set for the current object."), - EO_OP_DESCRIPTION_SENTINEL -}; -static const Eo_Class_Description class_desc = { - EO_VERSION, - MY_CLASS_NAME, - EO_CLASS_TYPE_REGULAR, - EO_CLASS_DESCRIPTION_OPS(&ELM_OBJ_WEB_BASE_ID, op_desc, ELM_OBJ_WEB_SUB_ID_LAST), - NULL, - sizeof(Elm_Web_Smart_Data), - _class_constructor, - NULL -}; +#include "elm_web.eo.c" -EO_DEFINE_CLASS(elm_obj_web_class_get, &class_desc, ELM_OBJ_WIDGET_CLASS, NULL); #endif --
