Merge branch 'master' into master

[proxmark3-svn] / client / proxgui.cpp

diff --git a/client/proxgui.cpp b/client/proxgui.cpp
index 7e87b5821c57c6ae10eab05003cf0aba38239053..18749158c1110f7e0bc6031f558b6d5baff6f61f 100644 (file)
--- a/client/proxgui.cpp
+++ b/client/proxgui.cpp
@@ -1,30 +1,54 @@
+//-----------------------------------------------------------------------------
+// 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, 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)
 {
 
 extern "C" void ShowGraphWindow(void)
 {

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

 }
 
 extern "C" void HideGraphWindow(void)
 {
 }
 
 extern "C" void HideGraphWindow(void)
 {

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

 }
 
 extern "C" void RepaintGraphWindow(void)
 {
 }
 
 extern "C" void RepaintGraphWindow(void)
 {

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

 
 

-       gui->RepaintGraphWindow();
+  gui->RepaintGraphWindow();

 }
 
 extern "C" void MainGraphics(void)
 }
 
 extern "C" void MainGraphics(void)


@@ -35,24 +59,22 @@ extern "C" void MainGraphics(void)
        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
 {
 #ifdef Q_WS_X11

-       bool useGUI = getenv("DISPLAY") != 0;
-#else
-       bool useGUI = true;
-#endif
-       if (!useGUI)
+       if (getenv("DISPLAY") == NULL)

                return;
                return;

+#endif

 
 

-       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;
 }
 
 extern "C" void ExitGraphics(void)
 {
        if (!gui)
                return;

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

        gui = NULL;
 }
        gui = NULL;
 }