/*
- 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 <string.h>
#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; }
using namespace Gtkmm2ext;
using namespace std;
+int FastMeter::min_pattern_metric_size = 16;
+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;
+FastMeter::Pattern10Map FastMeter::vm_pattern_cache;
+FastMeter::PatternBgMap FastMeter::vb_pattern_cache;
-int FastMeter::_clr0 = 0;
-int FastMeter::_clr1 = 0;
-int FastMeter::_clr2 = 0;
-int FastMeter::_clr3 = 0;
-
-FastMeter::FastMeter (long hold, unsigned long dimen, Orientation o, int len, int clr0, int clr1, int clr2, int clr3)
+FastMeter::FastMeter (long hold, unsigned long dimen, Orientation o, int len,
+ int clr0, int clr1, int clr2, int clr3,
+ int clr4, int clr5, int clr6, int clr7,
+ int clr8, int clr9, int bgc0, int bgc1,
+ float stp0, float stp1,
+ float stp2, float stp3
+ )
{
orientation = o;
hold_cnt = hold;
+ resized = true;
hold_state = 0;
current_peak = 0;
current_level = 0;
last_peak_rect.width = 0;
last_peak_rect.height = 0;
- _clr0 = clr0;
- _clr1 = clr1;
- _clr2 = clr2;
- _clr3 = clr3;
+
+ _clr[0] = clr0;
+ _clr[1] = clr1;
+ _clr[2] = clr2;
+ _clr[3] = clr3;
+ _clr[4] = clr4;
+ _clr[5] = clr5;
+ _clr[6] = clr6;
+ _clr[7] = clr7;
+ _clr[8] = clr8;
+ _clr[9] = clr9;
+
+ _bgc[0] = bgc0;
+ _bgc[1] = bgc1;
+
+ _stp[0] = stp0;
+ _stp[1] = stp1;
+ _stp[2] = stp2;
+ _stp[3] = stp3;
set_events (BUTTON_PRESS_MASK|BUTTON_RELEASE_MASK);
- pixrect.x = 0;
- pixrect.y = 0;
+ pixrect.x = 1;
+ pixrect.y = 1;
- if (orientation == Vertical) {
- if (!len)
- len = 250;
- pixbuf = request_vertical_meter(dimen, len);
- } else {
- if (!len)
- len = 186;
- pixbuf = request_horizontal_meter(len, dimen);
+ if (!len) {
+ len = 250;
}
+ fgpattern = request_vertical_meter(dimen, len, _clr, _stp);
+ bgpattern = request_vertical_background (dimen, len, _bgc);
+ pixheight = len;
+ pixwidth = dimen;
- pixheight = pixbuf->get_height();
- pixwidth = pixbuf->get_width();
+ pixrect.width = pixwidth;
+ pixrect.height = pixheight;
- if (orientation == Vertical) {
- pixrect.width = min (pixwidth, (gint) dimen);
- pixrect.height = pixheight;
- } else {
- pixrect.width = pixwidth;
- pixrect.height = min (pixheight, (gint) dimen);
- }
+ request_width = pixrect.width + 2;
+ request_height= pixrect.height + 2;
+}
- request_width = pixrect.width;
- request_height= pixrect.height;
+FastMeter::~FastMeter ()
+{
}
-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 *clr, float *stp)
{
- 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);
- // 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++) {
-
- 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;
-
- b = (guint8)floor((float)abs(b1 - b0) * (float)y / (float)(knee/2));
- (b0 >= b1) ? b = b0 - b : b += b0;
-
- 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;
- }
- }
+ guint8 r,g,b,a;
+ double knee;
+ double soft = 1.5 / (double) height;
- int offset = knee - y;
- for (int i=0; i < offset; i++,y++) {
+ cairo_pattern_t* pat = cairo_pattern_create_linear (0.0, 0.0, 0.0, height);
- r = (guint8)floor((float)abs(r2 - r1) * (float)i / (float)offset);
- (r1 >= r2) ? r = r1 - r : r += r1;
+ /*
+ Cairo coordinate space goes downwards as y value goes up, so invert
+ knee-based positions by using (1.0 - y)
+ */
- g = (guint8)floor((float)abs(g2 - g1) * (float)i / (float)offset);
- (g1 >= g2) ? g = g1 - g : g += g1;
+ UINT_TO_RGBA (clr[9], &r, &g, &b, &a); // top/clip
+ cairo_pattern_add_color_stop_rgb (pat, 0.0,
+ r/255.0, g/255.0, b/255.0);
- b = (guint8)floor((float)abs(b2 - b1) * (float)i / (float)offset);
- (b1 >= b2) ? b = b1 - b : b += b1;
+ knee = ((float)height * stp[3] / 115.0f); // -0dB
- 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;
- }
+ UINT_TO_RGBA (clr[8], &r, &g, &b, &a);
+ cairo_pattern_add_color_stop_rgb (pat, 1.0 - (knee/(double)height) - soft,
+ r/255.0, g/255.0, b/255.0);
+
+ UINT_TO_RGBA (clr[7], &r, &g, &b, &a);
+ cairo_pattern_add_color_stop_rgb (pat, 1.0 - (knee/(double)height) + soft,
+ r/255.0, g/255.0, b/255.0);
+
+ knee = ((float)height * stp[2]/ 115.0f); // -3dB || -2dB
+
+ UINT_TO_RGBA (clr[6], &r, &g, &b, &a);
+ cairo_pattern_add_color_stop_rgb (pat, 1.0 - (knee/(double)height) - soft,
+ r/255.0, g/255.0, b/255.0);
+
+ UINT_TO_RGBA (clr[5], &r, &g, &b, &a);
+ cairo_pattern_add_color_stop_rgb (pat, 1.0 - (knee/(double)height) + soft,
+ r/255.0, g/255.0, b/255.0);
+
+ knee = ((float)height * stp[1] / 115.0f); // -9dB
+
+ UINT_TO_RGBA (clr[4], &r, &g, &b, &a);
+ cairo_pattern_add_color_stop_rgb (pat, 1.0 - (knee/(double)height) - soft,
+ r/255.0, g/255.0, b/255.0);
+
+ UINT_TO_RGBA (clr[3], &r, &g, &b, &a);
+ cairo_pattern_add_color_stop_rgb (pat, 1.0 - (knee/(double)height) + soft,
+ r/255.0, g/255.0, b/255.0);
+
+ knee = ((float)height * stp[0] / 115.0f); // -18dB
+
+ UINT_TO_RGBA (clr[2], &r, &g, &b, &a);
+ cairo_pattern_add_color_stop_rgb (pat, 1.0 - (knee/(double)height) - soft,
+ r/255.0, g/255.0, b/255.0);
+
+ UINT_TO_RGBA (clr[1], &r, &g, &b, &a);
+ cairo_pattern_add_color_stop_rgb (pat, 1.0 - (knee/(double)height) + soft,
+ r/255.0, g/255.0, b/255.0);
+
+ UINT_TO_RGBA (clr[0], &r, &g, &b, &a); // bottom
+ cairo_pattern_add_color_stop_rgb (pat, 1.0,
+ r/255.0, g/255.0, b/255.0);
+
+ if (1) { // TODO Config->get_meter_shade()
+ cairo_pattern_t* shade_pattern = cairo_pattern_create_linear (0.0, 0.0, width, 0.0);
+ cairo_pattern_add_color_stop_rgba (shade_pattern, 0, 1.0, 1.0, 1.0, 0.2);
+ cairo_pattern_add_color_stop_rgba (shade_pattern, 1, 0.0, 0.0, 0.0, 0.3);
+
+ cairo_surface_t* surface;
+ cairo_t* tc = 0;
+ surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height);
+ tc = cairo_create (surface);
+ cairo_set_source (tc, pat);
+ cairo_rectangle (tc, 0, 0, width, height);
+ cairo_fill (tc);
+ cairo_set_source (tc, shade_pattern);
+ cairo_rectangle (tc, 0, 0, width, height);
+ cairo_fill (tc);
+
+ cairo_pattern_destroy (pat);
+ cairo_pattern_destroy (shade_pattern);
+
+ pat = cairo_pattern_create_for_surface (surface);
+
+ cairo_destroy (tc);
+ cairo_surface_destroy (surface);
}
-
- 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 (new Cairo::Pattern (pat, false));
+
+ return p;
}
-Glib::RefPtr<Gdk::Pixbuf> FastMeter::request_horizontal_meter(int width, int height)
+
+Cairo::RefPtr<Cairo::Pattern>
+FastMeter::generate_meter_background (
+ int width, int height, int *clr)
{
- 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);
- }
- Glib::RefPtr<Gdk::Pixbuf> ret = h_pixbuf_cache[index];
- if (ret)
- return ret;
-
- guint8* data;
-
- data = (guint8*) malloc(width*height * 3);
-
- guint8 r,g,b;
- r=0;
- g=255;
- b=0;
-
- // 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;
- }
- }
+ guint8 r0,g0,b0,r1,g1,b1,a;
- 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;
- }
+ cairo_pattern_t* pat = cairo_pattern_create_linear (0.0, 0.0, width, height);
+
+ UINT_TO_RGBA (clr[0], &r0, &g0, &b0, &a);
+ UINT_TO_RGBA (clr[1], &r1, &g1, &b1, &a);
+
+ cairo_pattern_add_color_stop_rgb (pat, 0.0,
+ r1/255.0, g1/255.0, b1/255.0);
+
+ cairo_pattern_add_color_stop_rgb (pat, 1.0,
+ r0/255.0, g0/255.0, b0/255.0);
+
+ Cairo::RefPtr<Cairo::Pattern> p (new Cairo::Pattern (pat, false));
+
+ return p;
+}
+
+Cairo::RefPtr<Cairo::Pattern>
+FastMeter::request_vertical_meter(
+ int width, int height, int *clr, float *stp)
+{
+ if (height < min_pattern_metric_size)
+ height = min_pattern_metric_size;
+ if (height > max_pattern_metric_size)
+ height = max_pattern_metric_size;
+
+ const Pattern10MapKey key (width, height,
+ stp[0], stp[1], stp[2], stp[3],
+ clr[0], clr[1], clr[2], clr[3],
+ clr[4], clr[5], clr[6], clr[7],
+ clr[8], clr[9]);
+
+ Pattern10Map::iterator i;
+ if ((i = vm_pattern_cache.find (key)) != vm_pattern_cache.end()) {
+ return i->second;
}
-
- ret = Pixbuf::create_from_data(data, COLORSPACE_RGB, false, 8, width, height, width * 3);
- h_pixbuf_cache[index] = ret;
+ // TODO flush pattern cache if it gets too large
- return ret;
+ Cairo::RefPtr<Cairo::Pattern> p = generate_meter_pattern (
+ width, height, clr, stp);
+ vm_pattern_cache[key] = p;
+
+ return p;
}
-FastMeter::~FastMeter ()
+Cairo::RefPtr<Cairo::Pattern>
+FastMeter::request_vertical_background(
+ int width, int height, int *bgc)
{
+ if (height < min_pattern_metric_size)
+ height = min_pattern_metric_size;
+ if (height > max_pattern_metric_size)
+ height = max_pattern_metric_size;
+
+ const PatternBgMapKey key (width, height, bgc[0], bgc[1]);
+ PatternBgMap::iterator i;
+ if ((i = vb_pattern_cache.find (key)) != vb_pattern_cache.end()) {
+ return i->second;
+ }
+ // TODO flush pattern cache if it gets too large
+
+ Cairo::RefPtr<Cairo::Pattern> p = generate_meter_background (
+ width, height, bgc);
+ vb_pattern_cache[key] = p;
+
+ return p;
}
+
void
FastMeter::set_hold_count (long val)
{
if (val < 1) {
val = 1;
}
-
+
hold_cnt = val;
hold_state = 0;
current_peak = 0;
-
+
queue_draw ();
}
void
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->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->height = request_height;
- }
+ req->height = request_height;
+ req->height = max(req->height, min_pattern_metric_size);
+ req->height = min(req->height, max_pattern_metric_size);
+ req->height += 2;
+ req->width = request_width;
}
void
FastMeter::on_size_allocate (Gtk::Allocation &alloc)
{
- if (orientation == Vertical) {
-
- if (alloc.get_width() != request_width) {
- alloc.set_width (request_width);
- }
-
- int h = alloc.get_height();
- h = max(h, min_v_pixbuf_size);
- h = min(h, max_v_pixbuf_size);
-
- if ( h != alloc.get_height())
- alloc.set_height(h);
-
- if (pixheight != h) {
- pixbuf = request_vertical_meter(request_width, h);
- }
-
- } else {
-
- if (alloc.get_height() != request_height) {
- alloc.set_height(request_height);
- }
-
- int w = alloc.get_width();
- w = max(w, min_h_pixbuf_size);
- w = min(w, max_h_pixbuf_size);
+ if (alloc.get_width() != request_width) {
+ alloc.set_width (request_width);
+ }
- if ( w != alloc.get_width())
- alloc.set_width(w);
+ int h = alloc.get_height();
+ h = max (h, min_pattern_metric_size + 2);
+ h = min (h, max_pattern_metric_size + 2);
- if (pixwidth != w) {
- pixbuf = request_horizontal_meter(w, request_height);
- }
+ if (h != alloc.get_height()) {
+ alloc.set_height (h);
}
- pixheight = pixbuf->get_height();
- pixwidth = pixbuf->get_width();
+ if (pixheight != h) {
+ fgpattern = request_vertical_meter (request_width, h, _clr, _stp);
+ bgpattern = request_vertical_background (request_width, h, _bgc);
+ pixheight = h - 2;
+ pixwidth = request_width - 2;
+ }
- DrawingArea::on_size_allocate(alloc);
+ DrawingArea::on_size_allocate (alloc);
+ resized = true;
}
bool
FastMeter::on_expose_event (GdkEventExpose* ev)
{
- if (orientation == Vertical) {
- return vertical_expose (ev);
- } else {
- return horizontal_expose (ev);
- }
+ return vertical_expose (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
+ rounded_rectangle (cr, 0, 0, pixrect.width + 2, pixheight + 2, 2);
+ 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
*/
pixrect.height = top_of_meter;
- pixrect.y = pixheight - top_of_meter;
+ pixrect.y = 1 + pixheight - top_of_meter;
- background.x = 0;
- background.y = 0;
+ background.x = 1;
+ background.y = 1;
background.width = pixrect.width;
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 (cr, bgpattern->cobj());
+ 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, fgpattern->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);
+ last_peak_rect.y = 1 + pixheight - (gint) floor (pixheight * current_peak);
+ last_peak_rect.height = min(2, pixheight - last_peak_rect.y);
+
+ cairo_set_source (cr, fgpattern->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;
}
- return TRUE;
-}
-
-bool
-FastMeter::horizontal_expose (GdkEventExpose* ev)
-{
- gint right_of_meter;
- GdkRectangle intersection;
- GdkRectangle background;
+ cairo_destroy (cr);
- right_of_meter = (gint) floor (pixwidth * current_level);
- pixrect.width = right_of_meter;
-
- background.x = 0;
- background.y = 0;
- background.width = pixwidth - right_of_meter;
- 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);
- }
-
- 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);
- }
-
- // draw peak bar
- // XXX: peaks don't work properly
- /*
- if (hold_state && intersection.height > 0) {
- gint x = (gint) floor(pixwidth * current_peak);
-
- get_window()->draw_pixbuf (get_style()->get_fg_gc(get_state()), pixbuf,
- x, intersection.y,
- x, intersection.y,
- 3, intersection.height,
- Gdk::RGB_DITHER_NONE, 0, 0);
- }
- */
-
- return true;
+ return TRUE;
}
void
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;
return;
}
- if (orientation == Vertical) {
- queue_vertical_redraw (win, old_level);
- } else {
- queue_horizontal_redraw (win, old_level);
- }
+ queue_vertical_redraw (win, old_level);
}
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;
+ rect.y = 1 + pixheight - new_top;
if (current_level > old_level) {
/* colored/pixbuf got larger, just draw the new section */
if (rect.height != 0) {
/* ok, first region to draw ... */
-
+
region = gdk_region_rectangle (&rect);
queue = true;
}
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);
}
}
-void
-FastMeter::queue_horizontal_redraw (const Glib::RefPtr<Gdk::Window>& win, float old_level)
-{
- /* XXX OPTIMIZE (when we have some horizontal meters) */
- queue_draw ();
-}
-
void
FastMeter::clear ()
{