ANDROID: use common graphics

Author: chrisws

src/platform/android/jni/display.cpp

@@ -22,7 +22,7 @@ extern common::Graphics *graphics;
 //
 // Canvas implementation
 //
-Canvas::Canvas() : common::Canvas(),
+Canvas::Canvas() :
   _canvas(NULL),
   _clip(NULL) {
 }
@@ -49,15 +49,6 @@ bool Canvas::create(int w, int h) {
   return result;
 }
 
-void Canvas::freeClip() {
-  delete _clip;
-  _clip = NULL;
-}
-
-pixel_t *Canvas::getLine(int y) {
-  return _canvas + (y * _w);
-}
-
 void Canvas::setClip(int x, int y, int w, int h) {
   delete _clip;
   if (x != 0 || y != 0 || _w != w || _h != h) {
@@ -115,8 +106,8 @@ void Graphics::redraw() {
       trace("Unable to lock window buffer");
     } else {
       void *pixels = buffer.bits;
-      int width = min(_w, min(buffer.width, _screen->width()));
-      int height = min(_h, min(buffer.height, _screen->height()));
+      int width = min(_w, min(buffer.width, _screen->_w));
+      int height = min(_h, min(buffer.height, _screen->_h));
       for (int y = 0; y < height; y++) {
         pixel_t *line = _screen->getLine(y);
         memcpy((pixel_t *)pixels, line, width * sizeof(pixel_t));
@@ -165,11 +156,6 @@ void maUpdateScreen(void) {
   ((Graphics *)graphics)->redraw();
 }
 
-MAHandle maCreatePlaceholder(void) {
-  MAHandle maHandle = (MAHandle) new Canvas();
-  return maHandle;
-}
-
 int maCreateDrawableImage(MAHandle maHandle, int width, int height) {
   int result = RES_OK;
   if (height > graphics->getHeight() * SIZE_LIMIT) {

src/platform/android/jni/display.h

@@ -18,27 +18,6 @@
 
 using namespace strlib;
 
-struct Canvas : public common::Canvas {
-  Canvas();
-  virtual ~Canvas();
-
-  bool create(int w, int h);
-  void freeClip();
-  void setClip(int x, int y, int w, int h);
-  pixel_t *getLine(int y);
-  int x() { return _clip ? _clip->left : 0; }
-  int y() { return _clip ? _clip->top : 0; }
-  int w() { return _clip ? _clip->right : _w; }
-  int h() { return _clip ? _clip->bottom : _h; }
-  int width()  { return _w; }
-  int height() { return _h; }
-
-  int _w;
-  int _h;
-  pixel_t *_canvas;
-  ARect *_clip;
-};
-
 struct Graphics : common::Graphics {
   Graphics(android_app *app);
   virtual ~Graphics();

src/platform/common/canvas.h

@@ -0,0 +1,58 @@
+// This file is part of SmallBASIC
+//
+// Copyright(C) 2001-2014 Chris Warren-Smith.
+//
+// This program is distributed under the terms of the GPL v2.0 or later
+// Download the GNU Public License (GPL) from www.gnu.org
+// 
+
+#ifndef COMMON_CANVAS
+#define COMMON_CANVAS
+
+typedef uint16_t pixel_t;
+
+#if defined(_SDL)
+
+#include <SDL.h>
+struct Canvas {
+  Canvas();
+  virtual ~Canvas();
+
+  bool create(int w, int h);
+  void setClip(int x, int y, int w, int h);
+  pixel_t *getLine(int y);
+  int x() { return _clip ? _clip->x : 0; }
+  int y() { return _clip ? _clip->y : 0; }
+  int w() { return _clip ? _clip->w : _w; }
+  int h() { return _clip ? _clip->h : _h; }
+
+  int _w;
+  int _h;
+  SDL_Surface *_canvas;
+  SDL_Rect *_clip;
+};
+
+#else
+
+#include <android/rect.h>
+struct Canvas {
+  Canvas();
+  virtual ~Canvas();
+
+  bool create(int w, int h);
+  void setClip(int x, int y, int w, int h);
+  pixel_t *getLine(int y) { return _canvas + (y * _w); }
+  int x() { return _clip ? _clip->left : 0; }
+  int y() { return _clip ? _clip->top : 0; }
+  int w() { return _clip ? _clip->right : _w; }
+  int h() { return _clip ? _clip->bottom : _h; }
+
+  int _w;
+  int _h;
+  pixel_t *_canvas;
+  ARect *_clip;
+};
+
+#endif
+#endif
+

src/platform/common/graphics.cpp

@@ -7,6 +7,7 @@
 //
 
 #include "config.h"
+
 #include "platform/common/graphics.h"
 #include "platform/common/utils.h"
 #include "common/device.h"
@@ -71,15 +72,6 @@ Font::~Font() {
   }
 }
 
-//
-// Canvas implementation
-//
-Canvas::Canvas() {
-}
-
-Canvas::~Canvas() {
-}
-
 //
 // Graphics implementation
 //
@@ -121,11 +113,10 @@ void Graphics::drawImageRegion(Canvas *src, const MAPoint2d *dstPoint, const MAR
   if (_drawTarget && _drawTarget != src) {
     int destY = dstPoint->y;
     int srcH = srcRect->height;
-    if (srcRect->top + srcRect->height > src->height()) {
-      srcH = src->height() - srcRect->top;
+    if (srcRect->top + srcRect->height > src->_h) {
+      srcH = src->_h - srcRect->top;
     }
-    int targetH = _drawTarget->height();
-    for (int y = 0; y < srcH && destY < targetH; y++, destY++) {
+    for (int y = 0; y < srcH && destY < _drawTarget->_h; y++, destY++) {
       pixel_t *line = src->getLine(y + srcRect->top) + srcRect->left;
       pixel_t *dstLine = _drawTarget->getLine(destY) + dstPoint->x;
       memcpy(dstLine, line, srcRect->width * sizeof(pixel_t));
@@ -257,8 +248,8 @@ int Graphics::getPixel(int posX, int posY) {
   if (_drawTarget
       && posX > -1 
       && posY > -1
-      && posX < _drawTarget->width()
-      && posY < _drawTarget->height() - 1) {
+      && posX < _drawTarget->_w
+      && posY < _drawTarget->_h - 1) {
     pixel_t *line = _drawTarget->getLine(posY);
     result = line[posX];
   }
@@ -291,13 +282,19 @@ MAHandle Graphics::setDrawTarget(MAHandle maHandle) {
   } else {
     _drawTarget = (Canvas *)maHandle;
   }
-  _drawTarget->freeClip();
+  delete _drawTarget->_clip;
+  _drawTarget->_clip = NULL;
   return (MAHandle) _drawTarget;
 }
 
 //
 // maapi implementation
 //
+MAHandle maCreatePlaceholder(void) {
+  MAHandle maHandle = (MAHandle) new Canvas();
+  return maHandle;
+}
+
 int maFontDelete(MAHandle maHandle) {
   if (maHandle != -1) {
     graphics->deleteFont((Font *)maHandle);

src/platform/common/graphics.h

@@ -11,6 +11,7 @@
 
 #include "platform/common/maapi.h"
 #include "platform/common/StringLib.h"
+#include "platform/common/canvas.h"
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
@@ -20,8 +21,6 @@
 
 using namespace strlib;
 
-typedef uint16_t pixel_t;
-
 namespace common {
 
 struct Glyph {
@@ -38,22 +37,6 @@ struct Font {
   Glyph _glyph[MAX_GLYPHS];
 };
 
-struct Canvas {
-  Canvas();
-  virtual ~Canvas();
-
-  virtual bool create(int w, int h) = 0;
-  virtual pixel_t *getLine(int y) = 0;
-  virtual void setClip(int x, int y, int w, int h) = 0;
-  virtual void freeClip() = 0;
-  virtual int x() = 0;
-  virtual int y() = 0;
-  virtual int w() = 0;
-  virtual int h() = 0;
-  virtual int width() = 0;
-  virtual int height() = 0;
-};
-
 struct Graphics {
   Graphics();
   virtual ~Graphics();

src/platform/sdl/display.cpp

@@ -20,7 +20,7 @@ extern common::Graphics *graphics;
 //
 // Canvas implementation
 //
-Canvas::Canvas() : common::Canvas(),
+Canvas::Canvas() :
   _canvas(NULL),
   _clip(NULL) {
 }
@@ -29,8 +29,9 @@ Canvas::~Canvas() {
   if (_canvas != NULL) {
     SDL_FreeSurface(_canvas);
   }
+  delete _clip;
   _canvas = NULL;
-  freeClip();
+  _clip = NULL;
 }
 
 bool Canvas::create(int w, int h) {
@@ -45,11 +46,6 @@ bool Canvas::create(int w, int h) {
   return _canvas != NULL;
 }
 
-void Canvas::freeClip() {
-  delete _clip;
-  _clip = NULL;
-}
-
 pixel_t *Canvas::getLine(int y) { 
   pixel_t *pixels = (pixel_t *)_canvas->pixels;
   return pixels + (y * _w); 
@@ -101,8 +97,8 @@ void Graphics::redraw() {
   SDL_Rect srcrect;
   srcrect.x = 0;
   srcrect.y = 0;
-  srcrect.w = _screen->width();
-  srcrect.h = _screen->height();
+  srcrect.w = _screen->_w;
+  srcrect.h = _screen->_h;
 
   SDL_Rect dstrect;
   dstrect.x = 0;
@@ -140,11 +136,6 @@ void maUpdateScreen(void) {
   ((::Graphics *)graphics)->redraw();
 }
 
-MAHandle maCreatePlaceholder(void) {
-  MAHandle maHandle = (MAHandle) new ::Canvas();
-  return maHandle;
-}
-
 int maCreateDrawableImage(MAHandle maHandle, int width, int height) {
   int result = RES_OK;
   if (height > graphics->getHeight() * SIZE_LIMIT) {

src/platform/sdl/display.h

@@ -15,27 +15,6 @@
 #include "platform/common/StringLib.h"
 #include "platform/common/graphics.h"
 
-struct Canvas : public common::Canvas {
-  Canvas();
-  virtual ~Canvas();
-
-  bool create(int w, int h);
-  void freeClip();
-  void setClip(int x, int y, int w, int h);
-  pixel_t *getLine(int y);
-  int x() { return _clip ? _clip->x : 0; }
-  int y() { return _clip ? _clip->y : 0; }
-  int w() { return _clip ? _clip->w : _w; }
-  int h() { return _clip ? _clip->h : _h; }
-  int width()  { return _w; }
-  int height() { return _h; }
-
-  int _w;
-  int _h;
-  SDL_Surface *_canvas;
-  SDL_Rect *_clip;
-};
-
 struct Graphics : common::Graphics {
   Graphics(SDL_Window *window);
   virtual ~Graphics();