fix fpga_comress sending no-error messages to stderr (#430)

[proxmark3-svn] / client / proxgui.cpp

diff --git a/client/proxgui.cpp b/client/proxgui.cpp
index 2858157caf53c28ffe2f9a0ec66f2ac04945c449..e7fdae6c402c2d59aeb6d37de05d2ed215199e9a 100644 (file)
--- a/client/proxgui.cpp
+++ b/client/proxgui.cpp
@@ -1,7 +1,31 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2009 Michael Gernoth <michael at gernoth.net>
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// GUI functions
+//-----------------------------------------------------------------------------
+

 #include "proxgui.h"
 #include "proxguiqt.h"
 #include "proxgui.h"
 #include "proxguiqt.h"

+#include "proxmark3.h"

 
 static ProxGuiQT *gui = NULL;
 
 static ProxGuiQT *gui = NULL;

+static WorkerThread *main_loop_thread = NULL;
+
+WorkerThread::WorkerThread(char *script_cmds_file, bool usb_present) : script_cmds_file(script_cmds_file), usb_present(usb_present)
+{
+}
+
+WorkerThread::~WorkerThread() 
+{
+}
+
+void WorkerThread::run() {
+       main_loop(script_cmds_file, usb_present);
+}

 
 extern "C" void ShowGraphWindow(void)
 {
 
 extern "C" void ShowGraphWindow(void)
 {


@@ -29,30 +53,35 @@ extern "C" void RepaintGraphWindow(void)
 
 extern "C" void MainGraphics(void)
 {
 
 extern "C" void MainGraphics(void)
 {

-  if (!gui)
-    return;
+       if (!gui)
+               return;

 
 

-  gui->MainLoop();
+       main_loop_thread->start();
+       gui->MainLoop();

 }
 
 }
 

-extern "C" void InitGraphics(int argc, char **argv)
+extern "C" void InitGraphics(int argc, char **argv, char *script_cmds_file, bool usb_present)

 {
 #ifdef Q_WS_X11
 {
 #ifdef Q_WS_X11

-  bool useGUI = getenv("DISPLAY") != 0;
+       bool useGUI = getenv("DISPLAY") != 0;

 #else
 #else

-  bool useGUI = true;
+       bool useGUI = true;

 #endif
 #endif

-  if (!useGUI)
-    return;
+       if (!useGUI)
+               return;

 
 

-  gui = new ProxGuiQT(argc, argv);
+       gui = new ProxGuiQT(argc, argv);
+       main_loop_thread = new WorkerThread(script_cmds_file, usb_present);
+       QObject::connect(main_loop_thread, SIGNAL(finished()), main_loop_thread, SLOT(deleteLater()));
+       QObject::connect(main_loop_thread, SIGNAL(finished()), gui, SLOT(_Exit()));

 }
 
 }
 

+

 extern "C" void ExitGraphics(void)
 {
   if (!gui)
     return;
 
 extern "C" void ExitGraphics(void)
 {
   if (!gui)
     return;
 

-  delete gui;
+  gui->Exit();

   gui = NULL;
 }
   gui = NULL;
 }