Merge lp:~midori/midori/innernodeselect into lp:midori

[Cris Dywan]

Get selected text for context menu from hit test result

[lp:~midori/midori/innernodeselect]

6461. By Cris Dywan on 2013-11-05

Check for HTML element if it's not a text node

[gue5t gue5t (gue5t)]

This looks good but it regresses behavior. After this patch, selecting a few letters of a word, right-clicking, and choosing "Search with->Duckduckgo" searches for the entire DOM node's contents instead of just the selected letters. This is not what happens before the patch and not what I would expect to happen as a user.

review: Needs Fixing

[Cris Dywan (kalikiana)]

What was lost in IRC conversations is the fact that neither the current trunk nor this branch fully work depending on the website, the original motivation was that it's subjectively broken in trunk.

We need a good idea on how to deal with this. Including how to test it, because opening the next best website is meaningless for this issue.

Unmerged revisions

6461. By Cris Dywan on 2013-11-05

Check for HTML element if it's not a text node

6460. By Cris Dywan on 2013-11-05

Get selected text for context menu from hit test result

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2013-11-05 23:09:04 +0000
+++ midori/midori-view.c	2013-11-05 23:53:58 +0000
@@ -2246,9 +2246,10 @@
 {
     MidoriView* view = user_data;
     const gchar* search = g_object_get_data (G_OBJECT (action), "search");
+    const gchar* selected = g_object_get_data (G_OBJECT (action), "selected");
     if (search == NULL)
         search = midori_settings_get_location_entry_search (MIDORI_SETTINGS (view->settings));
-    gchar* uri = midori_uri_for_search (search, view->selected_text);
+    gchar* uri = midori_uri_for_search (search, selected);
 
     if (view->open_new_pages_in == MIDORI_NEW_PAGE_WINDOW)
         g_signal_emit (view, signals[NEW_WINDOW], 0, uri);
@@ -2449,18 +2450,28 @@
                 webkit_web_view_can_copy_clipboard (WEBKIT_WEB_VIEW (view->web_view)));
         }
 
-        /* Ensure view->selected_text */
-        midori_view_has_selection (view);
-        if (midori_uri_is_valid (view->selected_text))
+        WebKitDOMNode* selected_node;
+        g_object_get (hit_test_result, "inner-node", &selected_node, NULL);
+        gchar* selected;
+        if (WEBKIT_DOM_IS_TEXT (selected_node))
+            selected = webkit_dom_text_get_whole_text (WEBKIT_DOM_TEXT (selected_node));
+        else if (WEBKIT_DOM_IS_HTML_ELEMENT (selected_node))
+            selected = webkit_dom_html_element_get_inner_text (WEBKIT_DOM_HTML_ELEMENT (selected_node));
+        else
+        {
+            selected = NULL;
+            g_warn_if_reached ();
+        }
+        if (midori_uri_is_valid (selected))
         {
             /* :// and @ together would mean login credentials */
-            if (g_str_has_prefix (view->selected_text, "mailto:")
-             || (strchr (view->selected_text, '@') != NULL
-              && strstr (view->selected_text, "://") == NULL))
+            if (g_str_has_prefix (selected, "mailto:")
+             || (strchr (selected, '@') != NULL
+              && strstr (selected, "://") == NULL))
             {
-                gchar* text = g_strdup_printf (_("Send a message to %s"), view->selected_text);
+                gchar* text = g_strdup_printf (_("Send a message to %s"), selected);
                 GtkAction* action = gtk_action_new ("SendMessage", text, NULL, GTK_STOCK_JUMP_TO);
-                g_object_set_data_full (G_OBJECT (action), "uri", g_strdup (view->selected_text), (GDestroyNotify)g_free);
+                g_object_set_data_full (G_OBJECT (action), "uri", g_strdup (selected), (GDestroyNotify)g_free);
                 g_signal_connect (action, "activate", G_CALLBACK (midori_view_menu_open_email_activate_cb), view);
                 midori_context_action_add (menu, action);
                 g_free (text);
@@ -2468,7 +2479,7 @@
             else
             {
                 GtkAction* action = gtk_action_new ("OpenAddressInNewTab", _("Open Address in New _Tab"), NULL, GTK_STOCK_JUMP_TO);
-                g_object_set_data_full (G_OBJECT (action), "uri", g_strdup (view->selected_text), (GDestroyNotify)g_free);
+                g_object_set_data_full (G_OBJECT (action), "uri", g_strdup (selected), (GDestroyNotify)g_free);
                 g_signal_connect (action, "activate", G_CALLBACK (midori_view_menu_open_link_tab_activate_cb), view);
                 midori_context_action_add (menu, action);
             }
@@ -2496,6 +2507,7 @@
                 }
                 gtk_action_set_always_show_image (GTK_ACTION (action), TRUE);
                 g_object_set_data (G_OBJECT (action), "search", (gchar*)katze_item_get_uri (item));
+                g_object_set_data_full (G_OBJECT (action), "selected", g_strdup (selected), (GDestroyNotify)g_free);
                 g_signal_connect (action, "activate",
                     G_CALLBACK (midori_web_view_menu_search_web_activate_cb), view);
                 i++;