github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-22 14:13:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

wip rebasing libmk2

Browse source
This commit is contained in:
Michael Farrell 2017-10-18 00:14:25 +11:00
commit e3fdbbc90b
3 changed files with 27 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

9
client/proxgui.cpp
View file

@ -65,13 +65,10 @@ extern "C" void MainGraphics(pm3_connection* conn)
extern "C" void InitGraphics(int argc, char **argv, char *script_cmds_file, bool usb_present, serial_port* port, bool flush_after_write)
{
#ifdef Q_WS_X11
bool useGUI = getenv("DISPLAY") != 0;
#else
bool useGUI = true;
#endif
if (!useGUI)
if (!has_gui()) {
printf("Oops, InitGraphics called when we have no GUI!\n");
return;
}
gui = new ProxGuiQT(argc, argv);
main_loop_thread = new WorkerThread(script_cmds_file, usb_present, port, flush_after_write);

35
client/proxmark3.c
View file

@ -27,6 +27,23 @@
#include "whereami.h"
#include "comms.h"
/* Returns true if we have a display that we should set up a GUI on.
*/
bool has_gui() {
#ifdef HAVE_GUI
# ifdef Q_WS_X11
// Check for "DISPLAY" environment variable. If present, we have a GUI
char* display = getenv("DISPLAY");
return (display && strlen(display) > 1);
# else
// Non-X11 always has GUI, if this is built.
return true;
# endif
#else
// Built without GUI support
return false;
#endif
}
void main_loop(char *script_cmds_file, bool usb_present, serial_port* port, bool flush_after_write) {
pm3_connection conn;
@ -57,8 +74,10 @@ void main_loop(char *script_cmds_file, bool usb_present, serial_port* port, bool
}
#ifdef HAVE_GUI
// Setup GUI with reference to our connection struct.
MainGraphics(&conn);
if (has_gui()) {
// Setup GUI with reference to our connection struct.
MainGraphics(&conn);
}
#endif
FILE *script_file = NULL;
@ -237,23 +256,15 @@ int main(int argc, char* argv[]) {
pthread_mutex_init(&print_lock, NULL);
#ifdef HAVE_GUI
#ifdef _WIN32
InitGraphics(argc, argv, script_cmds_file, usb_present, sp, flush_after_write);
#else
char* display = getenv("DISPLAY");
if (display && strlen(display) > 1)
if (has_gui())
{
InitGraphics(argc, argv, script_cmds_file, usb_present, sp, flush_after_write);
}
else
#endif
{
main_loop(script_cmds_file, usb_present, sp, flush_after_write);
}
#endif
#else
main_loop(script_cmds_file, usb_present, sp, flush_after_write);
#endif
// Clean up the port
if (usb_present) {

1
client/proxmark3.h
View file

@ -22,6 +22,7 @@
extern "C" {
#endif
bool has_gui();
const char *get_my_executable_path(void);
const char *get_my_executable_directory(void);
void main_loop(char *script_cmds_file, bool usb_present, serial_port* port, bool flush_after_write);