X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/c9ad641b61c6fc5e4b77b181ad9b58b8723f56c6..refs/pull/566/head:/client/ui.c?ds=inline diff --git a/client/ui.c b/client/ui.c index 5902cb89..8faed6e8 100644 --- a/client/ui.c +++ b/client/ui.c @@ -9,22 +9,31 @@ // UI utilities //----------------------------------------------------------------------------- -#include +#include +#ifndef EXTERNAL_PRINTANDLOG #include #include +#include #include #include +#endif #include "ui.h" -double CursorScaleFactor; -int PlotGridX, PlotGridY, PlotGridXdefault= 64, PlotGridYdefault= 64, CursorCPos= 0, CursorDPos= 0; +double CursorScaleFactor = 1; +int PlotGridX=0, PlotGridY=0, PlotGridXdefault= 64, PlotGridYdefault= 64, CursorCPos= 0, CursorDPos= 0; int offline; int flushAfterWrite = 0; //buzzy -extern pthread_mutex_t print_lock; +int GridOffset = 0; +bool GridLocked = false; +bool showDemod = true; static char *logfilename = "proxmark3.log"; +#ifndef EXTERNAL_PRINTANDLOG +// Declared in proxmark3.c +extern pthread_mutex_t print_lock; + void PrintAndLog(char *fmt, ...) { char *saved_line; @@ -43,7 +52,9 @@ void PrintAndLog(char *fmt, ...) logging=0; } } - + +#ifdef RL_STATE_READCMD + // We are using GNU readline. int need_hack = (rl_readline_state & RL_STATE_READCMD) > 0; if (need_hack) { @@ -53,6 +64,10 @@ void PrintAndLog(char *fmt, ...) rl_replace_line("", 0); rl_redisplay(); } +#else + // We are using libedit (OSX), which doesn't support this flag. + int need_hack = 0; +#endif va_start(argptr, fmt); va_copy(argptr2, argptr); @@ -83,7 +98,7 @@ void PrintAndLog(char *fmt, ...) //release lock pthread_mutex_unlock(&print_lock); } - +#endif void SetLogFilename(char *fn) {