Complete driver-based implementation of Fl_Image_Surface.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11283 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

13 files changed, 452 insertions, 260 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b4a105db0..2dca3db10 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -181,6 +181,7 @@ if (USE_X11)
     drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.cxx
     drivers/Xlib/Fl_Translated_Xlib_Graphics_Driver.cxx
     drivers/Xlib/Fl_Xlib_Copy_Surface.cxx
+    drivers/Xlib/Fl_Xlib_Image_Surface.cxx
   )
   if (USE_XFT)
     set(DRIVER_FILES ${DRIVER_FILES}
@@ -197,6 +198,7 @@ if (USE_X11)
     drivers/X11/Fl_X11_Window_Driver.H
     drivers/Quartz/Fl_Quartz_Graphics_Driver.H
     drivers/Xlib/Fl_Xlib_Copy_Surface.H
+    drivers/Xlib/Fl_Xlib_Image_Surface.H
   )
 
 elseif (USE_SDL)
@@ -244,6 +246,7 @@ elseif (APPLE)
     drivers/Quartz/Fl_Quartz_Graphics_Driver_arci.cxx
     drivers/Quartz/Fl_Quartz_Graphics_Driver_line_style.cxx
     drivers/Quartz/Fl_Quartz_Copy_Surface.cxx
+    drivers/Quartz/Fl_Quartz_Image_Surface.cxx
     drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx
     drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx
     drivers/Darwin/Fl_Darwin_System_Driver.cxx
@@ -254,6 +257,7 @@ elseif (APPLE)
     drivers/Cocoa/Fl_Cocoa_Window_Driver.H
     drivers/Quartz/Fl_Quartz_Graphics_Driver.H
     drivers/Quartz/Fl_Quartz_Copy_Surface.H
+    drivers/Quartz/Fl_Quartz_Image_Surface.H
   )
 
 else ()
@@ -273,6 +277,7 @@ else ()
     drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx
     drivers/GDI/Fl_GDI_Graphics_Driver_vertex.cxx
     drivers/GDI/Fl_GDI_Copy_Surface.cxx
+    drivers/GDI/Fl_GDI_Image_Surface.cxx
   )
   set(DRIVER_HEADER_FILES
     drivers/WinAPI/Fl_WinAPI_System_Driver.H
@@ -280,6 +285,7 @@ else ()
     drivers/WinAPI/Fl_WinAPI_Window_Driver.H
     drivers/GDI/Fl_GDI_Graphics_Driver.H
     drivers/GDI/Fl_GDI_Copy_Surface.H
+    drivers/GDI/Fl_GDI_Image_Surface.H
   )
 
 endif (USE_X11)
diff --git a/src/Fl_Copy_Surface.cxx b/src/Fl_Copy_Surface.cxx
index 87b294585..475ee902e 100644
--- a/src/Fl_Copy_Surface.cxx
+++ b/src/Fl_Copy_Surface.cxx
@@ -19,13 +19,14 @@
 #include "config_lib.h"
 #include <FL/Fl_Copy_Surface.H>
 
-#if !defined(FL_DOXYGEN)
-#ifdef __APPLE__
+#ifdef FL_CFG_GFX_QUARTZ
 #include <src/drivers/Quartz/Fl_Quartz_Copy_Surface.H>
 
-#elif defined(WIN32)
+#elif defined(FL_CFG_GFX_GDI)
 #include <src/drivers/GDI/Fl_GDI_Copy_Surface.H>
 
+#elif defined(USE_SDL)
+
 #elif defined(FL_PORTING)
 # pragma message "FL_PORTING: implement class Fl_Copy_Surface::Helper for your platform"
 
@@ -44,11 +45,10 @@ private:
   int printable_rect(int *w, int *h) {*w = width; *h = height; return 0;}
 };
 
-#else
+#elif defined(FL_CFG_GFX_XLIB)
 #include <src/drivers/Xlib/Fl_Xlib_Copy_Surface.H>
 
 #endif
-#endif // !FL_DOXYGEN
 
 /** the constructor */
 Fl_Copy_Surface::Fl_Copy_Surface(int w, int h) : Fl_Widget_Surface(NULL) {
diff --git a/src/Fl_Image_Surface.cxx b/src/Fl_Image_Surface.cxx
index f47975a4d..3548d40a1 100644
--- a/src/Fl_Image_Surface.cxx
+++ b/src/Fl_Image_Surface.cxx
@@ -17,185 +17,14 @@
 //
 
 #include <FL/Fl_Image_Surface.H>
-#include <FL/fl_draw.H>
-
 #include "config_lib.h"
 
 
-#if defined(__APPLE__)
 #ifdef FL_CFG_GFX_QUARTZ
-#include "drivers/Quartz/Fl_Quartz_Graphics_Driver.H"
-#endif
-
-#include <ApplicationServices/ApplicationServices.h>
-
-class Fl_Image_Surface::Helper : public Fl_Widget_Surface {
-  friend class Fl_Image_Surface;
-public:
-  Fl_Offscreen offscreen;
-  Fl_Surface_Device *previous;
-  Window pre_window;
-  int was_high;
-  int width;
-  int height;
-  Helper(int w, int h, int high_res);
-  ~Helper();
-  void set_current();
-  void translate(int x, int y);
-  void untranslate();
-  int printable_rect(int *w, int *h) {*w = width; *h = height; return 0;}
-  Fl_RGB_Image *image();
-  void end_current();
-};
+#include <src/drivers/Quartz/Fl_Quartz_Image_Surface.H>
 
-Fl_Image_Surface::Helper::Helper(int w, int h, int high_res) : Fl_Widget_Surface(NULL), width(w), height(h) {
-  previous = 0;
-  int W = high_res ? 2*w : w;
-  int H = high_res ? 2*h : h;
-  CGColorSpaceRef lut = CGColorSpaceCreateDeviceRGB();
-  offscreen = CGBitmapContextCreate(calloc(W*H,4), W, H, 8, W*4, lut, kCGImageAlphaPremultipliedLast);
-  CGColorSpaceRelease(lut);
-  driver(new Fl_Quartz_Graphics_Driver);
-  CGContextTranslateCTM(offscreen, -0.5, 0.5); // as when drawing to a window
-  if (high_res) {
-    CGContextScaleCTM(offscreen, 2, 2);
-  }
-  CGContextSetShouldAntialias(offscreen, false);
-  CGContextSaveGState(offscreen);
-  CGContextTranslateCTM(offscreen, 0, height);
-  CGContextScaleCTM(offscreen, 1.0f, -1.0f);
-  CGContextSetRGBFillColor(offscreen, 1, 1, 1, 0);
-  CGContextFillRect(offscreen, CGRectMake(0,0,w,h));
-}
-
-Fl_Image_Surface::Helper::~Helper() {
-  if (offscreen) {
-    void *data = CGBitmapContextGetData((CGContextRef)offscreen);
-    free(data);
-    CGContextRelease((CGContextRef)offscreen);
-  }
-}
-
-void Fl_Image_Surface::Helper::set_current() {
-  pre_window = fl_window;
-  if (!previous) previous = Fl_Surface_Device::surface();
-  driver()->gc(offscreen);
-  fl_window = 0;
-  Fl_Surface_Device::set_current();
-  was_high = Fl_Display_Device::high_resolution();
-  Fl_X::set_high_resolution( CGBitmapContextGetWidth(offscreen) > width );
-}
-
-void Fl_Image_Surface::Helper::translate(int x, int y) {
-  CGContextRef gc = (CGContextRef)driver()->gc();
-  CGContextRestoreGState(gc);
-  CGContextSaveGState(gc);
-  CGContextTranslateCTM(gc, x, -y);
-  CGContextSaveGState(gc);
-  CGContextTranslateCTM(gc, 0, height);
-  CGContextScaleCTM(gc, 1.0f, -1.0f);
-}
-
-void Fl_Image_Surface::Helper::untranslate() {
-  CGContextRestoreGState((CGContextRef)driver()->gc());
-}
-
-Fl_RGB_Image* Fl_Image_Surface::Helper::image()
-{
-  unsigned char *data;
-  int W = width, H = height;
-  CGContextFlush(offscreen);
-  W = CGBitmapContextGetWidth(offscreen);
-  H = CGBitmapContextGetHeight(offscreen);
-  data = fl_read_image(NULL, 0, 0, W, H, 0);
-  Fl_RGB_Image *image = new Fl_RGB_Image(data, W, H);
-  image->alloc_array = 1;
-  return image;
-}
-
-void Fl_Image_Surface::Helper::end_current()
-{
-  Fl_X::set_high_resolution(was_high);
-  previous->Fl_Surface_Device::set_current();
-  fl_window = pre_window;
-}
-
-#elif defined(WIN32)
-#ifdef FL_CFG_GFX_GDI
-#include "drivers/GDI/Fl_GDI_Graphics_Driver.H"
-#endif
-
-class Fl_Image_Surface::Helper : public Fl_Widget_Surface {
-  friend class Fl_Image_Surface;
-public:
-  Fl_Offscreen offscreen;
-  int width;
-  int height;
-  Fl_Surface_Device *previous;
-  Window pre_window;
-  HDC _sgc;
-  int _savedc;
-  Helper(int w, int h, int high_res);
-  ~Helper();
-  void set_current();
-  void translate(int x, int y);
-  void untranslate();
-  Fl_RGB_Image *image();
-  void end_current();
-  int printable_rect(int *w, int *h) {*w = width; *h = height; return 0;}
-};
-
-Fl_Image_Surface::Helper::Helper(int w, int h, int high_res) : Fl_Widget_Surface(NULL), width(w), height(h) {
-  previous = 0;
-  offscreen = CreateCompatibleBitmap( (fl_graphics_driver->gc() ? (HDC)fl_graphics_driver->gc() : fl_GetDC(0) ) , w, h);
-  driver(new Fl_Translated_GDI_Graphics_Driver);
-  _sgc = NULL;
-}
-
-Fl_Image_Surface::Helper::~Helper() {
-  if (offscreen) DeleteObject(offscreen);
-}
-
-void Fl_Image_Surface::Helper::set_current() {
-  pre_window = fl_window;
-  if (!previous) previous = Fl_Surface_Device::surface();
-  if (!_sgc) _sgc = (HDC)previous->driver()->gc();
-  HDC gc = fl_makeDC(offscreen);
-  Fl_Surface_Device::set_current();
-  driver()->gc(gc);
-  _savedc = SaveDC(gc);
-  fl_window=(HWND)offscreen;
-  fl_push_no_clip();
-}
-
-void Fl_Image_Surface::Helper::translate(int x, int y) {
-  ((Fl_Translated_GDI_Graphics_Driver*)driver())->translate_all(x, y);
-}
-
-void Fl_Image_Surface::Helper::untranslate() {
-  ((Fl_Translated_GDI_Graphics_Driver*)driver())->untranslate_all();
-}
-
-Fl_RGB_Image* Fl_Image_Surface::Helper::image()
-{
-  unsigned char *data;
-  data = fl_read_image(NULL, 0, 0, width, height, 0);
-  end_current();
-  previous->driver()->gc(_sgc);
-  Fl_RGB_Image *image = new Fl_RGB_Image(data, width, height);
-  image->alloc_array = 1;
-  return image;
-}
-
-void Fl_Image_Surface::Helper::end_current()
-{
-  HDC gc = (HDC)driver()->gc();
-  RestoreDC(gc, _savedc);
-  DeleteDC(gc);
-  fl_pop_clip();
-  previous->Fl_Surface_Device::set_current();
-  fl_window = pre_window;
-}
+#elif defined(FL_CFG_GFX_GDI)
+#include <src/drivers/GDI/Fl_GDI_Image_Surface.H>
 
 #elif defined(USE_SDL)
 
@@ -219,86 +48,8 @@ public:
   int printable_rect(int *w, int *h) {*w = width; *h = height; return 0;}
 };
 
-
-#else
-
-#ifdef FL_CFG_GFX_XLIB
-#include "drivers/Xlib/Fl_Translated_Xlib_Graphics_Driver.H"
-#endif
-
-class Fl_Image_Surface::Helper : public Fl_Widget_Surface {
-public:
-  Fl_Offscreen offscreen;
-  Fl_Surface_Device *previous;
-  Window pre_window;
-  int was_high;
-  int width;
-  int height;
-  Helper(int w, int h, int high_res);
-  Helper(Fl_Offscreen pixmap, int w, int h);
-  ~Helper();
-  void set_current();
-  void translate(int x, int y);
-  void untranslate();
-  int printable_rect(int *w, int *h) {*w = width; *h = height; return 0;}
-  Fl_RGB_Image *image();
-  void end_current();
-  public:
-};
-
-Fl_Image_Surface::Helper::Helper(int w, int h, int high_res) : Fl_Widget_Surface(NULL) {
-  width = w;
-  height = h;
-  previous = 0;
-  offscreen = XCreatePixmap(fl_display, RootWindow(fl_display, fl_screen), w, h, fl_visual->depth);
-  driver(new Fl_Translated_Xlib_Graphics_Driver());
-}
-
-Fl_Image_Surface::Helper::Helper(Fl_Offscreen pixmap, int w, int h) : Fl_Widget_Surface(NULL) {
-  width = w;
-  height = h;
-  previous = 0;
-  offscreen = pixmap;
-  driver(new Fl_Translated_Xlib_Graphics_Driver());
-}
-
-Fl_Image_Surface::Helper::~Helper() {
-  if (offscreen) XFreePixmap(fl_display, offscreen);
-}
-
-void Fl_Image_Surface::Helper::set_current() {
-  pre_window = fl_window;
-  if (!previous) previous = Fl_Surface_Device::surface();
-  fl_window = offscreen;
-  Fl_Surface_Device::set_current();
-  fl_push_no_clip();
-}
-
-void Fl_Image_Surface::Helper::translate(int x, int y) {
-  ((Fl_Translated_Xlib_Graphics_Driver*)driver())->translate_all(x, y);
-}
-
-void Fl_Image_Surface::Helper::untranslate() {
-  ((Fl_Translated_Xlib_Graphics_Driver*)driver())->untranslate_all();
-}
-
-Fl_RGB_Image* Fl_Image_Surface::Helper::image()
-{
-  unsigned char *data;
-  data = fl_read_image(NULL, 0, 0, width, height, 0);
-  end_current();
-  Fl_RGB_Image *image = new Fl_RGB_Image(data, width, height);
-  image->alloc_array = 1;
-  return image;
-}
-
-void Fl_Image_Surface::Helper::end_current()
-{
-  fl_pop_clip();
-  previous->Fl_Surface_Device::set_current();
-  fl_window = pre_window;
-}
-
+#elif defined(FL_CFG_GFX_XLIB)
+#include <src/drivers/Xlib/Fl_Xlib_Image_Surface.H>
 
 #endif
 
diff --git a/src/Makefile b/src/Makefile
index f1cccd2c1..3f1f317b0 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -234,6 +234,7 @@ QUARTZCPPFILES = \
 	drivers/Quartz/Fl_Quartz_Graphics_Driver_arci.cxx \
 	drivers/Quartz/Fl_Quartz_Graphics_Driver_line_style.cxx \
         drivers/Quartz/Fl_Quartz_Copy_Surface.cxx \
+        drivers/Quartz/Fl_Quartz_Image_Surface.cxx \
 	drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx \
 	drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx \
 	drivers/Darwin/Fl_Darwin_System_Driver.cxx
@@ -248,6 +249,7 @@ XLIBCPPFILES = \
 	drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.cxx \
 	drivers/Xlib/Fl_Translated_Xlib_Graphics_Driver.cxx \
         drivers/Xlib/Fl_Xlib_Copy_Surface.cxx \
+        drivers/Xlib/Fl_Xlib_Image_Surface.cxx \
 	drivers/X11/Fl_X11_Window_Driver.cxx \
 	drivers/X11/Fl_X11_Screen_Driver.cxx \
 	drivers/Posix/Fl_Posix_System_Driver.cxx
@@ -268,6 +270,7 @@ GDICPPFILES = \
 	drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx \
 	drivers/GDI/Fl_GDI_Graphics_Driver_vertex.cxx \
         drivers/GDI/Fl_GDI_Copy_Surface.cxx \
+        drivers/GDI/Fl_GDI_Image_Surface.cxx \
 	drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx \
 	drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx \
 	drivers/WinAPI/Fl_WinAPI_System_Driver.cxx
diff --git a/src/drivers/GDI/Fl_GDI_Copy_Surface.cxx b/src/drivers/GDI/Fl_GDI_Copy_Surface.cxx
index 77203da73..f8d13d747 100644
--- a/src/drivers/GDI/Fl_GDI_Copy_Surface.cxx
+++ b/src/drivers/GDI/Fl_GDI_Copy_Surface.cxx
@@ -16,6 +16,10 @@
 //     http://www.fltk.org/str.php
 //
 
+#include <src/config_lib.h>
+
+
+#ifdef FL_CFG_GFX_GDI
 #include "Fl_GDI_Copy_Surface.H"
 
 Fl_Copy_Surface::Helper::Helper(int w, int h) : Fl_Widget_Surface(NULL), width(w), height(h) {
@@ -67,6 +71,7 @@ void Fl_Copy_Surface::Helper::translate(int x, int y) {
 void Fl_Copy_Surface::Helper::untranslate() {
   ((Fl_Translated_GDI_Graphics_Driver*)driver())->untranslate_all();
 }
+#endif // FL_CFG_GFX_GDI
 
 //
 // End of "$Id: Fl_Copy_Surface.H 11220 2016-02-26 12:51:47Z manolo $".
diff --git a/src/drivers/GDI/Fl_GDI_Image_Surface.H b/src/drivers/GDI/Fl_GDI_Image_Surface.H
new file mode 100644
index 000000000..4fed1b40a
--- /dev/null
+++ b/src/drivers/GDI/Fl_GDI_Image_Surface.H
@@ -0,0 +1,48 @@
+//
+// "$Id: Fl_GDI_Image_Surface.H 11241 2016-02-27 13:52:27Z manolo $"
+//
+// Draw-to-image code for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2016 by Bill Spitzak and others.
+//
+// This library is free software. Distribution and use rights are outlined in
+// the file "COPYING" which should have been included with this file.  If this
+// file is missing or damaged, see the license at:
+//
+//     http://www.fltk.org/COPYING.php
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+#if !defined(FL_GDI_IMAGE_SURFACE_H) && !defined(FL_DOXYGEN)
+#define FL_GDI_IMAGE_SURFACE_H 1
+
+#include <FL/Fl_Image_Surface.H>
+
+class Fl_Image_Surface::Helper : public Fl_Widget_Surface {
+  friend class Fl_Image_Surface;
+public:
+  Fl_Offscreen offscreen;
+  int width;
+  int height;
+  Fl_Surface_Device *previous;
+  Window pre_window;
+  HDC _sgc;
+  int _savedc;
+  Helper(int w, int h, int high_res);
+  ~Helper();
+  void set_current();
+  void translate(int x, int y);
+  void untranslate();
+  Fl_RGB_Image *image();
+  void end_current();
+  int printable_rect(int *w, int *h) {*w = width; *h = height; return 0;}
+};
+
+#endif // FL_GDI_IMAGE_SURFACE_H
+
+//
+// End of "$Id: Fl_GDI_Image_Surface.H 11220 2016-02-26 12:51:47Z manolo $".
+//
diff --git a/src/drivers/GDI/Fl_GDI_Image_Surface.cxx b/src/drivers/GDI/Fl_GDI_Image_Surface.cxx
new file mode 100644
index 000000000..f0ef17c69
--- /dev/null
+++ b/src/drivers/GDI/Fl_GDI_Image_Surface.cxx
@@ -0,0 +1,85 @@
+//
+// "$Id: Fl_GDI_Image_Surface.cxx 11278 2016-03-03 19:16:22Z manolo $"
+//
+// Draw-to-image code for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2016 by Bill Spitzak and others.
+//
+// This library is free software. Distribution and use rights are outlined in
+// the file "COPYING" which should have been included with this file.  If this
+// file is missing or damaged, see the license at:
+//
+//     http://www.fltk.org/COPYING.php
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+#include <FL/fl_draw.H>
+
+#include <src/config_lib.h>
+
+
+#ifdef FL_CFG_GFX_GDI
+#include "Fl_GDI_Graphics_Driver.H"
+#include "Fl_GDI_Image_Surface.H"
+
+
+Fl_Image_Surface::Helper::Helper(int w, int h, int high_res) : Fl_Widget_Surface(NULL), width(w), height(h) {
+  previous = 0;
+  offscreen = CreateCompatibleBitmap( (fl_graphics_driver->gc() ? (HDC)fl_graphics_driver->gc() : fl_GetDC(0) ) , w, h);
+  driver(new Fl_Translated_GDI_Graphics_Driver);
+  _sgc = NULL;
+}
+
+Fl_Image_Surface::Helper::~Helper() {
+  if (offscreen) DeleteObject(offscreen);
+}
+
+void Fl_Image_Surface::Helper::set_current() {
+  pre_window = fl_window;
+  if (!previous) previous = Fl_Surface_Device::surface();
+  if (!_sgc) _sgc = (HDC)previous->driver()->gc();
+  HDC gc = fl_makeDC(offscreen);
+  Fl_Surface_Device::set_current();
+  driver()->gc(gc);
+  _savedc = SaveDC(gc);
+  fl_window=(HWND)offscreen;
+  fl_push_no_clip();
+}
+
+void Fl_Image_Surface::Helper::translate(int x, int y) {
+  ((Fl_Translated_GDI_Graphics_Driver*)driver())->translate_all(x, y);
+}
+
+void Fl_Image_Surface::Helper::untranslate() {
+  ((Fl_Translated_GDI_Graphics_Driver*)driver())->untranslate_all();
+}
+
+Fl_RGB_Image* Fl_Image_Surface::Helper::image()
+{
+  unsigned char *data;
+  data = fl_read_image(NULL, 0, 0, width, height, 0);
+  end_current();
+  previous->driver()->gc(_sgc);
+  Fl_RGB_Image *image = new Fl_RGB_Image(data, width, height);
+  image->alloc_array = 1;
+  return image;
+}
+
+void Fl_Image_Surface::Helper::end_current()
+{
+  HDC gc = (HDC)driver()->gc();
+  RestoreDC(gc, _savedc);
+  DeleteDC(gc);
+  fl_pop_clip();
+  previous->Fl_Surface_Device::set_current();
+  fl_window = pre_window;
+}
+
+#endif // FL_CFG_GFX_GDI
+
+//
+// End of "$Id: Fl_GDI_Image_Surface.cxx 11220 2016-02-26 12:51:47Z manolo $".
+//
diff --git a/src/drivers/Quartz/Fl_Quartz_Copy_Surface.cxx b/src/drivers/Quartz/Fl_Quartz_Copy_Surface.cxx
index 9c767d9b9..e138f3c4d 100644
--- a/src/drivers/Quartz/Fl_Quartz_Copy_Surface.cxx
+++ b/src/drivers/Quartz/Fl_Quartz_Copy_Surface.cxx
@@ -21,7 +21,6 @@
 #ifdef FL_CFG_GFX_QUARTZ
 #include "Fl_Quartz_Copy_Surface.H"
 #include "Fl_Quartz_Graphics_Driver.H"
-#endif
 
 Fl_Copy_Surface::Helper::Helper(int w, int h) : Fl_Widget_Surface(NULL), width(w), height(h) {
   driver(new Fl_Quartz_Graphics_Driver);
@@ -86,6 +85,8 @@ void Fl_Copy_Surface::Helper::untranslate() {
   CGContextRestoreGState(gc);
 }
 
+#endif // FL_CFG_GFX_QUARTZ
+
 //
 // End of "$Id: Fl_Copy_Surface.H 11220 2016-02-26 12:51:47Z manolo $".
 //
diff --git a/src/drivers/Quartz/Fl_Quartz_Image_Surface.H b/src/drivers/Quartz/Fl_Quartz_Image_Surface.H
new file mode 100644
index 000000000..8e9fc9cf2
--- /dev/null
+++ b/src/drivers/Quartz/Fl_Quartz_Image_Surface.H
@@ -0,0 +1,47 @@
+//
+// "$Id: Fl_Quartz_Image_Surface.H 11241 2016-02-27 13:52:27Z manolo $"
+//
+// Draw-to-image code for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2016 by Bill Spitzak and others.
+//
+// This library is free software. Distribution and use rights are outlined in
+// the file "COPYING" which should have been included with this file.  If this
+// file is missing or damaged, see the license at:
+//
+//     http://www.fltk.org/COPYING.php
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+#if !defined(FL_QUARTZ_IMAGE_SURFACE_H) && !defined(FL_DOXYGEN)
+#define FL_QUARTZ_IMAGE_SURFACE_H 1
+
+#include <FL/Fl_Image_Surface.H>
+
+class Fl_Image_Surface::Helper : public Fl_Widget_Surface {
+  friend class Fl_Image_Surface;
+public:
+  Fl_Offscreen offscreen;
+  Fl_Surface_Device *previous;
+  Window pre_window;
+  int was_high;
+  int width;
+  int height;
+  Helper(int w, int h, int high_res);
+  ~Helper();
+  void set_current();
+  void translate(int x, int y);
+  void untranslate();
+  int printable_rect(int *w, int *h) {*w = width; *h = height; return 0;}
+  Fl_RGB_Image *image();
+  void end_current();
+};
+
+#endif // FL_QUARTZ_IMAGE_SURFACE_H
+
+//
+// End of "$Id: Fl_Quartz_Image_Surface.H 11220 2016-02-26 12:51:47Z manolo $".
+//
diff --git a/src/drivers/Quartz/Fl_Quartz_Image_Surface.cxx b/src/drivers/Quartz/Fl_Quartz_Image_Surface.cxx
new file mode 100644
index 000000000..0349207fe
--- /dev/null
+++ b/src/drivers/Quartz/Fl_Quartz_Image_Surface.cxx
@@ -0,0 +1,107 @@
+//
+// "$Id: Fl_Quartz_Image_Surface.cxx 11278 2016-03-03 19:16:22Z manolo $"
+//
+// Draw-to-image code for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2016 by Bill Spitzak and others.
+//
+// This library is free software. Distribution and use rights are outlined in
+// the file "COPYING" which should have been included with this file.  If this
+// file is missing or damaged, see the license at:
+//
+//     http://www.fltk.org/COPYING.php
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+#include <FL/fl_draw.H>
+
+#include "config_lib.h"
+
+
+#ifdef FL_CFG_GFX_QUARTZ
+#include "Fl_Quartz_Graphics_Driver.H"
+#include "Fl_Quartz_Image_Surface.H"
+
+#include <ApplicationServices/ApplicationServices.h>
+
+
+Fl_Image_Surface::Helper::Helper(int w, int h, int high_res) : Fl_Widget_Surface(NULL), width(w), height(h) {
+  previous = 0;
+  int W = high_res ? 2*w : w;
+  int H = high_res ? 2*h : h;
+  CGColorSpaceRef lut = CGColorSpaceCreateDeviceRGB();
+  offscreen = CGBitmapContextCreate(calloc(W*H,4), W, H, 8, W*4, lut, kCGImageAlphaPremultipliedLast);
+  CGColorSpaceRelease(lut);
+  driver(new Fl_Quartz_Graphics_Driver);
+  CGContextTranslateCTM(offscreen, -0.5, 0.5); // as when drawing to a window
+  if (high_res) {
+    CGContextScaleCTM(offscreen, 2, 2);
+  }
+  CGContextSetShouldAntialias(offscreen, false);
+  CGContextSaveGState(offscreen);
+  CGContextTranslateCTM(offscreen, 0, height);
+  CGContextScaleCTM(offscreen, 1.0f, -1.0f);
+  CGContextSetRGBFillColor(offscreen, 1, 1, 1, 0);
+  CGContextFillRect(offscreen, CGRectMake(0,0,w,h));
+}
+
+Fl_Image_Surface::Helper::~Helper() {
+  if (offscreen) {
+    void *data = CGBitmapContextGetData((CGContextRef)offscreen);
+    free(data);
+    CGContextRelease((CGContextRef)offscreen);
+  }
+}
+
+void Fl_Image_Surface::Helper::set_current() {
+  pre_window = fl_window;
+  if (!previous) previous = Fl_Surface_Device::surface();
+  driver()->gc(offscreen);
+  fl_window = 0;
+  Fl_Surface_Device::set_current();
+  was_high = Fl_Display_Device::high_resolution();
+  Fl_X::set_high_resolution( CGBitmapContextGetWidth(offscreen) > width );
+}
+
+void Fl_Image_Surface::Helper::translate(int x, int y) {
+  CGContextRef gc = (CGContextRef)driver()->gc();
+  CGContextRestoreGState(gc);
+  CGContextSaveGState(gc);
+  CGContextTranslateCTM(gc, x, -y);
+  CGContextSaveGState(gc);
+  CGContextTranslateCTM(gc, 0, height);
+  CGContextScaleCTM(gc, 1.0f, -1.0f);
+}
+
+void Fl_Image_Surface::Helper::untranslate() {
+  CGContextRestoreGState((CGContextRef)driver()->gc());
+}
+
+Fl_RGB_Image* Fl_Image_Surface::Helper::image()
+{
+  unsigned char *data;
+  int W = width, H = height;
+  CGContextFlush(offscreen);
+  W = CGBitmapContextGetWidth(offscreen);
+  H = CGBitmapContextGetHeight(offscreen);
+  data = fl_read_image(NULL, 0, 0, W, H, 0);
+  Fl_RGB_Image *image = new Fl_RGB_Image(data, W, H);
+  image->alloc_array = 1;
+  return image;
+}
+
+void Fl_Image_Surface::Helper::end_current()
+{
+  Fl_X::set_high_resolution(was_high);
+  previous->Fl_Surface_Device::set_current();
+  fl_window = pre_window;
+}
+
+#endif // FL_CFG_GFX_QUARTZ
+
+//
+// End of "$Id: Fl_Quartz_Image_Surface.cxx 11220 2016-02-26 12:51:47Z manolo $".
+//
diff --git a/src/drivers/Xlib/Fl_Xlib_Copy_Surface.cxx b/src/drivers/Xlib/Fl_Xlib_Copy_Surface.cxx
index 862a9939c..bb54fd453 100644
--- a/src/drivers/Xlib/Fl_Xlib_Copy_Surface.cxx
+++ b/src/drivers/Xlib/Fl_Xlib_Copy_Surface.cxx
@@ -16,6 +16,9 @@
 //     http://www.fltk.org/str.php
 //
 
+#include "config_lib.h"
+
+#ifdef FL_CFG_GFX_XLIB
 #include "Fl_Xlib_Copy_Surface.H"
 #include <FL/Fl.H>
 #include <FL/fl_draw.H>
@@ -58,6 +61,8 @@ void Fl_Copy_Surface::Helper::untranslate() {
   ((Fl_Translated_Xlib_Graphics_Driver*)driver())->untranslate_all();
 }
 
+#endif // FL_CFG_GFX_XLIB
+
 //
 // End of "$Id: Fl_Copy_Surface.H 11220 2016-02-26 12:51:47Z manolo $".
 //
diff --git a/src/drivers/Xlib/Fl_Xlib_Image_Surface.H b/src/drivers/Xlib/Fl_Xlib_Image_Surface.H
new file mode 100644
index 000000000..458424ccc
--- /dev/null
+++ b/src/drivers/Xlib/Fl_Xlib_Image_Surface.H
@@ -0,0 +1,48 @@
+//
+// "$Id: Fl_Xlib_Image_Surface.H 11241 2016-02-27 13:52:27Z manolo $"
+//
+// Draw-to-image code for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2016 by Bill Spitzak and others.
+//
+// This library is free software. Distribution and use rights are outlined in
+// the file "COPYING" which should have been included with this file.  If this
+// file is missing or damaged, see the license at:
+//
+//     http://www.fltk.org/COPYING.php
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+#if !defined(FL_XLIB_IMAGE_SURFACE_H) && !defined(FL_DOXYGEN)
+#define FL_XLIB_IMAGE_SURFACE_H 1
+
+#include <FL/Fl_Image_Surface.H>
+
+class Fl_Image_Surface::Helper : public Fl_Widget_Surface {
+  friend class Fl_Image_Surface;
+public:
+  Fl_Offscreen offscreen;
+  Fl_Surface_Device *previous;
+  Window pre_window;
+  //?int was_high;
+  int width;
+  int height;
+  Helper(int w, int h, int high_res);
+  Helper(Fl_Offscreen pixmap, int w, int h);
+  ~Helper();
+  void set_current();
+  void translate(int x, int y);
+  void untranslate();
+  int printable_rect(int *w, int *h) {*w = width; *h = height; return 0;}
+  Fl_RGB_Image *image();
+  void end_current();
+};
+
+#endif // FL_XLIB_IMAGE_SURFACE_H
+
+//
+// End of "$Id: Fl_Xlib_Image_Surface.H 11220 2016-02-26 12:51:47Z manolo $".
+//
diff --git a/src/drivers/Xlib/Fl_Xlib_Image_Surface.cxx b/src/drivers/Xlib/Fl_Xlib_Image_Surface.cxx
new file mode 100644
index 000000000..062447f3e
--- /dev/null
+++ b/src/drivers/Xlib/Fl_Xlib_Image_Surface.cxx
@@ -0,0 +1,86 @@
+//
+// "$Id: Fl_Xlib_Image_Surface.cxx 11278 2016-03-03 19:16:22Z manolo $"
+//
+// Draw-to-image code for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2016 by Bill Spitzak and others.
+//
+// This library is free software. Distribution and use rights are outlined in
+// the file "COPYING" which should have been included with this file.  If this
+// file is missing or damaged, see the license at:
+//
+//     http://www.fltk.org/COPYING.php
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+#include <FL/fl_draw.H>
+
+#include "config_lib.h"
+
+
+#ifdef FL_CFG_GFX_XLIB
+#include "Fl_Xlib_Graphics_Driver.H"
+#include "Fl_Xlib_Image_Surface.H"
+#include "Fl_Translated_Xlib_Graphics_Driver.H"
+
+Fl_Image_Surface::Helper::Helper(int w, int h, int high_res) : Fl_Widget_Surface(NULL) {
+  width = w;
+  height = h;
+  previous = 0;
+  offscreen = XCreatePixmap(fl_display, RootWindow(fl_display, fl_screen), w, h, fl_visual->depth);
+  driver(new Fl_Translated_Xlib_Graphics_Driver());
+}
+
+Fl_Image_Surface::Helper::Helper(Fl_Offscreen pixmap, int w, int h) : Fl_Widget_Surface(NULL) {
+  width = w;
+  height = h;
+  previous = 0;
+  offscreen = pixmap;
+  driver(new Fl_Translated_Xlib_Graphics_Driver());
+}
+
+Fl_Image_Surface::Helper::~Helper() {
+  if (offscreen) XFreePixmap(fl_display, offscreen);
+}
+
+void Fl_Image_Surface::Helper::set_current() {
+  pre_window = fl_window;
+  if (!previous) previous = Fl_Surface_Device::surface();
+  fl_window = offscreen;
+  Fl_Surface_Device::set_current();
+  fl_push_no_clip();
+}
+
+void Fl_Image_Surface::Helper::translate(int x, int y) {
+  ((Fl_Translated_Xlib_Graphics_Driver*)driver())->translate_all(x, y);
+}
+
+void Fl_Image_Surface::Helper::untranslate() {
+  ((Fl_Translated_Xlib_Graphics_Driver*)driver())->untranslate_all();
+}
+
+Fl_RGB_Image* Fl_Image_Surface::Helper::image()
+{
+  unsigned char *data;
+  data = fl_read_image(NULL, 0, 0, width, height, 0);
+  end_current();
+  Fl_RGB_Image *image = new Fl_RGB_Image(data, width, height);
+  image->alloc_array = 1;
+  return image;
+}
+
+void Fl_Image_Surface::Helper::end_current()
+{
+  fl_pop_clip();
+  previous->Fl_Surface_Device::set_current();
+  fl_window = pre_window;
+}
+
+#endif // FL_CFG_GFX_XLIB
+
+//
+// End of "$Id: Fl_Xlib_Image_Surface.cxx 11220 2016-02-26 12:51:47Z manolo $".
+//