UI: minor performance fix

Author: chrisws

src/common/brun.c

@@ -283,7 +283,7 @@ void exec_setup_predefined_variables() {
   setsysvar_int(SYSVAR_YMAX, os_graf_my - 1);
   setsysvar_int(SYSVAR_TRUE, 1);
   setsysvar_int(SYSVAR_FALSE, 0);
-  setsysvar_str(SYSVAR_PWD, dev_getcwd());
+  setsysvar_str(SYSVAR_CWD, dev_getcwd());
   setsysvar_str(SYSVAR_COMMAND, opt_command);
 
 #if defined(_UnixOS)

src/common/file.c

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

src/common/scan.c

@@ -3444,9 +3444,9 @@ void comp_init() {
   comp_vartable[comp_var_getID(LCN_SV_CWD)].dolar_sup = 1;
   comp_vartable[comp_var_getID(LCN_SV_HOME)].dolar_sup = 1;
   comp_vartable[comp_var_getID(LCN_SV_COMMAND)].dolar_sup = 1;
-  comp_var_getID(LCN_SV_X);     // USE keyword
-  comp_var_getID(LCN_SV_Y);     // USE keyword
-  comp_var_getID(LCN_SV_Z);     // USE keyword
+  comp_var_getID(LCN_SV_X);
+  comp_var_getID(LCN_SV_Y);
+  comp_var_getID(LCN_SV_Z);
 }
 
 /*

src/common/var.h

@@ -48,7 +48,7 @@
 #define SYSVAR_YMAX         3  /**< system variable, YMAX      @ingroup var */
 #define SYSVAR_TRUE         4  /**< system variable, TRUE      @ingroup var */
 #define SYSVAR_FALSE        5  /**< system variable, FALSE     @ingroup var */
-#define SYSVAR_PWD          6  /**< system variable, PWD$      @ingroup var */
+#define SYSVAR_CWD          6  /**< system variable, CWD$      @ingroup var */
 #define SYSVAR_HOME         7  /**< system variable, HOME$     @ingroup var */
 #define SYSVAR_COMMAND      8  /**< system variable, COMMAND$  @ingroup var */
 #define SYSVAR_X            9  /**< system variable, X         @ingroup var */

src/ui/graphics.cpp

@@ -136,10 +136,14 @@ void Graphics::drawLine(int startX, int startY, int endX, int endY) {
       }
       if (startY >= 0 && startY < _drawTarget->_h) {
         pixel_t *line = _drawTarget->getLine(startY);
+        if (x1 < _drawTarget->x()) {
+          x1 = _drawTarget->x();
+        }
+        if (x2 >= _drawTarget->w()) {
+          x2 = _drawTarget->w() - 1;
+        }
         for (int x = x1; x <= x2; x++) {
-          if (x >= _drawTarget->x() && x < _drawTarget->w()) {
-            line[x] = _drawColor;
-          }
+          line[x] = _drawColor;
         }
       }
     } else if (startX == endX) {
@@ -157,11 +161,15 @@ void Graphics::drawLine(int startX, int startY, int endX, int endY) {
         y2 = _drawTarget->_h - 1;
       }
       if (startX >= 0 && startX < _drawTarget->_w) {
+        if (y1 < _drawTarget->y()) {
+          y1 = _drawTarget->y();
+        }
+        if (y2 >= _drawTarget->h()) {
+          y2 = _drawTarget->h() - 1;
+        }
         for (int y = y1; y <= y2; y++) {
-          if (y >= _drawTarget->y() && y < _drawTarget->h()) {
-            pixel_t *line = _drawTarget->getLine(y);
-            line[startX] = _drawColor;
-          }
+          pixel_t *line = _drawTarget->getLine(y);
+          line[startX] = _drawColor;
         }
       }
     } else if (opt_antialias) {