RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-25 00:25:48 +08:00
Code Issues Projects Releases Packages Wiki Activity

gui: Show a warning if user does not have gui support

Browse source 
qt gui: Split no-DISPLAY warning into two lines

And add XQuartz link

qt gui: Account for proxspace on no-DISPLAY warning

gui: Move no-DISPLAY warning from Qt to generic code, fix bugs
This commit is contained in:
Ave 2020-12-01 02:09:39 +03:00
parent 1cfc69bd0d
commit 31e475764e
No known key found for this signature in database
GPG key ID: 398DD7BD03276F6D
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
client/src/proxgui.cpp
View file

@ -13,6 +13,7 @@
#include <string.h> #include <string.h>
#include "proxguiqt.h" #include "proxguiqt.h"
#include "proxmark3.h" #include "proxmark3.h"
#include "ui.h" // for prints
static ProxGuiQT *gui = NULL; static ProxGuiQT *gui = NULL;
static WorkerThread *main_loop_thread = NULL; static WorkerThread *main_loop_thread = NULL;
@ -28,8 +29,15 @@ void WorkerThread::run() {
} }
extern "C" void ShowGraphWindow(void) { extern "C" void ShowGraphWindow(void) {
if (!gui) if (!gui) {
// Show a notice if X11/XQuartz isn't available
#if defined(__MACH__) && defined(__APPLE__)
PrintAndLogEx(WARNING, "You appear to be on a MacOS device without XQuartz.\nYou may need to install XQuartz (https://www.xquartz.org/) to make the plot work.");
#else
PrintAndLogEx(WARNING, "You appear to be on an environment without an X11 server or without DISPLAY environment variable set.\nPlot may not work until you resolve these issues.");
#endif
return; return;
}
gui->ShowGraphWindow(); gui->ShowGraphWindow();
} }