Code cleanup (#616)

[proxmark3-svn] / client / ui.c

diff --git a/client/ui.c b/client/ui.c
index 99c9f17007240191a7da4f14fd6b6464385a096c..50a6ec7d0256a2003f2d8f7e6bad0174a252516c 100644 (file)
--- a/client/ui.c
+++ b/client/ui.c
@@ -1,45 +1,103 @@
-#include <stdarg.h>
+//-----------------------------------------------------------------------------
+// Copyright (C) 2009 Michael Gernoth <michael at gernoth.net>
+// Copyright (C) 2010 iZsh <izsh at fail0verflow.com>
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// UI utilities
+//-----------------------------------------------------------------------------
+
+#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";
 
-// FIXME: ifndef not really nice...
-// We should eventually get rid of it once
-// we fully factorize the code between *nix and windows
-// (using pthread and alikes...)
-#ifndef WIN32
+#ifndef EXTERNAL_PRINTANDLOG
+static pthread_mutex_t print_lock = PTHREAD_MUTEX_INITIALIZER;
+
 void PrintAndLog(char *fmt, ...)
 {
-  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;
-    }
-  }
-
-  va_start(argptr, fmt);
-  va_copy(argptr2, argptr);
-  vprintf(fmt, argptr);
-  va_end(argptr);
-  printf("\n");
-  if (logging && logfile) {
-    vfprintf(logfile, fmt, argptr2);
-    fprintf(logfile,"\n");
-    fflush(logfile);
-  }
-  va_end(argptr2);
+       char *saved_line;
+       int saved_point;
+       va_list argptr, argptr2;
+       static FILE *logfile = NULL;
+       static int logging=1;
+
+       // 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) {
+               saved_point = rl_point;
+               saved_line = rl_copy_text(0, rl_end);
+               rl_save_prompt();
+               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");
+
+#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);
+               rl_point = saved_point;
+               rl_redisplay();
+               free(saved_line);
+       }
+#endif
+       
+       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
 
@@ -47,3 +105,8 @@ void SetLogFilename(char *fn)
 {
   logfilename = fn;
 }
+
+void SetFlushAfterWrite(bool flush_after_write) {
+       flushAfterWrite = flush_after_write;
+}
+