COMMON: revert minor changes for performance

Author: chrisws

ChangeLog

@@ -1,5 +1,7 @@
-2016-04-26 (0.12.6)
-	Added LASTX, LASTY system variables
+2016-05-07 (0.12.6)
+	Reverted LASTX/LASTY. Data was already accessible via POINT command
+	Reverted getPixel from SCREEN for performance. Can still access this by passed -ve x/y values
+	Reverted using var V_FUNC handling for int sys vars due to eval issues
 
 2016-04-26 (0.12.6)
 	Fixes for unit case sensitivity

src/common/blib.h

@@ -92,11 +92,7 @@ void cmd_deriv(void);
 void cmd_diffeq(void);
 
 // not basic, but speed is needed
-void graph_reset(void); // graphics module - reset
-void graph_get_xstep(var_t *r);
-void graph_get_ystep(var_t *r);
-void graph_get_mx(var_t *r);
-void graph_get_my(var_t *r);
+void graph_reset(void);
 void cmd_pset(void);
 void cmd_line(void);
 void cmd_rect(void);

src/common/blib_func.c

@@ -2354,7 +2354,7 @@ void cmd_genfunc(long funcCode, var_t *r) {
           err_argerr();
         else {
           x = v_getint(v_elem(v, 0));
-          y = v_getint(v_elem(v, 0));
+          y = v_getint(v_elem(v, 1));
         }
       } else {
         x = v_getint(v);

src/common/blib_graph.c

@@ -18,22 +18,6 @@ void graph_reset() {
   gra_x = gra_y = 0;
 }
 
-void graph_get_xstep(var_t *r) {
-  v_setint(r, gra_x);
-}
-
-void graph_get_ystep(var_t *r) {
-  v_setint(r, gra_y);
-}
-
-void graph_get_mx(var_t *r) {
-  v_setint(r, os_graf_mx - 1);
-}
-
-void graph_get_my(var_t *r) {
-  v_setint(r, os_graf_my - 1);
-}
-
 //
 //  VIEW [x1,y1,x2,y2[,c[,b]]]
 //

src/common/brun.c

@@ -219,26 +219,6 @@ void setsysvar_int(int index, var_int_t value) {
   activate_task(tid);
 }
 
-/**
- * sets the value of an callback system-variable
- */
-void setsysvar_fn(int index, method value) {
-  int tid;
-  int i;
-
-  tid = ctask->tid;
-  for (i = 0; i < count_tasks(); i++) {
-    activate_task(i);
-    if (ctask->has_sysvars) {
-      var_t *var_p = tvar[index];
-      var_p->type = V_FUNC;
-      var_p->const_flag = 1;
-      var_p->v.fn.cb = value;
-    }
-  }
-  activate_task(tid);
-}
-
 /**
  * sets the value of a real system-variable
  */
@@ -287,10 +267,6 @@ void setsysvar_str(int index, const char *value) {
   activate_task(tid);
 }
 
-void sysvar_getcwd(var_t *r) {
-  v_setstr(r, dev_getcwd());
-}
-
 /**
  * create predefined system variables for this task
  */
@@ -302,14 +278,12 @@ void exec_setup_predefined_variables() {
   ctask->has_sysvars = 1;
   setsysvar_str(SYSVAR_SBVER, SB_STR_VER);
   setsysvar_num(SYSVAR_PI, SB_PI);
+  setsysvar_int(SYSVAR_XMAX, os_graf_mx - 1);
+  setsysvar_int(SYSVAR_YMAX, os_graf_my - 1);
   setsysvar_int(SYSVAR_TRUE, 1);
   setsysvar_int(SYSVAR_FALSE, 0);
+  setsysvar_str(SYSVAR_CWD, dev_getcwd());
   setsysvar_str(SYSVAR_COMMAND, opt_command);
-  setsysvar_fn(SYSVAR_CWD, sysvar_getcwd);
-  setsysvar_fn(SYSVAR_XMAX, graph_get_mx);
-  setsysvar_fn(SYSVAR_YMAX, graph_get_my);
-  setsysvar_fn(SYSVAR_LASTX, graph_get_xstep);
-  setsysvar_fn(SYSVAR_LASTY, graph_get_ystep);
 
 #if defined(_UnixOS)
   if (dev_getenv("HOME")) {
@@ -329,7 +303,7 @@ void exec_setup_predefined_variables() {
     strcpy(homedir, dev_getenv("HOME"));
   }
   else {
-    GetModuleFileName(NULL, homedir, 1024);
+    GetModuleFileName(NULL, homedir, sizeof(homedir) - 1);
     char *p = strrchr(homedir, '\\');
     *p = '\0';
     strcat(homedir, "\\");

src/common/file.c

@@ -616,6 +616,7 @@ void dev_chdir(const char *dir) {
   if (chdir(dir) != 0) {
     err_file(errno);
   }
+  setsysvar_str(SYSVAR_CWD, dev_getcwd());
 }
 
 /**

src/common/scan.c

@@ -3447,8 +3447,6 @@ void comp_init() {
   comp_var_getID(LCN_SV_X);
   comp_var_getID(LCN_SV_Y);
   comp_var_getID(LCN_SV_Z);
-  comp_var_getID(LCN_SV_LASTX);
-  comp_var_getID(LCN_SV_LASTY);
 }
 
 /*

src/common/var.h

@@ -54,9 +54,7 @@
 #define SYSVAR_X            9  /**< system variable, X         @ingroup var */
 #define SYSVAR_Y            10 /**< system variable, Y         @ingroup var */
 #define SYSVAR_Z            11 /**< system variable, Z         @ingroup var */
-#define SYSVAR_LASTX        12 /**< system variable, LASTX     @ingroup var */
-#define SYSVAR_LASTY        13 /**< system variable, LASTY     @ingroup var */
-#define SYSVAR_COUNT        14
+#define SYSVAR_COUNT        12
 
 /**
  * @ingroup var

src/languages/keywords.en.c

@@ -492,8 +492,6 @@ struct proc_keyword_s proc_table[] = {
 #define LCN_SV_X                "X"
 #define LCN_SV_Y                "Y"
 #define LCN_SV_Z                "Z"
-#define LCN_SV_LASTX            "LASTX"
-#define LCN_SV_LASTY            "LASTY"
 
 // fast cut of comments (pp)
 #define LCN_REM_1               ":rem "

src/ui/ansiwidget.h

@@ -51,6 +51,7 @@ struct AnsiWidget {
   int  getColor() { return _back->_fg; }
   int  getFontSize() { return _fontSize; }
   FormInput *getNextField(FormInput *field) { return _back->getNextField(field); }
+  int  getPixel(int x, int y) { return _back->getPixel(x, y); }
   int  getScreenWidth()  { return _back->_width; }
   void getScroll(int &x, int &y) { _back->getScroll(x, y); }
   int  getHeight() { return _height; }