X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/cd00aa3043b507ed10bf79a37b83b88741d176d7..d040cb90240062a2c164800edce6a93e440ff693:/client/proxgui.cpp diff --git a/client/proxgui.cpp b/client/proxgui.cpp index 7e87b582..e899174c 100644 --- a/client/proxgui.cpp +++ b/client/proxgui.cpp @@ -1,30 +1,54 @@ +//----------------------------------------------------------------------------- +// Copyright (C) 2009 Michael Gernoth +// +// 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 "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) { - if (!gui) - return; - - gui->ShowGraphWindow(); + if (!gui) + return; + + gui->ShowGraphWindow(); } extern "C" void HideGraphWindow(void) { - if (!gui) - return; - - gui->HideGraphWindow(); + if (!gui) + return; + + gui->HideGraphWindow(); } extern "C" void RepaintGraphWindow(void) { - if (!gui) - return; + if (!gui) + return; - gui->RepaintGraphWindow(); + gui->RepaintGraphWindow(); } extern "C" void MainGraphics(void) @@ -35,7 +59,7 @@ extern "C" void MainGraphics(void) 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; @@ -45,14 +69,15 @@ extern "C" void InitGraphics(int argc, char **argv) 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; - - delete gui; + + gui->Exit(); gui = NULL; }