Update appmain.c

[proxmark3-svn] / client / ui.c

diff --git a/client/ui.c b/client/ui.c
index c0d01bc32983a2efb313f99640d745ce3af8cde9..8faed6e86cae50f34849dcd4b53b8337cfb03528 100644 (file)
--- a/client/ui.c
+++ b/client/ui.c
@@ -9,23 +9,31 @@
 // 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;
+double CursorScaleFactor = 1;
+int PlotGridX=0, PlotGridY=0, PlotGridXdefault= 64, PlotGridYdefault= 64, CursorCPos= 0, CursorDPos= 0;

 int offline;
 int flushAfterWrite = 0;  //buzzy
 int offline;
 int flushAfterWrite = 0;  //buzzy

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

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

+#ifndef EXTERNAL_PRINTANDLOG
+// Declared in proxmark3.c
+extern pthread_mutex_t print_lock;
+

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


@@ -34,7 +42,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 +52,9 @@ void PrintAndLog(char *fmt, ...)
                        logging=0;
                }
        }
                        logging=0;
                }
        }

-       
+
+#ifdef RL_STATE_READCMD
+       // We are using GNU readline.

        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 +64,10 @@ void PrintAndLog(char *fmt, ...)
                rl_replace_line("", 0);
                rl_redisplay();
        }
                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);
        
        va_start(argptr, fmt);
        va_copy(argptr2, argptr);


@@ -84,7 +98,7 @@ void PrintAndLog(char *fmt, ...)
        //release lock
        pthread_mutex_unlock(&print_lock);  
 }
        //release lock
        pthread_mutex_unlock(&print_lock);  
 }

-
+#endif

 
 void SetLogFilename(char *fn)
 {
 
 void SetLogFilename(char *fn)
 {