work save

RedPandaIDE/debugger.cpp

@@ -3,10 +3,12 @@
 #include "mainwindow.h"
 #include "editor.h"
 #include "settings.h"
+#include "cpudialog.h"
 
 #include <QFile>
 #include <QFileInfo>
 #include <QMessageBox>
+#include <QMessageBox>
 
 Debugger::Debugger(QObject *parent) : QObject(parent)
 {
@@ -36,6 +38,7 @@ void Debugger::start()
     mReader = new DebugReader(this);
     mReader->setDebuggerPath(debuggerPath);
     connect(mReader, &QThread::finished,this,&Debugger::stop);
+    connect(mReader, &DebugReader::parseFinished,this,&Debugger::syncFinishedParsing,Qt::BlockingQueuedConnection);
     mReader->start();
 
 
@@ -79,23 +82,23 @@ void Debugger::stop()
 
         pMainWindow->updateAppTitle();
 
-        MainForm.OnBacktraceReady;
+        mBacktraceModel->clear();
 
-        Application.HintHidePause := 2500;
+//        Application.HintHidePause := 2500;
 
-        WatchView.Items.BeginUpdate;
+//        WatchView.Items.BeginUpdate;
-        try
+//        try
-          //Clear all watch values
+//          //Clear all watch values
-          for I := 0 to WatchVarList.Count - 1 do begin
+//          for I := 0 to WatchVarList.Count - 1 do begin
-            WatchVar := PWatchVar(WatchVarList.Items[I]);
+//            WatchVar := PWatchVar(WatchVarList.Items[I]);
-            WatchVar^.Node.Text := WatchVar^.Name + ' = '+Lang[ID_MSG_EXECUTE_TO_EVALUATE];
+//            WatchVar^.Node.Text := WatchVar^.Name + ' = '+Lang[ID_MSG_EXECUTE_TO_EVALUATE];
 
-            // Delete now invalid children
+//            // Delete now invalid children
-            WatchVar^.Node.DeleteChildren;
+//            WatchVar^.Node.DeleteChildren;
-          end;
+//          end;
-        finally
+//        finally
-        WatchView.Items.EndUpdate;
+//        WatchView.Items.EndUpdate;
-        end;
+//        end;
     }
 }
 
@@ -221,7 +224,7 @@ void Debugger::sendBreakpointCommand(PBreakpoint breakpoint)
 
 void Debugger::sendClearBreakpointCommand(int index)
 {
-    sendClearBreakpointCommand(mBreakpointModel->breakpoints()[breakpoint]);
+    sendClearBreakpointCommand(mBreakpointModel->breakpoints()[index]);
 }
 
 void Debugger::sendClearBreakpointCommand(PBreakpoint breakpoint)
@@ -237,6 +240,133 @@ void Debugger::sendClearBreakpointCommand(PBreakpoint breakpoint)
     }
 }
 
+void Debugger::syncFinishedParsing()
+{
+    bool spawnedcpuform = false;
+
+    // GDB determined that the source code is more recent than the executable. Ask the user if he wants to rebuild.
+    if (mReader->doreceivedsfwarning) {
+        if (QMessageBox::question(pMainWindow,
+                                  tr("Compile"),
+                                  tr("Source file is more recent than executable.")+"<BR /><BR />" + tr("Recompile?"),
+                                  QMessageBox::Yes | QMessageBox::No,
+                                  QMessageBox::Yes
+                                  ) == QMessageBox::Yes) {
+            stop();
+            pMainWindow->compile();
+            return;
+        }
+    }
+
+    // The program to debug has stopped. Stop the debugger
+    if (mReader->doprocessexited) {
+        stop();
+        return;
+    }
+
+    // An evaluation variable has been processed. Forward the results
+    if (mReader->doevalready) {
+        emit evalReady(mReader->mEvalValue);
+    }
+
+    // show command output
+    if (pSettings->debugger().showCommandLog() ||
+            (mReader->mCurrentCmd && mReader->mCurrentCmd->showInConsole)) {
+        if (pSettings->debugger().showAnnotations()) {
+            QString strOutput = mReader->mOutput;
+            strOutput.replace(QChar(26),'>');
+            pMainWindow->addDebugOutput(strOutput);
+            pMainWindow->addDebugOutput("");
+            pMainWindow->addDebugOutput("");
+        } else {
+            QStringList strList = TextToLines(mReader->mOutput);
+            QStringList outStrList;
+            bool addToLastLine=false;
+            for (int i=0;i<strList.size();i++) {
+                QString strOutput=strList[i];
+                if (strOutput.startsWith("\032\032")) {
+                    addToLastLine = true;
+                } else {
+                    if (addToLastLine && outStrList.size()>0) {
+                        outStrList[outStrList.size()-1]+=strOutput;
+                    } else {
+                        outStrList.append(strOutput);
+                    }
+                    addToLastLine = false;
+                }
+            }
+            for (const QString& line:outStrList) {
+                pMainWindow->addDebugOutput(line);
+            }
+        }
+    }
+
+    // Some part of the CPU form has been updated
+    if (pMainWindow->CPUDialog()->isVisible() && !mReader->doreceivedsignal) {
+//        if (mReader->doregistersready)
+//            CPUForm.OnRegistersReady;
+
+//        if (mReader->dodisassemblerready)
+//            CPUForm.OnAssemblerReady;
+    }
+
+//if dobacktraceready then
+//  MainForm.OnBacktraceReady;
+
+
+    if (mReader->doupdateexecution) {
+        if (mReader->mCurrentCmd && mReader->mCurrentCmd == DebugCommandSource::Console) {
+            pMainWindow->setActiveBreakpoint(mReader->mBreakPointFile, mReader->mBreakPointLine,false);
+        } else {
+            pMainWindow->setActiveBreakpoint(mReader->mBreakPointFile, mReader->mBreakPointLine);
+        }
+        refreshWatchVars(); // update variable information
+    }
+
+    if (mReader->doreceivedsignal) {
+//SignalDialog := CreateMessageDialog(fSignal, mtError, [mbOk]);
+//SignalCheck := TCheckBox.Create(SignalDialog);
+
+//// Display it on top of everything
+//SignalDialog.FormStyle := fsStayOnTop;
+
+//SignalDialog.Height := 150;
+
+//with SignalCheck do begin
+//  Parent := SignalDialog;
+//  Caption := 'Show CPU window';
+//  Top := Parent.ClientHeight - 22;
+//  Left := 8;
+//  Width := Parent.ClientWidth - 16;
+//  Checked := devData.ShowCPUSignal;
+//end;
+
+//MessageBeep(MB_ICONERROR);
+//if SignalDialog.ShowModal = ID_OK then begin
+//  devData.ShowCPUSignal := SignalCheck.Checked;
+//  if SignalCheck.Checked and not Assigned(CPUForm) then begin
+//    MainForm.ViewCPUItemClick(nil);
+//    spawnedcpuform := true;
+//  end;
+//end;
+
+//SignalDialog.Free;
+
+    }
+
+
+    // CPU form updates itself when spawned, don't update twice!
+    if ((mReader->doupdatecpuwindow && !spawnedcpuform) && (pMainWindow->CPUDialog()->isVisible())) {
+            sendCommand("disas", "");
+            sendCommand("info registers", "");
+    }
+}
+
+bool Debugger::executing() const
+{
+    return mExecuting;
+}
+
 DebugReader::DebugReader(Debugger* debugger, QObject *parent) : QThread(parent)
 {
     mDebugger = debugger;

RedPandaIDE/debugger.h

@@ -146,16 +146,20 @@ public:
 
     BacktraceModel* backtraceModel();
     BreakpointModel* breakpointModel();
+    bool executing() const;
+
 public slots:
     void stop();
 signals:
+    void evalReady(QString value);
 
 private:
     void sendBreakpointCommand(int index);
     void sendBreakpointCommand(PBreakpoint breakpoint);
     void sendClearBreakpointCommand(int index);
     void sendClearBreakpointCommand(PBreakpoint breakpoint);
-
+private slots:
+    void syncFinishedParsing();
 private:
     bool mExecuting;
     bool mCommandChanged;
@@ -253,7 +257,7 @@ private:
     bool doreceivedsfwarning;
 
     bool mStop;
-
+    friend class Debugger;
     // QThread interface
 protected:
     void run() override;

RedPandaIDE/mainwindow.cpp

@@ -6,6 +6,8 @@
 #include "settings.h"
 #include "qsynedit/Constants.h"
 #include "debugger.h"
+#include "cpudialog.h"
+
 
 #include <QCloseEvent>
 #include <QComboBox>
@@ -82,6 +84,8 @@ MainWindow::MainWindow(QWidget *parent)
     ui->actionEncode_in_ANSI->setCheckable(true);
     ui->actionEncode_in_UTF_8->setCheckable(true);
 
+    mCPUDialog = new CPUDialog(this);
+
     updateEditorActions();
     applySettings();
 
@@ -217,48 +221,66 @@ void MainWindow::removeActiveBreakpoints()
 
 void MainWindow::updateAppTitle()
 {
-appName := Lang[ID_DEVCPP];
+    QString appName("Red Panda Dev-C++");
-e := fEditorList.GetEditor;
+    Editor *e = mEditorList->getEditor();
-if Assigned(e) and not e.InProject then begin
+    QString str;
-  if e.Text.Modified then
+    QCoreApplication *app = QApplication::instance();
-    str := e.FileName + ' [*]'
+    if (e && !e->inProject()) {
+        if (e->modified())
+          str = e->filename() + " [*]";
         else
-    str := e.FileName;
+          str = e->filename();
-  if fDebugger.Executing then begin
+        if (mDebugger->executing()) {
-    Caption := Format('%s - [Debugging] - %s %s', [str, appName, DEVCPP_VERSION]);
+            setWindowTitle(QString("%s - [%s] - %s %s").arg(str).arg(appName)
-    Application.Title := Format('%s - [Debugging] - %s', [ExtractFileName(e.FileName), appName]);
+                                 .arg(tr("Debugging")).arg(DEVCPP_VERSION));
-  end else if devExecutor.Running then begin
+            app->setApplicationName(QString("%s - [%s] - %s").arg(str).arg(appName)
-    Caption := Format('%s - [Executing] - %s %s', [str, appName, DEVCPP_VERSION]);
+                                    .arg(tr("Debugging")));
-    Application.Title := Format('%s - [Executing] - %s', [ExtractFileName(e.FileName), appName]);
+        } else if (mCompilerManager->running()) {
-  end else if fCompiler.Compiling then begin
+            setWindowTitle(QString("%s - [%s] - %s %s").arg(str).arg(appName)
-    Caption := Format('%s - [Compiling] - %s %s', [str, appName, DEVCPP_VERSION]);
+                                 .arg(tr("Running")).arg(DEVCPP_VERSION));
-    Application.Title := Format('%s - [Compiling] - %s', [ExtractFileName(e.FileName), appName]);
+            app->setApplicationName(QString("%s - [%s] - %s").arg(str).arg(appName)
-  end else begin
+                                    .arg(tr("Running")));
-    Caption := Format('%s - %s %s', [str, appName, DEVCPP_VERSION]);
+        } else if (mCompilerManager->compiling()) {
-    Application.Title := Format('%s - %s', [ExtractFileName(e.FileName), appName]);
+            setWindowTitle(QString("%s - [%s] - %s %s").arg(str).arg(appName)
-  end;
+                                 .arg(tr("Compiling")).arg(DEVCPP_VERSION));
-end else if Assigned(fProject) then begin
+            app->setApplicationName(QString("%s - [%s] - %s").arg(str).arg(appName)
-  if fDebugger.Executing then begin
+                                    .arg(tr("Compiling")));
-    Caption := Format('%s - [%s] - [Debugging] - %s %s',
+        } else {
-      [fProject.Name, ExtractFilename(fProject.Filename), appName, DEVCPP_VERSION]);
+            this->setWindowTitle(QString("%s - %s %s").arg(str).arg(appName).arg(DEVCPP_VERSION));
-    Application.Title := Format('%s - [Debugging] - %s', [fProject.Name, appName]);
+            app->setApplicationName(QString("%s - %s").arg(str).arg(appName));
-  end else if devExecutor.Running then begin
+        }
-    Caption := Format('%s - [%s] - [Executing] - %s %s',
+    }
-      [fProject.Name, ExtractFilename(fProject.Filename), appName, DEVCPP_VERSION]);
+// else if Assigned(fProject) then begin
-    Application.Title := Format('%s - [Executing] - %s', [fProject.Name, appName]);
+//  if fDebugger.Executing then begin
-  end else if fCompiler.Compiling then begin
+//    Caption := Format('%s - [%s] - [Debugging] - %s %s',
-    Caption := Format('%s - [%s] - [Compiling] - %s %s',
+//      [fProject.Name, ExtractFilename(fProject.Filename), appName, DEVCPP_VERSION]);
-      [fProject.Name, ExtractFilename(fProject.Filename), appName, DEVCPP_VERSION]);
+//    Application.Title := Format('%s - [Debugging] - %s', [fProject.Name, appName]);
-    Application.Title := Format('%s - [Compiling] - %s', [fProject.Name, appName]);
+//  end else if devExecutor.Running then begin
-  end else begin
+//    Caption := Format('%s - [%s] - [Executing] - %s %s',
-    Caption := Format('%s - [%s] - %s %s',
+//      [fProject.Name, ExtractFilename(fProject.Filename), appName, DEVCPP_VERSION]);
-      [fProject.Name, ExtractFilename(fProject.Filename), appName, DEVCPP_VERSION]);
+//    Application.Title := Format('%s - [Executing] - %s', [fProject.Name, appName]);
-    Application.Title := Format('%s - %s', [fProject.Name, appName]);
+//  end else if fCompiler.Compiling then begin
-  end;
+//    Caption := Format('%s - [%s] - [Compiling] - %s %s',
-end else begin
+//      [fProject.Name, ExtractFilename(fProject.Filename), appName, DEVCPP_VERSION]);
-  Caption := Format('%s %s', [appName, DEVCPP_VERSION]);
+//    Application.Title := Format('%s - [Compiling] - %s', [fProject.Name, appName]);
-  Application.Title := Format('%s', [DEVCPP]);
+//  end else begin
-end;
+//    Caption := Format('%s - [%s] - %s %s',
+//      [fProject.Name, ExtractFilename(fProject.Filename), appName, DEVCPP_VERSION]);
+//    Application.Title := Format('%s - %s', [fProject.Name, appName]);
+//  end;
+    else {
+        setWindowTitle(QString("%s %s").arg(appName).arg(DEVCPP_VERSION));
+        app->setApplicationName(QString("%s").arg(appName));
+    }
+}
+
+void MainWindow::addDebugOutput(const QString &text)
+{
+    if (text.isEmpty()) {
+        ui->debugConsole->addLine("");
+    } else {
+        ui->debugConsole->addText(text);
+    }
 }
 
 void MainWindow::updateStatusbarForLineCol()
@@ -762,6 +784,11 @@ void MainWindow::prepareDebugger()
     mDebugger->deleteWatchVars(false);
 }
 
+CPUDialog *MainWindow::CPUDialog() const
+{
+    return mCPUDialog;
+}
+
 
 void MainWindow::on_actionNew_triggered()
 {

RedPandaIDE/mainwindow.h

@@ -19,6 +19,7 @@ class QComboBox;
 class CompilerManager;
 class Editor;
 class Debugger;
+class CPUDialog;
 
 class MainWindow : public QMainWindow
 {
@@ -60,6 +61,9 @@ public:
 
     void removeActiveBreakpoints();
     void updateAppTitle();
+    void addDebugOutput(const QString& text);
+
+    CPUDialog *CPUDialog() const;
 
 protected:
     void openFiles(const QStringList& files);
@@ -159,6 +163,7 @@ private:
     QComboBox* mCompilerSet;
     CompilerManager* mCompilerManager;
     Debugger* mDebugger;
+    CPUDialog* mCPUDialog;
 
     bool mMessageControlChanged;
     bool mTabMessagesTogglingState;

RedPandaIDE/settings.cpp

@@ -97,6 +97,11 @@ QString Settings::filename() const
     return mFilename;
 }
 
+Debugger Settings::debugger() const
+{
+    return mDebugger;
+}
+
 Settings::Dirs::Dirs(Settings *settings):
     _Base(settings, SETTING_DIRS)
 {
@@ -2223,7 +2228,6 @@ void Settings::Executor::setMinimizeOnRun(bool minimizeOnRun)
 
 void Settings::Executor::doSave()
 {
-    //Appearence
     saveValue("pause_console", mPauseConsole);
     saveValue("minimize_on_run", mMinimizeOnRun);
 }
@@ -2240,8 +2244,44 @@ void Settings::Executor::setPauseConsole(bool pauseConsole)
 
 void Settings::Executor::doLoad()
 {
-    //Appearence
     mPauseConsole = boolValue("pause_console",true);
     mMinimizeOnRun = boolValue("minimize_on_run",false);
 }
 
+
+Settings::Debugger::Debugger(Settings *settings):_Base(settings, SETTING_DEBUGGER)
+{
+
+}
+
+bool Settings::Debugger::showCommandLog() const
+{
+    return mShowCommandLog;
+}
+
+void Settings::Debugger::setShowCommandLog(bool showCommandLog)
+{
+    mShowCommandLog = showCommandLog;
+}
+
+bool Settings::Debugger::showAnnotations() const
+{
+    return mShowAnnotations;
+}
+
+void Settings::Debugger::setShowAnnotations(bool showAnnotations)
+{
+    mShowAnnotations = showAnnotations;
+}
+
+void Settings::Debugger::doSave()
+{
+    saveValue("show_command_log", mShowCommandLog);
+    saveValue("show_annotations", mShowAnnotations);
+}
+
+void Settings::Debugger::doLoad()
+{
+    mShowCommandLog = boolValue("show_command_log",true);
+    mShowAnnotations = boolValue("show_annotations",false);
+}

RedPandaIDE/settings.h

@@ -16,6 +16,7 @@
 #define SETTING_EDITOR "Editor"
 #define SETTING_ENVIRONMENT "Environment"
 #define SETTING_EXECUTOR "Executor"
+#define SETTING_DEBUGGER "Debugger"
 #define SETTING_COMPILTER_SETS "CompilerSets"
 #define SETTING_COMPILTER_SETS_DEFAULT_INDEX "defaultIndex"
 #define SETTING_COMPILTER_SETS_COUNT "count"
@@ -388,6 +389,25 @@ public:
         void doLoad() override;
     };
 
+    class Debugger: public _Base {
+    public:
+        explicit Debugger(Settings* settings);
+        bool showCommandLog() const;
+        void setShowCommandLog(bool showCommandLog);
+
+        bool showAnnotations() const;
+        void setShowAnnotations(bool showAnnotations);
+
+    private:
+        bool mShowCommandLog;
+        bool mShowAnnotations;
+
+        // _Base interface
+    protected:
+        void doSave() override;
+        void doLoad() override;
+    };
+
 
     class CompilerSet {
     public:
@@ -566,6 +586,8 @@ public:
     Executor& executor();
     QString filename() const;
 
+    Debugger& debugger() const;
+
 private:
     QString mFilename;
     QSettings mSettings;
@@ -574,6 +596,7 @@ private:
     Environment mEnvironment;
     CompilerSets mCompilerSets;
     Executor mExecutor;
+    Debugger mDebugger;
 };
 
 

RedPandaIDE/systemconsts.h

@@ -30,6 +30,8 @@
 #error "Only support windows and linux now!"
 #endif
 
+#define DEVCPP_VERSION "0.01"
+
 class SystemConsts
 {
 public:

RedPandaIDE/widgets/qconsole.cpp

@@ -11,6 +11,7 @@
 #include <QDebug>
 #include <QTimer>
 #include <QApplication>
+#include "../utils.h"
 
 QConsole::QConsole(QWidget *parent):
     QAbstractScrollArea(parent),
@@ -143,6 +144,14 @@ void QConsole::addLine(const QString &line)
     mContents.addLine(line);
 }
 
+void QConsole::addText(const QString &text)
+{
+    QStringList lst = TextToLines(text);
+    for (const QString& line:lst) {
+        addLine(line);
+    }
+}
+
 void QConsole::removeLastLine()
 {
     mCurrentEditableLine = "";

RedPandaIDE/widgets/qconsole.h

@@ -110,6 +110,7 @@ public:
     void invalidateRect(const QRect& rect);
 
     void addLine(const QString& line);
+    void addText(const QString& text);
     void removeLastLine();
     void changeLastLine(const QString& line);
     QString getLastLine();