commit d8300bd0cdec5b4305b601db6b38b0ceb3978cec
parent 34cdaf0cedd40ad7ee80bdf840652dc1c004c89f
Author: Kyle Milz <kmilz@ucalgary.ca>
Date: Sat, 13 Oct 2012 22:10:10 -0600
do some mass renaming of functions
Diffstat:
1 file changed, 26 insertions(+), 24 deletions(-)
diff --git a/src/callbacks.c b/src/callbacks.c
@@ -21,7 +21,7 @@ Eina_Bool download_gui_update(void *data);
static void
-webview_title_changed_cb(void *data, Evas_Object *obj, void *event_info)
+title_changed_cb(void *data, Evas_Object *obj, void *event_info)
{
Buffer_Data *bd = data;
Window_Data *wd = bd->window;
@@ -35,7 +35,7 @@ webview_title_changed_cb(void *data, Evas_Object *obj, void *event_info)
}
static void
-webview_progress_changed_cb(void *data, Evas_Object *obj, void *event_info)
+load_progress_cb(void *data, Evas_Object *obj, void *event_info)
{
Buffer_Data *td = data;
Window_Data *wd = td->window;
@@ -117,7 +117,7 @@ webview_inspector_close_cb(void *data, Evas_Object *obj, void *event_info)
*/
static void
-webview_uri_changed_cb(void *data, Evas_Object *obj, void *event_info)
+uri_changed_cb(void *data, Evas_Object *obj, void *event_info)
{
// Arg a = { .i = Silent, .s = strdup(JS_SETUP_HINTS) };
Buffer_Data *bd = data;
@@ -142,7 +142,7 @@ webview_uri_changed_cb(void *data, Evas_Object *obj, void *event_info)
}
static void
-webview_load_finished_cb(void *data, Evas_Object *obj, void *event_info)
+load_finished_cb(void *data, Evas_Object *obj, void *event_info)
{
/* WebKitWebSettings *settings = webkit_web_view_get_settings(webview); */
Buffer_Data *bd = data;
@@ -282,12 +282,14 @@ download_cancelled_cb(void *data, Evas_Object *obj, void *event_info)
download_remove(wd, dl);
}
+/*
static void
webview_mousewheel_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Buffer_Data *bd = data;
update_state(bd->window);
}
+*/
Eina_Bool
process_keypress(void *event_info, void *data)
@@ -401,7 +403,7 @@ webview_keypress_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
/*
static void
-webview_hoverlink_cb(void *data, Evas_Object *obj, void *event_info)
+hoverlink_cb(void *data, Evas_Object *obj, void *event_info)
{
Buffer_Data *td = data;
const char *uri = ewk_view_uri_get(td->view);
@@ -424,14 +426,14 @@ webview_hoverlink_cb(void *data, Evas_Object *obj, void *event_info)
}
static void
-webview_hoverlink_out_cb(void *data, Evas_Object *obj, void *event_info)
+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
-webview_console_cb(void *data, Evas_Object *obj, const char *message, unsigned int line, const char *source)
+console_cb(void *data, Evas_Object *obj, const char *message, unsigned int line, const char *source)
{
Arg a;
Buffer_Data *td = data;
@@ -928,7 +930,7 @@ hist_title_updated_cb(const Evas_Object *vew, const char *title, const char *url
}
static void
-_web_free_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+webview_free_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Buffer_Data *bd = data;
Window_Data *wd = bd->window;
@@ -997,10 +999,10 @@ webview_create_window_cb(void *data, Evas_Object *obj, Eina_Bool js, const Elm_W
*/
void
-setup_buffer_callbacks(Buffer_Data *td)
+setup_buffer_callbacks(Buffer_Data *bd)
{
- Evas_Object *v = td->view;
- Window_Data *wd = td->window;
+ Evas_Object *v = bd->view;
+ Window_Data *wd = bd->window;
// elm_web_window_create_hook_set(td->web, webview_create_window_cb, td->window);
// elm_web_console_message_hook_set(td->web, webview_console_cb, td);
@@ -1013,24 +1015,24 @@ setup_buffer_callbacks(Buffer_Data *td)
evas_object_smart_callback_add(v, "download,cancelled", download_cancelled_cb, wd);
/* navigation */
- evas_object_smart_callback_add(v, "title,changed", webview_title_changed_cb, td);
- evas_object_smart_callback_add(v, "uri,changed", webview_uri_changed_cb, td);
- evas_object_smart_callback_add(v, "load,progress", webview_progress_changed_cb, td);
- evas_object_smart_callback_add(v, "load,finished", webview_load_finished_cb, td);
- evas_object_smart_callback_add(v, "load,error", load_error_cb, td);
+ evas_object_smart_callback_add(v, "title,changed", title_changed_cb, bd);
+ evas_object_smart_callback_add(v, "uri,changed", uri_changed_cb, bd);
+ evas_object_smart_callback_add(v, "load,progress", load_progress_cb, bd);
+ evas_object_smart_callback_add(v, "load,finished", load_finished_cb, bd);
+ evas_object_smart_callback_add(v, "load,error", load_error_cb, bd);
/* not yet implemented in ewebkit */
- // evas_object_smart_callback_add(v, "link,hover,in", webview_hoverlink_cb, td);
- // evas_object_smart_callback_add(v, "link,hover,out",webview_hoverlink_out_cb, td);
+ // 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_object_smart_callback_add(v, "inspector,view,create", webview_inspector_cb, td);
- // evas_object_smart_callback_add(v, "inspector,view,close", webview_inspector_close_cb, td);
+ // evas_object_smart_callback_add(v, "inspector,view,create", inspector_cb, td);
+ // evas_object_smart_callback_add(v, "inspector,view,close", inspector_close_cb, td);
/* input events */
- evas_object_event_callback_add(v, EVAS_CALLBACK_FREE, _web_free_cb, td);
- evas_object_event_callback_add(v, EVAS_CALLBACK_KEY_DOWN, webview_keypress_cb, td);
- // evas_object_event_callback_add(v, EVAS_CALLBACK_MOUSE_UP, notify_event_cb, td);
- evas_object_event_callback_add(v, EVAS_CALLBACK_MOUSE_WHEEL, webview_mousewheel_cb, td);
+ evas_object_event_callback_add(v, EVAS_CALLBACK_FREE, webview_free_cb, bd);
+ evas_object_event_callback_add(v, EVAS_CALLBACK_KEY_DOWN, webview_keypress_cb, bd);
+ // evas_object_event_callback_add(v, EVAS_CALLBACK_MOUSE_UP, notify_event_cb, bd);
+ // evas_object_event_callback_add(v, EVAS_CALLBACK_MOUSE_WHEEL, webview_mousewheel_cb, bd);
}
void
