Code cleanup (#616)

[proxmark3-svn] / client / ui.c

diff --git a/client/ui.c b/client/ui.c
index ba230e3316fa70a35f0d7bc5cbd8a129c4422927..50a6ec7d0256a2003f2d8f7e6bad0174a252516c 100644 (file)
--- a/client/ui.c
+++ b/client/ui.c
@@ -9,23 +9,29 @@
 // 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 <time.h>
+#include <stdarg.h>

 #include <readline/readline.h>
 #include <pthread.h>
 #include <readline/readline.h>
 #include <pthread.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
-extern pthread_mutex_t print_lock;
+double CursorScaleFactor = 1;
+int PlotGridX=0, PlotGridY=0, PlotGridXdefault= 64, PlotGridYdefault= 64, CursorCPos= 0, CursorDPos= 0;
+bool flushAfterWrite = false;  //buzzy
+int GridOffset = 0;
+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 PrintAndLog(char *fmt, ...)
 {
        char *saved_line;
 void PrintAndLog(char *fmt, ...)
 {
        char *saved_line;


@@ -34,7 +40,7 @@ void PrintAndLog(char *fmt, ...)
        static FILE *logfile = NULL;
        static int logging=1;
 
        static FILE *logfile = NULL;
        static int logging=1;
 

-       // lock this section to avoid interlacing prints from different threats
+       // lock this section to avoid interlacing prints from different threads

        pthread_mutex_lock(&print_lock);
   
        if (logging && !logfile) {
        pthread_mutex_lock(&print_lock);
   
        if (logging && !logfile) {


@@ -44,7 +50,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) {


@@ -54,6 +65,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);


@@ -62,6 +74,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);


@@ -69,6 +83,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);


@@ -77,16 +92,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;
+}
+