Merge lp:~ivaldi/midori/tabby-tab-usage into lp:midori

[André Stösel]

restore tabs in order of last usage

[Cris Dywan (kalikiana)]

We need to keep the order of tabs in the notebook. Some discussion on IRC suggests that's what is expected from static tab labels - there's interest in re-thinking the default switching behavior but it would be surprising to visibly re-order after startup.

review: Needs Fixing

[André Stösel (ivaldi)]

I know and agree with this but I planned to fix this in another branch/commit.
(I try to keep the commits small in order to simplify the review.)

[Cris Dywan (kalikiana)]

For the record, I would approve of the change by itself. I just feel uneasy formally approving because the notebook is affected even without being explicitly changed - it's a historic mistake that it's only ordered by insertion.

review: Abstain

[Musee "lae" Ullah (sleepingkyoto)]

If anything, I would leave this feature as optional and up to the user. This basically makes manually organizing/grouping tabs (by moving them around in the tab bar) completely useless, as their order would be reset on startup (so I'm agreeing with kalikiana). Although, I would prefer this over the current state of trunk.

[André Stösel (ivaldi)]

for clarification: this commit/branch only affects the order in which the tabs should be restored, not the tab soring itself. the problem is that the tab sorting part isn't implemented yet - it looks like it changes the sorting, but it dosn't (or shouldn't)

=== modified file 'extensions/tabby.vala'
--- extensions/tabby.vala	2013-09-09 21:00:43 +0000
+++ extensions/tabby.vala	2013-09-11 12:21:52 +0000
@@ -65,17 +65,24 @@
         }
 
         public abstract class Session : GLib.Object, ISession {
+            public Midori.Browser browser { get; protected set; }
+
             public abstract void add_item (Katze.Item item);
             public abstract void uri_changed (Midori.View view, string uri);
             public abstract void tab_added (Midori.Browser browser, Midori.View view);
             public abstract void tab_removed (Midori.Browser browser, Midori.View view);
-            public abstract void close ();
+            public abstract void tab_switched (Midori.View? old_view, Midori.View? new_view);
+
             public abstract Katze.Array get_tabs ();
 
             public void attach (Midori.Browser browser) {
+                this.browser = browser;
+
                 browser.add_tab.connect (this.tab_added);
                 browser.add_tab.connect (this.helper_uri_changed);
                 browser.remove_tab.connect (this.tab_removed);
+                browser.switch_tab.connect (this.tab_switched);
+                browser.delete_event.connect_after(this.delete_event);
 
                 foreach (Midori.View view in browser.get_tabs ()) {
                     this.tab_added (browser, view);
@@ -84,6 +91,8 @@
             }
 
             public void restore (Midori.Browser browser) {
+                this.browser = browser;
+
                 Katze.Array tabs = this.get_tabs ();
 
                 if(tabs.is_empty ()) {
@@ -95,6 +104,8 @@
                 browser.add_tab.connect (this.tab_added);
                 browser.add_tab.connect (this.helper_uri_changed);
                 browser.remove_tab.connect (this.tab_removed);
+                browser.switch_tab.connect (this.tab_switched);
+                browser.delete_event.connect_after(this.delete_event);
 
                 GLib.List<unowned Katze.Item> items = tabs.get_items ();
                 unowned GLib.List<unowned Katze.Item> u_items = items;
@@ -110,6 +121,8 @@
 
                             Katze.Item t_item = u_items.data<Katze.Item>;
 
+                            t_item.set_meta_integer ("append", 1);
+
                             if (delay)
                                 t_item.set_meta_integer ("delay", Midori.Delay.DELAYED);
                             else
@@ -124,6 +137,25 @@
                 });
             }
 
+            public virtual void close () {
+                this.browser.add_tab.disconnect (this.tab_added);
+                this.browser.add_tab.disconnect (this.helper_uri_changed);
+                this.browser.remove_tab.disconnect (this.tab_removed);
+                this.browser.switch_tab.disconnect (this.tab_switched);
+                this.browser.delete_event.disconnect (this.delete_event);
+            }
+
+#if HAVE_GTK3
+            protected bool delete_event (Gtk.Widget widget, Gdk.EventAny event) {
+#else
+            protected bool delete_event (Gtk.Widget widget, Gdk.Event event) {
+#endif
+
+                this.close();
+                return false;
+
+            }
+
             private void helper_uri_changed (Midori.Browser browser, Midori.View view) {
                 /* FixMe: skip first event while restoring the session */
                 view.web_view.notify["uri"].connect ( () => {
@@ -194,7 +226,24 @@
                     critical (_("Failed to update database: %s"), db.errmsg ());
             }
 
+            protected override void tab_switched (Midori.View? old_view, Midori.View? new_view) {
+                GLib.DateTime time = new DateTime.now_local ();
+                unowned Katze.Item item = new_view.get_proxy_item ();
+                int64 tab_id = item.get_meta_integer ("tabby-id");
+                string sqlcmd = "UPDATE `tabs` SET tstamp = :tstamp WHERE session_id = :session_id AND id = :tab_id;";
+                Sqlite.Statement stmt;
+                if (this.db.prepare_v2 (sqlcmd, -1, out stmt, null) != Sqlite.OK)
+                    critical (_("Failed to update database: %s"), db.errmsg ());
+                stmt.bind_int64 (stmt.bind_parameter_index (":session_id"), this.id);
+                stmt.bind_int64 (stmt.bind_parameter_index (":tab_id"), tab_id);
+                stmt.bind_int64 (stmt.bind_parameter_index (":tstamp"), time.to_unix ());
+                if (stmt.step () != Sqlite.DONE)
+                    critical (_("Failed to update database: %s"), db.errmsg ());
+            }
+
             public override void close() {
+                base.close ();
+
                 if (Session.open_sessions == 1)
                     return;
 
@@ -213,7 +262,7 @@
             public override Katze.Array get_tabs() {
                 Katze.Array tabs = new Katze.Array (typeof (Katze.Item));
 
-                string sqlcmd = "SELECT id, uri, title FROM tabs WHERE session_id = :session_id";
+                string sqlcmd = "SELECT id, uri, title FROM tabs WHERE session_id = :session_id ORDER BY tstamp DESC";
                 Sqlite.Statement stmt;
                 if (this.db.prepare_v2 (sqlcmd, -1, out stmt, null) != Sqlite.OK)
                     critical (_("Failed to select from database: %s"), db.errmsg ());