CoreLibrary performance issues

  - optimized and added overriden push_clip(x,y,w,h) method
    while preserving the push_clip(const Rectangle&) method
    I observed that an important amount of fltk2 code used a push_clip(Rectangle(x,y,w,h)); typical code
    which was doubly inefficient becaused inside push_clip() we copied again the const rectangle  
    Now only a native rectangle will be copied and with push_clip0(), 
    you can even gain this construction copy if you don't need to preserve original rect.
   push_clip() is called very often in drawing so i think this optimization is non neglectable
   furthermore having a second way of calling push_clip is quite convenient too in many situations.



git-svn-id: http://seriss.com/public/fltk/fltk/trunk@5114 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

Author: fabien

fltk/TabGroup.h

@@ -51,13 +51,14 @@ class FL_API TabGroup : public Group {
 protected:
   void draw();
 
-private:
-  int push(Widget *);
-  int tab_positions(int*, int*);
   int tab_height();
   void draw_tab(int x1, int x2, int W, int H, Widget* o, int sel=0);
   void draw_tab_background();
 
+private:
+  int push(Widget *);
+  int tab_positions(int*, int*);
+
   bool _drawOutline;
 };
 

fltk/compat/FL/fl_draw.H

@@ -9,7 +9,7 @@ inline void fl_color(uchar r, uchar g, uchar b) {fltk::setcolor(fltk::color(r,g,
 inline fltk::Color fl_color() {return fltk::getcolor();}
 
 // clip:
-inline void fl_push_clip(int x, int y, int w, int h) {fltk::push_clip(fltk::Rectangle(x,y,w,h));}
+inline void fl_push_clip(int x, int y, int w, int h) {fltk::push_clip(x,y,w,h);}
 #define fl_clip		fl_push_clip
 #define fl_pop_clip	fltk::pop_clip
 inline int fl_not_clipped(int x, int y, int w, int h) {return fltk::not_clipped(fltk::Rectangle(x,y,w,h));}

fltk/draw.h

@@ -61,7 +61,12 @@ FL_API void transform(Rectangle&);
 
 /*! \addtogroup clipping
   \{ */
-FL_API void push_clip(const Rectangle&);
+FL_API void push_clip0(Rectangle& r); // common method for push_clip primitives, r is modified in output
+// standard push_clip equals to former monolithic definition no perf. change
+inline void push_clip(const Rectangle& rectangle) {Rectangle r(rectangle); push_clip0(r);}
+// gain one rectangle construction by providing ddirect x,y,w,h push_clip alternative
+inline void push_clip(int X,int Y, int W, int H) {Rectangle r(X,Y,W,H); push_clip0(r);}
+
 FL_API void clipout(const Rectangle&);
 FL_API void pop_clip();
 FL_API void push_no_clip();

ide/visualc/fltk.lib.dsp

@@ -41,7 +41,7 @@ using namespace fltk;
 /*! \class fltk::Browser
 
   Displays a scrolling vertical list of text widgets, possibly with a
-  hierachial arrangement, and lets the user select one of them.
+  hierarchical arrangement, and lets the user select one of them.
 
   \image html browser.gif
 

src/Browser.cxx

@@ -662,7 +662,7 @@ void Group::draw() {
 #if USE_CLIPOUT
     // Non-blinky draw, draw the inside widgets first, clip their areas
     // out, and then draw the background:
-    push_clip(Rectangle(w(), h()));
+    push_clip(0,0, w(), h());
     int n; for (n = numchildren; n--;) {
       Widget& w = *child(n);
       fl_did_clipping = 0;
@@ -723,7 +723,7 @@ void Widget::draw_background() const {
   if (damage()&DAMAGE_EXPOSE) return;
 #endif
   if (!parent()) return;
-  push_clip(Rectangle(w(),h()));
+  push_clip(0,0,w(),h());
   push_matrix();
   translate(-x(), -y());
   if (!parent()->box()->fills_rectangle()) parent()->draw_background();

src/Group.cxx

@@ -136,8 +136,8 @@ void fltk::clip_region(Region region) {
   Pushes the \e intersection of the current region and \a rectangle
   onto the clip stack.
 */
-void fltk::push_clip(const Rectangle& rectangle) {
-  Rectangle r(rectangle); transform(r);
+void fltk::push_clip0(Rectangle& r) {
+  transform(r);
   Region region;
   if (r.empty()) {
 #if USE_X11

src/clip.cxx

@@ -228,7 +228,7 @@ void ccHueBox::draw() {
   if (damage()&DAMAGE_ALL) draw_frame();
   Rectangle r(w(),h()); box()->inset(r);
   if (damage() == DAMAGE_VALUE) {
-    push_clip(Rectangle(r.x()+px,r.y()+py,6,6));
+    push_clip(r.x()+px,r.y()+py,6,6);
   }
   drawimage(generate_image, this, RGB, r);
   if (damage() == DAMAGE_VALUE) pop_clip();
@@ -327,7 +327,7 @@ void ccValueBox::draw() {
     i.aimage = false;
   }
   if (damage() == DAMAGE_VALUE) {
-    push_clip(Rectangle(i.wh.x(),i.wh.y()+py,i.wh.w(),6));
+    push_clip(i.wh.x(),i.wh.y()+py,i.wh.w(),6);
   }
   drawimage(generate_vimage, &i, RGB, i.wh);
   if (damage() == DAMAGE_VALUE) pop_clip();

src/color_chooser.cxx

@@ -678,9 +678,9 @@ void fltk::drawtext(void (*textfunction)(const char*,int,float,float),
 	for (i=0; i<current_column; i++) xx += column_widths_[i];
 	pop_clip();
 	if (segment_count > 1)
-	  push_clip(Rectangle(xx, r.y(), column_widths_[current_column], r.h()));
+	  push_clip(xx, r.y(), column_widths_[current_column], r.h());
 	else
-	  push_clip(Rectangle(xx, r.y(), r.w(), r.h()));
+	  push_clip(xx, r.y(), r.w(), r.h());
       }
       if (s.symbol) {
 	Symbol::text(s.start);

src/drawtext.cxx

@@ -95,8 +95,8 @@ void fltk::clip_region(Region r) {
 /*!
   Pushes the \e intersection of the current region and this rectangle
   onto the clip stack. */
-void fltk::push_clip(const Rectangle& r1) {
-  Rectangle r(r1); transform(r);
+void fltk::push_clip0(Rectangle& r) {
+  transform(r);
   Region region = NewRgn();
   if (r.empty()) {
     SetEmptyRgn(region);

src/osx/clip.cxx

@@ -33,7 +33,7 @@ const char* name[7] = {"X", "Y", "W", "H", "start", "end", "rotate"};
 
 class Drawing : public fltk::Widget {
   void draw() {
-    fltk::push_clip(Rectangle(w(), h()));
+    fltk::push_clip(0,0, w(), h());
     fltk::setcolor(fltk::BLACK);
     fltk::fillrect(Rectangle(w(), h()));
     fltk::push_matrix();

test/arc.cxx

@@ -40,7 +40,7 @@ int points;
 
 class Drawing : public Widget {
   void draw() {
-    push_clip(Rectangle(w(),h()));
+    push_clip(0,0,w(),h());
     setcolor(GRAY20);
     fillrect(Rectangle(w(),h()));
     push_matrix();

test/curve.cxx

@@ -47,7 +47,7 @@ fltk::Widget* id_box;
 
 void FontDisplay::draw() {
   draw_box();
-  fltk::push_clip(fltk::Rectangle(2,2,w()-2,h()-2));
+  fltk::push_clip(2,2,w()-2,h()-2);
   const char* saved_encoding = fltk::get_encoding();
   fltk::set_encoding(encoding);
   fltk::setfont(font, (float) size);

test/fonts.cxx

@@ -38,7 +38,7 @@ rgbImage* theimage;
 
 class Drawing : public Widget {
   void draw() {
-    push_clip(Rectangle(w(),h()));
+    push_clip(0, 0, w(),h());
     setcolor(GRAY20);
     fillrect(Rectangle(w(),h()));
     setcolor(GRAY10);

test/image_transform.cxx

@@ -824,7 +824,7 @@ int makemove() {
 
 class QubixView : public Widget {
   void draw() {
-    push_clip(Rectangle(w(),h()));
+    push_clip(0, 0, w(),h());
     setcolor(WHITE);
     fillrect(Rectangle(w(),h()));
     push_matrix();