Add log widget to lower dock

[frida/frida.git] / src / gui / widgets / ScriptingDock.cxx

diff --git a/src/gui/widgets/ScriptingDock.cxx b/src/gui/widgets/ScriptingDock.cxx
index ce00030473be583013b5fc2eac81a9dbd8ec2591..8e5f3cf38f4a44a0f60d00dfae0c6e743a8c9fbc 100644 (file)
--- a/src/gui/widgets/ScriptingDock.cxx
+++ b/src/gui/widgets/ScriptingDock.cxx
@@ -1,36 +1,42 @@
 #include "ScriptingDock.hxx"
+#include "FridaDock.hxx"
 
-namespace {
-       SCM handler (void*, SCM tag, SCM throw_args) {
-               scm_handle_by_message_noexit ((void*)"foo", tag, throw_args);
-               return SCM_BOOL_F;
-       }
+#include "bindings/Interpreter.hxx"
+
+#include <sstream>
+
+ScriptingDock::ScriptingDock(Interpreter* interpreter, FridaDock* parent)
+       : QWidget(parent)
+       , logger(log4cxx::Logger::getLogger("ScriptingDock"))
+       , interpreter(interpreter) {
+       setLayout(layout = new QGridLayout);
+       layout->addWidget(browser = new QTextBrowser, 0, 0, 1, 0);
+       layout->addWidget(line = new QLineEdit, 1, 0);
+       layout->addWidget(button = new QPushButton(tr("Evaluate")), 1, 1);
+       connect(button, SIGNAL(released()), this, SLOT(doEvaluate()));
+       connect(line, SIGNAL(returnPressed()), this, SLOT(doEvaluate()));
 }
 
+
 void ScriptingDock::doEvaluate() {
+       std::stringstream stdout, stderr;
+       std::string result;
+       QString output;
        QString text = line->text();
+
        line->clear();
        LOG4CXX_INFO(logger, "Evaluating String \"" << text.toStdString() << "\"");
        browser->append(QString("> ") + text);
 
-       SCM result_obj = scm_internal_catch(SCM_BOOL_T,
-                                           (SCM (*)(void *))scm_c_eval_string,
-                                           (void*)text.toStdString().c_str(),
-                                           handler, NULL);
-       SCM result_str = scm_object_to_string(result_obj, SCM_UNDEFINED);
-
-       SCM output = scm_get_output_string(guile_output_port);
-       QString output_q = scm_to_locale_string(output);
-       if (output_q.endsWith("\n")) output_q.chop(1);
-       if (output_q != "") browser->append(output_q);
+       interpreter->evaluate(text.toStdString(), stdout, stderr, result);
 
-       output =  scm_get_output_string(guile_error_port);
-       output_q = scm_to_locale_string(output);
-       if (output_q.endsWith("\n")) output_q.chop(1);
-       if (output_q != "") browser->append(output_q);
+       output = stdout.str().c_str();
+       if (output.endsWith("\n")) output.chop(1);
+       if (output != "") browser->append(output);
 
-       scm_truncate_file(guile_output_port, scm_from_uint16(0));
-       scm_truncate_file(guile_error_port, scm_from_uint16(0));
+       output = stderr.str().c_str();
+       if (output.endsWith("\n")) output.chop(1);
+       if (output != "") browser->append(output);
 
-       browser->append(scm_to_locale_string(result_str));
+       browser->append(result.c_str());
 }