UI: added xpm validation check.

Author: chrisws

ChangeLog

@@ -1,3 +1,6 @@
+2021-07-04 (12.22)
+	SDL: Fix Live edit when start path contains unicode characters
+
 2021-07-02 (12.22)
 	UI: Fix to make image save and load compatible
 

documentation/sbasic_ref.csv

@@ -95,7 +95,7 @@ Graphics,command,PSET,621,"PSET [STEP] x,y [, color| COLOR color]","Draw a pixel
 Graphics,command,RECT,622,"RECT [STEP] x,y [,|STEP x2,y2] [, color| COLOR color] [FILLED]","Draws a rectangular parallelogram."
 Graphics,command,SHOWPAGE,1429,"SHOWPAGE","This command is used to display pending graphics operations allowing for smooth animations."
 Graphics,command,VIEW,623,"VIEW [x1,y1,x2,y2 [,color [,border-color]]]","Defines a viewport. The viewport defined by VIEW is disabled by a VIEW command with no parameters."
-Graphics,command,WINDOW,624,"WINDOW [x1,y1,x2,y2]","The WINDOW command allows you to redefine the corners of the display screen as a pair of ""world"" coordinates. WINDOW is also overloaded as a function, returning a system object providing access to the following sub-commands: graphicsScreen1, graphicsScreen2, textScreen, alert, ask, menu, message, showKeypad, insetTextScreen"
+Graphics,command,WINDOW,624,"WINDOW [x1,y2,x2,y1]","The WINDOW command allows you to redefine the corners of the display screen as a pair of ""world"" coordinates. WINDOW is also overloaded as a function, returning a system object providing access to the following sub-commands: graphicsScreen1, graphicsScreen2, textScreen, alert, ask, menu, message, showKeypad, insetTextScreen"
 Graphics,constant,XMAX,1526,"XMAX","Holds the screen width in pixels"
 Graphics,constant,YMAX,1527,"YMAX","Holds the screen height in pixels."
 Graphics,function,PEN,627,"PEN (0..14)","Returns the PEN/MOUSE data."

src/common/device.h

@@ -1070,12 +1070,19 @@ void panic(const char *fmt, ...);
 void lwrite(const char *buf);
 
 /**
- * @ingroup dev_f
+ * @ingroup dev
  *
  * resize the window coordinate system
  */
 void dev_resize(int width, int height);
 
+/**
+ * @ingroup dev
+ *
+ * adjust the point to the window coordinate system
+ */
+void dev_map_point(int *x, int *y);
+
 #if defined(__cplusplus)
 }
 #endif

src/common/screen.c

@@ -431,3 +431,8 @@ void dev_resize(int width, int height) {
   setsysvar_int(SYSVAR_XMAX, width - 1);
   setsysvar_int(SYSVAR_YMAX, height - 1);
 }
+
+void dev_map_point(int *x, int *y) {
+  *x = W2X(*x);
+  *y = W2Y(*y);
+}

src/lib/xpm.c

@@ -41,8 +41,7 @@ void set_pixels(uint8_t *image, int w, int x, int y, uint32_t c) {
 #endif
 }
 
-int xpm_decode32(uint8_t **image, unsigned *width, unsigned *height, 
-                 const char *const *xpm) {
+int xpm_decode32(uint8_t **image, unsigned *width, unsigned *height, const char *const *xpm) {
   int ncolors, chars_per_pixel;
   int next_line = 0;
 
@@ -61,20 +60,24 @@ int xpm_decode32(uint8_t **image, unsigned *width, unsigned *height,
     return 1;
   }
 
+  int maxColors = chars_per_pixel == 1 ? NUM_BASE : (NUM_BASE * NUM_BASE);
+  if (ncolors >= maxColors) {
+    return 1;
+  }
+
   // note that this array is unsigned char and skips the first line:
   const uint8_t *const* data = (const uint8_t*const*)(xpm + next_line + 1);
-  int i, x, y;
-  uint32_t colors[chars_per_pixel == 1 ? NUM_BASE : (NUM_BASE * NUM_BASE)];
+  uint32_t colors[maxColors];
 
-  for (i = 0; i < ncolors; i++) {
-    const uint8_t* p = *data++;
+  for (int i = 0; i < ncolors; i++) {
+    const uint8_t *p = *data++;
     int index = (*p++) - FIRSTCHAR;
-    uint32_t *c; // where to store color
     if (chars_per_pixel == 2) {
       int next = (*p++) - FIRSTCHAR;
       index = index * NUM_BASE + next;
     }
-    c = colors + index;
+    // where to store color
+    uint32_t *c = &colors[index];
 
     // look for "c word", or last word if none:
     while (*p && isspace(*p)) {
@@ -98,17 +101,17 @@ int xpm_decode32(uint8_t **image, unsigned *width, unsigned *height,
   *image = malloc((*width) * (*height) * sizeof(uint32_t));
 
   if (chars_per_pixel == 1) {
-    for (y = 0; y <* height; y++) {
+    for (int y = 0; y <* height; y++) {
       const uint8_t *p = data[y];
-      for (x = 0; x < *width; x++) {
+      for (int x = 0; x < *width; x++) {
         int index = *(p++) - FIRSTCHAR;
         set_pixels(*image, *width, x, y, colors[index]);
       }
     }
   } else {
-    for (y = 0; y < *height; y++) {
+    for (int y = 0; y < *height; y++) {
       const uint8_t *p = data[y];
-      for (x = 0; x < *width && *p; x++) {
+      for (int x = 0; x < *width && *p; x++) {
         int index = (*p++) - FIRSTCHAR;
         int next = (*p++) - FIRSTCHAR;
         index = index * NUM_BASE + next;

src/ui/image.cpp

@@ -102,6 +102,7 @@ void ImageDisplay::draw(int x, int y, int w, int h, int cw) {
     srcRect.top = MIN(_buffer->_height, _offsetTop);
     srcRect.width = MIN(w, MIN(_buffer->_width, _width));
     srcRect.height = MIN(h, MIN(_buffer->_height, _height));
+    dev_map_point(&dstPoint.x, &dstPoint.y);
 
     if (unsigned(srcRect.top + srcRect.height) > _buffer->_height) {
       srcRect.height = _buffer->_height - srcRect.top;

src/ui/system.cpp

@@ -512,7 +512,8 @@ void System::handleEvent(MAEvent &event) {
     _touchCurY = event.point.y;
     _output->pointerMoveEvent(event);
     if (_output->hasHover() ||
-        _output->overMenu(_touchCurX, _touchCurY)) {
+        _output->overMenu(_touchCurX, _touchCurY) ||
+        (_touchX != -1 && _touchY != -1)) {
       showCursor(kHand);
     } else if (_output->hasMenu()) {
       showCursor(kArrow);