X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fgui%2Fwidgets%2FScriptingDock.cxx;h=4ec7f3bd3be451269b6ffefef377df1e7d6ce0bb;hp=6a3f76304997eaa45992380cbc40aafb38bde214;hb=6c57e6468447bf3b71b5990e62b56990dc520fee;hpb=dba058b3ff87f818042a09bcfa8fc58072adc49b

diff --git a/src/gui/widgets/ScriptingDock.cxx b/src/gui/widgets/ScriptingDock.cxx
index 6a3f763..4ec7f3b 100644
--- a/src/gui/widgets/ScriptingDock.cxx
+++ b/src/gui/widgets/ScriptingDock.cxx
@@ -1,36 +1,61 @@
 #include "ScriptingDock.hxx"
+#include "FridaDock.hxx"
+
+#include "bindings/Interpreter.hxx"
+
+#include <sstream>
 
 namespace {
-    SCM handler (void *data, SCM tag, SCM throw_args) {
-        scm_handle_by_message_noexit ((void*)"foo", tag, throw_args);
-		return SCM_BOOL_F;
-	}
+	class ScriptingLineEdit : public QObject, public QLineEdit {
+	public:
+		void keyPressEvent(QKeyEvent* event) {
+			if (event->key() == Qt::Key_Up) {
+				setText(backlog);
+			}
+			QLineEdit::keyPressEvent(event);
+		}
+
+		void clear() {
+			backlog = text();
+			QLineEdit::clear();
+		}
+	private:
+		QString backlog;
+	};
 }
 
+ScriptingDock::ScriptingDock(Interpreter* interpreter, FridaDock* parent)
+	: QWidget(parent)
+	, logger(log4cxx::Logger::getLogger("gui.ScriptingDock"))
+	, interpreter(interpreter) {
+	setLayout(layout = new QGridLayout);
+	layout->addWidget(browser = new QTextBrowser, 0, 0, 1, 0);
+	layout->addWidget(line = new ScriptingLineEdit, 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() {
-    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);
-
-	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);
-
-	scm_truncate_file(guile_output_port, scm_from_uint16(0));
-	scm_truncate_file(guile_error_port, scm_from_uint16(0));	
-			
-    browser->append(scm_to_locale_string(result_str));
+	std::stringstream stdout, stderr;
+	std::string result;
+	QString output;
+	QString text = line->text();
+
+	((ScriptingLineEdit*)line)->clear();
+	LOG4CXX_INFO(logger, "Evaluating String \"" << text.toStdString() << "\"");
+	browser->append(QString("> ") + text);
+
+	interpreter->evaluate(text.toStdString(), stdout, stderr, result);
+
+	output = stdout.str().c_str();
+	if (output.endsWith("\n")) output.chop(1);
+	if (output != "") browser->append(output);
+
+	output = stderr.str().c_str();
+	if (output.endsWith("\n")) output.chop(1);
+	if (output != "") browser->append(output);
+
+	browser->append(result.c_str());
 }