Android: clipping regions code grew so big, they moved into their own

header and source file.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12758 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

4 files changed, 174 insertions, 134 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6534baea4..619f5bb45 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -305,7 +305,7 @@ elseif (ANDROID)
     drivers/Android/Fl_Android_Window_Driver.cxx
     drivers/Android/Fl_Android_Image_Surface_Driver.cxx
     drivers/Android/Fl_Android_Graphics_Driver.cxx
-    drivers/Android/Fl_Android_Graphics_Driver_region.cxx
+    drivers/Android/Fl_Android_Graphics_Clipping.cxx
   )
   set (DRIVER_HEADER_FILES
     drivers/Android/Fl_Android_Application.H
@@ -313,6 +313,7 @@ elseif (ANDROID)
     drivers/Android/Fl_Android_Screen_Driver.H
     drivers/Android/Fl_Android_Window_Driver.H
     drivers/Android/Fl_Android_Graphics_Driver.H
+    drivers/Android/Fl_Android_Graphics_Clipping.H
     drivers/Android/Fl_Font.H
   )
 
diff --git a/src/drivers/Android/Fl_Android_Graphics_Clipping.H b/src/drivers/Android/Fl_Android_Graphics_Clipping.H
new file mode 100644
index 000000000..803548bab
--- /dev/null
+++ b/src/drivers/Android/Fl_Android_Graphics_Clipping.H
@@ -0,0 +1,170 @@
+//
+// "$Id$"
+//
+// Graphics regions and clipping for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 2018 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
+//
+
+/**
+ \file Fl_Android_Graphics_Clipping.H
+ \brief Graphics regions and clipping for the Fast Light Tool Kit (FLTK).
+ */
+
+#ifndef FL_ANDROID_GRAPHICS_CLIPPING_H
+#define FL_ANDROID_GRAPHICS_CLIPPING_H
+
+#include <FL/Fl_Graphics_Driver.H>
+#include <limits.h>
+
+
+class Fl_Android_Window_Driver;
+
+
+/**
+ * The Fl_Rect_Region describes a rectangular clipping region.
+ *
+ * Contrary to common FLTK convention, rectangles are stored with coordinates
+ * instead of their width and height to accelerate calculations. The discreet
+ * constructor however uses the old convention for convenience.
+ */
+class Fl_Rect_Region
+{
+public:
+  enum Type {
+    EMPTY = 0, SAME, LESS, MORE, INFINITE
+  };
+
+  Fl_Rect_Region();
+  Fl_Rect_Region(int x, int y, int w, int h);
+  Fl_Rect_Region(const Fl_Rect_Region&);
+  Fl_Rect_Region(enum Type what);
+  virtual ~Fl_Rect_Region() { }
+
+  int x() const { return pLeft; }
+  int y() const { return pTop; }
+  int w() const { return pRight - pLeft; }
+  int h() const { return pBottom - pTop; }
+
+  int left() const { return pLeft; }
+  int top() const { return pTop; }
+  int right() const { return pRight; }
+  int bottom() const { return pBottom; }
+
+  bool is_empty() const;
+  bool is_infinite() const;
+
+  void set_empty();
+  void set(int x, int y, int w, int h);
+  void set_ltrb(int l, int t, int r, int b);
+  virtual void set(const Fl_Rect_Region &r);
+  virtual int intersect_with(const Fl_Rect_Region &r);
+
+  virtual void print(const char*) const;
+
+protected:
+  int pLeft, pTop, pRight, pBottom;
+
+private:
+  Fl_Rect_Region&  operator = (const Fl_Rect_Region& other);
+};
+
+
+/**
+ * The Fl_Complex_Region represents a clipping region of any shape.
+ *
+ * This class is organized in a tree-like structure. If the region is
+ * rectangular, is_simple() returns 1 and the rectangle can be used just
+ * as in Fl_Rect_Region.
+ *
+ * If a more complex representation is needed, the first list of
+ * subregions is organizen in horizontal strips. The root region rect
+ * will contain the outline of all subregions, and the subregions
+ * will either be simple rectangles, or they will contain a second
+ * level of subregions, subdividing the horizontal region into vertical
+ * columns.
+ *
+ * When reading, the tree can be easily walked using recursion.
+ */
+class Fl_Complex_Region : public Fl_Rect_Region
+{
+  class Iterator {
+  public:
+    Iterator(Fl_Complex_Region *r);
+    bool operator!= (const Iterator& other) const;
+    const Iterator& operator++ ();
+    Fl_Complex_Region *operator* () const;
+    Fl_Complex_Region *pRegion;
+  };
+
+  class Overlapping {
+    class OverlappingIterator {
+    public:
+      OverlappingIterator(Overlapping *ov);
+      bool operator!= (const OverlappingIterator& other) const;
+      const OverlappingIterator& operator++ ();
+      Overlapping *operator* () const;
+      Overlapping *pOv;
+    };
+  public:
+    Overlapping(Fl_Complex_Region *rgn, const Fl_Rect_Region &rect);
+    OverlappingIterator begin();
+    OverlappingIterator end();
+    Fl_Rect_Region &clipped_rect();
+    bool intersects();
+    bool find_intersecting();
+    bool find_next();
+    Fl_Complex_Region *pRegion;
+    Fl_Rect_Region pOriginalRect;
+    Fl_Rect_Region pClippedRect;
+  };
+
+public:
+  Fl_Complex_Region();
+  Fl_Complex_Region(const Fl_Rect_Region&);
+  virtual ~Fl_Complex_Region() override;
+
+  virtual void set(const Fl_Rect_Region &r) override;
+  void set(const Fl_Complex_Region &r);
+  Fl_Complex_Region *subregion() const { return pSubregion; }
+  Fl_Complex_Region *next() const { return pNext; }
+  Fl_Complex_Region *parent() const { return pParent; }
+  char is_simple() const { return pSubregion==0; }
+  char is_complex() const { return pSubregion!=0; }
+
+  virtual int intersect_with(const Fl_Rect_Region &r) override;
+  int subtract(const Fl_Rect_Region &r);
+
+  virtual void print(const char*) const override;
+
+  Iterator begin();
+  Iterator end();
+
+  Overlapping overlapping(const Fl_Rect_Region &r);
+
+protected:
+  void print_data(int indent) const;
+  int subtract_smaller_region(const Fl_Rect_Region &r);
+  Fl_Complex_Region *add_subregion();
+
+  Fl_Complex_Region *pSubregion = 0L;
+  Fl_Complex_Region *pParent = 0L;
+  Fl_Complex_Region *pNext = 0L;
+};
+
+
+#endif // FL_ANDROID_GRAPHICS_CLIPPING_H
+
+//
+// End of "$Id$".
+//
diff --git a/src/drivers/Android/Fl_Android_Graphics_Driver_region.cxx b/src/drivers/Android/Fl_Android_Graphics_Clipping.cxx
index 1bf05d0af..000ef929f 100644
--- a/src/drivers/Android/Fl_Android_Graphics_Driver_region.cxx
+++ b/src/drivers/Android/Fl_Android_Graphics_Clipping.cxx
@@ -3,7 +3,7 @@
 //
 // Clipping region routines for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2018 by Bill Spitzak and others.
+// Copyright 2018 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
diff --git a/src/drivers/Android/Fl_Android_Graphics_Driver.H b/src/drivers/Android/Fl_Android_Graphics_Driver.H
index 53118dc15..db8984c4c 100644
--- a/src/drivers/Android/Fl_Android_Graphics_Driver.H
+++ b/src/drivers/Android/Fl_Android_Graphics_Driver.H
@@ -26,6 +26,7 @@
 #define FL_ANDROID_GRAPHICS_DRIVER_H
 
 #include <FL/Fl_Graphics_Driver.H>
+#include "Fl_Android_Graphics_Clipping.H"
 #include <limits.h>
 
 
@@ -33,138 +34,6 @@ class Fl_Android_Window_Driver;
 
 
 /**
- * The Fl_Rect_Region describes a rectangular clipping region.
- *
- * Contrary to common FLTK convention, rectangles are stored with coordinates
- * instead of their width and height to accelerate calculations. The discreet
- * constructor however uses the old convention for convenience.
- */
-class Fl_Rect_Region
-{
-public:
-  enum Type {
-    EMPTY = 0, SAME, LESS, MORE, INFINITE
-  };
-
-  Fl_Rect_Region();
-  Fl_Rect_Region(int x, int y, int w, int h);
-  Fl_Rect_Region(const Fl_Rect_Region&);
-  Fl_Rect_Region(enum Type what);
-  virtual ~Fl_Rect_Region() { }
-
-  int x() const { return pLeft; }
-  int y() const { return pTop; }
-  int w() const { return pRight - pLeft; }
-  int h() const { return pBottom - pTop; }
-
-  int left() const { return pLeft; }
-  int top() const { return pTop; }
-  int right() const { return pRight; }
-  int bottom() const { return pBottom; }
-
-  bool is_empty() const;
-  bool is_infinite() const;
-
-  void set_empty();
-  void set(int x, int y, int w, int h);
-  void set_ltrb(int l, int t, int r, int b);
-  virtual void set(const Fl_Rect_Region &r);
-  virtual int intersect_with(const Fl_Rect_Region &r);
-
-  virtual void print(const char*) const;
-
-protected:
-  int pLeft, pTop, pRight, pBottom;
-
-private:
-  Fl_Rect_Region&  operator = (const Fl_Rect_Region& other);
-};
-
-
-/**
- * The Fl_Complex_Region represents a clipping region of any shape.
- *
- * This class is organized in a tree-like structure. If the region is
- * rectangular, is_simple() returns 1 and the rectangle can be used just
- * as in Fl_Rect_Region.
- *
- * If a more complex representation is needed, the first list of
- * subregions is organizen in horizontal strips. The root region rect
- * will contain the outline of all subregions, and the subregions
- * will either be simple rectangles, or they will contain a second
- * level of subregions, subdividing the horizontal region into vertical
- * columns.
- *
- * When reading, the tree can be easily walked using recursion.
- */
-class Fl_Complex_Region : public Fl_Rect_Region
-{
-  class Iterator {
-  public:
-    Iterator(Fl_Complex_Region *r);
-    bool operator!= (const Iterator& other) const;
-    const Iterator& operator++ ();
-    Fl_Complex_Region *operator* () const;
-    Fl_Complex_Region *pRegion;
-  };
-
-  class Overlapping {
-    class OverlappingIterator {
-    public:
-      OverlappingIterator(Overlapping *ov);
-      bool operator!= (const OverlappingIterator& other) const;
-      const OverlappingIterator& operator++ ();
-      Overlapping *operator* () const;
-      Overlapping *pOv;
-    };
-  public:
-    Overlapping(Fl_Complex_Region *rgn, const Fl_Rect_Region &rect);
-    OverlappingIterator begin();
-    OverlappingIterator end();
-    Fl_Rect_Region &clipped_rect();
-    bool intersects();
-    bool find_intersecting();
-    bool find_next();
-    Fl_Complex_Region *pRegion;
-    Fl_Rect_Region pOriginalRect;
-    Fl_Rect_Region pClippedRect;
-  };
-
-public:
-  Fl_Complex_Region();
-  Fl_Complex_Region(const Fl_Rect_Region&);
-  virtual ~Fl_Complex_Region() override;
-
-  virtual void set(const Fl_Rect_Region &r) override;
-  void set(const Fl_Complex_Region &r);
-  Fl_Complex_Region *subregion() const { return pSubregion; }
-  Fl_Complex_Region *next() const { return pNext; }
-  Fl_Complex_Region *parent() const { return pParent; }
-  char is_simple() const { return pSubregion==0; }
-  char is_complex() const { return pSubregion!=0; }
-
-  virtual int intersect_with(const Fl_Rect_Region &r) override;
-  int subtract(const Fl_Rect_Region &r);
-
-  virtual void print(const char*) const override;
-
-  Iterator begin();
-  Iterator end();
-
-  Overlapping overlapping(const Fl_Rect_Region &r);
-
-protected:
-  void print_data(int indent) const;
-  int subtract_smaller_region(const Fl_Rect_Region &r);
-  Fl_Complex_Region *add_subregion();
-
-  Fl_Complex_Region *pSubregion = 0L;
-  Fl_Complex_Region *pParent = 0L;
-  Fl_Complex_Region *pNext = 0L;
-};
-
-
-/**
   \brief The Windows-specific graphics driver class.
 
   This class is implemented only on the Windows platform.