X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/1a3c006469f38deb037cd8f0d79555f2f564d784..8efd0b80f2d11946b2fc0911cde939f9f93eb40f:/client/proxgui.cpp?ds=sidebyside

diff --git a/client/proxgui.cpp b/client/proxgui.cpp
index 7dcb0da0..18749158 100644
--- a/client/proxgui.cpp
+++ b/client/proxgui.cpp
@@ -10,8 +10,22 @@
 
 #include "proxgui.h"
 #include "proxguiqt.h"
+#include "proxmark3.h"
 
 static ProxGuiQT *gui = NULL;
+static WorkerThread *main_loop_thread = NULL;
+
+WorkerThread::WorkerThread(char *script_cmds_file, char *script_cmd, bool usb_present) : script_cmds_file(script_cmds_file), script_cmd(script_cmd), usb_present(usb_present)
+{
+}
+
+WorkerThread::~WorkerThread() 
+{
+}
+
+void WorkerThread::run() {
+	main_loop(script_cmds_file, script_cmd, usb_present);
+}
 
 extern "C" void ShowGraphWindow(void)
 {
@@ -39,31 +53,28 @@ extern "C" void RepaintGraphWindow(void)
 
 extern "C" void MainGraphics(void)
 {
-  if (!gui)
-    return;
+	if (!gui)
+		return;
 
-  gui->MainLoop();
+	gui->MainLoop();
 }
 
-extern "C" void InitGraphics(int argc, char **argv)
+extern "C" void InitGraphics(int argc, char **argv, char *script_cmds_file, char *script_cmd, bool usb_present)
 {
 #ifdef Q_WS_X11
-  bool useGUI = getenv("DISPLAY") != 0;
-#else
-  bool useGUI = true;
+	if (getenv("DISPLAY") == NULL)
+		return;
 #endif
-  if (!useGUI)
-    return;
 
-  gui = new ProxGuiQT(argc, argv);
+	main_loop_thread = new WorkerThread(script_cmds_file, script_cmd, usb_present);
+	gui = new ProxGuiQT(argc, argv, main_loop_thread);
 }
 
 extern "C" void ExitGraphics(void)
 {
-  if (!gui)
-    return;
+	if (!gui)
+		return;
 
-  gui->Exit();
-  //delete gui;
-  gui = NULL;
+	gui->Exit();
+	gui = NULL;
 }