Changeset 43324 in vbox

Timestamp:

Sep 13, 2012 9:33:37 PM (12 years ago)

Author:

vboxsync

Message:

bug #6322: Debugger: Redo the command history

Maintain invariant that the empty line is the last one. That
simplifies the logic and make history actually work as expected.

Location:

trunk/src/VBox/Debugger

Files:

• VBoxDbgConsole.cpp (modified) (2 diffs)
• VBoxDbgConsole.h (modified) (1 diff)

trunk/src/VBox/Debugger/VBoxDbgConsole.cpp

@@ -146 +146 @@
 
 VBoxDbgConsoleInput::VBoxDbgConsoleInput(QWidget *pParent/* = NULL*/, const char *pszName/* = NULL*/)
-    : QComboBox(pParent), m_iBlankItem(0), m_hGUIThread(RTThreadNativeSelf())
-{
-    insertItem(m_iBlankItem, "");
+    : QComboBox(pParent), m_hGUIThread(RTThreadNativeSelf())
+{
+    addItem(""); /* invariant: empty command line is the last item */
+
     setEditable(true);
     setInsertPolicy(NoInsert);
@@ -181 +182 @@
 {
     Assert(m_hGUIThread == RTThreadNativeSelf());
+
+    QString command = currentText();
+    /* TODO: trim whitespace? */
+    if (command.isEmpty()) {
+        return;
+    }
+
     /* deal with the current command. */
-    QString Str = currentText();
-    emit commandSubmitted(Str);
-
-    /* update the history and clear the entry field */
-    QString PrevStr = m_iBlankItem > 0 ? itemText(m_iBlankItem - 1) : "";
-    if (PrevStr != Str)
-    {
-        setItemText(m_iBlankItem, Str);
-        if (    m_iBlankItem > 0
-            &&  m_iBlankItem >= maxCount() - 1)
-            removeItem(m_iBlankItem - maxCount() - 1);
-        insertItem(++m_iBlankItem, "");
-    }
-
-    clearEditText();
-    setCurrentIndex(m_iBlankItem);
+    emit commandSubmitted(command);
+
+
+    /*
+     * Add current command to history.
+     */
+    bool needsAppending = true;
+
+    /* invariant: empty line at the end */
+    int lastItem = count() - 1;
+    Assert(itemText(lastItem).isEmpty());
+
+    /* have previous command? check duplicate. */
+    if (lastItem > 0) {
+        const QString prevCommand(itemText(lastItem - 1));
+        if (command == prevCommand) {
+            needsAppending = false;
+        }
+    }
+
+    if (needsAppending) {
+        /* history full? drop the oldest command. */
+        if (count() == maxCount()) {
+            removeItem(0);
+            --lastItem;
+        }
+
+        /* insert before the empty line. */
+        insertItem(lastItem, command);
+    }
+
+    /* invariant: empty line at the end */
+    int newLastItem = count() - 1;
+    Assert(itemText(newLastItem).isEmpty());
+
+    /* select empty line to present "new" command line to the user */
+    setCurrentIndex(newLastItem);
 }
 

trunk/src/VBox/Debugger/VBoxDbgConsole.h

@@ -118 +118 @@
 
 protected:
-    /** The current blank entry. */
-    int m_iBlankItem;
     /** The handle to the GUI thread. */
     RTNATIVETHREAD m_hGUIThread;