COMMON: call graph_reset on run

Author: chrisws

src/common/blib_graph.c

@@ -7,12 +7,6 @@
 //
 // Copyright(C) 2000 Nicholas Christopoulos
 
-#include "common/sys.h"
-#include "common/str.h"
-#include "common/kw.h"
-#include "common/panic.h"
-#include "common/var.h"
-#include "common/blib.h"
 #include "common/pproc.h"
 #include "common/messages.h"
 
@@ -22,7 +16,6 @@ int gra_y;
 
 void graph_reset() {
   gra_x = gra_y = 0;
-  dev_cls();
 }
 
 void graph_get_xstep(var_t *r) {

src/common/brun.c

@@ -296,10 +296,10 @@ void sysvar_getcwd(var_t *r) {
  */
 void exec_setup_predefined_variables() {
   char homedir[OS_PATHNAME_SIZE + 1];
+  homedir[0] = '\0';
 
   // needed here (otherwise task will not updated)
   ctask->has_sysvars = 1;
-
   setsysvar_str(SYSVAR_SBVER, SB_STR_VER);
   setsysvar_num(SYSVAR_PI, SB_PI);
   setsysvar_int(SYSVAR_TRUE, 1);
@@ -323,7 +323,6 @@ void exec_setup_predefined_variables() {
     homedir[l] = OS_DIRSEP;
     homedir[l + 1] = '\0';
   }
-  setsysvar_str(SYSVAR_HOME, homedir);
 #elif defined(_Win32)
   if (dev_getenv("HOME")) {
     // this works on cygwin
@@ -334,7 +333,6 @@ void exec_setup_predefined_variables() {
     char *p = strrchr(homedir, '\\');
     *p = '\0';
     strcat(homedir, "\\");
-
     if (OS_DIRSEP == '/') {
       p = homedir;
       while (*p) {
@@ -344,18 +342,8 @@ void exec_setup_predefined_variables() {
       }
     }
   }
-  setsysvar_str(SYSVAR_HOME, homedir);  // mingw32
-
-  {
-    static char stupid_os_envsblog[1024]; // it must be static at
-    // least by default on DOS
-    // or Win32(BCB)
-    sprintf(stupid_os_envsblog, "SBLOG=%s%csb.log", homedir, OS_DIRSEP);
-    putenv(stupid_os_envsblog);
-  }
-#else
-  setsysvar_str(SYSVAR_HOME, "");
 #endif
+  setsysvar_str(SYSVAR_HOME, homedir);
 }
 
 /**
@@ -536,7 +524,7 @@ static inline void bc_loop_call_proc() {
   pcode_t pcode = code_getaddr();
   switch (pcode) {
   case kwCLS:
-    graph_reset();
+    dev_cls();
     break;
   case kwTHROW:
     cmd_throw();
@@ -1721,6 +1709,7 @@ void sbasic_exec_prepare(const char *filename) {
   }
   // reset system
   cmd_play_reset();
+  graph_reset();
 }
 
 /*

src/common/device.c

@@ -398,12 +398,7 @@ void log_printf(const char *format, ...) {
       buf[i--] = '\0';
     }
     strcat(buf, "\r\n");
-
-#if defined(IMPL_LOG_WRITE)
     lwrite(buf);
-#else
-    dev_print(buf);
-#endif
     free(buf);
   }
 }
@@ -420,3 +415,9 @@ void dev_trace_line(int lineNo) {
   dev_printf("<%d>", lineNo);
 }
 #endif
+
+#ifndef IMPL_LOG_WRITE
+void lwrite(const char *buf) {
+  fprintf(stderr, "%s\n", buf);
+}
+#endif

src/common/proc.c

@@ -200,45 +200,6 @@ void exec_usefunc3(var_t *var1, var_t *var2, var_t *var3, bcip_t ip) {
   free(old_z);
 }
 
-#ifndef IMPL_LOG_WRITE
-
-/**
- * Write to the log file
- */
-void lwrite(const char *buf) {
-  int log_dev; /* logfile file handle */
-  char log_name[OS_PATHNAME_SIZE + 1]; /* LOGFILE filename */
-
-  // open
-#if defined(_Win32) || defined(__MINGW32__)
-  if (getenv("SBLOG")) {
-    strcpy(log_name, getenv("SBLOG"));
-  }
-  else {
-    sprintf(log_name, "c:%csb.log", OS_DIRSEP);
-  }
-#else
-  sprintf(log_name, "%ctmp%csb.log", OS_DIRSEP, OS_DIRSEP);
-#endif
-
-  log_dev = open(log_name, O_RDWR, 0660);
-  lseek(log_dev, 0, SEEK_END);
-  if (log_dev == -1) {
-    log_dev = open(log_name, O_CREAT | O_RDWR, 0660);
-  }
-  if (log_dev == -1) {
-    panic("LOG: Error on creating log file");
-  }
-
-  // write
-  if (write(log_dev, buf, strlen(buf)) == -1) {
-    panic("LOG: write failed");
-  }
-
-  close(log_dev);
-}
-#endif // NOT IMPL_LOG_WRITE
-
 /*
  * Write string to output device
  */

src/common/screen.c

@@ -13,6 +13,7 @@
 #include "common/messages.h"
 #include "common/osd.h"
 #include "common/sberr.h"
+#include "common/blib.h"
 
 #define W2X(x) (((((x) - dev_Wx1) * dev_Vdx) / dev_Wdx) + dev_Vx1)
 #define W2Y(y) (((((y) - dev_Wy1) * dev_Vdy) / dev_Wdy) + dev_Vy1)
@@ -155,6 +156,7 @@ void dev_print(const char *str) {
  * clears the screen
  */
 void dev_cls() {
+  graph_reset();
   osd_cls();
 }
 

src/ui/textedit.cpp

@@ -52,9 +52,9 @@ const int theme1[] = {
 };
 
 const int theme2[] = {
-  0xcccccc, 0x000077, 0x333333, 0xa7aebc, 0x0000aa, 0x008888,
+  0xcccccc, 0x000077, 0x333333, 0x333333, 0x0000aa, 0x008888,
   0x010101, 0xeeeeee, 0x010101, 0xffff00, 0x00ff00, 0x010101,
-  0x00ffff, 0xff00ff, 0xffffff, 0x00ffff, 0x007777
+  0x00ffff, 0xff00ff, 0xffffff, 0x00ffff, 0x00aaff
 };
 
 const int theme3[] = {