Ticket #3088: mc-4.8.30-terminal-cwd-v2.patch

doc/man/mc.1.in

@@ -1876 +1876 @@
 .BR No .
 This option is disabled by default.
 .PP
+.I Auto cd new terminal.
+If this option is enabled, mc tells its current directory to the terminal.
+Some graphical terminal emulators use this information to open new windows
+or tabs in that directory.
+.PP
 .I Auto save setup.
 If this option is enabled, when you exit Midnight Commander, the
 configurable options of Midnight Commander are saved in the

src/execute.c

@@ -373 +373 @@
     {
         update_panels (UP_OPTIMIZE, UP_KEEPSEL);
         update_xterm_title_path ();
+        update_terminal_cwd ();
     }
 
     do_refresh ();
@@ -567 +568 @@
     {
         update_panels (UP_OPTIMIZE, UP_KEEPSEL);
         update_xterm_title_path ();
+        update_terminal_cwd ();
     }
 
     if (was_sigwinch != 0 || tty_got_winch ())

src/filemanager/boxes.c

@@ -580 +580 @@
                                     &mc_global.widget.show_all_if_ambiguous, NULL),
                     QUICK_CHECKBOX (N_("Rotating d&ash"), &nice_rotating_dash, NULL),
                     QUICK_CHECKBOX (N_("Cd follows lin&ks"), &mc_global.vfs.cd_symlinks, NULL),
+                    QUICK_CHECKBOX (N_("Auto cd new terminal"), &auto_cd_new_terminal, NULL),  /* w/o hotkey */
                     QUICK_CHECKBOX (N_("Sa&fe delete"), &safe_delete, NULL),
                     QUICK_CHECKBOX (N_("Safe overwrite"), &safe_overwrite, NULL),       /* w/o hotkey */
                     QUICK_CHECKBOX (N_("A&uto save setup"), &auto_save_setup, NULL),
                     QUICK_SEPARATOR (FALSE),
-                    QUICK_SEPARATOR (FALSE),
                 QUICK_STOP_GROUPBOX,
             QUICK_STOP_COLUMNS,
             QUICK_BUTTONS_OK_CANCEL,

src/filemanager/layout.c

@@ -913 +913 @@
     widget_set_visibility (WIDGET (the_bar), mc_global.keybar_visible);
 
     update_xterm_title_path ();
+    update_terminal_cwd ();
 
     /* unlock */
     if (active)
@@ -1567 +1568 @@
         g_free (login);
         g_free (path);
 
-        fprintf (stdout, "\33]0;%s\7", str_term_form (p));
+        fprintf (stdout, "\33]0;%s\33\\", str_term_form (p));
         g_free (p);
 
         if (!mc_global.tty.alternate_plus_minus)
@@ -1577 +1578 @@
 }
 
 /* --------------------------------------------------------------------------------------------- */
+
+/** Tell the current directory to the terminal so it can open new tabs there */
+void
+update_terminal_cwd (void)
+{
+    if (mc_global.tty.xterm_flag && auto_cd_new_terminal && vfs_current_is_local ())
+    {
+        const gchar *host;
+        char *path, *path_uri;
+
+        host = g_get_host_name ();
+        path = vfs_path_to_str_flags (current_panel->cwd_vpath, 0, VPF_NONE);
+        path_uri = g_uri_escape_string (path, "/", FALSE);
+
+        fprintf (stdout, "\33]7;file://%s%s\33\\", host, path_uri);
+        (void) fflush (stdout);
+
+        g_free (path_uri);
+        g_free (path);
+    }
+}
+
+/* --------------------------------------------------------------------------------------------- */

src/filemanager/layout.h

@@ -90 +90 @@
 #endif
 
 void update_xterm_title_path (void);
+void update_terminal_cwd (void);
 
 void title_path_prepare (char **path, char **login);
 

src/filemanager/panel.c

@@ -3436 +3436 @@
     load_hint (FALSE);
     panel->dirty = TRUE;
     update_xterm_title_path ();
+    update_terminal_cwd ();
 
     vfs_path_free (olddir_vpath, TRUE);
 
@@ -3823 +3824 @@
             subshell_chdir (panel->cwd_vpath);
 
         update_xterm_title_path ();
+        update_terminal_cwd ();
         select_item (panel);
 
         bb = buttonbar_find (h);

src/setup.c

@@ -112 +112 @@
 /* Ask file name before start the editor */
 gboolean editor_ask_filename_before_edit = FALSE;
 
+/* Tell cwd to the terminal so it can open new tabs there */
+gboolean auto_cd_new_terminal = TRUE;
+
 panel_view_mode_t startup_left_mode;
 panel_view_mode_t startup_right_mode;
 
@@ -366 +369 @@
     { "mcview_remember_file_position", &mcview_remember_file_position },
     { "auto_fill_mkdir_name", &auto_fill_mkdir_name },
     { "copymove_persistent_attr", &copymove_persistent_attr },
+    { "auto_cd_new_terminal", &auto_cd_new_terminal },
     { NULL, NULL }
 };
 

src/setup.h

@@ -100 +100 @@
 #endif
 extern gboolean file_op_compute_totals;
 extern gboolean editor_ask_filename_before_edit;
+extern gboolean auto_cd_new_terminal;
 
 extern panels_options_t panels_options;