Merge pull request #494 from qaisjp/patch-1

[proxmark3-svn] / client / ui.c

diff --git a/client/ui.c b/client/ui.c
index 5902cb89923f980a0318b4819aac17ec4831b40c..df2c3ce3c6a6909cb99317f34770853c40992f13 100644 (file)
--- a/client/ui.c
+++ b/client/ui.c
@@ -12,15 +12,20 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <stdbool.h>
 #include <readline/readline.h>
 #include <pthread.h>
 
 #include "ui.h"
 
-double CursorScaleFactor;
-int PlotGridX, PlotGridY, PlotGridXdefault= 64, PlotGridYdefault= 64, CursorCPos= 0, CursorDPos= 0;
+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";
@@ -43,7 +48,9 @@ void PrintAndLog(char *fmt, ...)
                        logging=0;
                }
        }
-       
+
+#ifdef RL_STATE_READCMD
+       // We are using GNU readline.
        int need_hack = (rl_readline_state & RL_STATE_READCMD) > 0;
 
        if (need_hack) {
@@ -53,6 +60,10 @@ 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);