UI: Fixed using POINT to retrieve IMAGE data

Author: chrisws

ChangeLog

@@ -24,6 +24,7 @@
 	Fixed capslock handling
 	Added file manager to main shell program
 	Fixed issues with TRY/CATCH
+	Fixed using POINT to retrieve IMAGE data
 
 2016-02-11
 	Added export to mobile command (SDL)

ide/android/assets/main.bas

@@ -56,7 +56,7 @@ sub do_okay_button()
   button.x = xmax / 2
   button.y = -1
   button.label = "Close"
-  button.backgroundColor = "blue"
+  button.backgroundColor = "green"
   button.color = "white"
   frm.inputs << button
   frm = form(frm)
@@ -66,7 +66,7 @@ end
 
 sub do_about()
   cls
-  color 2,0
+  color 7,0
   print " __           _      ___ _"
   print "(_ ._ _  _.|||_) /\ (_ |/ "
   print "__)| | |(_||||_)/--\__)|\_"

src/common/blib_graph.c

@@ -102,7 +102,8 @@ void cmd_window() {
 //  PSET [STEP] x, y [, color | COLOR color]
 //
 void cmd_pset() {
-  int32_t color = dev_fgcolor, step1 = 0;
+  long color = dev_fgcolor;
+  int32_t step1 = 0;
   ipt_t pt;
 
   /*

src/ui/ansiwidget.h

@@ -51,7 +51,6 @@ 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; }

src/ui/graphics.cpp

@@ -307,6 +307,9 @@ void Graphics::getImageData(Canvas *canvas, uint8_t *image,
 
 int Graphics::getPixel(Canvas *canvas, int posX, int posY) {
   int result = 0;
+  if (canvas == HANDLE_SCREEN) {
+    canvas = _screen;
+  }
   if (canvas
       && posX > -1
       && posY > -1

src/ui/screen.cpp

@@ -509,22 +509,6 @@ void GraphicScreen::drawRectFilled(int x1, int y1, int x2, int y2) {
   maFillRect(x1, y1, x2 - x1, y2 - y1);
 }
 
-// returns the color of the pixel at the given xy location
-int GraphicScreen::getPixel(int x, int y) {
-  MARect rc;
-  rc.left = x;
-  rc.top = y;
-  rc.width = 1;
-  rc.height = 1;
-
-  int data[1];
-  int result;
-
-  maGetImageData(_image, &data, &rc, 1);
-  result = -(data[0] & 0x00FFFFFF);
-  return result;
-}
-
 // extend the image to allow for additional content on the newline
 void GraphicScreen::imageAppend(MAHandle newImage) {
   MARect srcRect;

src/ui/screen.h

@@ -36,7 +36,6 @@ struct Screen : public Shape {
   virtual void drawLine(int x1, int y1, int x2, int y2) = 0;
   virtual void drawRect(int x1, int y1, int x2, int y2) = 0;
   virtual void drawRectFilled(int x1, int y1, int x2, int y2) = 0;
-  virtual int  getPixel(int x, int y) = 0;
   virtual void newLine(int lineHeight) = 0;
   virtual int  print(const char *p, int lineHeight, bool allChars=false);
   virtual bool setGraphicsRendition(const char c, int escValue, int lineHeight) = 0;
@@ -111,7 +110,6 @@ struct GraphicScreen : public Screen {
   void resize(int newWidth, int newHeight, int oldWidth,
               int oldHeight, int lineHeight);
   void updateFont(int size);
-  int  getPixel(int x, int y);
   int  getMaxHScroll() { return 0; }
 
   MAHandle _image;
@@ -319,7 +317,6 @@ struct TextScreen : public Screen {
   void drawLine(int x1, int y1, int x2, int y2);
   void drawRect(int x1, int y1, int x2, int y2);
   void drawRectFilled(int x1, int y1, int x2, int y2);
-  int  getPixel(int x, int y) { return 0; }
   void inset(int x, int y, int w, int h, Screen *over);
   void newLine(int lineHeight);
   int  print(const char *p, int lineHeight, bool allChars=false);

src/ui/system.cpp

@@ -1072,7 +1072,17 @@ int osd_getpen(int mode) {
 }
 
 long osd_getpixel(int x, int y) {
-  return g_system->getOutput()->getPixel(x, y);
+  g_system->getOutput()->redraw();
+
+  MARect rc;
+  int data[1];
+  rc.left = x;
+  rc.top = y;
+  rc.width = 1;
+  rc.height = 1;
+  maGetImageData(HANDLE_SCREEN, &data, &rc, 1);
+  int result = -(data[0] & 0x00FFFFFF);
+  return result;
 }
 
 int osd_getx(void) {