Changeset 2060

Timestamp:

03/01/10 13:37:15 (5 months ago)

Author:

tpgww

Message:

add action pane.clear_history for clearing goto histories

Location:

trunk

Files:

• docs/ACTIONS (modified) (1 diff)
• src/e2_pane.c (modified) (5 diffs)

trunk/docs/ACTIONS

@@ -100 +100 @@
 pane.<filters>                  O       show menu of filtering-options for a pane
 pane.activate                   O       make a pane active if it's not already so. Arg may be 1 or 2 or missing
+pane.clear_history              O       clear opened-directories history for pane(s). Arg may be 1 or 2 or 1,2 or "both"
 pane.focus                              O       focus a filelist (mainly for start of chained filelist keybings)
 pane.go_back                    O       display the dir that is before the current one in the corresponding history list. Arg may be 1 or 2 or missing

trunk/src/e2_pane.c

@@ -1689 +1689 @@
 @return TRUE if a combo is found
 */
-static gboolean _e2_pane_clear_history (gpointer from, E2_ActionRuntime *art)
+static gboolean _e2_pane_clear_dirline_history (gpointer from, E2_ActionRuntime *art)
 {
         E2_PaneRuntime *rt = e2_pane_get_runtime (from, art->data, NULL);
@@ -1712 +1712 @@
         }
         return FALSE;
+}
+
+/**
+@brief clear the current forward-back history content
+@param from the button, menu item etc which was activated
+@param art action runtime data
+
+@return TRUE
+*/
+static gboolean _e2_pane_clear_goto_history (gpointer from, E2_ActionRuntime *art)
+{
+        gboolean retval = FALSE;
+        const gchar *arg = NULL;
+        E2_PaneRuntime *rt = e2_pane_get_runtime (from, art->data, &arg);
+        if (rt != NULL)
+        {
+                rt->opendir_cur = 0;
+                //do not clear the data, it's shared with app.dir_history
+                g_list_free (rt->opendirs);
+                rt->opendirs = NULL;
+                retval = TRUE;
+        }
+        if (arg != NULL)
+        {
+                if (g_str_has_prefix (arg, "1"))
+                        rt = &app.pane1;
+                else if (g_str_has_prefix (arg, "2"))
+                        rt = &app.pane2;
+                else if ((strchr (arg, '1') != NULL && strchr (arg, '2') != NULL)
+                                        || g_str_has_prefix (arg, _("both")))
+                {
+                        rt = &app.pane1;
+                        rt->opendir_cur = 0;
+                        g_list_free (rt->opendirs);
+                        rt->opendirs = NULL;
+                        rt = &app.pane2;
+                }
+                rt->opendir_cur = 0;
+                g_list_free (rt->opendirs);
+                rt->opendirs = NULL;
+                retval = TRUE;
+        }
+        return retval;
 }
 
@@ -1793 +1836 @@
         }
 
-/* no need to "go back" to places visited in a prior session
-        //CHECKME do this again after post-config window recreation ?
-        gchar *history_name = g_strconcat (rt->name, "-history", NULL);
-        e2_cache_list_register (history_name, &rt->history);
-        if (rt->history != NULL)  //if history list found in cache
-                rt->opendir_cur = 0;    //g_list_length (rt->history);
-        g_free (history_name);
-*/
-        gchar *history_name = g_strconcat (rt->name, "-history", NULL);
-        e2_cache_list_register (history_name, &rt->opendirs);
-        g_free (history_name);
-        if (rt->opendirs != NULL)
-        {
-                GList *node;
-                for (node = rt->opendirs; node != NULL; node = node->next)
-                {
-                        gchar *dirpath = (gchar *)node->data;
-                        E2_DirHistoryEntry *hist_entry = g_hash_table_lookup (app.dir_history, dirpath);
-                        if (hist_entry == NULL)
-                        {//need a new entry for the history cache
-                                hist_entry = ALLOCATE0 (E2_DirHistoryEntry);
-                                CHECKALLOCATEDWARNT (hist_entry, );
-                                if (hist_entry != NULL)
+        if (e2_option_bool_get ("cache-history"))
+        {
+                gchar *history_name = g_strconcat (rt->name, "-history", NULL);
+                e2_cache_list_register (history_name, &rt->opendirs);
+                g_free (history_name);
+                if (rt->opendirs != NULL)
+                {
+                        GList *node;
+                        for (node = rt->opendirs; node != NULL; node = node->next)
+                        {
+                                gchar *dirpath = (gchar *)node->data;
+                                E2_DirHistoryEntry *hist_entry = g_hash_table_lookup (app.dir_history, dirpath);
+                                if (hist_entry == NULL)
+                                {//need a new entry for the history cache
+                                        hist_entry = ALLOCATE0 (E2_DirHistoryEntry);
+                                        CHECKALLOCATEDWARNT (hist_entry, );
+                                        if (hist_entry != NULL)
+                                        {
+                                                g_strlcpy (hist_entry->path, dirpath, sizeof(hist_entry->path));
+                                                hist_entry->selrow = -1;
+#ifdef E2_VFSTMP
+                                                hist_entry->spacedata = view->spacedata;
+#endif
+                                                g_hash_table_insert (app.dir_history, dirpath, hist_entry);
+                                        }
+                                }
+                                else
                                 {
-                                        g_strlcpy (hist_entry->path, dirpath, sizeof(hist_entry->path));
-                                        hist_entry->selrow = -1;
-#ifdef E2_VFSTMP
-                                        hist_entry->spacedata = view->spacedata;
-#endif
-                                        g_hash_table_insert (app.dir_history, dirpath, hist_entry);
+                                        g_free (dirpath);
+                                        node->data = hist_entry;
                                 }
                         }
-                        else
-                        {
-                                g_free (dirpath);
-                                node->data = hist_entry;
-                        }
-                }
-        }
-        history_name = g_strconcat (rt->name, "-current", NULL);
-        e2_cache_int_register (history_name, (gint*)&rt->opendir_cur, 0);
-        g_free (history_name);
-        if (rt->opendirs == NULL)
-                rt->opendir_cur = 0;
-        else if (startdir == NULL)
-        {
-                g_free (rt->path);
-                rt->path = g_strdup (g_list_nth_data (rt->opendirs, rt->opendir_cur));
+                }
+                history_name = g_strconcat (rt->name, "-current", NULL);
+                e2_cache_int_register (history_name, (gint*)&rt->opendir_cur, 0);
+                g_free (history_name);
+                if (rt->opendirs == NULL)
+                        rt->opendir_cur = 0;
+                else if (startdir == NULL)
+                {
+                        g_free (rt->path);
+                        rt->path = g_strdup (g_list_nth_data (rt->opendirs, rt->opendir_cur));
+                }
         }
 
@@ -1992 +2030 @@
                 NULL, NULL},
         {g_strconcat(_A(8),".",_A(27),NULL), NULL,                  TRUE, E2_ACTION_TYPE_HISTORY, 0, NULL, NULL},
+        {g_strconcat(_A(13),".",_A(34),NULL),_e2_pane_clear_goto_history, TRUE, E2_ACTION_TYPE_ITEM, 0, NULL, NULL},
         {g_strconcat(_A(13),".",_A(49),NULL),_e2_pane_go_back,      TRUE, E2_ACTION_TYPE_HOVER, 0, hdata1, NULL},
         {g_strconcat(_A(13),".",_A(50),NULL),_e2_pane_go_forward,   TRUE, E2_ACTION_TYPE_HOVER, 0, hdata2, NULL},
@@ -2009 +2048 @@
         {g_strconcat(_A(13),".",_A(122),NULL),_e2_pane_select_space,  TRUE, E2_ACTION_TYPE_ITEM, 0, NULL, NULL},
 #endif
-        {g_strconcat(_A(5),".",_A(34),NULL),_e2_pane_clear_history,   TRUE, E2_ACTION_TYPE_ITEM, 0, NULL, NULL},
+        {g_strconcat(_A(5),".",_A(34),NULL),_e2_pane_clear_dirline_history, TRUE, E2_ACTION_TYPE_ITEM, 0, NULL, NULL},
         {g_strconcat(_A(7),".",_A(52),NULL),_e2_pane_focus_bottom,    TRUE, E2_ACTION_TYPE_ITEM, 0, NULL, NULL},
         {g_strconcat(_A(7),".",_A(53),NULL),_e2_pane_focus_top,       TRUE, E2_ACTION_TYPE_ITEM, 0, NULL, NULL},