Changeset 2042

Timestamp:

02/18/10 23:11:26 (5 months ago)

Author:

tpgww

Message:

re-introduce support for dir-history cacheing and combined menu

Location:

trunk

Files:

• docs/ACTIONS (modified) (2 diffs)
• plugins/e2p_upgrade.c (modified) (2 diffs)
• src/actions/e2_action.h (modified) (1 diff)
• src/e2_context_menu.c (modified) (2 diffs)
• src/e2_pane.c (modified) (6 diffs)
• src/e2_pane.h (modified) (2 diffs)
• src/e2_toolbar.c (modified) (1 diff)

trunk/docs/ACTIONS

@@ -13 +13 @@
 
 bookmark.add                    O       add dir to bookmarks. Parameter1: pane1 or pane2 = use the dir shown in that pane, or else a specific path (absolute or relative) or else none = use active pane dir; parameter2: (optional) top = add to top of list; child = add as child of clicked bookmark
-bookmark.delete                 O       remove dir from bookmarks. Parameter: a specific path or else use active pane directory; 
+bookmark.delete                 O       remove dir from bookmarks. Parameter: a specific path or else use active pane directory;
 children.<menu>                 N       create menu of running child processes. Selection from that menu adds that child's pid to the command line (always prepended if <Ctrl> is pressed at the time of selection)
 children.list                   N       list in the output pane all the child processes of the running e2 instance
@@ -75 +75 @@
 filelist.toggle_selected        O       toggle current selection-state of all items in a filelist
 history.list                    N       list in the output pane all prior commands and actions in the session
-option.set                              Y       set config option from string Parameter = string like "option-name=option-value"
+history.<menu>          O       show a menu of all directories in the forward/back history for the relevant filelist
+option.set                      Y       set config option from string Parameter = string like "option-name=option-value"
 output.activate                 N       open the filetype item (if any) whose path or name is under the pointer in the active output tab
 output.adjust_ratio             Y       adjust height of output pane relative to the main window. Parameter = 0.0 (hidden) to 1.0 (full window), may have ",*" appended to decimal, to cause toggling. In that case, the arg string or at least the * char must be quoted to stop interpretation into a list of files

trunk/plugins/e2p_upgrade.c

@@ -374 +374 @@
 }
 
+static void _e2p_upgrade_0_7_2 (void)
+{
+        gchar *sed = _e2p_upgrade_get_sed ();
+        if (sed != NULL)
+        {
+                //context menu item add
+                gchar *oldstr1 = g_strconcat("\t",_("_Edit bookmarks.."),"|gtk-preferences|false|false|",_A(3),".",_C(1),"|",NULL);
+                gchar *newstr1 = g_strconcat(_("_History"),"|gtk-jump-to|false|false|",_A(8),".",_A(27),"|",NULL);
+
+                gchar *cfg_file = g_build_filename (e2_cl_options.config_dir,
+                        default_config_file, NULL);
+                gchar *local = F_FILENAME_TO_LOCALE (cfg_file);
+                gchar *command = g_strconcat ("cp -f ", local, " ", local, ".save;",
+                sed,
+#ifndef E2_VERSIONDOCS
+                        " -e '1s/", app.cfgfile_version, "/", VERSION RELEASE, "/'",
+#endif
+                        " -e '/",oldstr1,"$/a\\\n",newstr1,"'",
+                        " ",local,".save >",local,NULL);
+                if (!_e2p_upgrade_run (command, local))
+                        printd (WARN, "failed to execute command to do upgrade 0.7.2");
+                g_free (oldstr1);
+                g_free (newstr1);
+                g_free (cfg_file);
+                F_FREE (local, cfg_file);
+                g_free (command);
+                g_free (sed);
+        }
+        else
+                _e2p_upgrade_0_4_5 ();  //suggest default
+}
+
 gboolean init_plugin (Plugin *p)
 {
@@ -412 +444 @@
                                 _e2p_upgrade_0_5_1_1 ();
                         }
+                        if (strcmp (app.cfgfile_version,"0.7.2") < 0)
+                        {
+                                cancelled = FALSE;
+                                _e2p_upgrade_0_7_2 ();
+                        }
                 }
                 if (!cancelled)

trunk/src/actions/e2_action.h

@@ -42 +42 @@
         E2_ACTION_TYPE_COMMAND_LINE,
         E2_ACTION_TYPE_BOOKMARKS,
+        E2_ACTION_TYPE_HISTORY,
         E2_ACTION_TYPE_CHECK_ITEM,  //UNUSED
         E2_ACTION_TYPE_FILTERS, //UNUSED

trunk/src/e2_context_menu.c

@@ -464 +464 @@
                                         }
                                                 break;
+                                        case E2_ACTION_TYPE_HISTORY:
+                                        {
+                                                GtkWidget *item = e2_menu_add (menu, label, icon, NULL, NULL, NULL);
+                                                E2_PaneRuntime *rt = e2_pane_get_runtime (curr_view->treeview,
+                                                        arg, NULL);
+                                                GtkWidget *submenu = e2_pane_visited_menu (rt);
+                                                gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), submenu);
+                                        }
+                                        break;
                                         case E2_ACTION_TYPE_FILE_ACTIONS:
                                                 e2_context_menu_add_filetype_item (menu);
@@ -677 +686 @@
         g_strconcat("\t||false|false|",_A(21),"|",NULL),
         g_strconcat("\t",_("_Edit bookmarks.."),"|gtk-preferences|false|false|",_A(3),".",_C(1),"|",NULL),
+        g_strconcat(_("_History"),"|gtk-jump-to|false|false|",_A(8),".",_A(27),"|",NULL),
         g_strconcat("||false|false|",_A(21),"|",NULL),
         g_strconcat(_("_Edit filetype.."),"|gtk-preferences|false|false|",_A(3),".",_A(45),"|",NULL),

trunk/src/e2_pane.c

@@ -1 +1 @@
 /* $Id$
 
-Copyright (C) 2004-2009 tooar <tooar@emelfm2.net>
+Copyright (C) 2004-2010 tooar <tooar@emelfm2.net>
 
 This file is part of emelFM2.
@@ -779 +779 @@
 }
 
+/**
+@brief construct destroyable menu of all history for the pane associated with @rt
+
+@param rt pointer to pane data struct
+
+@return the menu widget (unshown)
+*/
+GtkWidget *e2_pane_visited_menu (E2_PaneRuntime *rt)
+{
+        guint curr = 0;
+        GtkWidget *menu = gtk_menu_new ();
+        //work backward so that "go back" items are at top
+        GList *member = g_list_last (rt->opendirs);
+        while (member != NULL)
+        {
+                GtkWidget *item;
+                if (strcmp ((gchar *)member->data, rt->view.dir) == 0)
+                        item = gtk_radio_menu_item_new_with_label (NULL, (gchar *)member->data);
+                else
+                        item = gtk_menu_item_new_with_label ((gchar *)member->data);
+                gtk_widget_show_all (item);
+                gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+                g_object_set_data (G_OBJECT (item), "e2-history-pick",
+                        GUINT_TO_POINTER (curr));
+                g_signal_connect (G_OBJECT (item), "activate",
+                        G_CALLBACK (_e2_pane_history_selected_cb), rt);
+                HISTORY_LOCK
+                member = member->prev;
+                HISTORY_UNLOCK
+                curr++;
+        }
+        return menu;
+}
+
   /*******************/
  /***** actions *****/
@@ -1036 +1070 @@
 static GtkWidget *_e2_pane_popup_forward (GtkWidget *from, E2_PaneRuntime *rt)
 {
-        guint curr = (rt->opendir_cur > 1) ? rt->opendir_cur - 1 : 0;
-        if (curr == 0)
-                return NULL;
+        if (rt->opendir_cur == 0)
+                return NULL;    //nowhere to go in forward direction
+        guint curr = rt->opendir_cur - 1;
+        GtkWidget *menu = gtk_menu_new ();
         GList *member = g_list_nth (rt->opendirs, curr);
-
-        GtkWidget *menu = gtk_menu_new ();
         while (member != NULL)
         {
@@ -1768 +1801 @@
         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)
+                                {
+                                        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_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));
+        }
+
         //register pane-specific actions
         E2_Action actions[] =
@@ -1809 +1884 @@
         //existing hooklists are cleared if appropriate in e2_window_recreate()
         rt->pane_sw = e2_fileview_create_list (&rt->view);
+        rt->inner_box = gtk_vbox_new (FALSE, 0);
+        gtk_box_pack_start (GTK_BOX (rt->inner_box), rt->pane_sw, TRUE, TRUE, 0);
         rt->outer_box = gtk_hbox_new (FALSE, 0);
-        rt->inner_box = gtk_vbox_new (FALSE, 0);
-        gtk_box_pack_start_defaults (GTK_BOX (rt->inner_box), rt->pane_sw);
-        gtk_box_pack_start_defaults (GTK_BOX (rt->outer_box), rt->inner_box);
+        gtk_box_pack_start (GTK_BOX (rt->outer_box), rt->inner_box, TRUE, TRUE, 0);
 
         gtk_widget_show (rt->inner_box);
@@ -1916 +1991 @@
                 E2_ACTION_EXCLUDE_MENU | E2_ACTION_EXCLUDE_TOOLBAR, //CHECKME exclusions
                 NULL, NULL},
+        {g_strconcat(_A(8),".",_A(27),NULL), NULL,                  TRUE, E2_ACTION_TYPE_HISTORY, 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},

trunk/src/e2_pane.h

@@ -43 +43 @@
 #endif
         E2_OptionSet *opt_transparent;  //for quick checks whether to interpret relative path strings
-        GList *opendirs;        /*list of paths of dirs previously opened (utf-8,
+        GList *opendirs;        /* effectively a list of paths of dirs previously opened (UTF-8,
                                                 absolute for current namespace, with trailer). Used for
-                                                "goto" buttons menu. List was cached, and then, data items
-                                                were heaped copies of path strings. Now not cached, and
-                                                shares data with app.dir_history. Unlike the latter, this
-                                                list may have multiple entries for the same dir */
+                                                "goto-buttons" menus. Actually, shares data with app.dir_history.
+                                                Unlike the latter, this list may have multiple entries for the
+                                                same dir */
         guint opendir_cur;      //0-based index of current position in opendirs list
         GHookList hook_change_dir;      //data for functions to run during change-dir function,
@@ -78 +77 @@
 void e2_pane_options_register (gint num);
 
+GtkWidget *e2_pane_visited_menu (E2_PaneRuntime *rt);
+
 #endif //ndef __E2_PANE_H__

trunk/src/e2_toolbar.c

@@ -2328 +2328 @@
                                 }
                                 break;
+                        case E2_ACTION_TYPE_HISTORY:
+                                {
+                                        E2_PaneRuntime *prt;
+                                        button = _e2_toolbar_add_button (rt, bstyle, label, icon, tip, NULL);
+                                        if (rt == app.bars[E2_BAR_PANE1]->rt)
+                                                prt = &app.pane1;
+                                        else if (rt == app.bars[E2_BAR_PANE2]->rt)
+                                                prt = &app.pane2;
+                                        else
+                                                prt = curr_pane;
+                                        GtkWidget *submenu = e2_pane_visited_menu (prt);
+                                        if (submenu != NULL)
+                                        {
+                                                g_object_set_data_full (G_OBJECT (button), "menu", submenu,
+                                                        (GDestroyNotify) gtk_widget_destroy);
+                                                g_signal_connect (G_OBJECT (button), "button-press-event",
+                                                        G_CALLBACK (e2_utils_generic_press_cb), NULL);
+                                                g_signal_connect (G_OBJECT (button), "button-release-event",
+                                                        G_CALLBACK (_e2_toolbar_menu_popup_cb), rt);
+                                                g_signal_connect (G_OBJECT (button), "mnemonic-activate",
+                                                        G_CALLBACK (_e2_toolbar_menu_popup_mnemonic_cb), rt);
+                                        }
+                                }
+                                break;
                         case E2_ACTION_TYPE_TOGGLE:
                                 {