viking

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

commit 55fa7f7a759945bbcd046bba5e8899c5f9c4f5a9
parent d9ef67e48d23530305af837a05d6d9f967f79bad
Author: Kyle Milz <kmilz@ucalgary.ca>
Date:   Mon, 17 Dec 2012 14:35:16 -0700

buffer: move some (for now) unused functions

Diffstat:
Msrc/buffer.c | 74+++++---------------------------------------------------------------------
Msrc/buffer_callback.c | 64++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/src/buffer.c b/src/buffer.c @@ -275,36 +275,6 @@ webview_keypress_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) /* static void -hoverlink_cb(void *data, Evas_Object *obj, void *event_info) -{ - Buffer_Data *td = data; - const char *uri = ewk_view_uri_get(td->view); - // event_info is a char *link[2] where the first string contains the URL - // and the second the title of the link - char **link = event_info; - // char *markup; - - memset(td->window->rememberedURI, 0, 1024); - if (link && link[0]) { - // markup = g_markup_printf_escaped("<span font=\"%s\">Link: %s</span>", statusfont, link[0]); - // markup = strdup_printf("<font=Monospace font_size=10 color=#FF0>%s", link[0]); - // gtk_label_set_markup(GTK_LABEL(td->app->status_url), markup); - // elm_object_text_set(td->app->status_url, markup); - update_url(link[0], td->window); - strcpy(td->window->rememberedURI, link[0]); - // free(markup); - } else - update_url(uri, td->window); -} - -static void -hoverlink_out_cb(void *data, Evas_Object *obj, void *event_info) -{ - Buffer_Data *td = data; - update_url(ewk_view_uri_get(td->view), td->window); -} - -static void console_cb(void *data, Evas_Object *obj, const char *message, unsigned int line, const char *source) { Arg a; @@ -392,39 +362,6 @@ free_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) /* static void -inputmethod_changed_cb(void *data, Evas_Object *obj, void *event_info) -{ - const char *value = NULL; - Eina_Bool *enabled = event_info; - Buffer_Data *bd = data; - Window_Data *wd = bd->window; - // Evas_Object *frame = ewk_view_frame_main_get(bd->view); - - printf("inputmethod_changed()\n"); - - if (wd->mode == ModeNormal && enabled) { - Arg a = { .i = ModeInsert }; - set(&a, wd); - wd->manual_focus = TRUE; - } else if (wd->mode == ModeInsert && !enabled) { - Arg a = { .i = ModeNormal }; - set(&a, wd); - } else { - // char *value = NULL, *message = NULL; - // jsapi_evaluate_script("window.getSelection().focusNode", &value, &message, ad); - // value = ewk_frame_script_execute(frame, "window.getSelection().focusNode"); - if (value && !strcmp(value, "[object HTMLFormElement]")) { - Arg a = { .i = ModeInsert, .s = NULL }; - set(&a, wd); - wd->manual_focus = TRUE; - } - // free(value); - eina_stringshare_del(value); - // free(message); - } -} - -static void // notify_event_cb(GtkWidget *widget, GdkEvent *event, gpointer user_data) { notify_event_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) { @@ -578,6 +515,11 @@ buffer_add(const unsigned char flags, Window_Data *wd, const char *url, Session_ evas_object_smart_callback_add(v, "tooltip,text,set", on_tooltip_text_set, wd); evas_object_smart_callback_add(v, "tooltip,text,unset", on_tooltip_text_unset, wd); evas_object_smart_callback_add(v, "file,chooser,request", on_file_chooser_request, wd); + /* not yet implemented in ewebkit2 + evas_object_smart_callback_add(v, "link,hover,in", hoverlink_cb, td); + evas_object_smart_callback_add(v, "link,hover,out",hoverlink_out_cb, td); + evas_object_smart_callback_add(v, "inputmethod,changed", inputmethod_changed_cb, td); + */ /* downloads - download.h */ evas_object_smart_callback_add(v, "download,request", download_request_cb, wd); @@ -595,16 +537,10 @@ buffer_add(const unsigned char flags, Window_Data *wd, const char *url, Session_ /* other */ evas_object_smart_callback_add(v, "icon,changed", icon_changed_cb, bd); evas_object_smart_callback_add(v, "back,forward,list,changed", bf_list_changed_cb, bd); - evas_object_smart_callback_add(v, "policy,decision,new,window", policy_new_window_cb, bd); evas_object_smart_callback_add(v, "close,window", close_window_cb, bd); evas_object_smart_callback_add(v, "create,window", create_window_cb, bd); - /* not yet implemented in ewebkit2 */ - // evas_object_smart_callback_add(v, "link,hover,in", hoverlink_cb, td); - // evas_object_smart_callback_add(v, "link,hover,out",hoverlink_out_cb, td); - // evas_object_smart_callback_add(v, "inputmethod,changed", inputmethod_changed_cb, td); - /* evas events */ evas_object_event_callback_add(v, EVAS_CALLBACK_FREE, free_cb, bd); evas_object_event_callback_add(v, EVAS_CALLBACK_KEY_DOWN, webview_keypress_cb, bd); diff --git a/src/buffer_callback.c b/src/buffer_callback.c @@ -478,4 +478,68 @@ on_file_chooser_request(void *user_data, Evas_Object *webview, void *event_info) evas_object_show(window); } +/* +static void +hoverlink_cb(void *data, Evas_Object *obj, void *event_info) +{ + Buffer_Data *td = data; + const char *uri = ewk_view_uri_get(td->view); + // event_info is a char *link[2] where the first string contains the URL + // and the second the title of the link + char **link = event_info; + // char *markup; + + memset(td->window->rememberedURI, 0, 1024); + if (link && link[0]) { + // markup = g_markup_printf_escaped("<span font=\"%s\">Link: %s</span>", statusfont, link[0]); + // markup = strdup_printf("<font=Monospace font_size=10 color=#FF0>%s", link[0]); + // gtk_label_set_markup(GTK_LABEL(td->app->status_url), markup); + // elm_object_text_set(td->app->status_url, markup); + update_url(link[0], td->window); + strcpy(td->window->rememberedURI, link[0]); + // free(markup); + } else + update_url(uri, td->window); +} + +static void +hoverlink_out_cb(void *data, Evas_Object *obj, void *event_info) +{ + Buffer_Data *td = data; + update_url(ewk_view_uri_get(td->view), td->window); +} + +static void +inputmethod_changed_cb(void *data, Evas_Object *obj, void *event_info) +{ + const char *value = NULL; + Eina_Bool *enabled = event_info; + Buffer_Data *bd = data; + Window_Data *wd = bd->window; + // Evas_Object *frame = ewk_view_frame_main_get(bd->view); + + printf("inputmethod_changed()\n"); + + if (wd->mode == ModeNormal && enabled) { + Arg a = { .i = ModeInsert }; + set(&a, wd); + wd->manual_focus = TRUE; + } else if (wd->mode == ModeInsert && !enabled) { + Arg a = { .i = ModeNormal }; + set(&a, wd); + } else { + // char *value = NULL, *message = NULL; + // jsapi_evaluate_script("window.getSelection().focusNode", &value, &message, ad); + // value = ewk_frame_script_execute(frame, "window.getSelection().focusNode"); + if (value && !strcmp(value, "[object HTMLFormElement]")) { + Arg a = { .i = ModeInsert, .s = NULL }; + set(&a, wd); + wd->manual_focus = TRUE; + } + // free(value); + eina_stringshare_del(value); + // free(message); + } +} +*/