commit dd839b1885876a8f51f8d5cfa6c9700dbcc4d91b
parent 55fa7f7a759945bbcd046bba5e8899c5f9c4f5a9
Author: Kyle Milz <kmilz@ucalgary.ca>
Date: Mon, 17 Dec 2012 14:37:06 -0700
buffer: remove old commented function
Diffstat:
M | src/buffer.c | | | 80 | ------------------------------------------------------------------------------- |
1 file changed, 0 insertions(+), 80 deletions(-)
diff --git a/src/buffer.c b/src/buffer.c
@@ -360,85 +360,6 @@ free_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
free(bd);
}
-/*
-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)
-{
- int i;
- // WebKitHitTestResult *result;
- // WebKitHitTestResultContext context;
- Ewk_Hit_Test *result;
- Ewk_Hit_Test_Result_Context context;
-
- Evas_Event_Mouse_Up *ev = event_info;
- Buffer_Data *td = data;
- App_Data *ad = td->app;
-
- Evas_Object *view = elm_web_webkit_view_get(td->web);
- Evas_Object *frame = ewk_view_frame_main_get(view);
-
- // if (mode == ModeNormal && event->type == GDK_BUTTON_RELEASE) {
- if (ad->mode == ModeNormal) {
- // handle mouse click events
- for (i = 0; i < LENGTH(mouse); i++) {
- // if (mouse[i].mask == CLEAN(event->button.state)
- if ( (mouse[i].mask == 0 || evas_key_modifier_is_set(ev->modifiers, mouse[i].mask))
- // && (mouse[i].modkey == current_modkey
- && ((ad->current_modkey && !strcmp(mouse[i].modkey, ad->current_modkey))
- || (!mouse[i].modkey && !ad->current_modkey)
- // || mouse[i].modkey == GDK_VoidSymbol) // wildcard
- || !strcmp(mouse[i].modkey, "*")) // wildcard
- // && mouse[i].button == event->button.button
- && (mouse[i].button & ev->button)
- && mouse[i].func) {
- if (mouse[i].func(&mouse[i].arg, ad)) {
- // current_modkey = count = 0;
- ad->current_modkey = NULL;
- ad->count = 0;
- update_state(ad);
- return TRUE;
- }
- }
- }
- // result = webkit_web_view_get_hit_test_result(WEBKIT_WEB_VIEW(widget), (GdkEventButton*)event);
- result = ewk_frame_hit_test_new(frame, ev->canvas.x, ev->canvas.y);
- context = result->context;
-
- // g_object_get(result, "context", &context, NULL);
- // if (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE) {
- if (context & EWK_HIT_TEST_RESULT_CONTEXT_EDITABLE) {
- Arg a = { .i = ModeInsert };
- set(&a, ad);
- ad->manual_focus = TRUE;
- }
- // } else if (mode == ModeInsert && event->type == GDK_BUTTON_RELEASE) {
- } else if (ad->mode == ModeInsert) {
- //result = webkit_web_view_get_hit_test_result(WEBKIT_WEB_VIEW(widget), (GdkEventButton*)event);
- result = ewk_frame_hit_test_new(frame, ev->output.x, ev->output.y);
-
- // g_object_get(result, "context", &context, NULL);
- // if (!(context & WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE)) {
- if (!(context & EWK_HIT_TEST_RESULT_CONTEXT_EDITABLE)) {
- Arg a = { .i = ModeNormal };
- set(&a, ad);
- }
- } else {
- char *value = NULL, *message = NULL;
- jsapi_evaluate_script("window.getSelection().focusNode", &value, &message, ad);
- if (value && !strcmp(value, "[object HTMLFormElement]")) {
- Arg a = { .i = ModeInsert, .s = NULL };
- set(&a, ad);
- ad->manual_focus = TRUE;
- }
- free(value);
- free(message);
- }
- ewk_frame_hit_test_free(result);
- return FALSE;
-}
-*/
-
static void
mousewheel_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
@@ -544,7 +465,6 @@ buffer_add(const unsigned char flags, Window_Data *wd, const char *url, Session_
/* 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);
- // evas_object_event_callback_add(v, EVAS_CALLBACK_MOUSE_UP, notify_event_cb, bd);
evas_object_event_callback_add(v, EVAS_CALLBACK_MOUSE_WHEEL, mousewheel_cb, bd);
if (url)