Merge lp:~midori/midori/clippyBookmarks into lp:midori

[Cris Dywan]

Move bookmarkbar into clippy extension

I created a new (stock) extension, Clippy, which implements the bookmarks toolbar (and potentially all of the bookmark features in the future).

Unmerged revisions

7174. By Cris Dywan on 2017-11-26

Move bookmarkbar into clippy extension

7173. By Cris Dywan on 2017-11-26

Drop pass-through-console flag

7172. By Cris Dywan on 2017-11-25

Unconditionally include WebKit2 headers

7171. By Cris Dywan on 2017-11-07

Drop non-WebKit2 website saving code path

7170. By Cris Dywan on 2017-11-06

Non-conditional skipping of non-WebKit2 extensions

7169. By Cris Dywan on 2017-11-06

Drop non-WebKit2/ non-libnotify code paths

=== added file 'extensions/clippy.vala'
--- extensions/clippy.vala	1970-01-01 00:00:00 +0000
+++ extensions/clippy.vala	2017-11-26 10:03:39 +0000
@@ -0,0 +1,153 @@
+/*
+   Copyright (C) 2009-2017 Christian Dywan <[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 Bookmarks {
+    private class Toolbar : Gtk.Toolbar {
+        Midori.Browser browser;
+        bool populating;
+
+        public Toolbar (Midori.Browser browser) {
+            set_icon_size (Gtk.IconSize.MENU);
+            set_style (Gtk.ToolbarStyle.BOTH_HORIZ);
+
+            this.browser = browser;
+            browser.bookmarks.add_item.connect_after (item_added);
+            browser.bookmarks.update_item.connect_after (item_updated);
+            browser.bookmarks.remove_item.connect_after (item_removed);
+            browser.settings.notify["show-bookmarkbar"].connect (settings_updated);
+            browser.settings.notify_property ("show-bookmarkbar");
+            var action_group = browser.get_action_group ();
+            var action = action_group.get_action ("Bookmarkbar") as Gtk.ToggleAction;
+            action.toggled.connect(toggled);
+            browser.window_state_event.connect (window_state_changed);
+        }
+
+        void toggled (Gtk.ToggleAction action) {
+            browser.settings.show_bookmarkbar = action.get_active ();
+        }
+
+        bool window_state_changed (Gdk.EventWindowState event) {
+            bool is_fullscreen = (event.new_window_state & Gdk.WindowState.FULLSCREEN) != 0;
+            visible = !is_fullscreen && browser.settings.show_bookmarkbar;
+            return false;
+        }
+
+        void settings_updated (GLib.ParamSpec pspec) {
+            var action_group = browser.get_action_group ();
+            var action = action_group.get_action ("Bookmarkbar") as Gtk.ToggleAction;
+            action.set_active (browser.settings.show_bookmarkbar);
+            if (!browser.settings.show_bookmarkbar)
+                clear ();
+            else
+                populate ();
+        }
+
+        void item_added (GLib.Object item) {
+            if (get_visible ())
+                populate ();
+            else if ((item as Katze.Item).get_meta_boolean ("toolbar"))
+                browser.activate_action ("Bookmarkbar");
+            Midori.Browser.update_history ((Katze.Item)item, "bookmark", "created");
+        }
+
+        void item_updated (GLib.Object item) {
+            if (get_visible ())
+                populate ();
+            Midori.Browser.update_history ((Katze.Item)item, "bookmark", "modify");
+        }
+
+        void item_removed (GLib.Object item) {
+            if (get_visible ())
+                populate ();
+            Midori.Browser.update_history ((Katze.Item)item, "bookmark", "delete");
+        }
+
+        void populate () {
+            if (!populating) {
+                populating = true;
+                GLib.Idle.add (populate_idle);
+            }
+        }
+
+        bool populate_idle () {
+            if (populating) {
+                clear ();
+                /* Use a dummy to ensure height of the toolbar */
+                insert (new Gtk.SeparatorToolItem (), -1);
+                var array = (browser.bookmarks as Midori.BookmarksDb).query_recursive (
+                    "id, parentid, title, uri, desc, app, toolbar, pos_panel, pos_bar",
+                    "toolbar = 1", null, false);
+                if (array != null) {
+                    foreach (var item in array.get_items ())
+                        insert_item (item);
+                }
+
+                var action_group = browser.get_action_group ();
+                var action = action_group.get_action ("Bookmarkbar") as Gtk.ToggleAction;
+                visible = action.get_active ();
+                populating = false;
+            }
+            return false;
+        }
+
+        void insert_item (GLib.Object? item) {
+            var action_group = browser.get_action_group ();
+            var action = action_group.get_action ("Bookmarks") as Katze.ArrayAction;
+            var toolitem = action.create_tool_item_for ((Katze.Item)item);
+            toolitem.ref (); // FIXME: Why is this necessary?
+            if (!(item is Katze.Item)) // separator
+                toolitem.set_use_drag_window (true);
+            toolitem.show ();
+            insert (toolitem, -1);
+        }
+
+        void clear () {
+            hide ();
+            foreach (var toolitem in get_children ())
+                toolitem.destroy ();
+        }
+    }
+
+    private class Manager : Midori.Extension {
+        void browser_added (Midori.Browser browser) {
+            browser.notify["bookmarks"].connect (bookmarks_changed);
+            browser.notify_property ("bookmarks");
+        }
+
+        void bookmarks_changed (GLib.Object object, GLib.ParamSpec pspec) {
+            var browser = object as Midori.Browser;
+            var action_group = browser.get_action_group ();
+            var action = action_group.get_action ("Bookmarkbar") as Gtk.ToggleAction;
+            action.visible = browser.parent == null && browser.bookmarks != null;
+            if (action.visible)
+                browser.add_toolbar (new Toolbar (browser));
+        }
+
+        void activated (Midori.App app) {
+            foreach (var browser in app.get_browsers ())
+                browser_added (browser);
+            app.add_browser.connect (browser_added);
+        }
+
+        internal Manager () {
+            GLib.Object (name: "Bookmark Manager",
+                         description: "Manage bookmarks",
+                         version: "0.1" + Midori.VERSION_SUFFIX,
+                         authors: "Christian Dywan <[e-mail]>");
+
+            activate.connect (activated);
+        }
+    }
+}
+
+public Midori.Extension extension_init () {
+    return new Bookmarks.Manager ();
+}

=== modified file 'katze/katze.vapi'
--- katze/katze.vapi	2014-02-22 14:06:19 +0000
+++ katze/katze.vapi	2017-11-26 10:03:39 +0000
@@ -17,6 +17,7 @@
     public class Array : Katze.Item {
         public Array (GLib.Type type);
         public signal void add_item (GLib.Object item);
+        public signal void update_item (GLib.Object item);
         public signal void remove_item (GLib.Object item);
         public uint get_length ();
         public GLib.List<unowned Item> get_items ();
@@ -24,6 +25,11 @@
     }
 
     [CCode (cheader_filename = "katze/katze.h")]
+    public class ArrayAction : Gtk.Action {
+        public Gtk.ToolItem create_tool_item_for (Katze.Item item);
+    }
+
+    [CCode (cheader_filename = "katze/katze.h")]
     public class Item : GLib.Object {
         public Item ();
         public string? uri { get; set; }

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2017-11-26 10:03:39 +0000
+++ midori/midori-browser.c	2017-11-26 10:03:39 +0000
@@ -66,7 +66,6 @@
     GtkWidget* menubar;
     GtkWidget* throbber;
     GtkWidget* navigationbar;
-    GtkWidget* bookmarkbar;
 
     GtkWidget* panel;
     GtkWidget* notebook;
@@ -174,14 +173,6 @@
                               KatzeItem*     item);
 
 static void
-midori_bookmarkbar_populate (MidoriBrowser* browser);
-static void
-midori_bookmarkbar_populate_idle (MidoriBrowser* browser);
-
-static void
-midori_bookmarkbar_clear (GtkWidget* toolbar);
-
-static void
 _midori_browser_set_toolbar_style (MidoriBrowser*     browser,
                                    MidoriToolbarStyle toolbar_style);
 
@@ -299,6 +290,7 @@
 
     _action_set_sensitive (browser, "AddSpeedDial", !midori_view_is_blank (view));
     _action_set_sensitive (browser, "BookmarkAdd", !midori_view_is_blank (view));
+    _action_set_sensitive (browser, "BookmarkFolderAdd", !midori_view_is_blank (view));
     _action_set_sensitive (browser, "MailTo", !midori_view_is_blank (view));
     _action_set_sensitive (browser, "SaveAs", midori_tab_can_save (MIDORI_TAB (view)));
     _action_set_sensitive (browser, "ZoomIn", midori_view_can_zoom_in (view));
@@ -1650,7 +1642,6 @@
                       "show-tabs", FALSE,
                       NULL);
         sokoke_widget_set_visible (new_browser->menubar, FALSE);
-        sokoke_widget_set_visible (new_browser->bookmarkbar, FALSE);
         sokoke_widget_set_visible (new_browser->statusbar, FALSE);
         _action_set_visible (new_browser, "CompactMenu", FALSE);
         _action_set_sensitive (new_browser, "Location", FALSE);
@@ -3344,15 +3335,6 @@
 }
 
 static void
-_action_bookmarkbar_activate (GtkToggleAction* action,
-                              MidoriBrowser*   browser)
-{
-    gboolean active = gtk_toggle_action_get_active (action);
-    g_object_set (browser->settings, "show-bookmarkbar", active, NULL);
-    sokoke_widget_set_visible (browser->bookmarkbar, active);
-}
-
-static void
 _action_statusbar_activate (GtkToggleAction* action,
                             MidoriBrowser*   browser)
 {
@@ -3539,9 +3521,6 @@
         if (katze_object_get_boolean (G_OBJECT (browser->settings), "show-panel"))
             gtk_widget_show (browser->panel);
 
-        if (katze_object_get_boolean (G_OBJECT (browser->settings), "show-bookmarkbar"))
-            gtk_widget_show (browser->bookmarkbar);
-
         if (browser->show_navigationbar)
             gtk_widget_show (browser->navigationbar);
 
@@ -3555,7 +3534,6 @@
     {
         gtk_widget_hide (browser->menubar);
         gtk_widget_hide (browser->panel);
-        gtk_widget_hide (browser->bookmarkbar);
         gtk_widget_hide (browser->navigationbar);
         gtk_widget_hide (browser->statusbar);
         midori_notebook_set_labels_visible (MIDORI_NOTEBOOK (browser->notebook), FALSE);
@@ -5303,7 +5281,7 @@
         FALSE },
     { "Bookmarkbar", NULL,
         N_("_Bookmarkbar"), "",
-        NULL, G_CALLBACK (_action_bookmarkbar_activate),
+        NULL, NULL,
         FALSE },
     { "Statusbar", NULL,
         N_("_Statusbar"), "<Ctrl>j",
@@ -5734,21 +5712,6 @@
     }
 }
 
-static gboolean
-midori_browser_idle (gpointer data)
-{
-    MidoriBrowser* browser = MIDORI_BROWSER (data);
-
-    if (browser->bookmarkbar_populate)
-    {
-        midori_bookmarkbar_populate_idle (browser);
-
-        browser->bookmarkbar_populate = FALSE;
-    }
-
-    return FALSE;
-}
-
 static void
 midori_browser_init (MidoriBrowser* browser)
 {
@@ -6022,9 +5985,10 @@
 
     _action_set_visible (browser, "Bookmarks", browser->bookmarks != NULL);
     _action_set_visible (browser, "BookmarkAdd", browser->bookmarks != NULL);
+    _action_set_visible (browser, "BookmarkFolderAdd", browser->bookmarks != NULL);
     _action_set_visible (browser, "BookmarksImport", browser->bookmarks != NULL);
     _action_set_visible (browser, "BookmarksExport", browser->bookmarks != NULL);
-    _action_set_visible (browser, "Bookmarkbar", browser->bookmarks != NULL);
+    _action_set_visible (browser, "Bookmarkbar", FALSE);
     _action_set_visible (browser, "Trash", browser->trash != NULL);
     _action_set_visible (browser, "UndoTabClose", browser->trash != NULL);
 
@@ -6035,17 +5999,6 @@
     g_signal_connect (browser, "context-menu",
         G_CALLBACK (midori_browser_toolbar_context_menu_cb), browser);
 
-    /* Bookmarkbar */
-    browser->bookmarkbar = gtk_toolbar_new ();
-    gtk_widget_set_name (browser->bookmarkbar, "MidoriBookmarkbar");
-    gtk_toolbar_set_icon_size (GTK_TOOLBAR (browser->bookmarkbar),
-                               GTK_ICON_SIZE_MENU);
-    gtk_toolbar_set_style (GTK_TOOLBAR (browser->bookmarkbar),
-                           GTK_TOOLBAR_BOTH_HORIZ);
-    midori_window_add_toolbar (MIDORI_WINDOW (browser), browser->bookmarkbar);
-    g_signal_connect (browser->bookmarkbar, "popup-context-menu",
-        G_CALLBACK (midori_browser_toolbar_popup_context_menu_cb), browser);
-
     /* Create the panel */
     hpaned = gtk_hpaned_new ();
     g_signal_connect (hpaned, "notify::position",
@@ -6156,8 +6109,6 @@
     katze_object_assign (browser->history_database, NULL);
     katze_object_assign (browser->dial, NULL);
 
-    g_idle_remove_by_data (browser);
-
     G_OBJECT_CLASS (midori_browser_parent_class)->finalize (object);
 }
 
@@ -6285,7 +6236,7 @@
     gboolean compact_sidepanel;
     gboolean right_align_sidepanel, open_panels_in_windows;
     gint last_panel_position, last_panel_page;
-    gboolean show_menubar, show_bookmarkbar;
+    gboolean show_menubar;
     gboolean show_panel;
     MidoriToolbarStyle toolbar_style;
     gchar* toolbar_items;
@@ -6304,7 +6255,6 @@
                   "last-panel-page", &last_panel_page,
                   "show-menubar", &show_menubar,
                   "show-navigationbar", &browser->show_navigationbar,
-                  "show-bookmarkbar", &show_bookmarkbar,
                   "show-panel", &show_panel,
                   "show-statusbar", &browser->show_statusbar,
                   "toolbar-style", &toolbar_style,
@@ -6385,8 +6335,6 @@
     _action_set_active (browser, "Menubar", show_menubar);
     if (GTK_IS_TOOLBAR (browser->navigationbar))
         _action_set_active (browser, "Navigationbar", browser->show_navigationbar);
-    _action_set_active (browser, "Bookmarkbar", show_bookmarkbar
-                                             && browser->bookmarks != NULL);
     _action_set_active (browser, "Panel", show_panel);
     _action_set_active (browser, "Statusbar", browser->show_statusbar);
 
@@ -6433,10 +6381,6 @@
         if (GTK_IS_TOOLBAR (browser->navigationbar))
             _action_set_active (browser, "Navigationbar", g_value_get_boolean (&value));
     }
-    else if (name == g_intern_string ("show-bookmarkbar"))
-    {
-        _action_set_active (browser, "Bookmarkbar", g_value_get_boolean (&value));
-    }
     else if (name == g_intern_string ("show-statusbar"))
     {
         browser->show_statusbar = g_value_get_boolean (&value);
@@ -6465,138 +6409,13 @@
 }
 
 static void
-midori_bookmarkbar_insert_item (GtkWidget* toolbar,
-                                KatzeItem* item)
-{
-    MidoriBrowser* browser = midori_browser_get_for_widget (toolbar);
-    GtkAction* action = _action_by_name (browser, "Bookmarks");
-    GtkToolItem* toolitem = katze_array_action_create_tool_item_for (
-        KATZE_ARRAY_ACTION (action), item);
-    g_object_set_data (G_OBJECT (toolitem), "KatzeItem", item);
-
-    if (!KATZE_IS_ITEM (item)) /* Separator */
-        gtk_tool_item_set_use_drag_window (toolitem, TRUE);
-
-    gtk_widget_show (GTK_WIDGET (toolitem));
-    gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
-}
-
-static void
-midori_bookmarkbar_add_item_cb (KatzeArray*    bookmarks,
-                                KatzeItem*     item,
-                                MidoriBrowser* browser)
-{
-    if (gtk_widget_get_visible (browser->bookmarkbar))
-        midori_bookmarkbar_populate (browser);
-    else if (katze_item_get_meta_boolean (item, "toolbar"))
-        _action_set_active (browser, "Bookmarkbar", TRUE);
-    midori_browser_update_history (item, "bookmark", "created");
-}
-
-static void
-midori_bookmarkbar_update_item_cb (KatzeArray*    bookmarks,
-                                   KatzeItem*     item,
-                                   MidoriBrowser* browser)
-{
-    if (gtk_widget_get_visible (browser->bookmarkbar))
-        midori_bookmarkbar_populate (browser);
-    midori_browser_update_history (item, "bookmark", "modify");
-}
-
-static void
-midori_bookmarkbar_remove_item_cb (KatzeArray*    bookmarks,
-                                   KatzeItem*     item,
-                                   MidoriBrowser* browser)
-{
-    if (gtk_widget_get_visible (browser->bookmarkbar))
-        midori_bookmarkbar_populate (browser);
-    midori_browser_update_history (item, "bookmark", "delete");
-}
-
-static void
-midori_bookmarkbar_populate (MidoriBrowser* browser)
-{
-    if (browser->bookmarkbar_populate)
-        return;
-
-    g_idle_add (midori_browser_idle, browser);
-    browser->bookmarkbar_populate = TRUE;
-}
-
-static void
-midori_bookmarkbar_populate_idle (MidoriBrowser* browser)
-{
-    KatzeArray* array;
-    KatzeItem* item;
-
-    midori_bookmarkbar_clear (browser->bookmarkbar);
-
-    /* Use a dummy to ensure height of the toolbar */
-    gtk_toolbar_insert (GTK_TOOLBAR (browser->bookmarkbar),
-                        gtk_separator_tool_item_new (), -1);
-
-    array = midori_bookmarks_db_query_recursive (browser->bookmarks,
-        "id, parentid, title, uri, desc, app, toolbar, pos_panel, pos_bar", "toolbar = 1", NULL, FALSE);
-    if (!array)
-    {
-        _action_set_sensitive (browser, "BookmarkAdd", FALSE);
-        _action_set_sensitive (browser, "BookmarkFolderAdd", FALSE);
-        return;
-    }
-
-    KATZE_ARRAY_FOREACH_ITEM (item, array)
-    {
-        midori_bookmarkbar_insert_item (browser->bookmarkbar, item);
-    }
-    _action_set_sensitive (browser, "BookmarkAdd", TRUE);
-    _action_set_sensitive (browser, "BookmarkFolderAdd", TRUE);
-}
-
-static void
-midori_bookmarkbar_clear (GtkWidget* toolbar)
-{
-    GList* children = gtk_container_get_children (GTK_CONTAINER (toolbar));
-    while (children != NULL)
-    {
-        gtk_widget_destroy (children->data);
-        children = g_list_next (children);
-    }
-}
-
-static void
-midori_browser_show_bookmarkbar_notify_value_cb (MidoriWebSettings* settings,
-                                                 GParamSpec*        pspec,
-                                                 MidoriBrowser*     browser)
-{
-    if (!katze_object_get_boolean (browser->settings, "show-bookmarkbar"))
-        midori_bookmarkbar_clear (browser->bookmarkbar);
-    else
-        midori_bookmarkbar_populate (browser);
-}
-
-static void
 midori_browser_set_bookmarks (MidoriBrowser* browser,
                               MidoriBookmarksDb*    bookmarks)
 {
-    MidoriWebSettings* settings;
-
-    if (browser->bookmarks != NULL)
-    {
-        g_signal_handlers_disconnect_by_func (browser->bookmarks,
-            midori_bookmarkbar_add_item_cb, browser);
-        g_signal_handlers_disconnect_by_func (browser->bookmarks,
-            midori_bookmarkbar_update_item_cb, browser);
-        g_signal_handlers_disconnect_by_func (browser->bookmarks,
-            midori_bookmarkbar_remove_item_cb, browser);
-    }
-
     g_object_set (G_OBJECT (_action_by_name (browser, "Bookmarks")),
         "array", KATZE_ARRAY (bookmarks),
         NULL);
 
-    settings = midori_browser_get_settings (browser);
-    g_signal_handlers_disconnect_by_func (settings,
-        midori_browser_show_bookmarkbar_notify_value_cb, browser);
     katze_object_assign (browser->bookmarks, bookmarks);
 
     _action_set_visible (browser, "Bookmarks", bookmarks != NULL);
@@ -6609,25 +6428,14 @@
             gtk_widget_show (proxies->data);
     }
     _action_set_visible (browser, "BookmarkAdd", bookmarks != NULL);
+    _action_set_visible (browser, "BookmarkFolderAdd", bookmarks != NULL);
     _action_set_visible (browser, "BookmarksImport", bookmarks != NULL);
     _action_set_visible (browser, "BookmarksExport", bookmarks != NULL);
-    _action_set_visible (browser, "Bookmarkbar", bookmarks != NULL);
 
     if (!bookmarks)
         return;
 
-    if (katze_object_get_boolean (browser->settings, "show-bookmarkbar"))
-        _action_set_active (browser, "Bookmarkbar", TRUE);
     g_object_ref (bookmarks);
-    g_signal_connect (settings, "notify::show-bookmarkbar",
-        G_CALLBACK (midori_browser_show_bookmarkbar_notify_value_cb), browser);
-    g_object_notify (G_OBJECT (settings), "show-bookmarkbar");
-    g_signal_connect_after (bookmarks, "add-item",
-        G_CALLBACK (midori_bookmarkbar_add_item_cb), browser);
-    g_signal_connect_after (bookmarks, "update-item",
-        G_CALLBACK (midori_bookmarkbar_update_item_cb), browser);
-    g_signal_connect_after (bookmarks, "remove-item",
-        G_CALLBACK (midori_bookmarkbar_remove_item_cb), browser);
 }
 
 static void

=== modified file 'midori/midori-extension.c'
--- midori/midori-extension.c	2016-01-26 05:36:38 +0000
+++ midori/midori-extension.c	2017-11-26 10:03:39 +0000
@@ -562,6 +562,7 @@
         g_assert (midori_extension_activate_gracefully (app, extension_path, "libtabby." G_MODULE_SUFFIX, activate));
         g_assert (midori_extension_activate_gracefully (app, extension_path, "libopen-with." G_MODULE_SUFFIX, activate));
         g_assert (midori_extension_activate_gracefully (app, extension_path, "libflummi." G_MODULE_SUFFIX, activate));
+        g_assert (midori_extension_activate_gracefully (app, extension_path, "libclippy." G_MODULE_SUFFIX, activate));
 
         gint i = 0;
         const gchar* filename;
@@ -706,6 +707,7 @@
      && strcmp (filename, "libabout." G_MODULE_SUFFIX)
      && strcmp (filename, "libtabby." G_MODULE_SUFFIX)
      && strcmp (filename, "libopen-with." G_MODULE_SUFFIX)
+     && strcmp (filename, "libclippy." G_MODULE_SUFFIX)
      && strcmp (filename, "libflummi." G_MODULE_SUFFIX))
         katze_array_add_item (extensions, extension);
 

=== modified file 'midori/midori.vapi'
--- midori/midori.vapi	2015-05-24 00:19:21 +0000
+++ midori/midori.vapi	2017-11-26 10:03:39 +0000
@@ -22,6 +22,11 @@
         [CCode (array_length = false)] string[]? uris, [CCode (array_length = false)] string[]? commands, int reset, string? block);
     public static void normal_app_on_quit (App app);
 
+    [CCode (type_id = "TYPE_MIDORI_BOOKMARKS_DB", cheader_filename = "midori/midori-bookmarks-db.h")]
+    public class BookmarksDb : Katze.Array {
+        public Katze.Array? query_recursive (string fields, string condition, string? value, bool recursive);
+    }
+
     [CCode (cheader_filename = "midori/midori-array.h")]
     public static bool array_from_file (Katze.Array array, string filename, string format) throws GLib.Error;