UI: Implemented calling IMAGE with another image variable

Author: chrisws

ChangeLog

@@ -11,6 +11,7 @@
 	Fix screen dump invalid file name for online files
 	Fix file manager .bas file case sensitivity
 	Implemented editor F2 command to display online help
+	Implemented calling IMAGE with another image variable
 
 2015-10-20
 	Fix LET when assigning a value to a MAP/ARRAY field

debian/changelog

@@ -1,7 +1,7 @@
 smallbasic (0.12.1) unstable; urgency=low
   * Various - see web site
 
- -- Chris Warren-Smith <cwarrensmith@gmail.com>  Sat, 17 Sep 2015 09:45:25 +1000
+ -- Chris Warren-Smith <cwarrensmith@gmail.com>  Sat, 17 Nov 2015 09:45:25 +1000
 
 smallbasic (0.12.0) unstable; urgency=low
   * Various - see web site

documentation/sbasic_ref.csv

@@ -107,7 +107,7 @@ Graphics,command,CIRCLE,613,"CIRCLE [STEP] x,y,r [,aspect [, color]] [COLOR colo
 Graphics,command,COLOR,614,"COLOR foreground-color [, background-color]","Specifies the foreground and background colors."
 Graphics,command,DRAW,615,"DRAW ""commands""","Draw lines as specified by the given directional commands. "
 Graphics,command,DRAWPOLY,616,"DRAWPOLY array [,x-origin,y-origin [, scalef [, color]]] [COLOR color] [FILLED]","Draws a polyline. "
-Graphics,command,IMAGE,617,"IMAGE #handle, index, x, y [,sx,sy [,w,h]]","Display a graphical image."
+Graphics,command,IMAGE,617,"IMAGE [#handle | fileName | http://path-to-file.png | image-var | array of pixmap data]","Creates a graphical image object providing access to the following sub-commands: show([x,y [,zindex [,opacity]]]), hide, save([x,y [,w,h]])"
 Graphics,command,LINE,618,"LINE [STEP] x,y [,|STEP x2,y2] [, color| COLOR color]","Draws a line."
 Graphics,command,PAINT,619,"PAINT [STEP] x, y [,fill-color [,border-color]]","Fills an enclosed area on the graphics screen with a specific color. x,y = Screen coordinate (column, row) within the area that is to be filled."
 Graphics,command,PLOT,620,"PLOT xmin, xmax USE f(x)","Graph of f(x)."

src/ui/image.cpp

@@ -106,6 +106,22 @@ void ImageDisplay::draw(int x, int y, int w, int h, int cw) {
   maDrawRGB(&dstPoint, _buffer->_image, &srcRect, _opacity, _buffer->_width);
 }
 
+// share image buffer from another image variable
+ImageBuffer *load_image(var_t *map) {
+  ImageBuffer *result = NULL;
+  int bid = map->type == V_MAP ? map_get_int(map, IMG_BID, -1) : -1;
+  if (bid != -1) {
+    List_each(ImageBuffer *, it, cache) {
+      ImageBuffer *next = (*it);
+      if (next->_bid == (unsigned)bid) {
+        result = next;
+        break;
+      }
+    }
+  }
+  return result;
+}
+
 ImageBuffer *load_image(dev_file_t *filep) {
   ImageBuffer *result = NULL;
   List_each(ImageBuffer *, it, cache) {
@@ -294,7 +310,7 @@ void create_image(var_p_t var, ImageBuffer *image) {
   map_add_var(var, IMG_OFFSET_TOP, 0);
   map_add_var(var, IMG_OFFSET_LEFT, 0);
   map_add_var(var, IMG_ZINDEX, 1);
-  map_add_var(var, IMG_OPACITY, 1);
+  map_add_var(var, IMG_OPACITY, 0);
   map_add_var(var, IMG_ID, ++nextId);
 
   if (image != NULL) {
@@ -416,6 +432,8 @@ extern "C" void v_create_image(var_p_t var) {
       }
       image = load_xpm_image(data);
       delete [] data;
+    } else {
+      image = load_image(&arg);
     }
     v_free(&arg);
     break;