X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=src%2Fkernel%2Fkernel.cpp;h=ee5e9c753a5630e23e25d28114d35bc478b82258;hb=02fadcf3ea33e60f2d8badbc8d83758c91a5c34d;hp=6e9beec81fa6aa43de734df0c83b51bbad0055fd;hpb=f43129215d9cc2dcd6bf5f2a4c6b1bebec34de16;p=vlp.git

diff --git a/src/kernel/kernel.cpp b/src/kernel/kernel.cpp
index 6e9beec..ee5e9c7 100644
--- a/src/kernel/kernel.cpp
+++ b/src/kernel/kernel.cpp
@@ -65,14 +65,16 @@
 #include <X11/Xlib.h>
 
 #include "kernel.h"
-#include "ui/kernelwindow.h"
-#include "lock.h"
-#include "options.h"
-#include "kill_interpreter_dialog.h"
-#include "connect_dialog.h"
+#include "ui/KernelWindow.h"
+#include "ConnectDialog.h"
+#include "KillDialog.h"
+#include "LockDialog.h"
+#include "OptionsDialog.h"
+#include "MessageDialog.h"
 
 #include "vlp/config.h"
 
+#include <sys/prctl.h>
 /* File resides in top directory (where are Makefiles)*/
 #include "../../config.h"
 
@@ -243,6 +245,7 @@ void QKernel::on_actionEditor_triggered()
 	QString program = getHomeDir();
 	program += "/modules/logedit";
 
+	fprintf(stderr, "Run EDIT Module: %s, %s\n", program.toStdString().c_str(), getHomeDir());
 	pid_t pid = fork();
 	if (pid == 0) {
 		if (execl(program.toStdString().c_str(),
@@ -277,6 +280,8 @@ void QKernel::on_actionHelp_triggered()
 	QString docDir = getHomeDir();
 	docDir += "/doc";
 
+	fprintf(stderr, "Run HELP Module: %s, %s\n", program.toStdString().c_str(), docDir.toStdString().c_str());
+
 	pid_t pid = fork();
 	if (pid == 0) {
 		if (execl(program.toStdString().c_str(),
@@ -309,6 +314,8 @@ void QKernel::RunGraphModule(char *sk)
 	QString program = getHomeDir();
 	program += "/modules/loggraph";
 
+	fprintf(stderr, "Run GRAPH Module: %s, %s\n", program.toStdString().c_str(), sk);
+
 	pid_t pid = fork();
 	if (pid == 0) {
 		if (execl(program.toStdString().c_str(),
@@ -342,6 +349,7 @@ void QKernel::RunGraphModule(char *sk)
  */
 void QKernel::RunNetModule()
 {
+
 	struct sockaddr_un svr;
 	int len;
 	int on;
@@ -350,6 +358,7 @@ void QKernel::RunNetModule()
 	QString program = getHomeDir();
 	program += "/modules/lognet";
 
+	fprintf(stderr, "Run NET Module: %s, %s %s\n", program.toStdString().c_str(), getNetModuleSocket(), getConfigFilePath().toStdString().c_str());
 	pid_t pid = fork();
 	if (pid == 0) {
 		if (execl(program.toStdString().c_str(),
@@ -412,7 +421,6 @@ void QKernel::on_actionConnect_triggered()
 	MESSAGE m;
 
 	dialog::ConnectDialog dialog(this);
-	dialog.setWindowTitle("IP Address:");
 
 	if (dialog.exec()) {
 		m.msg_type = MSG_NET;
@@ -474,48 +482,17 @@ void QKernel::on_actionQuit_triggered()
  */
 void QKernel::on_actionMessage_triggered()
 {
-	QDialog *dlg;
-	QLineEdit *nodenr;
+	dialog::MessageDialog dialog(this);
 	MESSAGE m;
 
-	dlg = new QDialog(this, Qt::Dialog);
-	dlg->setWindowTitle("Send message to node");
-
-	nodenr = new QLineEdit("number", dlg);
-	nodenr->setGeometry(90, 10, 50, 30);
-	nodenr->setText("");
-
-	QLabel *tmpQLabel;
-	tmpQLabel = new QLabel("Node number:", dlg);
-	tmpQLabel->setGeometry(10, 10, 77, 30);
-
-	tmpQLabel = new QLabel("Message:", dlg);
-	tmpQLabel->setGeometry(10, 50, 70, 30);
-
-	QLineEdit *msg;
-	msg = new QLineEdit("", dlg);
-	msg->setGeometry(80, 60, 330, 30);
-
-	QPushButton *ob;
-	ob = new QPushButton("Send", dlg);
-	ob->setGeometry(230, 10, 80, 30);
-	ob->setDefault(TRUE);
-	
-	QPushButton *cb;
-	cb = new QPushButton("Cancel", dlg);
-	cb->setGeometry(330, 10, 80, 30);
-	dlg->resize(430, 110);
-	connect(ob, SIGNAL(clicked()), dlg, SLOT(accept()));
-	connect(cb, SIGNAL(clicked()), dlg, SLOT(reject()));
-
-	if (dlg->exec()) {
+	if (dialog.exec()) {
 		m.msg_type = MSG_NET;
 		m.param.pword[0] = NET_PROPAGATE;
 		m.param.pword[1] = MSG_VLP;
 		m.param.pword[2] = NodeNumber;
-		m.param.pword[4] = atoi(nodenr->text().toAscii().data());
+		m.param.pword[4] = dialog.getNodeNumber();
 		m.param.pword[6] = VLP_WRITE;
-		strcpy(m.param.pstr, msg->text().toAscii().data());
+		strcpy(m.param.pstr, dialog.getMessage().toStdString().c_str());
 		write(net_sock, &m, sizeof(MESSAGE));
 	}
 }
@@ -528,7 +505,6 @@ void QKernel::on_actionMessage_triggered()
 void QKernel::on_actionKill_triggered()
 {
 	dialog::KillInterpreterDialog dialog(this);
-	dialog.setWindowTitle("Kill interpreter");
 
 	if (dialog.exec()) {
 		MESSAGE m;
@@ -584,17 +560,17 @@ void QKernel::NetMessage()
 				case VLP_WRITE:
 					QApplication::beep();
 					WriteMessage(CharLine);
-					WriteMessage(
-						"### Incoming Messsage ###");
-					sprintf(ss, "Mesg from Node %d: %s",
-							msg.param.pword[2],
-							msg.param.pstr);
+					WriteMessage("### Incoming Messsage ###");
+					sprintf(ss,
+						"Mesg from Node %d: %s",
+						msg.param.pword[2],
+						msg.param.pstr
+					);
 					WriteMessage(ss);
 					WriteMessage(CharLine);
 					break;
 				case VLP_REMOTE_INSTANCE:
-					sprintf(ss, "%s/%s", getRemoteDir(),
-								msg.param.pstr);
+					sprintf(ss, "%s/%s", getRemoteDir(), msg.param.pstr);
 
 					if (info_messages) { 
 						WriteMessage("Running program:");
@@ -679,6 +655,7 @@ void QKernel::IntMessage(int sock)
 		switch (msg.msg_type) { 
 		case MSG_GRAPH:
 			if (msg.param.pword[0] == GRAPH_ALLOCATE) {
+				fprintf(stderr, "Running graph module with arg: %s\n", msg.param.pstr);
 				RunGraphModule(msg.param.pstr);
 			}
 			break;
@@ -897,6 +874,7 @@ InterpEntry *QKernel::findINTbyID(int _id)
  */
 InterpEntry *QKernel::RunIntModule(char *ss, int r)
 {
+	fprintf(stderr, "Run INT Module: %s, %d\n", ss, r);
 	char a[256], b[255];
 	struct sockaddr_un svr;
 	int len, sock, on;