(hopefully) Final driver-based rewriting of the Fl_Image_Surface class.

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

2 files changed, 32 insertions, 22 deletions

diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx
index d466153cc..4e89df5bd 100644
--- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx
+++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx
@@ -720,7 +720,7 @@ void Fl_Xlib_Graphics_Driver::draw(Fl_RGB_Image *img, int XP, int YP, int WP, in
       surface = new Fl_Image_Surface(img->w(), img->h());
     } else if (depth == 4 && fl_can_do_alpha_blending()) {
       Fl_Offscreen pixmap = XCreatePixmap(fl_display, RootWindow(fl_display, fl_screen), img->w(), img->h(), 32);
-      surface = new Fl_Image_Surface(pixmap, img->w(), img->h());
+      surface = new Fl_Image_Surface(img->w(), img->h(), 0, pixmap);
       depth |= FL_IMAGE_WITH_ALPHA;
     }
     if (surface) {
diff --git a/src/drivers/Xlib/Fl_Xlib_Image_Surface.cxx b/src/drivers/Xlib/Fl_Xlib_Image_Surface.cxx
index 2f04259b1..0367a34f0 100644
--- a/src/drivers/Xlib/Fl_Xlib_Image_Surface.cxx
+++ b/src/drivers/Xlib/Fl_Xlib_Image_Surface.cxx
@@ -20,34 +20,45 @@
 
 #include "../../config_lib.h"
 
-
 #ifdef FL_CFG_GFX_XLIB
 #include "Fl_Xlib_Graphics_Driver.H"
-#include "Fl_Xlib_Image_Surface.H"
+#include <FL/Fl_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;
-  fl_open_display();
-  offscreen = XCreatePixmap(fl_display, RootWindow(fl_display, fl_screen), w, h, fl_visual->depth);
-  driver(new Fl_Translated_Xlib_Graphics_Driver());
+class Fl_Xlib_Image_Surface_Driver : public Fl_Image_Surface_Driver {
+  friend class Fl_Image_Surface;
+public:
+  Fl_Surface_Device *previous;
+  Window pre_window;
+  int was_high;
+  Fl_Xlib_Image_Surface_Driver(int w, int h, int high_res, Fl_Offscreen off);
+  ~Fl_Xlib_Image_Surface_Driver();
+  void set_current();
+  void translate(int x, int y);
+  void untranslate();
+  Fl_RGB_Image *image();
+  void end_current();
+};
+
+Fl_Image_Surface_Driver *Fl_Image_Surface_Driver::newImageSurfaceDriver(int w, int h, int high_res, Fl_Offscreen off)
+{
+  return new Fl_Xlib_Image_Surface_Driver(w, h, high_res, off);
 }
 
-Fl_Image_Surface::Helper::Helper(Fl_Offscreen pixmap, int w, int h) : Fl_Widget_Surface(NULL) {
-  width = w;
-  height = h;
+Fl_Xlib_Image_Surface_Driver::Fl_Xlib_Image_Surface_Driver(int w, int h, int high_res, Fl_Offscreen off) : Fl_Image_Surface_Driver(w, h, high_res, off) {
   previous = 0;
-  offscreen = pixmap;
+  if (!off) {
+    fl_open_display();
+    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_Xlib_Image_Surface_Driver::~Fl_Xlib_Image_Surface_Driver() {
   if (offscreen) XFreePixmap(fl_display, offscreen);
 }
 
-void Fl_Image_Surface::Helper::set_current() {
+void Fl_Xlib_Image_Surface_Driver::set_current() {
   pre_window = fl_window;
   if (!previous) previous = Fl_Surface_Device::surface();
   fl_window = offscreen;
@@ -55,25 +66,24 @@ void Fl_Image_Surface::Helper::set_current() {
   fl_push_no_clip();
 }
 
-void Fl_Image_Surface::Helper::translate(int x, int y) {
+void Fl_Xlib_Image_Surface_Driver::translate(int x, int y) {
   ((Fl_Translated_Xlib_Graphics_Driver*)driver())->translate_all(x, y);
 }
 
-void Fl_Image_Surface::Helper::untranslate() {
+void Fl_Xlib_Image_Surface_Driver::untranslate() {
   ((Fl_Translated_Xlib_Graphics_Driver*)driver())->untranslate_all();
 }
 
-Fl_RGB_Image* Fl_Image_Surface::Helper::image()
+Fl_RGB_Image* Fl_Xlib_Image_Surface_Driver::image()
 {
-  unsigned char *data;
-  data = fl_read_image(NULL, 0, 0, width, height, 0);
+  unsigned char *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()
+void Fl_Xlib_Image_Surface_Driver::end_current()
 {
   fl_pop_clip();
   previous->Fl_Surface_Device::set_current();