Merge lp:~ivaldi/midori/outsource-webinspector into lp:midori

[André Stösel]

[Cris Dywan (kalikiana)]

I dislike saving the hit test result because it is racy and you will eventually encounter a situation where it's not set, this is what happened before with regard to the URI below the mouse pointer and the selected text.

How about taking the hit test result in the context menu event and storing it in the action, in a subclass maybe, which is added to the menu?

review: Needs Fixing

[lp:~ivaldi/midori/outsource-webinspector]

6468. By André Stösel on 2013-11-28

use wrapper object to launch the web inspector

6469. By André Stösel on 2013-11-28

remove unused hit test property

Unmerged revisions

6469. By André Stösel on 2013-11-28

remove unused hit test property

6468. By André Stösel on 2013-11-28

use wrapper object to launch the web inspector

6467. By André Stösel on 2013-11-06

set coordinates for "inspect element"

6466. By André Stösel on 2013-11-06

add property for view->hit_test

6465. By André Stösel on 2013-11-06

new webinspector extension

6464. By André Stösel on 2013-11-06

remove webinspector from core

=== added file 'extensions/webinspector.vala'
--- extensions/webinspector.vala	1970-01-01 00:00:00 +0000
+++ extensions/webinspector.vala	2013-11-28 20:51:46 +0000
@@ -0,0 +1,126 @@
+/*
+   Copyright (C) 2013 André Stösel <[e-mail]>
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   See the file COPYING for the full license text.
+*/
+
+namespace WebInspector {
+    private class Launcher : GLib.Object {
+        private GLib.Value v;
+        private Midori.App app;
+
+        public Launcher (Midori.App app, WebKit.HitTestResult hit_test_result) {
+            this.app = app;
+            this.v = new GLib.Value (typeof (WebKit.HitTestResult));
+            this.v.set_object (hit_test_result);
+        }
+
+        public void inspect_element (Gtk.Action action) {
+            Midori.Browser browser = this.app.browser;
+            Midori.View view = browser.tab as Midori.View;
+
+            WebKit.WebInspector inspector = view.web_view.web_inspector;
+
+            WebKit.HitTestResult hit_test_result = this.v.get_object () as WebKit.HitTestResult;
+
+            int x, y;
+            hit_test_result.get("x", out x);
+            hit_test_result.get("y", out y);
+
+            inspector.inspect_coordinates (x, y);
+            inspector.show();
+
+            this.unref ();
+        }
+    }
+
+    private class Manager : Midori.Extension {
+        private unowned WebKit.WebView inspector_inspect_web_view (WebKit.WebView web_view) {
+            Gtk.Widget inspector_view = new WebKit.WebView ();
+            Gtk.Window window = new Gtk.Window ();
+            window.add (inspector_view);
+            window.show_all ();
+            return inspector_view as WebKit.WebView;
+        }
+
+        private bool inspector_show_window (WebKit.WebInspector inspector) {
+            Gtk.Widget inspector_view = inspector.web_view as Gtk.Widget;
+            Gtk.Widget window = inspector_view.get_toplevel ();
+            window.show ();
+            return true;
+        }
+
+        private void context_menu (WebKit.HitTestResult hit_test_result, Midori.ContextAction menu) {
+            Launcher launcher = new Launcher (this.get_app (), hit_test_result);
+            launcher.ref ();
+            menu.add_simple ("InspectElement", _("Inspect _Element"), null, null, launcher.inspect_element);
+        }
+
+        private void tab_added (Midori.Browser browser, Midori.View view) {
+            view.context_menu.connect (this.context_menu);
+
+            view.web_view.web_inspector.show_window.connect (this.inspector_show_window);
+            view.web_view.web_inspector.inspect_web_view.connect (this.inspector_inspect_web_view);
+        }
+
+        private void tab_removed (Midori.Browser browser, Midori.View view) {
+            view.context_menu.disconnect (this.context_menu);
+        }
+
+        private void browser_added (Midori.Browser browser) {
+            foreach (Midori.View tab in browser.get_tabs ()) {
+                this.tab_added (browser, tab);
+            }
+
+            browser.add_tab.connect (this.tab_added);
+            browser.remove_tab.connect (this.tab_removed);
+        }
+
+        private void browser_removed (Midori.Browser browser) {
+            foreach (Midori.View tab in browser.get_tabs ()) {
+                this.tab_removed (browser, tab);
+            }
+
+            browser.add_tab.disconnect (this.tab_added);
+            browser.remove_tab.disconnect (this.tab_removed);
+        }
+
+        private void activated (Midori.App app) {
+            foreach (Midori.Browser browser in app.get_browsers ()) {
+                this.browser_added (browser);
+            }
+
+            app.add_browser.connect (this.browser_added);
+            app.remove_browser.connect (this.browser_removed);
+        }
+
+        private void deactivated () {
+            Midori.App app = this.get_app ();
+            foreach (Midori.Browser browser in app.get_browsers ()) {
+                this.browser_removed (browser);
+            }
+
+            app.add_browser.disconnect (this.browser_added);
+            app.remove_browser.disconnect (this.browser_removed);
+        }
+
+        internal Manager () {
+            GLib.Object (name: _("WebInspector"),
+                         description: _("WebInspector support"),
+                         version: "0.1" + Midori.VERSION_SUFFIX,
+                         authors: "André Stösel <[e-mail]>");
+
+            this.activate.connect (this.activated);
+            this.deactivate.connect (this.deactivated);
+        }
+    }
+}
+
+public Midori.Extension extension_init () {
+    return new WebInspector.Manager ();
+}
 
=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2013-11-27 09:47:37 +0000
+++ midori/midori-browser.c	2013-11-28 20:51:46 +0000
@@ -71,9 +71,6 @@
     GtkWidget* panel;
     GtkWidget* notebook;
 
-    GtkWidget* inspector;
-    GtkWidget* inspector_view;
-
     GtkWidget* find;
 
     GtkWidget* statusbar;
@@ -1401,41 +1398,6 @@
 }
 
 static void
-midori_view_attach_inspector_cb (GtkWidget*     view,
-                                 GtkWidget*     inspector_view,
-                                 MidoriBrowser* browser)
-{
-    GtkWidget* toplevel = gtk_widget_get_toplevel (inspector_view);
-    GtkWidget* scrolled = gtk_widget_get_parent (browser->inspector_view);
-    if (browser->inspector_view == inspector_view)
-        return;
-
-    gtk_widget_hide (toplevel);
-    gtk_widget_destroy (browser->inspector_view);
-    gtk_widget_reparent (inspector_view, scrolled);
-    gtk_widget_show_all (browser->inspector);
-    browser->inspector_view = inspector_view;
-    gtk_widget_destroy (toplevel);
-    if (!katze_object_get_boolean (browser->settings, "last-inspector-attached"))
-        g_object_set (browser->settings, "last-inspector-attached", TRUE, NULL);
-}
-
-static void
-midori_view_detach_inspector_cb (GtkWidget*     view,
-                                 GtkWidget*     inspector_view,
-                                 MidoriBrowser* browser)
-{
-    GtkWidget* scrolled = gtk_widget_get_parent (GTK_WIDGET (inspector_view));
-    GtkWidget* paned = gtk_widget_get_parent (scrolled);
-    browser->inspector_view = gtk_viewport_new (NULL, NULL);
-    gtk_container_remove (GTK_CONTAINER (scrolled), GTK_WIDGET (inspector_view));
-    gtk_container_add (GTK_CONTAINER (scrolled), browser->inspector_view);
-    gtk_widget_hide (paned);
-    if (katze_object_get_boolean (browser->settings, "last-inspector-attached"))
-        g_object_set (browser->settings, "last-inspector-attached", FALSE, NULL);
-}
-
-static void
 midori_browser_view_copy_history (GtkWidget* view_to,
                                   GtkWidget* view_from,
                                   gboolean   omit_last)
@@ -1904,10 +1866,6 @@
                       midori_view_notify_zoom_level_cb, browser,
                       "signal::notify::statusbar-text",
                       midori_view_notify_statusbar_text_cb, browser,
-                      "signal::attach-inspector",
-                      midori_view_attach_inspector_cb, browser,
-                      "signal::detach-inspector",
-                      midori_view_detach_inspector_cb, browser,
                       "signal::new-tab",
                       midori_view_new_tab_cb, browser,
                       "signal::new-window",
@@ -1979,10 +1937,6 @@
                          midori_view_notify_zoom_level_cb, browser,
                          "any_signal",
                          midori_view_notify_statusbar_text_cb, browser,
-                         "any_signal::attach-inspector",
-                         midori_view_attach_inspector_cb, browser,
-                         "any_signal::detach-inspector",
-                         midori_view_detach_inspector_cb, browser,
                          "any_signal::new-tab",
                          midori_view_new_tab_cb, browser,
                          "any_signal::new-window",
@@ -3227,7 +3181,6 @@
     midori_context_action_add_action_group (menu, browser->action_group);
     midori_context_action_add_by_name (menu, "ManageSearchEngines");
     midori_context_action_add_by_name (menu, "ClearPrivateData");
-    midori_context_action_add_by_name (menu, "InspectPage");
     g_signal_emit (browser, signals[POPULATE_TOOL_MENU], 0, default_menu);
     midori_context_action_add (menu, NULL);
     gsize j = 0;
@@ -4702,16 +4655,6 @@
 }
 
 static void
-_action_inspect_page_activate (GtkAction*     action,
-                               MidoriBrowser* browser)
-{
-    GtkWidget* view = midori_browser_get_current_tab (browser);
-    WebKitWebView* web_view = WEBKIT_WEB_VIEW (midori_view_get_web_view (MIDORI_VIEW (view)));
-    WebKitWebInspector* inspector = webkit_web_view_get_inspector (web_view);
-    webkit_web_inspector_show (inspector);
-}
-
-static void
 _action_tab_move_activate (GtkAction*     action,
                            MidoriBrowser* browser)
 {
@@ -5515,9 +5458,6 @@
     { "ClearPrivateData", NULL,
         N_("_Clear Private Data…"), "<Ctrl><Shift>Delete",
         NULL, G_CALLBACK (_action_clear_private_data_activate) },
-    { "InspectPage", NULL,
-        N_("_Inspect Page"), "<Ctrl><Shift>i",
-        NULL, G_CALLBACK (_action_inspect_page_activate) },
 
     { "TabPrevious", GTK_STOCK_GO_BACK,
         N_("_Previous Tab"), "<Ctrl>Page_Up",
@@ -5893,7 +5833,6 @@
             "<menuitem action='UndoTabClose'/>"
             "<menuitem action='TrashEmpty'/>"
             "<menuitem action='Preferences'/>"
-            "<menuitem action='InspectPage'/>"
             "<menuitem action='ReloadUncached'/>"
             "<menuitem action='CaretBrowsing'/>"
             "</menu>"
@@ -6079,7 +6018,6 @@
     GtkSettings* gtk_settings;
     GtkWidget* hpaned;
     GtkWidget* vpaned;
-    GtkWidget* scrolled;
     KatzeArray* dummy_array;
 
     browser->settings = midori_web_settings_new ();
@@ -6464,19 +6402,6 @@
     #endif
     gtk_widget_show (browser->notebook);
 
-    /* Inspector container */
-    browser->inspector = gtk_vbox_new (FALSE, 0);
-    gtk_paned_pack2 (GTK_PANED (vpaned), browser->inspector, FALSE, FALSE);
-    scrolled = gtk_scrolled_window_new (NULL, NULL);
-    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
-                                    GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-    gtk_widget_set_can_focus (scrolled, TRUE);
-    gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled),
-                                         GTK_SHADOW_ETCHED_IN);
-    gtk_box_pack_start (GTK_BOX (browser->inspector), scrolled, TRUE, TRUE, 0);
-    browser->inspector_view = gtk_viewport_new (NULL, NULL);
-    gtk_container_add (GTK_CONTAINER (scrolled), browser->inspector_view);
-
     /* Incremental findbar */
     browser->find = g_object_new (MIDORI_TYPE_FINDBAR, NULL);
     gtk_box_pack_start (GTK_BOX (vbox), browser->find, FALSE, FALSE, 0);
 
=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2013-11-22 18:03:14 +0000
+++ midori/midori-view.c	2013-11-28 20:51:46 +0000
@@ -2300,21 +2300,6 @@
 #endif
 
 static void
-midori_view_inspect_element_activate_cb (GtkAction* action,
-                                         gpointer   user_data)
-{
-    MidoriView* view = user_data;
-    WebKitWebInspector* inspector = webkit_web_view_get_inspector (WEBKIT_WEB_VIEW (view->web_view));
-    #ifndef HAVE_WEBKIT2
-    WebKitHitTestResult* hit_test_result = view->hit_test;
-    gint x = katze_object_get_int (hit_test_result, "x");
-    gint y = katze_object_get_int (hit_test_result, "y");
-    webkit_web_inspector_inspect_coordinates (inspector, x, y);
-    #endif
-    webkit_web_inspector_show (inspector);
-}
-
-static void
 midori_view_add_search_engine_cb (GtkWidget*  widget,
                                   MidoriView* view)
 {
@@ -2569,10 +2554,6 @@
             midori_context_action_add_by_name (menu, "Fullscreen");
     }
 
-    if (katze_object_get_boolean (view->settings, "enable-developer-extras"))
-        midori_context_action_add_simple (menu, "InspectElement", _("Inspect _Element"), NULL, NULL,
-            midori_view_inspect_element_activate_cb, view);
-
     g_signal_emit_by_name (view, "context-menu", hit_test_result, menu);
     return menu;
 }
@@ -3383,152 +3364,6 @@
     return midori_tab_get_progress (MIDORI_TAB (view));
 }
 
-#ifndef HAVE_WEBKIT2
-static gboolean
-midori_view_inspector_window_key_press_event_cb (GtkWidget*   window,
-                                                 GdkEventKey* event,
-                                                 gpointer     user_data)
-{
-    /* Close window on Ctrl+W */
-    if (event->keyval == 'w' && (event->state & GDK_CONTROL_MASK))
-        gtk_widget_destroy (window);
-
-    return FALSE;
-}
-
-static void
-midori_view_web_inspector_construct_window (gpointer       inspector,
-                                            WebKitWebView* web_view,
-                                            GtkWidget*     inspector_view,
-                                            MidoriView*    view)
-{
-    gchar* title;
-    const gchar* label;
-    GtkWidget* window;
-    GtkWidget* toplevel;
-    const gchar* icon_name;
-    GtkIconTheme* icon_theme;
-    GdkPixbuf* icon;
-    GdkPixbuf* gray_icon;
-
-    label = midori_view_get_display_title (view);
-    title = g_strdup_printf (_("Inspect page - %s"), label);
-    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-    gtk_window_set_title (GTK_WINDOW (window), title);
-    g_free (title);
-
-    toplevel = gtk_widget_get_toplevel (GTK_WIDGET (view));
-    if (gtk_widget_is_toplevel (toplevel))
-    {
-        gtk_window_set_screen (GTK_WINDOW (window), gtk_window_get_screen (GTK_WINDOW (toplevel)));
-        katze_window_set_sensible_default_size (GTK_WINDOW (window));
-    }
-
-    /* Attempt to make a gray version of the icon on the fly */
-    icon_name = gtk_window_get_icon_name (GTK_WINDOW (toplevel));
-    icon_theme = gtk_icon_theme_get_for_screen (
-        gtk_widget_get_screen (GTK_WIDGET (view)));
-    icon = gtk_icon_theme_load_icon (icon_theme, icon_name, 32,
-        GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
-    if (icon)
-    {
-        gray_icon = gdk_pixbuf_copy (icon);
-        if (gray_icon)
-        {
-            gdk_pixbuf_saturate_and_pixelate (gray_icon, gray_icon, 0.1f, FALSE);
-            gtk_window_set_icon (GTK_WINDOW (window), gray_icon);
-            g_object_unref (gray_icon);
-        }
-        g_object_unref (icon);
-    }
-    else
-        gtk_window_set_icon_name (GTK_WINDOW (window), icon_name);
-    #if GTK_CHECK_VERSION (3, 4, 0)
-    gtk_window_set_hide_titlebar_when_maximized (GTK_WINDOW (window), TRUE);
-    #endif
-    gtk_container_add (GTK_CONTAINER (window), inspector_view);
-    gtk_widget_show_all (inspector_view);
-
-    g_signal_connect (window, "key-press-event",
-        G_CALLBACK (midori_view_inspector_window_key_press_event_cb), NULL);
-
-    /* FIXME: Update window title with URI */
-}
-
-static WebKitWebView*
-midori_view_web_inspector_inspect_web_view_cb (gpointer       inspector,
-                                               WebKitWebView* web_view,
-                                               MidoriView*    view)
-{
-    GtkWidget* inspector_view = webkit_web_view_new ();
-    midori_view_web_inspector_construct_window (inspector,
-        web_view, inspector_view, view);
-    return WEBKIT_WEB_VIEW (inspector_view);
-}
-
-static gboolean
-midori_view_web_inspector_show_window_cb (WebKitWebInspector* inspector,
-                                          MidoriView*         view)
-{
-    GtkWidget* inspector_view = GTK_WIDGET (webkit_web_inspector_get_web_view (inspector));
-    GtkWidget* window = gtk_widget_get_toplevel (inspector_view);
-    if (!window)
-        return FALSE;
-    if (katze_object_get_boolean (view->settings, "last-inspector-attached"))
-    {
-        gboolean handled = FALSE;
-        g_signal_emit_by_name (inspector, "attach-window", &handled);
-    }
-    else
-    {
-        gtk_widget_show (window);
-        gtk_window_present (GTK_WINDOW (window));
-    }
-    return TRUE;
-}
-
-static gboolean
-midori_view_web_inspector_attach_window_cb (gpointer    inspector,
-                                            MidoriView* view)
-{
-    GtkWidget* inspector_view = GTK_WIDGET (webkit_web_inspector_get_web_view (inspector));
-    g_signal_emit_by_name (view, "attach-inspector", inspector_view);
-    return TRUE;
-}
-
-static gboolean
-midori_view_web_inspector_detach_window_cb (gpointer    inspector,
-                                            MidoriView* view)
-{
-    GtkWidget* inspector_view = GTK_WIDGET (webkit_web_inspector_get_web_view (inspector));
-    GtkWidget* parent = gtk_widget_get_parent (inspector_view);
-    if (GTK_IS_WINDOW (parent))
-        return FALSE;
-
-    gtk_widget_hide (parent);
-    g_signal_emit_by_name (view, "detach-inspector", inspector_view);
-    midori_view_web_inspector_construct_window (inspector,
-        WEBKIT_WEB_VIEW (view->web_view), inspector_view, view);
-    return TRUE;
-}
-
-static gboolean
-midori_view_web_inspector_close_window_cb (gpointer    inspector,
-                                           MidoriView* view)
-{
-    GtkWidget* inspector_view = GTK_WIDGET (webkit_web_inspector_get_web_view (inspector));
-    #ifdef HAVE_WEBKIT2
-    GtkWidget* scrolled = inspector_view;
-    #else
-    GtkWidget* scrolled = gtk_widget_get_parent (inspector_view);
-    #endif
-    if (!scrolled)
-        return FALSE;
-    gtk_widget_hide (gtk_widget_get_parent (scrolled));
-    return TRUE;
-}
-#endif
-
 static GObject*
 midori_view_constructor (GType                  type,
                          guint                  n_construct_properties,
@@ -3670,20 +3505,6 @@
 
     #ifndef HAVE_WEBKIT2
     gtk_container_add (GTK_CONTAINER (view->scrolled_window), view->web_view);
-
-    gpointer inspector = webkit_web_view_get_inspector ((WebKitWebView*)view->web_view);
-    g_object_connect (inspector,
-                      "signal::inspect-web-view",
-                      midori_view_web_inspector_inspect_web_view_cb, view,
-                      "signal::show-window",
-                      midori_view_web_inspector_show_window_cb, view,
-                      "signal::attach-window",
-                      midori_view_web_inspector_attach_window_cb, view,
-                      "signal::detach-window",
-                      midori_view_web_inspector_detach_window_cb, view,
-                      "signal::close-window",
-                      midori_view_web_inspector_close_window_cb, view,
-                      NULL);
     #endif
     gtk_widget_show_all (view->scrolled_window);
     return object;