Ticket #2733: 2733-file-edit-history.patch

lib/keybind.c

@@ -231 +231 @@
     {"SortBySize", CK_SortBySize},
     {"SortByMTime", CK_SortByMTime},
     {"CdParentSmart", CK_CdParentSmart},
+    {"FileEditHistory", CK_FileEditHistory},
 
     /* dialog */
     {"Ok", CK_Ok},

lib/keybind.h

@@ -205 +205 @@
     CK_SortByMTime,
     CK_ScrollLeft,
     CK_ScrollRight,
+    CK_FileEditHistory,
 
     /* dialog */
     CK_Ok = 300L,

lib/widget/history.c

@@ -57 +57 @@
 
 /*** file scope macro definitions ****************************************************************/
 
+#define B_VIEW          (B_USER + 1)
+#define B_EDIT          (B_USER + 2)
+
 /*** file scope type declarations ****************************************************************/
 
 typedef struct
@@ -114 +117 @@
 
 /* --------------------------------------------------------------------------------------------- */
 
+static inline cb_ret_t
+history_handle_key (WDialog * h, int key)
+{
+    switch (key)
+    {
+    case KEY_F (3):
+        h->ret_value = B_VIEW;
+        dlg_stop (h);
+        return MSG_HANDLED;
+
+    case KEY_F (4):
+        h->ret_value = B_EDIT;
+        dlg_stop (h);
+        return MSG_HANDLED;
+    default:
+        return MSG_NOT_HANDLED;
+    }
+}
+
+/* --------------------------------------------------------------------------------------------- */
+
 static cb_ret_t
 history_dlg_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *data)
 {
@@ -122 +146 @@
     case MSG_RESIZE:
         return history_dlg_reposition (DIALOG (w));
 
+    case MSG_UNHANDLED_KEY:
+         return history_handle_key (DIALOG (w), parm);
+
     default:
         return dlg_default_callback (w, sender, msg, parm, data);
     }
@@ -285 +312 @@
 /* --------------------------------------------------------------------------------------------- */
 
 char *
-history_show (GList ** history, Widget * widget, int current)
+history_show (GList ** history, Widget * widget, int current, int *param)
 {
     GList *z, *hlist = NULL, *hi;
     size_t maxlen, count = 0;
@@ -293 +320 @@
     WDialog *query_dlg;
     WListbox *query_list;
     history_dlg_data hist_data;
+    int dlg_ret;
 
     if (*history == NULL)
         return NULL;
@@ -356 +384 @@
             listbox_select_entry (query_list, current);
     }
 
-    if (dlg_run (query_dlg) != B_CANCEL)
+    dlg_ret = dlg_run (query_dlg);
+    if (dlg_ret != B_CANCEL)
     {
         char *q;
 
+        if (param != NULL)
+        {
+            switch (dlg_ret)
+            {
+            case B_EDIT:
+                *param = CK_Edit;
+                break;
+            case B_VIEW:
+                *param = CK_View;
+                break;
+            default:
+                *param = CK_CdChild;
+            }
+        }
+
         listbox_get_current (query_list, &q, NULL);
         r = g_strdup (q);
     }

lib/widget/history.h

@@ -28 +28 @@
 void history_save (mc_config_t * cfg, const char *name, GList * h);
 /* for repositioning of history dialog we should pass widget to this
  * function, as position of history dialog depends on widget's position */
-char *history_show (GList ** history, Widget * widget, int current);
+char *history_show (GList ** history, Widget * widget, int current, int *action);
 
 /*** inline functions ****************************************************************************/
 

lib/widget/input.c

@@ -178 +178 @@
     len = get_history_length (in->history.list);
 
     r = history_show (&in->history.list, WIDGET (in),
-                      g_list_position (in->history.list, in->history.list));
+                      g_list_position (in->history.list, in->history.list), NULL);
     if (r != NULL)
     {
         input_assign_text (in, r);

src/filemanager/panel.c

@@ -3344 +3344 @@
 
     pos = g_list_position (panel->dir_history_current, panel->dir_history);
 
-    s = history_show (&panel->dir_history, WIDGET (panel), pos);
+    s = history_show (&panel->dir_history, WIDGET (panel), pos, NULL);
     if (s != NULL)
     {
         vfs_path_t *s_vpath;
@@ -3381 +3381 @@
     }
 }
 
+static void
+file_edit_history_list (WPanel * panel)
+{
+
+    char *fn;
+    FILE *f;
+    char buf[MC_MAXPATHLEN + 100];
+    GList *file_list = NULL;
+    char *s;
+    int action;
+
+    /* open file with positions */
+    fn =  mc_config_get_full_path (MC_FILEPOS_FILE);
+    f = fopen (fn, "r");
+    g_free (fn);
+    if (f == NULL)
+        return;
+
+    while (fgets (buf, sizeof (buf), f) != NULL)
+    {
+        s = strrchr(buf, ' ');
+        if (s)
+        {
+            *s = 0;
+        }
+        s = g_strdup (buf);
+
+       file_list = g_list_prepend (file_list, s);
+       file_list = g_list_first(file_list);
+    }
+    fclose(f);
+
+    file_list = g_list_last(file_list);
+
+    s = history_show (&file_list, WIDGET(panel), 0, &action);
+
+    if (s != NULL)
+    {
+        vfs_path_t *vpath;
+
+        switch (action)
+        {
+        case CK_Edit:
+            vpath = vfs_path_from_str (s);
+            edit_file_at_line (vpath, use_internal_edit, 0);
+            break;
+        case CK_View:
+            vpath = vfs_path_from_str (s);
+            view_file (vpath, TRUE, use_internal_view);
+            break;
+        default:
+            {
+            char *dirname = g_path_get_dirname(s);
+            vpath = vfs_path_from_str (dirname);
+            g_free (dirname);
+
+            do_cd (vpath, cd_exact);
+            try_to_select (panel, basename(s));
+            }
+        }
+        vfs_path_free(vpath);
+        g_free (s);
+    }
+
+    file_list = g_list_first (file_list);
+    g_list_foreach (file_list, (GFunc) g_free, NULL);
+    g_list_free (file_list);
+}
+
 /* --------------------------------------------------------------------------------------------- */
 
 static cb_ret_t
@@ -3458 +3527 @@
     case CK_CdParent:
         goto_parent_dir (panel);
         break;
+    case CK_FileEditHistory:
+        file_edit_history_list (panel);
+        break;
     case CK_History:
         directory_history_list (panel);
         break;