[Xfce4-commits] <midori:master> Use existing event if available to ensure link URI

[Christian Dywan]

Updating branch refs/heads/master
         to 1f15d17c5fcd6d3ce80a2f3bd5cd00780870fdf5 (commit)
       from 9b3d90ec7320e3be3a4d21c08efc5ad11965c457 (commit)

commit 1f15d17c5fcd6d3ce80a2f3bd5cd00780870fdf5
Author: Alexander Butenko <a.butenka at gmail.com>
Date:   Sun Jan 2 01:24:50 2011 +0100

    Use existing event if available to ensure link URI
    
    This partially resolves problems with Midori opening the
    wrong link when opening tabs in the background.

 midori/midori-view.c |   27 ++++++++++++++++-----------
 1 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/midori/midori-view.c b/midori/midori-view.c
index ea44456..2efc0a8 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -1611,28 +1611,33 @@ webkit_web_view_hovering_over_link_cb (WebKitWebView* web_view,
 static void
 midori_view_ensure_link_uri (MidoriView* view,
                              gint        *x,
-                             gint        *y)
+                             gint        *y,
+                             GdkEventButton* event)
 {
     g_return_if_fail (MIDORI_IS_VIEW (view));
 
     #if WEBKIT_CHECK_VERSION (1, 1, 15)
     if (view->web_view && gtk_widget_get_window (view->web_view))
     {
-        gint ex, ey;
-        GdkEventButton event;
+        GdkEventButton ev;
+
+        if (!event) {
+            gint ex, ey;
+            event = &ev;
+            gdk_window_get_pointer (gtk_widget_get_window (view->web_view), &ex, &ey, NULL);
+            event->x = ex;
+            event->y = ey;
+        }
 
-        gdk_window_get_pointer (gtk_widget_get_window (view->web_view), &ex, &ey, NULL);
         if (x != NULL)
-            *x = ex;
+            *x = event->x;
         if (y != NULL)
-            *y = ey;
+            *y = event->y;
 
-        event.x = ex;
-        event.y = ey;
         katze_object_assign (view->hit_test,
             g_object_ref (
             webkit_web_view_get_hit_test_result (
-            WEBKIT_WEB_VIEW (view->web_view), &event)));
+            WEBKIT_WEB_VIEW (view->web_view), event)));
         katze_assign (view->link_uri,
              katze_object_get_string (view->hit_test, "link-uri"));
     }
@@ -1654,7 +1659,7 @@ gtk_widget_button_press_event_cb (WebKitWebView*  web_view,
     gboolean background;
 
     event->state = event->state & MIDORI_KEYS_MODIFIER_MASK;
-    midori_view_ensure_link_uri (view, NULL, NULL);
+    midori_view_ensure_link_uri (view, NULL, NULL, event);
     link_uri = midori_view_get_link_uri (view);
 
     switch (event->button)
@@ -2248,7 +2253,7 @@ midori_view_populate_popup (MidoriView* view,
     gboolean is_image;
     gboolean is_media;
 
-    midori_view_ensure_link_uri (view, &x, &y);
+    midori_view_ensure_link_uri (view, &x, &y, NULL);
     context = katze_object_get_int (view->hit_test, "context");
     has_selection = context & WEBKIT_HIT_TEST_RESULT_CONTEXT_SELECTION;
     /* Ensure view->selected_text */