Merge lp:~jeremywootten/pantheon-terminal/fix-1621637-same-tab-name-in-terminal into lp:~elementary-apps/pantheon-terminal/trunk

[Jeremy Wootten]

Where two tabs are opened at different folders that have the same name, label the tabs in a way that distinguishes them.

In this branch, enough of the parent path needed to distinguish them is prepended to the tab-name.

However, because of the limited and fixed size of the tabs it is quite likely that the distinguishing parts of the name will not be visible on the tab and can only be seen in the tooltip displayed when the tab is hovered. It would be necessary to patch Granite.Widgets.DynamicNotebook to allow variable tab sizes to address this.

[Zisu Andrei (matzipan)]

Some comments inline.

Can you confirm this behavior isn't already present in trunk?

review: Needs Fixing

[Rico Tzschichholz (ricotz)]

Assigning a string an owned variable already results in an implicit copy.
So "string name = t.window_title.dup ();" results in two copies are made.

[Danielle Foré (danrabbit)]

Terminal has moved to GitHub, please resubmit at https://github.com/elementary/terminal

Unmerged revisions

896. By Jeremy Wootten on 2017-02-04

Merge trunk to r936

895. By Jeremy Wootten on 2017-02-04

Fix code style

894. By Jeremy Wootten on 2016-09-09

Deal with duplicate tab names with different paths

=== modified file 'src/PantheonTerminalWindow.vala'
--- src/PantheonTerminalWindow.vala	2017-01-23 18:01:21 +0000
+++ src/PantheonTerminalWindow.vala	2017-02-04 18:40:59 +0000
@@ -501,7 +501,7 @@
         private void on_switch_page (Granite.Widgets.Tab? old,
                                      Granite.Widgets.Tab new_tab) {
             current_terminal = get_term_widget (new_tab);
-            title = current_terminal.window_title ?? "";
+            title = current_terminal.tab.label ?? "";
             new_tab.icon = null;
             new_tab.page.grab_focus ();
         }
@@ -575,6 +575,14 @@
                 }
             });
 
+            t.window_title_changed.connect (() => {
+                t.tab.label = check_for_tab_with_same_name (t);
+
+                if (t == this.current_terminal) {
+                    this.title = t.tab.label;
+                }
+            });
+
             t.set_font (term_font);
 
             int minimum_width = t.calculate_width (80) / 2;
@@ -782,6 +790,70 @@
             return (TerminalWidget)((Gtk.Bin)tab.page).get_child ();
         }
 
+        private string check_for_tab_with_same_name (TerminalWidget t) {
+            string name = t.window_title;
+            string new_name = name;
+            string? path = t.get_shell_location ();
+
+            foreach (Granite.Widgets.Tab tab in notebook.tabs) {
+                var scrolled_window = (Gtk.ScrolledWindow)(tab.page);
+                var content = (TerminalWidget)(scrolled_window.get_child ());
+                if (content != t) {
+                    string? content_path = content.get_shell_location ();
+                    if (content.window_title == name && content_path != path) {
+                        if (content.window_title == content.tab.label) {
+                            Idle.add_full (GLib.Priority.LOW, () => {
+                                content.window_title_changed ();
+                                return false;
+                            }); /* Trigger relabelling of conflicting tab (but not before this function finishes) */
+                        }
+                        new_name = append_parent (name, path, content_path); /*Also relabel this tab */
+                    }
+                }
+            }
+
+            return new_name;
+        }
+
+        private string append_parent (string name, string path, string conflict_path) {
+            string sfx = "";
+            string sfx2 = "";
+            string p = path;
+            string p2 = conflict_path;
+
+            /* Add parent directories until path and conflict path differ */
+            while (sfx == sfx2) {
+                var pp = get_parent_path_from_path (p);
+                var pp2 = get_parent_path_from_path (p2);
+                sfx = Path.get_basename (pp) + Path.DIR_SEPARATOR_S + sfx;
+                sfx2 = Path.get_basename (pp2) + Path.DIR_SEPARATOR_S + sfx2;
+                p = pp;
+                p2 = pp2;
+            }
+
+            return sfx + name;
+        }
+
+        /*** Simplified version of PF.FileUtils function, with fewer checks ***/
+        private string get_parent_path_from_path (string path) {
+            if (path.length < 2) {
+                return Path.DIR_SEPARATOR_S;
+            }
+
+            StringBuilder sb = new StringBuilder (path);
+            if (path.has_suffix (Path.DIR_SEPARATOR_S)) {
+                sb.erase (sb.str.length - 1,-1);
+            }
+
+            int last_separator = sb.str.last_index_of (Path.DIR_SEPARATOR_S);
+            if (last_separator < 0) {
+                last_separator = 0;
+            }
+
+            sb.erase (last_separator, -1);
+            return sb.str + Path.DIR_SEPARATOR_S;
+        }
+
         static const Gtk.ActionEntry[] main_entries = {
             { "CloseTab", "gtk-close", N_("Close"),
               "<Control><Shift>w", N_("Close"),

=== modified file 'src/TerminalWidget.vala'
--- src/TerminalWidget.vala	2016-07-10 16:08:53 +0000
+++ src/TerminalWidget.vala	2017-02-04 18:40:59 +0000
@@ -139,13 +139,6 @@
                 window.main_actions.get_action ("Copy").set_sensitive (get_has_selection ());
             });
 
-            window_title_changed.connect ((event) => {
-                if (this == window.current_terminal)
-                    window.title = window_title;
-
-                tab.label = window_title;
-            });
-
             child_exited.connect (on_child_exited);
 
             /* target entries specify what kind of data the terminal widget accepts */