Merge pull request #884 from pwpiwi/fix_iclass_snoop

[proxmark3-svn] / client / ui.c

diff --git a/client/ui.c b/client/ui.c
index b438521e6f05ccf52dde44c7f2b3e4c094e9f9d7..5c9d7424a614189ef5347b2acc8db6600bb4732e 100644 (file)
--- a/client/ui.c
+++ b/client/ui.c
@@ -9,26 +9,101 @@
 // UI utilities
 //-----------------------------------------------------------------------------
 
 // UI utilities
 //-----------------------------------------------------------------------------
 

-#include <stdarg.h>
+#include <stdbool.h>
+#ifndef EXTERNAL_PRINTANDLOG

 #include <stdlib.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdio.h>

-#include <stdbool.h>
+#include <stdarg.h>

 #include <readline/readline.h>
 #include <pthread.h>
 #include <readline/readline.h>
 #include <pthread.h>

+#include "util.h"
+#endif

 
 #include "ui.h"
 
 
 #include "ui.h"
 

-double CursorScaleFactor;
-int PlotGridX, PlotGridY, PlotGridXdefault= 64, PlotGridYdefault= 64, CursorCPos= 0, CursorDPos= 0;
-int offline;
-int flushAfterWrite = 0;  //buzzy
+double CursorScaleFactor = 1;
+int PlotGridX=0, PlotGridY=0, PlotGridXdefault= 64, PlotGridYdefault= 64, CursorCPos= 0, CursorDPos= 0;
+bool flushAfterWrite = false;  //buzzy

 int GridOffset = 0;
 int GridOffset = 0;

-bool GridLocked = 0;
-
-extern pthread_mutex_t print_lock;
+bool GridLocked = false;
+bool showDemod = true;

 
 static char *logfilename = "proxmark3.log";
 
 
 static char *logfilename = "proxmark3.log";
 

+#ifndef EXTERNAL_PRINTANDLOG
+static pthread_mutex_t print_lock = PTHREAD_MUTEX_INITIALIZER;
+
+void PrintAndLogEx(logLevel_t level, char *fmt, ...) {
+
+       // skip debug messages if client debugging is turned off i.e. 'DATA SETDEBUG 0' 
+//     if (g_debugMode == 0 && level == DEBUG)
+//             return;
+       
+       char buffer[MAX_PRINT_BUFFER] = {0};
+       char buffer2[MAX_PRINT_BUFFER] = {0};
+       char prefix[20] = {0};
+       char *token = NULL;
+       int size = 0;
+                                               //   {NORMAL, SUCCESS, INFO, FAILED, WARNING, ERR, DEBUG}
+       static char *prefixes[7] = { "", "", "INFO: ", "FAILED: ", "WARNING: ", "ERROR: ", "#: "};
+       
+       switch( level ) {
+               case FAILED:
+                       strncpy(prefix,_RED_(FAILED: ), sizeof(prefix)-1);
+                       break;
+               case DEBUG:
+                       strncpy(prefix,_BLUE_(#: ), sizeof(prefix)-1);                  
+                       break;
+               case SUCCESS: 
+                       strncpy(prefix,_GREEN_( ), sizeof(prefix)-1);
+                       break;
+               case WARNING:
+                       strncpy(prefix,_CYAN_(WARNING: ), sizeof(prefix)-1);
+                       break;          
+               default:
+                       strncpy(prefix, prefixes[level], sizeof(prefix)-1);
+                       break;
+       }
+       
+       va_list args;
+       va_start(args, fmt);
+       vsnprintf(buffer, sizeof(buffer), fmt, args);
+       va_end(args);
+
+       // no prefixes for normal
+       if ( level == NORMAL ) {
+               PrintAndLog(buffer);
+               return;
+       }
+       
+       if (strchr(buffer, '\n')) {
+
+               const char delim[2] = "\n";
+                       
+               // line starts with newline
+               if (buffer[0] == '\n') 
+                       PrintAndLog("");
+               
+               token = strtok(buffer, delim);
+               
+               while (token != NULL) {
+                       
+                       size = strlen(buffer2);
+               
+                       if (strlen(token))
+                               snprintf(buffer2+size, sizeof(buffer2)-size, "%s%s\n", prefix, token);
+                       else
+                               snprintf(buffer2+size, sizeof(buffer2)-size, "\n");
+                       
+                       token = strtok(NULL, delim);
+               }
+               PrintAndLog(buffer2);
+       } else {
+               snprintf(buffer2, sizeof(buffer2), "%s%.*s", prefix, MAX_PRINT_BUFFER - 20, buffer);
+               PrintAndLog(buffer2);
+       }
+}
+

 void PrintAndLog(char *fmt, ...)
 {
        char *saved_line;
 void PrintAndLog(char *fmt, ...)
 {
        char *saved_line;


@@ -47,7 +122,12 @@ void PrintAndLog(char *fmt, ...)
                        logging=0;
                }
        }
                        logging=0;
                }
        }

-       
+
+       // If there is an incoming message from the hardware (eg: lf hid read) in
+       // the background (while the prompt is displayed and accepting user input),
+       // stash the prompt and bring it back later.
+#ifdef RL_STATE_READCMD
+       // We are using GNU readline. libedit (OSX) doesn't support this flag.

        int need_hack = (rl_readline_state & RL_STATE_READCMD) > 0;
 
        if (need_hack) {
        int need_hack = (rl_readline_state & RL_STATE_READCMD) > 0;
 
        if (need_hack) {


@@ -57,6 +137,7 @@ void PrintAndLog(char *fmt, ...)
                rl_replace_line("", 0);
                rl_redisplay();
        }
                rl_replace_line("", 0);
                rl_redisplay();
        }

+#endif

        
        va_start(argptr, fmt);
        va_copy(argptr2, argptr);
        
        va_start(argptr, fmt);
        va_copy(argptr2, argptr);


@@ -65,6 +146,8 @@ void PrintAndLog(char *fmt, ...)
        va_end(argptr);
        printf("\n");
 
        va_end(argptr);
        printf("\n");
 

+#ifdef RL_STATE_READCMD
+       // We are using GNU readline. libedit (OSX) doesn't support this flag.

        if (need_hack) {
                rl_restore_prompt();
                rl_replace_line(saved_line, 0);
        if (need_hack) {
                rl_restore_prompt();
                rl_replace_line(saved_line, 0);


@@ -72,6 +155,7 @@ void PrintAndLog(char *fmt, ...)
                rl_redisplay();
                free(saved_line);
        }
                rl_redisplay();
                free(saved_line);
        }

+#endif

        
        if (logging && logfile) {
                vfprintf(logfile, fmt, argptr2);
        
        if (logging && logfile) {
                vfprintf(logfile, fmt, argptr2);


@@ -80,16 +164,21 @@ void PrintAndLog(char *fmt, ...)
        }
        va_end(argptr2);
 
        }
        va_end(argptr2);
 

-       if (flushAfterWrite == 1)  //buzzy
+       if (flushAfterWrite)  //buzzy

        {
                fflush(NULL);
        }
        //release lock
        pthread_mutex_unlock(&print_lock);  
 }
        {
                fflush(NULL);
        }
        //release lock
        pthread_mutex_unlock(&print_lock);  
 }

-
+#endif

 
 void SetLogFilename(char *fn)
 {
   logfilename = fn;
 }
 
 void SetLogFilename(char *fn)
 {
   logfilename = fn;
 }

+
+void SetFlushAfterWrite(bool flush_after_write) {
+       flushAfterWrite = flush_after_write;
+}
+