Fix: ControlWidget placement (#690)

[proxmark3-svn] / client / ui.c

diff --git a/client/ui.c b/client/ui.c
index 554230cb098fdb0f7f09d628aa53c8e66c9c0b0c..50a6ec7d0256a2003f2d8f7e6bad0174a252516c 100644 (file)
--- a/client/ui.c
+++ b/client/ui.c
@@ -9,36 +9,53 @@
 // UI utilities
 //-----------------------------------------------------------------------------
 
-#include <stdarg.h>
+#include <stdbool.h>
+#ifndef EXTERNAL_PRINTANDLOG
 #include <stdlib.h>
 #include <stdio.h>
-#include <time.h>
+#include <stdarg.h>
 #include <readline/readline.h>
+#include <pthread.h>
+#endif
 
 #include "ui.h"
 
-double CursorScaleFactor;
-int PlotGridX, PlotGridY;
-int offline;
+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";
 
+#ifndef EXTERNAL_PRINTANDLOG
+static pthread_mutex_t print_lock = PTHREAD_MUTEX_INITIALIZER;
+
 void PrintAndLog(char *fmt, ...)
 {
        char *saved_line;
        int saved_point;
-  va_list argptr, argptr2;
-  static FILE *logfile = NULL;
-  static int logging=1;
+       va_list argptr, argptr2;
+       static FILE *logfile = NULL;
+       static int logging=1;
 
-  if (logging && !logfile) {
-    logfile=fopen(logfilename, "a");
-    if (!logfile) {
-      fprintf(stderr, "Can't open logfile, logging disabled!\n");
-      logging=0;
-    }
-  }
-       
+       // lock this section to avoid interlacing prints from different threads
+       pthread_mutex_lock(&print_lock);
+  
+       if (logging && !logfile) {
+               logfile=fopen(logfilename, "a");
+               if (!logfile) {
+                       fprintf(stderr, "Can't open logfile, logging disabled!\n");
+                       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) {
@@ -48,14 +65,17 @@ void PrintAndLog(char *fmt, ...)
                rl_replace_line("", 0);
                rl_redisplay();
        }
+#endif
        
-  va_start(argptr, fmt);
-  va_copy(argptr2, argptr);
-  vprintf(fmt, argptr);
-  printf("          "); // cleaning prompt
-  va_end(argptr);
-  printf("\n");
+       va_start(argptr, fmt);
+       va_copy(argptr2, argptr);
+       vprintf(fmt, argptr);
+       printf("          "); // cleaning prompt
+       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);
@@ -63,16 +83,30 @@ void PrintAndLog(char *fmt, ...)
                rl_redisplay();
                free(saved_line);
        }
+#endif
        
-  if (logging && logfile) {
-    vfprintf(logfile, fmt, argptr2);
-    fprintf(logfile,"\n");
-    fflush(logfile);
-  }
-  va_end(argptr2);
+       if (logging && logfile) {
+               vfprintf(logfile, fmt, argptr2);
+               fprintf(logfile,"\n");
+               fflush(logfile);
+       }
+       va_end(argptr2);
+
+       if (flushAfterWrite)  //buzzy
+       {
+               fflush(NULL);
+       }
+       //release lock
+       pthread_mutex_unlock(&print_lock);  
 }
+#endif
 
 void SetLogFilename(char *fn)
 {
   logfilename = fn;
 }
+
+void SetFlushAfterWrite(bool flush_after_write) {
+       flushAfterWrite = flush_after_write;
+}
+