Ticket #83: mc.patch

src/cmd.c

@@ -117 +117 @@
 {
     static const char *viewer = NULL;
     int move_dir = 0;
+    int run_editor = 0;
 
 
     if (plain_view) {
@@ -136 +137 @@
         mcview_default_hex_mode = 0;
         mcview_default_nroff_flag = 0;
         mcview_default_magic_flag = 0;
-        mcview_viewer (NULL, filename, &move_dir, start_line);
+        mcview_viewer (NULL, filename, &move_dir, start_line, &run_editor);
         if (changed_hex_mode && !mcview_altered_hex_mode)
             mcview_default_hex_mode = 1;
         if (changed_nroff_flag && !mcview_altered_nroff_flag)
@@ -144 +145 @@
         if (changed_magic_flag && !mcview_altered_magic_flag)
             mcview_default_magic_flag = 1;
         repaint_screen ();
+        if (run_editor) {
+                do_edit_at_line (filename, start_line);
+                repaint_screen ();
+        }
         return move_dir;
     }
     if (internal) {
@@ -156 +161 @@
             strcpy (view_entry, "View");
 
         if (regex_command (filename, view_entry, &move_dir) == 0) {
-            mcview_viewer (NULL, filename, &move_dir, start_line);
+            mcview_viewer (NULL, filename, &move_dir, start_line, &run_editor);
             repaint_screen ();
         }
     } else {
@@ -169 +174 @@
         }
         execute_with_vfs_arg (viewer, filename);
     }
+    if (run_editor) {
+        do_edit_at_line (filename, start_line);
+        repaint_screen ();
+    }
     return move_dir;
 }
 
@@ -289 +298 @@
     if (!command)
         return;
 
-    mcview_viewer (command, "", NULL, 0);
+    mcview_viewer (command, "", NULL, 0, NULL);
 
     g_free (command);
 }

src/cmddef.h

@@ -274 +274 @@
 #define CK_ViewPrevFile                 5025
 #define CK_ViewToggleRuler              5026
 #define CK_ViewToggleHexNavMode         5027
+#define CK_ViewRunEditor                5028
 
 /* Tree */
 #define CK_TreeHelp                     6001

src/ext.c

@@ -252 +252 @@
          * into view
          */
         if (written_nonspace) {
-            mcview_viewer (cmd, filename, move_dir, start_line);
+            mcview_viewer (cmd, filename, move_dir, start_line, NULL);
             unlink (file_name);
         } else {
-            mcview_viewer (NULL, filename, move_dir, start_line);
+            mcview_viewer (NULL, filename, move_dir, start_line, NULL);
         }
         if (changed_hex_mode && !mcview_altered_hex_mode)
             mcview_default_hex_mode = def_hex_mode;

src/keybind.c

@@ -249 +249 @@
     { "ViewPrevFile",                    CK_ViewPrevFile },
     { "ViewToggleRuler",                 CK_ViewToggleRuler },
     { "ViewToggleHexNavMode",            CK_ViewToggleHexNavMode },
+    { "ViewRunEditor",                   CK_ViewRunEditor },
 
     /* help */
     { "HelpHelp",                        CK_HelpHelp },
@@ -514 +515 @@
     { ALT ('e'),   CK_SelectCodepage,        "M-e" },
     { XCTRL ('o'), CK_ShowCommandLine,       "C-o" },
 
+    { KEY_F (14),  CK_ViewRunEditor,        "S-F4" },
+
     { 0, CK_Ignore_Key, "" }
 };
 

src/main.c

@@ -1604 +1604 @@
         }
 
         /* Ctrl-Shift-Enter */
-        if (parm == (KEY_M_CTRL | KEY_M_SHIFT | '\n')) {
+        if (parm == (KEY_M_CTRL | KEY_M_SHIFT | '\n')) 
+        {
             copy_current_pathname ();
             copy_prog_name ();
             return MSG_HANDLED;

src/user.c

@@ -702 +702 @@
     chmod (file_name, S_IRWXU);
     if (run_view) {
         run_view = 0;
-        mcview_viewer (file_name, NULL, &run_view, 0);
+        mcview_viewer (file_name, NULL, &run_view, 0, NULL);
     } else {
         /* execute the command indirectly to allow execution even
          * on no-exec filesystems. */

src/viewer/actions_cmd.c

@@ -439 +439 @@
         if (!mcview_is_in_panel (view))
             view->move_dir = (command == CK_ViewNextFile) ? 1 : -1;
         /* fallthrough */
+    case CK_ViewRunEditor:
+        view->run_editor = 1;
     case CK_ViewQuit:
         if (mcview_ok_to_quit (view))
             view->want_to_quit = TRUE;

src/viewer/internal.h

@@ -191 +191 @@
     struct mcview_nroff_struct *search_nroff_seq;
 
     int search_numNeedSkipChar;
+
+    int run_editor;
 } mcview_t;
 
 typedef struct mcview_nroff_struct

src/viewer/mcviewer.c

@@ -257 +257 @@
     view->update_steps = 0;
     view->update_activate = 0;
 
+    view->run_editor = 0;
+
     if (mcview_default_hex_mode)
         mcview_toggle_hex_mode (view);
     if (mcview_default_nroff_flag)
@@ -275 +277 @@
 
 /* Real view only */
 int
-mcview_viewer (const char *command, const char *file, int *move_dir_p, int start_line)
+mcview_viewer (const char *command, const char *file, int *move_dir_p, int start_line, int * run_editor)
 {
     gboolean succeeded;
     mcview_t *lc_mcview;
@@ -296 +298 @@
         run_dlg (view_dlg);
         if (move_dir_p)
             *move_dir_p = lc_mcview->move_dir;
+        if (run_editor)
+            *run_editor = lc_mcview->run_editor;
     }
     else
     {

src/viewer/mcviewer.h

@@ -43 +43 @@
  * point to a variable that will receive the direction in which the user
  * wants to move (-1 = previous file, 1 = next file, 0 = do nothing).
  */
-extern int mcview_viewer (const char *command, const char *file, int *move_dir_p, int start_line);
+extern int mcview_viewer (const char *command, const char *file, int *move_dir_p, int start_line, int * run_editor);
 
 extern gboolean mcview_load (struct mcview_struct *, const char *, const char *, int);