viking

webkit based web browser for Enlightenment
Log | Files | Refs | LICENSE

commit 1fce9d1b03b54b25662a833085cf75cae3dbb43f
parent 2751dc3d16c166172d02000ac0d7ffb7bee6afbf
Author: Kyle Milz <kmilz@ucalgary.ca>
Date:   Sat, 13 Oct 2012 16:21:45 -0600

don't use elm_web, use ewk_view directly

Diffstat:
Msrc/callbacks.c | 10++++++----
Msrc/commands.c | 1+
Msrc/utilities.c | 19++++++++-----------
Msrc/viking.h | 1-
4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/callbacks.c b/src/callbacks.c @@ -169,7 +169,8 @@ webview_load_finished_cb(void *data, Evas_Object *obj, void *event_info) // userscript_hooks_end(elm_web_uri_get(td->web)); - elm_object_focus_set(bd->web, EINA_TRUE); + elm_object_focus_set(elm_object_top_widget_get(wd->win), EINA_FALSE); + evas_object_focus_set(bd->view, EINA_TRUE); } /* @@ -493,9 +494,10 @@ inputbox_activate_cb(void *data, Evas_Object *obj, void *event_info) // gtk_widget_grab_focus(GTK_WIDGET(webview)); /* process_line above may have deleted the tab, check if its still around */ - if (wd->cur_buf->web) - // evas_object_focus_set(wd->cur_buf->view, EINA_TRUE); - elm_object_focus_set(wd->cur_buf->web, EINA_TRUE); + if (wd->cur_buf->view) { + elm_object_focus_set(elm_object_top_widget_get(wd->win), EINA_FALSE); + evas_object_focus_set(wd->cur_buf->view, EINA_TRUE); + } } static Eina_Bool diff --git a/src/commands.c b/src/commands.c @@ -744,6 +744,7 @@ set(const Arg *arg, void *data) // gtk_entry_set_text(GTK_ENTRY(inputbox), ""); // gtk_widget_grab_focus(GTK_WIDGET(webview)); elm_entry_entry_set(ad->url, ""); + elm_object_focus_set(elm_object_top_widget_get(ad->win), EINA_FALSE); evas_object_focus_set(ad->cur_buf->view, EINA_TRUE); break; case ModePassThrough: diff --git a/src/utilities.c b/src/utilities.c @@ -1168,19 +1168,16 @@ buffer_add(const unsigned char flags, Window_Data *wd, const char *url, Session_ td->inspector_enabled = EINA_FALSE; td->proxy_enabled = EINA_FALSE; td->cookies_enabled = EINA_FALSE; - // td->view = ewk_view_add_with_context(evas_object_evas_get(wd->win), wd->app->ewk_context); - // ewk_view_theme_set(td->view, "/usr/share/ewebkit-0/themes/default.edj"); - td->web = elm_web_add(wd->win); - td->view = elm_web_webkit_view_get(td->web); + td->view = ewk_view_add(evas_object_evas_get(wd->win)); + ewk_view_theme_set(td->view, "/usr/share/ewebkit-0/themes/default.edj"); - // ewk_view_setting_user_agent_set(td->view, "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.7 (KHTML, like Gecko) Chrome/7.0.514.0 Safari/534.7"); - // ewk_view_history_enable_set(td->view, EINA_TRUE); + // Ewk_Settings *settings = ewk_view_settings_get(td->view); + // ewk_settings_DNS_prefetching_enabled_set(settings, EINA_TRUE); - elm_web_inwin_mode_set(td->web, EINA_TRUE); - evas_object_size_hint_weight_set(td->web, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(td->web, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(td->view, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(td->view, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_naviframe_item_simple_push(wd->naviframe, td->web); + elm_naviframe_item_simple_push(wd->naviframe, td->view); /* if (wd->cur_buf) @@ -1238,7 +1235,7 @@ buffer_current_set(Buffer_Data *new_buf) // ewk_view_web_inspector_show(new_buf->view); //} - elm_naviframe_item_simple_promote(wd->naviframe, new_buf->web); + elm_naviframe_item_simple_promote(wd->naviframe, new_buf->view); /* if (new_buf->proxy_enabled) enable_proxy(ad->cur_buf); diff --git a/src/viking.h b/src/viking.h @@ -260,7 +260,6 @@ typedef struct struct _Buffer_Data { - Evas_Object *web; Evas_Object *view; unsigned int buf_number;