X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/7ddb99003292dbe619bfdabe1156dcbd11f18d42..refs/pull/524/head:/client/ui.c diff --git a/client/ui.c b/client/ui.c index 09479620..df2c3ce3 100644 --- a/client/ui.c +++ b/client/ui.c @@ -12,14 +12,21 @@ #include #include #include -#include +#include #include +#include #include "ui.h" -double CursorScaleFactor; -int PlotGridX, PlotGridY, PlotGridXdefault= 64, PlotGridYdefault= 64; +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 = false; +bool showDemod = true; + +extern pthread_mutex_t print_lock; static char *logfilename = "proxmark3.log"; @@ -27,18 +34,23 @@ void PrintAndLog(char *fmt, ...) { char *saved_line; int saved_point; - va_list argptr, argptr2; - static FILE *logfile = NULL; - static int logging=1; + va_list argptr, argptr2; + static FILE *logfile = NULL; + static int logging=1; - if (logging && !logfile) { - logfile=fopen(logfilename, "a"); - if (!logfile) { - fprintf(stderr, "Can't open logfile, logging disabled!\n"); - logging=0; - } - } - + // lock this section to avoid interlacing prints from different threads + pthread_mutex_lock(&print_lock); + + if (logging && !logfile) { + logfile=fopen(logfilename, "a"); + if (!logfile) { + fprintf(stderr, "Can't open logfile, logging disabled!\n"); + logging=0; + } + } + +#ifdef RL_STATE_READCMD + // We are using GNU readline. int need_hack = (rl_readline_state & RL_STATE_READCMD) > 0; if (need_hack) { @@ -48,13 +60,17 @@ 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); - vprintf(fmt, argptr); - printf(" "); // cleaning prompt - va_end(argptr); - printf("\n"); + va_start(argptr, fmt); + va_copy(argptr2, argptr); + vprintf(fmt, argptr); + printf(" "); // cleaning prompt + va_end(argptr); + printf("\n"); if (need_hack) { rl_restore_prompt(); @@ -64,14 +80,22 @@ void PrintAndLog(char *fmt, ...) free(saved_line); } - if (logging && logfile) { - vfprintf(logfile, fmt, argptr2); - fprintf(logfile,"\n"); - fflush(logfile); - } - va_end(argptr2); + if (logging && logfile) { + vfprintf(logfile, fmt, argptr2); + fprintf(logfile,"\n"); + fflush(logfile); + } + va_end(argptr2); + + if (flushAfterWrite == 1) //buzzy + { + fflush(NULL); + } + //release lock + pthread_mutex_unlock(&print_lock); } + void SetLogFilename(char *fn) { logfilename = fn;