X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/a553f2674865fa544d04ca7b8194e30c008644ae..17331e14ee99bebaef8d84fba44a90818bc5c817:/client/ui.c?ds=sidebyside diff --git a/client/ui.c b/client/ui.c index 0b4183df..09479620 100644 --- a/client/ui.c +++ b/client/ui.c @@ -1,4 +1,5 @@ //----------------------------------------------------------------------------- +// Copyright (C) 2009 Michael Gernoth // Copyright (C) 2010 iZsh // // This code is licensed to you under the terms of the GNU GPL, version 2 or, @@ -9,19 +10,23 @@ //----------------------------------------------------------------------------- #include +#include #include #include +#include #include "ui.h" double CursorScaleFactor; -int PlotGridX, PlotGridY; +int PlotGridX, PlotGridY, PlotGridXdefault= 64, PlotGridYdefault= 64; int offline; static char *logfilename = "proxmark3.log"; void PrintAndLog(char *fmt, ...) { + char *saved_line; + int saved_point; va_list argptr, argptr2; static FILE *logfile = NULL; static int logging=1; @@ -33,12 +38,32 @@ void PrintAndLog(char *fmt, ...) logging=0; } } + + int need_hack = (rl_readline_state & RL_STATE_READCMD) > 0; + if (need_hack) { + saved_point = rl_point; + saved_line = rl_copy_text(0, rl_end); + rl_save_prompt(); + rl_replace_line("", 0); + rl_redisplay(); + } + 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(); + rl_replace_line(saved_line, 0); + rl_point = saved_point; + rl_redisplay(); + free(saved_line); + } + if (logging && logfile) { vfprintf(logfile, fmt, argptr2); fprintf(logfile,"\n");