summaryrefslogtreecommitdiff
path: root/src/drivers/Android
diff options
context:
space:
mode:
Diffstat (limited to 'src/drivers/Android')
-rw-r--r--src/drivers/Android/Fl_Android_Graphics_Driver.H22
-rw-r--r--src/drivers/Android/Fl_Android_Graphics_Driver.cxx120
2 files changed, 59 insertions, 83 deletions
diff --git a/src/drivers/Android/Fl_Android_Graphics_Driver.H b/src/drivers/Android/Fl_Android_Graphics_Driver.H
index a8c7ddfd7..046735c1c 100644
--- a/src/drivers/Android/Fl_Android_Graphics_Driver.H
+++ b/src/drivers/Android/Fl_Android_Graphics_Driver.H
@@ -54,6 +54,9 @@ protected:
// - methods marked with // super: use the implemnetation of the super class
// - virtual ... override functions are implemented for Android
private:
+ virtual void draw_fixed(Fl_RGB_Image * rgb,int XP, int YP, int WP, int HP, int cx, int cy) override;
+ virtual void draw_fixed(Fl_Pixmap * pxm,int XP, int YP, int WP, int HP, int cx, int cy) override;
+ virtual void draw_fixed(Fl_Bitmap *bm, int XP, int YP, int WP, int HP, int cx, int cy) override;
// some platforms may need to reimplement this
// This is called from the surface device, see: end_current_()
// super: virtual void set_current_();
@@ -67,6 +70,7 @@ protected:
virtual fl_uintptr_t cache(Fl_Pixmap *img) override;
/** Support function for Fl_Bitmap drawing */
virtual fl_uintptr_t cache(Fl_Bitmap *img) override;
+ virtual fl_uintptr_t cache(Fl_RGB_Image *img) override;
/** Support function for Fl_RGB_Image drawing */
virtual void uncache(Fl_RGB_Image *img, fl_uintptr_t &id_, fl_uintptr_t &mask_) override;
// --- implementation is in src/drivers/xxx/Fl_xxx_Graphics_Driver_image.cxx
@@ -78,20 +82,6 @@ protected:
virtual void draw_image(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=3) override;
/** see fl_draw_image_mono(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D) */
virtual void draw_image_mono(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=1) override;
- /** \brief Draws an Fl_RGB_Image object using this graphics driver. */
- virtual void draw(Fl_RGB_Image * rgb,int XP, int YP, int WP, int HP, int cx, int cy) override;
- /** \brief Draws an Fl_Pixmap object using this graphics driver.
- *
- Specifies a bounding box for the image, with the origin (upper left-hand corner) of
- the image offset by the cx and cy arguments.
- */
- virtual void draw(Fl_Pixmap * pxm,int XP, int YP, int WP, int HP, int cx, int cy) override;
- /** \brief Draws an Fl_Bitmap object using this graphics driver.
- *
- Specifies a bounding box for the image, with the origin (upper left-hand corner) of
- the image offset by the cx and cy arguments.
- */
- virtual void draw(Fl_Bitmap *bm, int XP, int YP, int WP, int HP, int cx, int cy) override;
#if 0
virtual void copy_offscreen(int x, int y, int w, int h, Fl_Offscreen pixmap, int srcx, int srcy);
@@ -282,9 +272,6 @@ public:
virtual const char *font_name(int num) override;
/** Support for Fl::set_font() */
virtual void font_name(int num, const char *name) override;
- // Draws an Fl_Image scaled to width W & height H
- // TODO: we don't seem to need this until we introduce a scaling graphis driver
- // super: virtual int draw_scaled(Fl_Image *img, int X, int Y, int W, int H);
/** Support function for fl_overlay_rect() and scaled GUI.
Defaut implementation may be enough */
// super: virtual bool overlay_rect_unscaled();
@@ -358,7 +345,6 @@ public:
virtual int has_feature(driver_feature mask) { return mask & (NATIVE | PRINTER); }
void draw_unscaled(Fl_Pixmap *pxm, float s, int XP, int YP, int WP, int HP, int cx, int cy);
void draw_unscaled(Fl_Bitmap *bm, float s, int XP, int YP, int WP, int HP, int cx, int cy);
- int draw_scaled(Fl_Image *img, int XP, int YP, int WP, int HP);
#endif
diff --git a/src/drivers/Android/Fl_Android_Graphics_Driver.cxx b/src/drivers/Android/Fl_Android_Graphics_Driver.cxx
index d4cd77951..05af4bed6 100644
--- a/src/drivers/Android/Fl_Android_Graphics_Driver.cxx
+++ b/src/drivers/Android/Fl_Android_Graphics_Driver.cxx
@@ -962,31 +962,23 @@ void Fl_Android_Graphics_Driver::circle(double x, double y, double r)
}
-void Fl_Android_Graphics_Driver::draw(Fl_Pixmap * pxm, int XP, int YP, int WP, int HP, int cx, int cy)
+void Fl_Android_Graphics_Driver::draw_fixed(Fl_Pixmap * pxm, int X, int Y, int W, int H, int cx, int cy)
{
- int X, Y, W, H;
- if (Fl_Graphics_Driver::prepare(pxm, XP, YP, WP, HP, cx, cy, X, Y, W, H)) {
- return;
- }
if (*Fl_Graphics_Driver::id(pxm)) {
Fl_Android_565A_Map *cache = (Fl_Android_565A_Map*)*Fl_Graphics_Driver::id(pxm);
for (const auto &it: pClippingRegion.overlapping(Fl_Rect_Region(X, Y, W, H))) {
- draw(XP, YP, cache, it->clipped_rect());
+ draw(X-cx, Y-cy, cache, it->clipped_rect());
}
}
}
-void Fl_Android_Graphics_Driver::draw(Fl_Bitmap *bm, int XP, int YP, int WP, int HP, int cx, int cy)
+void Fl_Android_Graphics_Driver::draw_fixed(Fl_Bitmap *bm, int X, int Y, int W, int H, int cx, int cy)
{
- int X, Y, W, H;
- if (Fl_Graphics_Driver::prepare(bm, XP, YP, WP, HP, cx, cy, X, Y, W, H)) {
- return;
- }
if (*Fl_Graphics_Driver::id(bm)) {
Fl_Android_Bytemap *cache = (Fl_Android_Bytemap*)*Fl_Graphics_Driver::id(bm);
for (const auto &it: pClippingRegion.overlapping(Fl_Rect_Region(X, Y, W, H))) {
- draw(XP, YP, cache, it->clipped_rect());
+ draw(X-cx, Y-cy, cache, it->clipped_rect());
}
}
}
@@ -1050,68 +1042,65 @@ void Fl_Android_Graphics_Driver::uncache_pixmap(fl_uintptr_t p)
delete img;
}
-
-void Fl_Android_Graphics_Driver::draw(Fl_RGB_Image *img, int XP, int YP, int WP, int HP, int cx, int cy)
+fl_uintptr_t Fl_Android_Graphics_Driver::cache(Fl_RGB_Image *img)
{
- int X, Y, W, H;
- // Don't draw an empty image...
- if (!img->d() || !img->array) {
- Fl_Graphics_Driver::draw_empty(img, XP, YP);
- return;
- }
- if (start_image(img, XP, YP, WP, HP, cx, cy, X, Y, W, H)) {
- return;
- }
- Fl_Android_565A_Map *cgimg = (Fl_Android_565A_Map*)*Fl_Graphics_Driver::id(img);
- if (!cgimg) {
- int w = img->w(), h = img->h(), d = img->d(), stride = w*d + img->ld();
- cgimg = new Fl_Android_565A_Map(w, h);
- *Fl_Graphics_Driver::id(img) = (fl_uintptr_t)cgimg;
- if (d==1) { // grayscale
- for (int iy=0; iy<h; iy++) {
- const uchar *src = img->array + iy*stride;
- uint32_t *dst = cgimg->pWords + iy*cgimg->pStride;
- for (int ix=0; ix<w; ix++) {
- uchar l = *src++;
- uint32_t rgba = Fl_Android_565A_Map::toRGBA(l, l, l, 255);
- *dst++ = rgba;
- }
+ int w = img->data_w(), h = img->data_h(), d = img->d(), stride = w*d + img->ld();
+ Fl_Android_565A_Map *cgimg = new Fl_Android_565A_Map(w, h);
+ *Fl_Graphics_Driver::id(img) = (fl_uintptr_t)cgimg;
+ int *pw, *ph;
+ cache_w_h(img, pw, ph);
+ *pw = img->data_w();
+ *ph = img->data_h();
+ if (d==1) { // grayscale
+ for (int iy=0; iy<h; iy++) {
+ const uchar *src = img->array + iy*stride;
+ uint32_t *dst = cgimg->pWords + iy*cgimg->pStride;
+ for (int ix=0; ix<w; ix++) {
+ uchar l = *src++;
+ uint32_t rgba = Fl_Android_565A_Map::toRGBA(l, l, l, 255);
+ *dst++ = rgba;
}
- } else if (d==2) { // gray + alpha
- for (int iy=0; iy<h; iy++) {
- const uchar *src = img->array + iy*stride;
- uint32_t *dst = cgimg->pWords + iy*cgimg->pStride;
- for (int ix=0; ix<w; ix++) {
- uchar l = *src++, a = *src++;
- uint32_t rgba = Fl_Android_565A_Map::toRGBA(l, l, l, a);
- *dst++ = rgba;
- }
+ }
+ } else if (d==2) { // gray + alpha
+ for (int iy=0; iy<h; iy++) {
+ const uchar *src = img->array + iy*stride;
+ uint32_t *dst = cgimg->pWords + iy*cgimg->pStride;
+ for (int ix=0; ix<w; ix++) {
+ uchar l = *src++, a = *src++;
+ uint32_t rgba = Fl_Android_565A_Map::toRGBA(l, l, l, a);
+ *dst++ = rgba;
}
- } else if (d==3) { // rgb
- for (int iy=0; iy<h; iy++) {
- const uchar *src = img->array + iy*stride;
- uint32_t *dst = cgimg->pWords + iy*cgimg->pStride;
- for (int ix=0; ix<w; ix++) {
- uchar r = *src++, g = *src++, b = *src++;
- uint32_t rgba = Fl_Android_565A_Map::toRGBA(r, g, b, 255);
- *dst++ = rgba;
- }
+ }
+ } else if (d==3) { // rgb
+ for (int iy=0; iy<h; iy++) {
+ const uchar *src = img->array + iy*stride;
+ uint32_t *dst = cgimg->pWords + iy*cgimg->pStride;
+ for (int ix=0; ix<w; ix++) {
+ uchar r = *src++, g = *src++, b = *src++;
+ uint32_t rgba = Fl_Android_565A_Map::toRGBA(r, g, b, 255);
+ *dst++ = rgba;
}
- } else if (d==4) { // rgb + alpha
- for (int iy=0; iy<h; iy++) {
- const uchar *src = img->array + iy*stride;
- uint32_t *dst = cgimg->pWords + iy*cgimg->pStride;
- for (int ix=0; ix<w; ix++) {
- uchar r = *src++, g = *src++, b = *src++, a = *src++;
- uint32_t rgba = Fl_Android_565A_Map::toRGBA(r, g, b, a);
- *dst++ = rgba;
- }
+ }
+ } else if (d==4) { // rgb + alpha
+ for (int iy=0; iy<h; iy++) {
+ const uchar *src = img->array + iy*stride;
+ uint32_t *dst = cgimg->pWords + iy*cgimg->pStride;
+ for (int ix=0; ix<w; ix++) {
+ uchar r = *src++, g = *src++, b = *src++, a = *src++;
+ uint32_t rgba = Fl_Android_565A_Map::toRGBA(r, g, b, a);
+ *dst++ = rgba;
}
}
}
+ return (fl_uintptr_t)cgimg;
+}
+
+void Fl_Android_Graphics_Driver::draw_fixed(Fl_RGB_Image *img, int X, int Y, int W, int H, int cx, int cy)
+{
+ Fl_Android_565A_Map *cgimg = (Fl_Android_565A_Map*)*Fl_Graphics_Driver::id(img);
if (cgimg) {
for (const auto &it: pClippingRegion.overlapping(Fl_Rect_Region(X, Y, W, H))) {
- draw(XP, YP, cgimg, it->clipped_rect());
+ draw(X-cx, Y-cy, cgimg, it->clipped_rect());
}
}
}
@@ -1232,6 +1221,7 @@ void Fl_Android_Graphics_Driver::uncache(Fl_RGB_Image*, fl_uintptr_t &id_, fl_ui
{
Fl_Android_565A_Map *cgimg = (Fl_Android_565A_Map*)id_;
delete cgimg;
+ id_ = 0;
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-08 15:48:42 +0000