Merge branch '4783_input_line_history_save'

* 4783_input_line_history_save:
  (panel_save_history): save history in any case.
  (mc_config_history_save): remove old history from config if new history is empty.
  (query_default_callback): clarify position of query dialog.
  Ticket #4783: input line: save modified history in any case.

Author: aborodin

lib/mcconfig/history.c

@@ -186,6 +186,10 @@ mc_config_history_load (mc_config_t *cfg, const char *name)
 
 /**
  * Save history to the mc_config, but don't save config to file
+ *
+ * @param cfg mc_config_t object where history is stored in
+ * @param name history name
+ * @param h history. If NULL, then the @name group will be removed from @cfg
  */
 void
 mc_config_history_save (mc_config_t *cfg, const char *name, GList *h)
@@ -194,7 +198,12 @@ mc_config_history_save (mc_config_t *cfg, const char *name, GList *h)
     GString *buffer;
     int i;
 
-    if (name == NULL || *name == '\0' || h == NULL)
+    if (name == NULL || *name == '\0')
+        return;
+
+    mc_config_del_group (cfg, name);
+
+    if (h == NULL)
         return;
 
     // go to end of list
@@ -204,8 +213,6 @@ mc_config_history_save (mc_config_t *cfg, const char *name, GList *h)
     for (i = 0; (i < num_history_items_recorded - 1) && (h->prev != NULL); i++)
         h = g_list_previous (h);
 
-    mc_config_del_group (cfg, name);
-
     /* create charset conversion handler to convert strings
        from system codepage to UTF-8 */
     if (!mc_global.utf8_display)

lib/widget/input.c

@@ -842,15 +842,18 @@ input_save_history (const gchar *event_group_name, const gchar *event_name, gpoi
     (void) event_name;
 
     if (!in->is_password && (DIALOG (WIDGET (in)->owner)->ret_value != B_CANCEL))
+        input_push_history (in);
+
+    // save modified history regardless of ret_value
+    if (in->history.changed)
     {
-        ev_history_load_save_t *ev = (ev_history_load_save_t *) data;
+        const ev_history_load_save_t *ev = (ev_history_load_save_t *) data;
 
-        input_push_history (in);
-        if (in->history.changed)
-            mc_config_history_save (ev->cfg, in->history.name, in->history.list);
-        in->history.changed = FALSE;
+        mc_config_history_save (ev->cfg, in->history.name, in->history.list);
     }
 
+    in->history.changed = FALSE;
+
     return TRUE;
 }
 

lib/widget/wtools.c

@@ -75,8 +75,8 @@ query_default_callback (Widget *w, Widget *sender, widget_msg_t msg, int parm, v
         if ((w->pos_flags & WPOS_CENTER) == 0)
         {
             WDialog *prev_dlg = NULL;
-            int ypos, xpos;
-            WRect r;
+            int ypos;
+            WRect r = { 0, 0, w->rect.lines, w->rect.cols };
 
             // get dialog under h
             if (top_dlg != NULL)
@@ -101,14 +101,13 @@ query_default_callback (Widget *w, Widget *sender, widget_msg_t msg, int parm, v
             else
                 ypos = WIDGET (prev_dlg)->rect.y + 2;
 
-            // if dialog is too high, place it centered
-            if (ypos + w->rect.lines < LINES / 2)
-                w->pos_flags |= WPOS_CENTER;
-
-            xpos = COLS / 2 - w->rect.cols / 2;
+            // if dialog is too high or too low, place it centered
+            if (ypos + w->rect.lines < LINES / 2 || ypos > LINES / 2)
+                w->pos_flags |= WPOS_CENTER_VERT;
+            else
+                r.y = ypos;
 
-            // set position
-            rect_init (&r, ypos, xpos, w->rect.lines, w->rect.cols);
+            w->pos_flags |= WPOS_CENTER_HORZ;
 
             return dlg_default_callback (w, NULL, MSG_RESIZE, 0, &r);
         }

src/filemanager/panel.c

@@ -1377,16 +1377,12 @@ panel_save_history (const gchar *event_group_name, const gchar *event_name, gpoi
                     gpointer data)
 {
     WPanel *p = PANEL (init_data);
+    ev_history_load_save_t *ev = (ev_history_load_save_t *) data;
 
     (void) event_group_name;
     (void) event_name;
 
-    if (p->dir_history.list != NULL)
-    {
-        ev_history_load_save_t *ev = (ev_history_load_save_t *) data;
-
-        mc_config_history_save (ev->cfg, p->dir_history.name, p->dir_history.list);
-    }
+    mc_config_history_save (ev->cfg, p->dir_history.name, p->dir_history.list);
 
     return TRUE;
 }