X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/0f321d631adb37c7cc6c6567f66eef8e2a795760..refs/pull/477/head:/client/ui.c?ds=sidebyside diff --git a/client/ui.c b/client/ui.c index b438521e..df2c3ce3 100644 --- a/client/ui.c +++ b/client/ui.c @@ -18,12 +18,13 @@ #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 int GridOffset = 0; -bool GridLocked = 0; +bool GridLocked = false; +bool showDemod = true; extern pthread_mutex_t print_lock; @@ -47,7 +48,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) { @@ -57,6 +60,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);