fastmeter: 1px padding left&right
[ardour.git] / libs / gtkmm2ext / fastmeter.cc
index 4bb6e81d00b94bd3e945bc08fda567f5a7545069..ff2cb68fe99dd977d4e5f788ccb05462b2db6fec 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2003-2006 Paul Davis 
+    Copyright (C) 2003-2006 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 #include <iostream>
 #include <cmath>
 #include <algorithm>
+#include <cstring>
+
 #include <gdkmm/rectangle.h>
 #include <gtkmm2ext/fastmeter.h>
 #include <gtkmm2ext/utils.h>
-#include <gtkmm/style.h>
-#include <cstring>
 
 #define UINT_TO_RGB(u,r,g,b) { (*(r)) = ((u)>>16)&0xff; (*(g)) = ((u)>>8)&0xff; (*(b)) = (u)&0xff; }
 #define UINT_TO_RGBA(u,r,g,b,a) { UINT_TO_RGB(((u)>>8),r,g,b); (*(a)) = (u)&0xff; }
@@ -35,24 +35,17 @@ using namespace Glib;
 using namespace Gtkmm2ext;
 using namespace std;
 
+int FastMeter::min_pattern_metric_size = 10;
+int FastMeter::max_pattern_metric_size = 1024;
 
-int FastMeter::min_v_pixbuf_size = 10;
-int FastMeter::max_v_pixbuf_size = 1024;
-Glib::RefPtr<Gdk::Pixbuf>* FastMeter::v_pixbuf_cache = 0;
-
-int FastMeter::min_h_pixbuf_size = 10;
-int FastMeter::max_h_pixbuf_size = 1024;
-Glib::RefPtr<Gdk::Pixbuf>* FastMeter::h_pixbuf_cache = 0;
-
-int FastMeter::_clr0 = 0;
-int FastMeter::_clr1 = 0;
-int FastMeter::_clr2 = 0;
-int FastMeter::_clr3 = 0;
+FastMeter::PatternMap FastMeter::v_pattern_cache;
+FastMeter::PatternMap FastMeter::h_pattern_cache;
 
 FastMeter::FastMeter (long hold, unsigned long dimen, Orientation o, int len, int clr0, int clr1, int clr2, int clr3)
 {
        orientation = o;
        hold_cnt = hold;
+       resized = true;
        hold_state = 0;
        current_peak = 0;
        current_level = 0;
@@ -65,192 +58,146 @@ FastMeter::FastMeter (long hold, unsigned long dimen, Orientation o, int len, in
 
        set_events (BUTTON_PRESS_MASK|BUTTON_RELEASE_MASK);
 
-       pixrect.x = 0;
+       pixrect.x = 1;
        pixrect.y = 0;
 
        if (orientation == Vertical) {
-               if (!len)
+               if (!len) {
                        len = 250;
-               pixbuf = request_vertical_meter(dimen, len);
+               }
+               pattern = request_vertical_meter(dimen, len, clr0, clr1, clr2, clr3);
+               pixheight = len;
+               pixwidth = dimen;
        } else {
-               if (!len)
-                       len = 186;
-               pixbuf = request_horizontal_meter(len, dimen);
+               if (!len) {
+                       len = 186; // interesting size, eh?
+               }
+               pattern = request_horizontal_meter(len, dimen, clr0, clr1, clr2, clr3);
+               pixheight = dimen;
+               pixwidth = len;
        }
 
-       pixheight = pixbuf->get_height();
-       pixwidth  = pixbuf->get_width();
-
        if (orientation == Vertical) {
-               pixrect.width = min (pixwidth, (gint) dimen);
+               pixrect.width = pixwidth;
                pixrect.height = pixheight;
        } else {
                pixrect.width = pixwidth;
                pixrect.height = min (pixheight, (gint) dimen);
        }
 
-       request_width = pixrect.width;
+       request_width = pixrect.width + 2;
        request_height= pixrect.height;
 }
 
-Glib::RefPtr<Gdk::Pixbuf> FastMeter::request_vertical_meter(int width, int height)
+Cairo::RefPtr<Cairo::Pattern>
+FastMeter::generate_meter_pattern (
+               int width, int height, int clr0, int clr1, int clr2, int clr3)
 {
-       if (height < min_v_pixbuf_size)
-               height = min_v_pixbuf_size;
-       if (height > max_v_pixbuf_size)
-               height = max_v_pixbuf_size;
-       
-       //int index = height - 1;
-
-       //if (v_pixbuf_cache == 0) {
-       //      v_pixbuf_cache = (Glib::RefPtr<Gdk::Pixbuf>*) malloc(sizeof(Glib::RefPtr<Gdk::Pixbuf>) * max_v_pixbuf_size);
-       //      memset(v_pixbuf_cache,0,sizeof(Glib::RefPtr<Gdk::Pixbuf>) * max_v_pixbuf_size);
-       //}
-       Glib::RefPtr<Gdk::Pixbuf> ret;// = v_pixbuf_cache[index];
-       //if (ret)
-       //      return ret;
-
-       guint8* data;
-
-       data = (guint8*) malloc(width*height * 3);
-
-       guint8 r,g,b,r0,g0,b0,r1,g1,b1,r2,g2,b2,r3,g3,b3,a;
-
-       UINT_TO_RGBA (_clr0, &r0, &g0, &b0, &a);
-       UINT_TO_RGBA (_clr1, &r1, &g1, &b1, &a);
-       UINT_TO_RGBA (_clr2, &r2, &g2, &b2, &a);
-       UINT_TO_RGBA (_clr3, &r3, &g3, &b3, &a);
+       guint8 r0,g0,b0,r1,g1,b1,r2,g2,b2,r3,g3,b3,a;
+
+       /*
+         The knee is the hard transition point (e.g. at 0dB where the colors
+         change dramatically to make clipping apparent). Thus there are two
+         gradients in the pattern, the "normal range" and the "clip range", which
+         are separated at the knee point.
+
+         clr0: color at bottom of normal range gradient
+         clr1: color at top of normal range gradient
+         clr2: color at bottom of clip range gradient
+         clr3: color at top of clip range gradient
+       */
+
+       UINT_TO_RGBA (clr0, &r0, &g0, &b0, &a);
+       UINT_TO_RGBA (clr1, &r1, &g1, &b1, &a);
+       UINT_TO_RGBA (clr2, &r2, &g2, &b2, &a);
+       UINT_TO_RGBA (clr3, &r3, &g3, &b3, &a);
+
        // fake log calculation copied from log_meter.h
        // actual calculation:
        // log_meter(0.0f) =
        //  def = (0.0f + 20.0f) * 2.5f + 50f
        //  return def / 115.0f
-       int knee = (int)floor((float)height * 100.0f / 115.0f);
-       int y;
 
-       for (y = 0; y < knee/2; y++) {
+       const int knee = (int)floor((float)height * 100.0f / 115.0f);
+       cairo_pattern_t* pat = cairo_pattern_create_linear (0.0, 0.0, width, height);
 
-               r = (guint8)floor((float)abs(r1 - r0) * (float)y / (float)(knee/2));
-               (r0 >= r1) ? r = r0 - r : r += r0;
-                       
-               g = (guint8)floor((float)abs(g1 - g0) * (float)y / (float)(knee/2));
-               (g0 >= g1) ? g = g0 - g : g += g0;
+       /*
+         Cairo coordinate space goes downwards as y value goes up, so invert
+         knee-based positions by using (1.0 - y)
+       */
 
-               b = (guint8)floor((float)abs(b1 - b0) * (float)y / (float)(knee/2));
-               (b0 >= b1) ? b = b0 - b : b += b0;
+       // Clip range top
+       cairo_pattern_add_color_stop_rgb (pat, 0.0,
+                                         r3/255.0, g3/255.0, b3/255.0);
 
-               for (int x = 0; x < width; x++) {
-                       data[ (x+(height-y-1)*width) * 3 + 0 ] = r;
-                       data[ (x+(height-y-1)*width) * 3 + 1 ] = g;
-                       data[ (x+(height-y-1)*width) * 3 + 2 ] = b;
-               }
-       }
+       // Clip range bottom
+       cairo_pattern_add_color_stop_rgb (pat, 1.0 - (knee/(double)height),
+                                         r2/255.0, g2/255.0, b2/255.0);
 
-       int offset = knee - y;
-       for (int i=0; i < offset; i++,y++) {
+       // Normal range top (double-stop at knee)
+       cairo_pattern_add_color_stop_rgb (pat, 1.0 - (knee/(double)height),
+                                         r1/255.0, g1/255.0, b1/255.0);
 
-               r = (guint8)floor((float)abs(r2 - r1) * (float)i / (float)offset);
-               (r1 >= r2) ? r = r1 - r : r += r1;
+       // Normal range bottom
+       cairo_pattern_add_color_stop_rgb (pat, 1.0,
+                                         r0/255.0, g0/255.0, b0/255.0); // top
 
-               g = (guint8)floor((float)abs(g2 - g1) * (float)i / (float)offset);
-               (g1 >= g2) ? g = g1 - g : g += g1;
+       Cairo::RefPtr<Cairo::Pattern> p (new Cairo::Pattern (pat, false));
 
-               b = (guint8)floor((float)abs(b2 - b1) * (float)i / (float)offset);
-               (b1 >= b2) ? b = b1 - b : b += b1;
+       return p;
+}
 
-               for (int x = 0; x < width; x++) {
-                       data[ (x+(height-y-1)*width) * 3 + 0 ] = r;
-                       data[ (x+(height-y-1)*width) * 3 + 1 ] = g;
-                       data[ (x+(height-y-1)*width) * 3 + 2 ] = b;
-               }
-       }
-       y--;
-       for (; y < height; y++) {
-               for (int x = 0; x < width; x++) {
-                       data[ (x+(height-y-1)*width) * 3 + 0 ] = r3;
-                       data[ (x+(height-y-1)*width) * 3 + 1 ] = g3;
-                       data[ (x+(height-y-1)*width) * 3 + 2 ] = b3;
-               }
+Cairo::RefPtr<Cairo::Pattern>
+FastMeter::request_vertical_meter(
+               int width, int height, int clr0, int clr1, int clr2, int clr3)
+{
+       if (height < min_pattern_metric_size)
+               height = min_pattern_metric_size;
+       if (height > max_pattern_metric_size)
+               height = max_pattern_metric_size;
+
+       const PatternMapKey key (width, height, clr0, clr1, clr2, clr3);
+       PatternMap::iterator i;
+       if ((i = v_pattern_cache.find (key)) != v_pattern_cache.end()) {
+               return i->second;
        }
-       
-       ret = Pixbuf::create_from_data(data, COLORSPACE_RGB, false, 8, width, height, width * 3);
-       //v_pixbuf_cache[index] = ret;
 
-       return ret;
+       Cairo::RefPtr<Cairo::Pattern> p = generate_meter_pattern (
+               width, height, clr0, clr1, clr2, clr3);
+       v_pattern_cache[key] = p;
+
+       return p;
 }
 
-Glib::RefPtr<Gdk::Pixbuf> FastMeter::request_horizontal_meter(int width, int height)
+Cairo::RefPtr<Cairo::Pattern>
+FastMeter::request_horizontal_meter(
+               int width, int height, int clr0, int clr1, int clr2, int clr3)
 {
-       if (width < min_h_pixbuf_size)
-               width = min_h_pixbuf_size;
-       if (width > max_h_pixbuf_size)
-               width = max_h_pixbuf_size;
-       
-       int index = width - 1;
-       
-       if (h_pixbuf_cache == 0) {
-               h_pixbuf_cache = (Glib::RefPtr<Gdk::Pixbuf>*) malloc(sizeof(Glib::RefPtr<Gdk::Pixbuf>) * max_h_pixbuf_size);
-               memset(h_pixbuf_cache,0,sizeof(Glib::RefPtr<Gdk::Pixbuf>) * max_h_pixbuf_size);
+       if (width < min_pattern_metric_size)
+               width = min_pattern_metric_size;
+       if (width > max_pattern_metric_size)
+               width = max_pattern_metric_size;
+
+       const PatternMapKey key (width, height, clr0, clr1, clr2, clr3);
+       PatternMap::iterator i;
+       if ((i = h_pattern_cache.find (key)) != h_pattern_cache.end()) {
+               return i->second;
        }
-       Glib::RefPtr<Gdk::Pixbuf> ret = h_pixbuf_cache[index];
-       if (ret)
-               return ret;
 
-       guint8* data;
+       /* flip height/width so that we get the right pattern */
 
-       data = (guint8*) malloc(width*height * 3);
-       
-       guint8 r,g,b;
-       r=0;
-       g=255;
-       b=0;
+       Cairo::RefPtr<Cairo::Pattern> p = generate_meter_pattern (
+               height, width, clr0, clr1, clr2, clr3);
 
-       // fake log calculation copied from log_meter.h
-       // actual calculation:
-       // log_meter(0.0f) =
-       //  def = (0.0f + 20.0f) * 2.5f + 50f
-       //  return def / 115.0f
-       int knee = (int)floor((float)width * 100.0f / 115.0f);
-       
-       int x;
-       
-       for (x = 0; x < knee / 2; x++) {
-
-               r = (guint8)floor(255.0 * (float)x/(float)(knee / 2));
-               
-               for (int y = 0; y < height; y++) {
-                       data[ (x+(height-y-1)*width) * 3 + 0 ] = r;
-                       data[ (x+(height-y-1)*width) * 3 + 1 ] = g;
-                       data[ (x+(height-y-1)*width) * 3 + 2 ] = b;
-               }
-       }
-       
-       for (; x < knee; x++) {
-
-               g = 255 - (guint8)floor(170.0 * (float)(x - knee/ 2)/(float)(knee / 2));
-               
-               for (int y = 0; y < height; y++) {
-                       data[ (x+(height-y-1)*width) * 3 + 0 ] = r;
-                       data[ (x+(height-y-1)*width) * 3 + 1 ] = g;
-                       data[ (x+(height-y-1)*width) * 3 + 2 ] = b;
-               }
-       }
+       /* rotate to make it horizontal */
 
-       r=255;
-       g=0;
-       b=0;
-       for (; x < width; x++) {
-               for (int y = 0; y < height; y++) {
-                       data[ (x+(height-y-1)*width) * 3 + 0 ] = r;
-                       data[ (x+(height-y-1)*width) * 3 + 1 ] = g;
-                       data[ (x+(height-y-1)*width) * 3 + 2 ] = b;
-               }
-       }
-       
-       ret = Pixbuf::create_from_data(data, COLORSPACE_RGB, false, 8, width, height, width * 3);
-       h_pixbuf_cache[index] = ret;
+       cairo_matrix_t m;
+       cairo_matrix_init_rotate (&m, -M_PI/2.0);
+       cairo_pattern_set_matrix (p->cobj(), &m);
 
-       return ret;
+       h_pattern_cache[key] = p;
+
+       return p;
 }
 
 FastMeter::~FastMeter ()
@@ -263,11 +210,11 @@ FastMeter::set_hold_count (long val)
        if (val < 1) {
                val = 1;
        }
-       
+
        hold_cnt = val;
        hold_state = 0;
        current_peak = 0;
-       
+
        queue_draw ();
 }
 
@@ -277,16 +224,16 @@ FastMeter::on_size_request (GtkRequisition* req)
        if (orientation == Vertical) {
 
                req->height = request_height;
-               req->height = max(req->height, min_v_pixbuf_size);
-               req->height = min(req->height, max_v_pixbuf_size);
+               req->height = max(req->height, min_pattern_metric_size);
+               req->height = min(req->height, max_pattern_metric_size);
 
                req->width  = request_width;
 
        } else {
 
                req->width  = request_width;
-               req->width  = max(req->width,  min_h_pixbuf_size);
-               req->width  = min(req->width,  max_h_pixbuf_size);
+               req->width  = max(req->width,  min_pattern_metric_size);
+               req->width  = min(req->width,  max_pattern_metric_size);
 
                req->height = request_height;
        }
@@ -303,14 +250,18 @@ FastMeter::on_size_allocate (Gtk::Allocation &alloc)
                }
 
                int h = alloc.get_height();
-               h = max(h, min_v_pixbuf_size);
-               h = min(h, max_v_pixbuf_size);
+               h = max (h, min_pattern_metric_size);
+               h = min (h, max_pattern_metric_size);
 
-               if ( h != alloc.get_height())
-                       alloc.set_height(h);
+               if (h != alloc.get_height()) {
+                       alloc.set_height (h);
+               }
 
                if (pixheight != h) {
-                       pixbuf = request_vertical_meter(request_width, h);
+                       pattern = request_vertical_meter (
+                               request_width, h, _clr0, _clr1, _clr2, _clr3);
+                       pixheight = h;
+                       pixwidth  = request_width - 2;
                }
 
        } else {
@@ -320,21 +271,23 @@ FastMeter::on_size_allocate (Gtk::Allocation &alloc)
                }
 
                int w = alloc.get_width();
-               w = max(w, min_h_pixbuf_size);
-               w = min(w, max_h_pixbuf_size);
+               w = max (w, min_pattern_metric_size);
+               w = min (w, max_pattern_metric_size);
 
-               if ( w != alloc.get_width())
-                       alloc.set_width(w);
+               if (w != alloc.get_width()) {
+                       alloc.set_width (w);
+               }
 
                if (pixwidth != w) {
-                       pixbuf = request_horizontal_meter(w, request_height);
+                       pattern = request_horizontal_meter (
+                               w, request_height, _clr0, _clr1, _clr2, _clr3);
+                       pixheight = request_height;
+                       pixwidth  = w;
                }
        }
 
-       pixheight = pixbuf->get_height();
-       pixwidth  = pixbuf->get_width();
-
-       DrawingArea::on_size_allocate(alloc);
+       DrawingArea::on_size_allocate (alloc);
+       resized = true;
 }
 
 bool
@@ -350,12 +303,24 @@ FastMeter::on_expose_event (GdkEventExpose* ev)
 bool
 FastMeter::vertical_expose (GdkEventExpose* ev)
 {
+       Glib::RefPtr<Gdk::Window> win = get_window ();
        gint top_of_meter;
        GdkRectangle intersection;
        GdkRectangle background;
 
+       cairo_t* cr = gdk_cairo_create (get_window ()->gobj());
+
+       if (resized) {
+               cairo_set_source_rgb (cr, 0, 0, 0); // black
+               cairo_rectangle (cr, 0, 0, pixrect.width + 2, pixheight);
+               cairo_fill (cr);
+       }
+
+       cairo_rectangle (cr, ev->area.x, ev->area.y, ev->area.width, ev->area.height);
+       cairo_clip (cr);
+
        top_of_meter = (gint) floor (pixheight * current_level);
-       
+
        /* reset the height & origin of the rect that needs to show the pixbuf
         */
 
@@ -364,52 +329,56 @@ FastMeter::vertical_expose (GdkEventExpose* ev)
 
        background.x = 0;
        background.y = 0;
-       background.width = pixrect.width;
+       background.width = pixrect.width + 2;
        background.height = pixheight - top_of_meter;
 
        if (gdk_rectangle_intersect (&background, &ev->area, &intersection)) {
-               get_window()->draw_rectangle (get_style()->get_black_gc(), true, 
-                                             intersection.x, intersection.y,
-                                             intersection.width, intersection.height);
+               cairo_set_source_rgb (cr, 0, 0, 0); // black
+               cairo_rectangle (cr, intersection.x, intersection.y, intersection.width, intersection.height);
+               cairo_fill (cr);
        }
 
        if (gdk_rectangle_intersect (&pixrect, &ev->area, &intersection)) {
                // draw the part of the meter image that we need. the area we draw is bounded "in reverse" (top->bottom)
-               get_window()->draw_pixbuf(get_style()->get_fg_gc(get_state()), pixbuf, 
-                                         intersection.x, intersection.y,
-                                         intersection.x, intersection.y,
-                                         intersection.width, intersection.height,
-                                         Gdk::RGB_DITHER_NONE, 0, 0);
+               cairo_set_source (cr, pattern->cobj());
+               cairo_rectangle (cr, intersection.x, intersection.y, intersection.width, intersection.height);
+               cairo_fill (cr);
        }
 
-       // draw peak bar 
+       // draw peak bar
 
        if (hold_state) {
-               last_peak_rect.x = 0;
+               last_peak_rect.x = 1;
                last_peak_rect.width = pixwidth;
                last_peak_rect.y = pixheight - (gint) floor (pixheight * current_peak);
                last_peak_rect.height = min(3, pixheight - last_peak_rect.y);
 
-               get_window()->draw_pixbuf (get_style()->get_fg_gc(get_state()), pixbuf,
-                                          0, last_peak_rect.y,
-                                          0, last_peak_rect.y,
-                                          pixwidth, last_peak_rect.height,
-                                          Gdk::RGB_DITHER_NONE, 0, 0);
+               cairo_set_source (cr, pattern->cobj());
+               cairo_rectangle (cr, 1, last_peak_rect.y, pixwidth, last_peak_rect.height);
+               cairo_fill (cr);
+
        } else {
                last_peak_rect.width = 0;
                last_peak_rect.height = 0;
        }
 
+       cairo_destroy (cr);
+
        return TRUE;
 }
 
 bool
 FastMeter::horizontal_expose (GdkEventExpose* ev)
 {
+       Glib::RefPtr<Gdk::Window> win = get_window ();
        gint right_of_meter;
        GdkRectangle intersection;
        GdkRectangle background;
 
+       cairo_t* cr = gdk_cairo_create (get_window ()->gobj());
+       cairo_rectangle (cr, ev->area.x, ev->area.y, ev->area.width, ev->area.height);
+       cairo_clip (cr);
+
        right_of_meter = (gint) floor (pixwidth * current_level);
        pixrect.width = right_of_meter;
 
@@ -419,21 +388,22 @@ FastMeter::horizontal_expose (GdkEventExpose* ev)
        background.height = pixrect.height;
 
        if (gdk_rectangle_intersect (&background, &ev->area, &intersection)) {
-               get_window()->draw_rectangle (get_style()->get_black_gc(), true, 
-                                             intersection.x + right_of_meter, intersection.y,
-                                             intersection.width, intersection.height);
+               cairo_set_source_rgb (cr, 0, 0, 0); // black
+               cairo_rectangle (cr, intersection.x + right_of_meter, intersection.y, intersection.width, intersection.height);
+               cairo_fill (cr);
        }
-       
+
        if (gdk_rectangle_intersect (&pixrect, &ev->area, &intersection)) {
                // draw the part of the meter image that we need. the area we draw is bounded "in reverse" (top->bottom)
-               get_window()->draw_pixbuf(get_style()->get_fg_gc(get_state()), pixbuf, 
-                                         intersection.x, intersection.y,
-                                         intersection.x, intersection.y,
-                                         pixrect.width, intersection.height,
-                                         Gdk::RGB_DITHER_NONE, 0, 0);
+               cairo_matrix_t m;
+               cairo_matrix_init_translate (&m, -intersection.x, -intersection.y);
+               cairo_pattern_set_matrix (pattern->cobj(), &m);
+               cairo_set_source (cr, pattern->cobj());
+               cairo_rectangle (cr, intersection.x, intersection.y, pixrect.width, intersection.height);
+               cairo_fill (cr);
        }
 
-       // draw peak bar 
+       // draw peak bar
        // XXX: peaks don't work properly
        /*
        if (hold_state && intersection.height > 0) {
@@ -446,7 +416,9 @@ FastMeter::horizontal_expose (GdkEventExpose* ev)
                                           Gdk::RGB_DITHER_NONE, 0, 0);
        }
        */
-       
+
+       cairo_destroy (cr);
+
        return true;
 }
 
@@ -457,12 +429,12 @@ FastMeter::set (float lvl)
        float old_peak = current_peak;
 
        current_level = lvl;
-       
+
        if (lvl > current_peak) {
                current_peak = lvl;
                hold_state = hold_cnt;
        }
-       
+
        if (hold_state > 0) {
                if (--hold_state == 0) {
                        current_peak = lvl;
@@ -492,10 +464,10 @@ void
 FastMeter::queue_vertical_redraw (const Glib::RefPtr<Gdk::Window>& win, float old_level)
 {
        GdkRectangle rect;
-       
+
        gint new_top = (gint) floor (pixheight * current_level);
-       
-       rect.x = 0;
+
+       rect.x = 1;
        rect.width = pixwidth;
        rect.height = new_top;
        rect.y = pixheight - new_top;
@@ -523,7 +495,7 @@ FastMeter::queue_vertical_redraw (const Glib::RefPtr<Gdk::Window>& win, float ol
        if (rect.height != 0) {
 
                /* ok, first region to draw ... */
-               
+
                region = gdk_region_rectangle (&rect);
                queue = true;
        }
@@ -532,14 +504,14 @@ FastMeter::queue_vertical_redraw (const Glib::RefPtr<Gdk::Window>& win, float ol
           the next expose will draw the new one whether its part of
           expose region or not.
        */
-       
+
        if (last_peak_rect.width * last_peak_rect.height != 0) {
                if (!queue) {
                        region = gdk_region_new ();
-                       queue = true; 
+                       queue = true;
                }
                gdk_region_union_with_rect (region, &last_peak_rect);
-       } 
+       }
 
        if (queue) {
                gdk_window_invalidate_region (win->gobj(), region, true);