Merge lp:~niclasl/pantheon-terminal/new-dn-api into lp:~elementary-apps/pantheon-terminal/trunk

[Niclas Lockner]

Made compatible with DynamicNotebook's new API.

Made compatible with DynamicNotebook's new API

=== modified file 'src/PantheonTerminalWindow.vala'
--- src/PantheonTerminalWindow.vala	2013-10-26 21:22:18 +0000
+++ src/PantheonTerminalWindow.vala	2013-12-15 14:15:56 +0000
@@ -69,9 +69,6 @@
         public Gtk.ActionGroup main_actions;
         public Gtk.UIManager ui;
 
-        //variable indicating that a tab might has been closed by exit command
-        bool closed_by_exit;
-
         public PantheonTerminalWindow (Granite.Application app, bool should_recreate_tabs=true) {
             this.app = app as PantheonTerminalApp;
             set_application (app);
@@ -105,8 +102,6 @@
             Notify.init (app.program_name);
             set_visual (Gdk.Screen.get_default ().get_rgba_visual ());
 
-            closed_by_exit = true;
-
             Gtk.Settings.get_default ().gtk_application_prefer_dark_theme = true;
             title = _("Terminal");
             restore_saved_state (restore_pos);
@@ -161,81 +156,17 @@
                 notebook.show_tabs = false;
             }
 
+            notebook.tab_added.connect (on_tab_added);
+            notebook.tab_removed.connect (on_tab_removed);
             notebook.tab_switched.connect (on_switch_page);
             notebook.tab_moved.connect (on_tab_moved);
+            notebook.tab_reordered.connect (on_tab_reordered);
             notebook.tab_duplicated.connect (on_tab_duplicated);
+            notebook.close_tab_requested.connect (on_close_tab_requested);
+            notebook.new_tab_requested.connect (on_new_tab_requested);
             notebook.allow_new_window = true;
             notebook.allow_duplication = true;
             notebook.group_name = "pantheon-terminal";
-
-            notebook.tab_added.connect ((tab) => {
-                if (settings.follow_last_tab)
-                    new_tab (previous_terminal.get_shell_location (), tab);
-                else
-                    new_tab ("", tab);
-            });
-
-            notebook.tab_removed.connect ((tab) => {
-                var t = (tab.page as Gtk.Grid).get_child_at (0, 0) as TerminalWidget;
-
-                if (t.has_foreground_process ()) {
-                    var d = new ForegroundProcessDialog ();
-                    if (d.run () == 1) {
-                        closed_by_exit = false;
-                        t.kill_ps_and_fg ();
-
-                        if (notebook.n_tabs - 1 == 0) {
-                            update_saved_state ();
-                            destroy ();
-                        }
-
-                        d.destroy ();
-
-                        if (notebook.n_tabs == 2) {
-                            if (settings.tab_bar_behavior == PantheonTerminalTabBarBehavior.SINGLE) {
-                                notebook.show_tabs = false;
-                            }
-                        }
-
-                        return true;
-                    }
-
-                    d.destroy ();
-
-                    return false;
-                } else {
-                    if (notebook.n_tabs - 1 == 0) {
-                        update_saved_state ();
-                        tab.parent.parent.parent.destroy ();
-                    }
-                }
-
-                if (current_terminal.tab == tab) {
-                    int new_position = notebook.get_tab_position (notebook.current) + 1;
-                    if (new_position >= notebook.n_tabs) {
-                        new_position = notebook.n_tabs - 2;
-                    }
-
-                    foreach (var terminal in terminals) {
-                        if (notebook.get_tab_position (terminal.tab) == new_position) {
-                            current_terminal = terminal;
-                            break;
-                        }
-                    }
-                }
-
-                closed_by_exit = false;
-                t.kill_ps ();
-
-                if (notebook.n_tabs == 2) {
-                    if (settings.tab_bar_behavior == PantheonTerminalTabBarBehavior.SINGLE) {
-                        notebook.show_tabs = false;
-                    }
-                }
-
-                return true;
-            });
-
             notebook.can_focus = false;
             add (notebook);
 
@@ -328,18 +259,15 @@
             saved_state.tabs = "";
         }
 
-        private void on_tab_moved (Granite.Widgets.Tab tab, int new_pos,
-                                   bool new_window, int x, int y) {
-            if (new_window) {
-                var win = app.new_window_with_coords (x, y, false);
-
-                notebook.remove_tab_force (tab);
-
-                var n = win.notebook;
-                n.insert_tab (tab, -1);
-            } else {
-                current_terminal.grab_focus ();
-            }
+        private void on_tab_added (Granite.Widgets.Tab tab) {
+            var t = (tab.page as Gtk.Grid).get_child_at (0, 0) as TerminalWidget;
+            terminals.append (t);
+            t.set_parent_window (this);
+        }
+
+        private void on_tab_removed (Granite.Widgets.Tab tab) {
+            var t = (tab.page as Gtk.Grid).get_child_at (0, 0) as TerminalWidget;
+            terminals.remove (t);
 
             if (notebook.n_tabs == 0) {
                 destroy ();
@@ -347,12 +275,95 @@
                 notebook.show_tabs = false;
             }
         }
+
+        private bool on_close_tab_requested (Granite.Widgets.Tab tab) {
+            var t = (tab.page as Gtk.Grid).get_child_at (0, 0) as TerminalWidget;
+
+            if (t.has_foreground_process ()) {
+                var d = new ForegroundProcessDialog ();
+                if (d.run () == 1) {
+                    t.manually_closed = true;
+                    t.kill_ps_and_fg ();
+
+                    if (notebook.n_tabs - 1 == 0) {
+                        update_saved_state ();
+                        destroy ();
+                    }
+
+                    d.destroy ();
+
+                    if (notebook.n_tabs == 2) {
+                        if (settings.tab_bar_behavior == PantheonTerminalTabBarBehavior.SINGLE) {
+                            notebook.show_tabs = false;
+                        }
+                    }
+
+                    return true;
+                }
+
+                d.destroy ();
+
+                return false;
+            } else {
+                if (notebook.n_tabs - 1 == 0) {
+                    update_saved_state ();
+                    tab.parent.parent.parent.destroy ();
+                }
+            }
+
+            if (current_terminal.tab == tab) {
+                int new_position = notebook.get_tab_position (notebook.current) + 1;
+                if (new_position >= notebook.n_tabs) {
+                    new_position = notebook.n_tabs - 2;
+                }
+
+                foreach (var terminal in terminals) {
+                    if (notebook.get_tab_position (terminal.tab) == new_position) {
+                        current_terminal = terminal;
+                        break;
+                    }
+                }
+            }
+
+            t.manually_closed = true;
+            t.kill_ps ();
+
+            if (notebook.n_tabs == 2) {
+                if (settings.tab_bar_behavior == PantheonTerminalTabBarBehavior.SINGLE) {
+                    notebook.show_tabs = false;
+                }
+            }
+
+            return true;
+        }
+
+        private void on_tab_reordered (Granite.Widgets.Tab tab, int new_pos) {
+            current_terminal.grab_focus ();
+        }
+
+        private void on_tab_moved (Granite.Widgets.Tab tab, int x, int y) {
+            var new_window = app.new_window_with_coords (x, y, false);
+            var terminal = (tab.page as Gtk.Grid).get_child_at (0, 0) as TerminalWidget;
+            var new_notebook = new_window.notebook;
+
+            notebook.remove_tab (tab);
+            new_notebook.insert_tab (tab, -1);
+            new_window.previous_terminal = terminal;
+            new_window.current_terminal = terminal;
+        }
         
         private void on_tab_duplicated (Granite.Widgets.Tab tab) {
             var t = (tab.page as Gtk.Grid).get_child_at (0, 0) as TerminalWidget;
             new_tab (t.get_shell_location ());
         }
 
+        private void on_new_tab_requested () {
+            if (settings.follow_last_tab && previous_terminal != null)
+                new_tab (previous_terminal.get_shell_location ());
+            else
+                new_tab ();
+        }
+
         private void update_context_menu () {
             clipboard.request_targets (update_context_menu_cb);
         }
@@ -430,15 +441,21 @@
             }
         }
 
-        private void new_tab (string location="",
-                              owned Granite.Widgets.Tab? tab=null,
-                              string? program=null) {
-            /* If the user choose to use a specific working directory */
-            if (location == "") {
+        private void new_tab (string directory="", string? program=null) {
+            /* 
+             * If the user choose to use a specific working directory.
+             * Reassigning the directory variable a new value 
+             * leads to free'd memory being read.
+             */
+            string location;
+            if (directory == "") {
                 location = PantheonTerminalApp.working_directory ?? "";
+            } else {
+                location = directory;
             }
+
             /* Set up terminal */
-            var t = new TerminalWidget (main_actions, ui, this);
+            var t = new TerminalWidget (main_actions, this);
             t.scrollback_lines = settings.scrollback_lines;
             previous_terminal = current_terminal;
             current_terminal = t;
@@ -471,16 +488,7 @@
             /* Set up actions releated to the terminal */
             main_actions.get_action ("Copy").set_sensitive (t.get_has_selection ());
 
-            /* Create a new tab if it hasnt already been created by the plus button press */
-            bool to_be_inserted = false;
-            if (tab == null) {
-                tab = new Granite.Widgets.Tab (_("Terminal"), null, g);
-                to_be_inserted = true;
-            } else {
-                tab.page = g;
-                tab.label = _("Terminal");
-                tab.page.show_all ();
-            }
+            var tab = new Granite.Widgets.Tab (_("Terminal"), null, g);
 
             t.tab = tab;
             tab.ellipsize_mode = Pango.EllipsizeMode.START;
@@ -505,14 +513,13 @@
             });
 
             t.selection_changed.connect (() => {
-                main_actions.get_action("Copy").set_sensitive (t.get_has_selection ());
+                main_actions.get_action ("Copy").set_sensitive (t.get_has_selection ());
             });
 
             t.child_exited.connect (() => {
-                if (closed_by_exit)
-                    notebook.remove_tab (tab);
-
-                closed_by_exit = true;
+                if (!t.manually_closed) {
+                    tab.close ();
+                }
             });
 
             t.set_font (term_font);
@@ -523,17 +530,13 @@
             app.minimum_width = minimum_width;
             app.minimum_height = minimum_height;
 
-            terminals.append (t);
-
-            if (to_be_inserted)
-                notebook.insert_tab (tab, -1);
-
+            notebook.insert_tab (tab, -1);
             notebook.current = tab;
             t.grab_focus ();
         }
 
         public void run_program_term (string program) {
-            new_tab ("", null, program);
+            new_tab ("", program);
         }
 
         static string get_term_font () {
@@ -594,8 +597,7 @@
         }
 
         void action_close_tab () {
-            terminals.remove (current_terminal);
-            notebook.remove_tab (notebook.current);
+            current_terminal.tab.close ();
         }
 
         void action_new_window () {

=== modified file 'src/TerminalWidget.vala'
--- src/TerminalWidget.vala	2013-09-29 18:22:11 +0000
+++ src/TerminalWidget.vala	2013-12-15 14:15:56 +0000
@@ -26,6 +26,7 @@
 
         GLib.Pid child_pid;
         private PantheonTerminalWindow window;
+        private Gtk.Menu menu;
         public Granite.Widgets.Tab tab;
         public string? uri;
 
@@ -56,22 +57,22 @@
             "(?:news:|man:|info:)[[:alnum:]\\Q^_{|}~!\"#$%&'()*+,./;:=?`\\E]+"
         };
 
-        public TerminalWidget (Gtk.ActionGroup main_actions, Gtk.UIManager ui,
+        private bool _manually_closed = false;
+        public bool manually_closed {
+            get { return _manually_closed;  }
+            set { _manually_closed = value; }
+        }
+
+        public TerminalWidget (Gtk.ActionGroup main_actions,
                                PantheonTerminalWindow parent_window) {
 
             /* Sets characters that define word for double click selection */
             set_word_chars ("-A-Za-z0-9/.,_~#%?:=+@");
 
-            /* Set up the parents */
-            this.window = parent_window;
-            app = parent_window.app;
-
             restore_settings ();
             settings.changed.connect (restore_settings);
 
-            /* Create a pop menu */
-            var menu = ui.get_widget ("ui/AppMenu") as Gtk.Menu;
-            menu.show_all ();
+            set_parent_window (parent_window);
 
             button_press_event.connect ((event) => {
                 uri = get_link ((long) event.x, (long) event.y);
@@ -120,6 +121,17 @@
             this.clickable (regex_strings);
         }
 
+        public void set_parent_window (PantheonTerminalWindow parent_window) {
+            this.window = parent_window;
+            this.app = parent_window.app;
+            this.menu = parent_window.ui.get_widget ("ui/AppMenu") as Gtk.Menu;
+            this.menu.show_all ();
+        }
+
+        public PantheonTerminalWindow get_parent_window () {
+            return window;
+        }
+
         public void restore_settings () {
             /* Load configuration */
             int opacity = settings.opacity * 65535;