Merge lp:~kalikiana/midori/popup into lp:midori

[Cris Dywan]

Implement dialog windows opened via javascript

[Cris Dywan (kalikiana)]

Meh, the cmake stuff shows up there. Let's hold this off for a moment.

[Cris Dywan (kalikiana)]

FYI cmake is out of the way, can be reviewed now.

[André Stösel (ivaldi)]

review: Approve

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2013-08-15 21:32:30 +0000
+++ midori/midori-browser.c	2013-09-01 17:50:34 +0000
@@ -1553,6 +1553,32 @@
                          gboolean       user_initiated,
                          MidoriBrowser* browser)
 {
+    if (midori_tab_get_is_dialog (MIDORI_TAB (view)))
+    {
+        /* Dialog: URL, no toolbars, no tabs */
+        MidoriBrowser* new_browser;
+        g_signal_emit (browser, signals[NEW_WINDOW], 0, NULL, &new_browser);
+        g_assert (new_browser != NULL);
+        gtk_window_set_transient_for (GTK_WINDOW (new_browser), GTK_WINDOW (browser));
+        gtk_window_set_destroy_with_parent (GTK_WINDOW (new_browser), TRUE);
+        MidoriWebSettings* settings = midori_web_settings_new ();
+        g_object_set (settings,
+                      "toolbar-items", "Location",
+                      "show-menubar", FALSE,
+                      "show-bookmarkbar", FALSE,
+                      "show-statusbar", FALSE,
+                      NULL);
+        g_object_set (new_browser,
+                      "settings", settings,
+                      "show-tabs", FALSE,
+                      NULL);
+        g_object_unref (settings);
+        _action_set_visible (new_browser, "CompactMenu", FALSE);
+        midori_browser_add_tab (new_browser, new_view);
+        midori_browser_set_current_tab (new_browser, new_view);
+        return;
+    }
+
     if (midori_view_forward_external (new_view,
         katze_item_get_uri (midori_view_get_proxy_item (MIDORI_VIEW (new_view))),
         where))
@@ -6773,7 +6799,6 @@
     MidoriToolbarStyle toolbar_style;
     gchar* toolbar_items;
     gboolean close_buttons_on_tabs;
-    KatzeItem* item;
 
     g_object_get (browser->settings,
                   "remember-last-window-size", &remember_last_window_size,
@@ -6840,13 +6865,15 @@
     {
         const gchar* default_search = midori_settings_get_location_entry_search (
             MIDORI_SETTINGS (browser->settings));
-        item = katze_array_get_nth_item (browser->search_engines,
-                                         browser->last_web_search);
-        if (item)
+        KatzeItem* item;
+
+        if ((item = katze_array_get_nth_item (browser->search_engines,
+                                              browser->last_web_search)))
             midori_search_action_set_current_item (MIDORI_SEARCH_ACTION (
                 _action_by_name (browser, "Search")), item);
 
-        if ((item = katze_array_find_uri (browser->search_engines, default_search)))
+        if (default_search != NULL
+         && (item = katze_array_find_uri (browser->search_engines, default_search)))
             midori_search_action_set_default_item (MIDORI_SEARCH_ACTION (
                 _action_by_name (browser, "Search")), item);
     }
 
=== modified file 'midori/midori-tab.vala'
--- midori/midori-tab.vala	2013-07-28 15:50:26 +0000
+++ midori/midori-tab.vala	2013-09-01 17:50:34 +0000
@@ -92,6 +92,10 @@
        /* Since: 0.5.5 */
         public signal void context_menu (WebKit.HitTestResult hit_test_result, ContextAction menu);
 
+        /* A dialog tab has a fixed size, limited GUI and is transient.
+           Since: 0.5.6 */
+        public bool is_dialog { get; protected set; }
+
         public bool is_blank () {
             return URI.is_blank (uri);
         }
 
=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2013-09-01 16:40:29 +0000
+++ midori/midori-view.c	2013-09-01 17:50:34 +0000
@@ -2618,16 +2618,39 @@
 
 #ifndef HAVE_WEBKIT2
 static gboolean
+midori_view_web_view_close_cb (WebKitWebView* web_view,
+                               GtkWidget*     view)
+{
+    midori_browser_close_tab (midori_browser_get_for_widget (view), view);
+    return TRUE;
+}
+
+static gboolean
 webkit_web_view_web_view_ready_cb (GtkWidget*  web_view,
                                    MidoriView* view)
 {
     MidoriNewView where = MIDORI_NEW_VIEW_TAB;
     GtkWidget* new_view = GTK_WIDGET (midori_view_get_for_widget (web_view));
 
-    /* FIXME: Open windows opened by scripts in tabs if they otherwise
+    WebKitWebWindowFeatures* features = webkit_web_view_get_window_features (web_view);
+    gboolean locationbar_visible, menubar_visible, toolbar_visible;
+    gint width, height;
+    g_object_get (features,
+                  "locationbar-visible", &locationbar_visible,
+                  "menubar-visible", &menubar_visible,
+                  "toolbar-visible", &toolbar_visible,
+                  "width", &width,
+                  "height", &height,
+                  NULL);
+    midori_tab_set_is_dialog (MIDORI_TAB (view),
+     !locationbar_visible && !menubar_visible && !toolbar_visible
+     && width > 0 && height > 0);
+
+    /* Open windows opened by scripts in tabs if they otherwise
         would be replacing the page the user opened. */
     if (view->open_new_pages_in == MIDORI_NEW_PAGE_CURRENT)
-        return TRUE;
+        if (!midori_tab_get_is_dialog (MIDORI_TAB (view)))
+            return TRUE;
 
     if (view->open_new_pages_in == MIDORI_NEW_PAGE_TAB)
     {
@@ -2640,6 +2663,15 @@
     gtk_widget_show (new_view);
     g_signal_emit (view, signals[NEW_VIEW], 0, new_view, where, FALSE);
 
+    if (midori_tab_get_is_dialog (MIDORI_TAB (view)))
+    {
+        GtkWidget* toplevel = gtk_widget_get_toplevel (new_view);
+        if (width > 0 && height > 0)
+            gtk_widget_set_size_request (toplevel, width, height);
+        g_signal_connect (web_view, "close-web-view",
+                          G_CALLBACK (midori_view_web_view_close_cb), new_view);
+    }
+
     return TRUE;
 }
 
@@ -3947,6 +3979,10 @@
                 for (i = 0; i < G_N_ELEMENTS (widgets); i++)
                     g_string_append_printf (demo, widgets[i], " class=\"fallback\"");
                 g_string_append (demo, "</div>");
+                g_string_append (demo, "<p><a href=\"http://example.com\" target=\"wp\" "
+                                       "onclick=\"javascript:window.open('http://example.com','wp',"
+                                       "'width=320, height=240, toolbar=false'); return false\""
+                                       ">Popup window</a></p>");
                 data = g_string_free (demo, FALSE);
             }
             else if (!strcmp (uri, "about:private"))