--- gigedit/trunk/src/gigedit/dimregionchooser.cpp 2007/06/10 10:56:11 1225 +++ gigedit/trunk/src/gigedit/dimregionchooser.cpp 2010/11/21 12:38:41 2151 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006, 2007 Andreas Persson + * Copyright (C) 2006-2010 Andreas Persson * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -18,7 +18,28 @@ */ #include "dimregionchooser.h" +#include #include +#include + +#include "global.h" + +#include "global.h" + +#if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 10) || GTKMM_MAJOR_VERSION < 2 + +#define create_cairo_context() \ + gobj() ? Cairo::RefPtr( \ + new Cairo::Context(gdk_cairo_create(get_window()->gobj()))) : \ + Cairo::RefPtr() + +namespace Gdk { + namespace Cairo { + void set_source_color(const ::Cairo::RefPtr< ::Cairo::Context >& cr, + const Gdk::Color& color); + } +} +#endif DimRegionChooser::DimRegionChooser() { @@ -44,40 +65,33 @@ resize.active = false; cursor_is_resize = false; h = 20; - w = 800; +#if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 18) || GTKMM_MAJOR_VERSION < 2 set_flags(Gtk::CAN_FOCUS); +#else + set_can_focus(); +#endif add_events(Gdk::BUTTON_PRESS_MASK | Gdk::POINTER_MOTION_MASK | Gdk::POINTER_MOTION_HINT_MASK); - for (int i = 0 ; i < 256 ; i++) { - dimvalue_from[i] = 0; - dimvalue_to[i] = 1; - } + for (int i = 0 ; i < 256 ; i++) dimvalue[i] = 0; } DimRegionChooser::~DimRegionChooser() { } -void DimRegionChooser::on_realize() -{ - // We need to call the base on_realize() - Gtk::DrawingArea::on_realize(); - - // Now we can allocate any additional resources we need - Glib::RefPtr window = get_window(); - gc = Gdk::GC::create(window); -} - bool DimRegionChooser::on_expose_event(GdkEventExpose* event) { if (!region) return true; // This is where we draw on the window + int w = get_width(); Glib::RefPtr window = get_window(); Glib::RefPtr context = get_pango_context(); Glib::RefPtr layout = Pango::Layout::create(context); + Cairo::RefPtr cr = get_window()->create_cairo_context(); + cr->set_line_width(1); window->clear(); @@ -90,40 +104,40 @@ const char* dstr; char dstrbuf[10]; switch (region->pDimensionDefinitions[i].dimension) { - case gig::dimension_none: dstr="none"; break; - case gig::dimension_samplechannel: dstr="samplechannel"; break; - case gig::dimension_layer: dstr="layer"; break; - case gig::dimension_velocity: dstr="velocity"; break; - case gig::dimension_channelaftertouch: dstr="channelaftertouch"; break; - case gig::dimension_releasetrigger: dstr="releasetrigger"; break; - case gig::dimension_keyboard: dstr="keyboard"; break; - case gig::dimension_roundrobin: dstr="roundrobin"; break; - case gig::dimension_random: dstr="random"; break; - case gig::dimension_smartmidi: dstr="smartmidi"; break; - case gig::dimension_roundrobinkeyboard: dstr="roundrobinkeyboard"; break; - case gig::dimension_modwheel: dstr="modwheel"; break; - case gig::dimension_breath: dstr="breath"; break; - case gig::dimension_foot: dstr="foot"; break; - case gig::dimension_portamentotime: dstr="portamentotime"; break; - case gig::dimension_effect1: dstr="effect1"; break; - case gig::dimension_effect2: dstr="effect2"; break; - case gig::dimension_genpurpose1: dstr="genpurpose1"; break; - case gig::dimension_genpurpose2: dstr="genpurpose2"; break; - case gig::dimension_genpurpose3: dstr="genpurpose3"; break; - case gig::dimension_genpurpose4: dstr="genpurpose4"; break; - case gig::dimension_sustainpedal: dstr="sustainpedal"; break; - case gig::dimension_portamento: dstr="portamento"; break; - case gig::dimension_sostenutopedal: dstr="sostenutopedal"; break; - case gig::dimension_softpedal: dstr="softpedal"; break; - case gig::dimension_genpurpose5: dstr="genpurpose5"; break; - case gig::dimension_genpurpose6: dstr="genpurpose6"; break; - case gig::dimension_genpurpose7: dstr="genpurpose7"; break; - case gig::dimension_genpurpose8: dstr="genpurpose8"; break; - case gig::dimension_effect1depth: dstr="effect1depth"; break; - case gig::dimension_effect2depth: dstr="effect2depth"; break; - case gig::dimension_effect3depth: dstr="effect3depth"; break; - case gig::dimension_effect4depth: dstr="effect4depth"; break; - case gig::dimension_effect5depth: dstr="effect5depth"; break; + case gig::dimension_none: dstr=_("none"); break; + case gig::dimension_samplechannel: dstr=_("samplechannel"); break; + case gig::dimension_layer: dstr=_("layer"); break; + case gig::dimension_velocity: dstr=_("velocity"); break; + case gig::dimension_channelaftertouch: dstr=_("channelaftertouch"); break; + case gig::dimension_releasetrigger: dstr=_("releasetrigger"); break; + case gig::dimension_keyboard: dstr=_("keyswitching"); break; + case gig::dimension_roundrobin: dstr=_("roundrobin"); break; + case gig::dimension_random: dstr=_("random"); break; + case gig::dimension_smartmidi: dstr=_("smartmidi"); break; + case gig::dimension_roundrobinkeyboard: dstr=_("roundrobinkeyboard"); break; + case gig::dimension_modwheel: dstr=_("modwheel"); break; + case gig::dimension_breath: dstr=_("breath"); break; + case gig::dimension_foot: dstr=_("foot"); break; + case gig::dimension_portamentotime: dstr=_("portamentotime"); break; + case gig::dimension_effect1: dstr=_("effect1"); break; + case gig::dimension_effect2: dstr=_("effect2"); break; + case gig::dimension_genpurpose1: dstr=_("genpurpose1"); break; + case gig::dimension_genpurpose2: dstr=_("genpurpose2"); break; + case gig::dimension_genpurpose3: dstr=_("genpurpose3"); break; + case gig::dimension_genpurpose4: dstr=_("genpurpose4"); break; + case gig::dimension_sustainpedal: dstr=_("sustainpedal"); break; + case gig::dimension_portamento: dstr=_("portamento"); break; + case gig::dimension_sostenutopedal: dstr=_("sostenutopedal"); break; + case gig::dimension_softpedal: dstr=_("softpedal"); break; + case gig::dimension_genpurpose5: dstr=_("genpurpose5"); break; + case gig::dimension_genpurpose6: dstr=_("genpurpose6"); break; + case gig::dimension_genpurpose7: dstr=_("genpurpose7"); break; + case gig::dimension_genpurpose8: dstr=_("genpurpose8"); break; + case gig::dimension_effect1depth: dstr=_("effect1depth"); break; + case gig::dimension_effect2depth: dstr=_("effect2depth"); break; + case gig::dimension_effect3depth: dstr=_("effect3depth"); break; + case gig::dimension_effect4depth: dstr=_("effect4depth"); break; + case gig::dimension_effect5depth: dstr=_("effect5depth"); break; default: sprintf(dstrbuf, "%d", region->pDimensionDefinitions[i].dimension); @@ -136,9 +150,14 @@ double text_w = double(rectangle.get_width()) / Pango::SCALE; if (text_w > maxwidth) maxwidth = text_w; double text_h = double(rectangle.get_height()) / Pango::SCALE; - Glib::RefPtr fg = get_style()->get_fg_gc(get_state()); - window->draw_layout(fg, 4, int(y + (h - text_h) / 2 + 0.5), layout); - + const Gdk::Color fg = get_style()->get_fg(get_state()); + Gdk::Cairo::set_source_color(cr, fg); + cr->move_to(4, int(y + (h - text_h) / 2 + 0.5)); +#if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 16) || GTKMM_MAJOR_VERSION < 2 + pango_cairo_show_layout(cr->cobj(), layout->gobj()); +#else + layout->show_in_cairo_context(cr); +#endif } y += h; } @@ -157,13 +176,18 @@ 0, y, label_width, 20); } - Glib::RefPtr black = get_style()->get_black_gc(); // draw top and bottom lines of dimension's zones - window->draw_line(black, label_width, y, w - 1, y); - window->draw_line(black, w - 1, y + h - 1, label_width, y + h - 1); + Gdk::Cairo::set_source_color(cr, black); + cr->move_to(label_width, y + 0.5); + cr->line_to(w, y + 0.5); + cr->move_to(w, y + h - 0.5); + cr->line_to(label_width, y + h - 0.5); + cr->stroke(); + // erase whole dimension's zones area - window->draw_rectangle(get_style()->get_white_gc(), true, - label_width + 1, y + 1, (w - label_width - 2), h - 2); + Gdk::Cairo::set_source_color(cr, white); + cr->rectangle(label_width + 1, y + 1, (w - label_width - 2), h - 2); + cr->fill(); int c = 0; if (dimregno >= 0) { @@ -177,26 +201,32 @@ region->pDimensionRegions[c]->VelocityUpperLimit)); // draw dimension's zone borders + Gdk::Cairo::set_source_color(cr, black); if (customsplits) { - window->draw_line(black, label_width, y + 1, label_width, y + h - 2); + cr->move_to(label_width + 0.5, y + 1); + cr->line_to(label_width + 0.5, y + h - 1); + for (int j = 0 ; j < nbZones ; j++) { gig::DimensionRegion *d = region->pDimensionRegions[c + (j << bitpos)]; int upperLimit = d->DimensionUpperLimits[i]; if (!upperLimit) upperLimit = d->VelocityUpperLimit; int v = upperLimit + 1; int x = int((w - label_width - 1) * v / 128.0 + 0.5); - window->draw_line(black, label_width + x, y + 1, label_width + x, y + h - 2); + cr->move_to(label_width + x + 0.5, y + 1); + cr->line_to(label_width + x + 0.5, y + h - 1); } } else { for (int j = 0 ; j <= nbZones ; j++) { int x = int((w - label_width - 1) * j / double(nbZones) + 0.5); - window->draw_line(black, label_width + x, y + 1, label_width + x, y + h - 2); + cr->move_to(label_width + x + 0.5, y + 1); + cr->line_to(label_width + x + 0.5, y + h - 1); } } + cr->stroke(); // draw fill for currently selected zone if (dimregno >= 0) { - gc->set_foreground(red); + Gdk::Cairo::set_source_color(cr, red); int dr = (dimregno >> bitpos) & ((1 << region->pDimensionDefinitions[i].bits) - 1); if (customsplits) { int x1 = 0; @@ -207,8 +237,9 @@ int v = upperLimit + 1; int x2 = int((w - label_width - 1) * v / 128.0 + 0.5); if (j == dr && x1 < x2) { - window->draw_rectangle(gc, true, label_width + x1 + 1, y + 1, - (x2 - x1) - 1, h - 2); + cr->rectangle(label_width + x1 + 1, y + 1, + (x2 - x1) - 1, h - 2); + cr->fill(); break; } x1 = x2; @@ -217,8 +248,9 @@ if (dr < nbZones) { int x1 = int((w - label_width - 1) * dr / double(nbZones) + 0.5); int x2 = int((w - label_width - 1) * (dr + 1) / double(nbZones) + 0.5); - window->draw_rectangle(gc, true, label_width + x1 + 1, y + 1, - (x2 - x1) - 1, h - 2); + cr->rectangle(label_width + x1 + 1, y + 1, + (x2 - x1) - 1, h - 2); + cr->fill(); } } } @@ -233,7 +265,6 @@ void DimRegionChooser::on_size_request(GtkRequisition* requisition) { - printf("DimRegionChooser::on_size_request\n"); *requisition = GtkRequisition(); requisition->height = region ? nbDimensions * 20 : 0; requisition->width = 800; @@ -250,21 +281,8 @@ if (region->pDimensionDefinitions[dim].bits == 0) continue; nbDimensions++; - int from = dimvalue_from[region->pDimensionDefinitions[dim].dimension]; - int to = dimvalue_to[region->pDimensionDefinitions[dim].dimension]; - int z; - switch (region->pDimensionDefinitions[dim].split_type) { - case gig::split_type_normal: - z = int((to + from) / 2.0 / region->pDimensionDefinitions[dim].zone_size); - break; - case gig::split_type_bit: - z = std::min(from, region->pDimensionDefinitions[dim].zones - 1); - break; - } - int mask = - ~(((1 << region->pDimensionDefinitions[dim].bits) - 1) << - bitcount); - dimregno &= mask; + int z = std::min(dimvalue[region->pDimensionDefinitions[dim].dimension], + region->pDimensionDefinitions[dim].zones - 1); dimregno |= (z << bitcount); bitcount += region->pDimensionDefinitions[dim].bits; } @@ -272,10 +290,34 @@ } else { dimreg = 0; } - sel_changed_signal.emit(); + dimregion_selected(); queue_resize(); } + +void DimRegionChooser::get_dimregions(const gig::Region* region, bool stereo, + std::set& dimregs) const +{ + int dimregno = 0; + int bitcount = 0; + int stereo_bit = 0; + for (int dim = 0 ; dim < region->Dimensions ; dim++) { + if (region->pDimensionDefinitions[dim].bits == 0) continue; + if (stereo && + region->pDimensionDefinitions[dim].dimension == gig::dimension_samplechannel) { + stereo_bit = (1 << bitcount); + } else { + int z = std::min(dimvalue[region->pDimensionDefinitions[dim].dimension], + region->pDimensionDefinitions[dim].zones - 1); + dimregno |= (z << bitcount); + } + bitcount += region->pDimensionDefinitions[dim].bits; + } + dimregs.insert(region->pDimensionRegions[dimregno]); + if (stereo_bit) dimregs.insert(region->pDimensionRegions[dimregno | stereo_bit]); +} + + bool DimRegionChooser::on_button_release_event(GdkEventButton* event) { if (resize.active) { @@ -353,6 +395,7 @@ i = (i & ~((1 << bitpos) - 1)) + (1 << bitpos); } } + region_changed(); if (!is_in_resize_zone(event->x, event->y) && cursor_is_resize) { get_window()->set_cursor(); @@ -364,6 +407,7 @@ bool DimRegionChooser::on_button_press_event(GdkEventButton* event) { + int w = get_width(); if (region && event->y < nbDimensions * h && event->x >= label_width && event->x < w) { @@ -424,20 +468,7 @@ region->pDimensionDefinitions[dim].split_type, region->pDimensionDefinitions[dim].zones, region->pDimensionDefinitions[dim].zone_size); -#if 0 - switch (region->pDimensionDefinitions[dim].split_type) { - case gig::split_type_normal: - dimvalue_from[region->pDimensionDefinitions[dim].dimension] = - int(z * region->pDimensionDefinitions[dim].zone_size); - dimvalue_to[region->pDimensionDefinitions[dim].dimension] = - int((z + 1) * region->pDimensionDefinitions[dim].zone_size) - 1; - break; - case gig::split_type_bit: - dimvalue_from[region->pDimensionDefinitions[dim].dimension] = z; - dimvalue_to[region->pDimensionDefinitions[dim].dimension] = z + 1; - break; - } -#endif + dimvalue[region->pDimensionDefinitions[dim].dimension] = z; dimregno = c | (z << bitpos); @@ -445,7 +476,7 @@ if (has_focus()) queue_draw(); else grab_focus(); dimreg = region->pDimensionRegions[dimregno]; - sel_changed_signal.emit(); + dimregion_selected(); } } return true; @@ -459,6 +490,7 @@ window->get_pointer(x, y, state); if (resize.active) { + int w = get_width(); int k = int((x - label_width) * 128.0 / (w - label_width - 1) + 0.5); if (k < resize.min) k = resize.min; @@ -467,8 +499,8 @@ if (k < 2) k = 2; // k is upper limit + 1, upper limit 0 is forbidden if (k != resize.pos) { - Glib::RefPtr black = get_style()->get_black_gc(); - Glib::RefPtr white = get_style()->get_white_gc(); + Cairo::RefPtr cr = get_window()->create_cairo_context(); + cr->set_line_width(1); int prevx = int((w - label_width - 1) * resize.pos / 128.0 + 0.5) + label_width; int x = int((w - label_width - 1) * k / 128.0 + 0.5) + label_width; @@ -476,32 +508,38 @@ if (resize.selected == resize.none) { if (resize.pos != resize.min && resize.pos != resize.max) { - window->draw_line(white, prevx, y + 1, prevx, y + h - 2); + Gdk::Cairo::set_source_color(cr, white); + cr->move_to(prevx + 0.5, y + 1); + cr->line_to(prevx + 0.5, y + h - 1); + cr->stroke(); } } else { - gc->set_foreground(red); - - Glib::RefPtr left; - Glib::RefPtr right; + Gdk::Color left; + Gdk::Color right; if (resize.selected == resize.left) { - left = gc; + left = red; right = white; } else { left = white; - right = gc; + right = red; } if (k > resize.pos) { int xx = resize.pos == resize.min ? 1 : 0; - window->draw_rectangle(left, true, - prevx + xx, y + 1, x - prevx - xx, h - 2); + Gdk::Cairo::set_source_color(cr, left); + cr->rectangle(prevx + xx, y + 1, x - prevx - xx, h - 2); } else { int xx = resize.pos == resize.max ? 0 : 1; - window->draw_rectangle(right, true, - x, y + 1, prevx - x + xx, h - 2); + Gdk::Cairo::set_source_color(cr, right); + cr->rectangle(x, y + 1, prevx - x + xx, h - 2); } + cr->fill(); } - window->draw_line(black, x, y + 1, x, y + h - 2); + Gdk::Cairo::set_source_color(cr, black); + cr->move_to(x + 0.5, y + 1); + cr->line_to(x + 0.5, y + h - 1); + cr->stroke(); + resize.pos = k; } } else { @@ -521,6 +559,7 @@ bool DimRegionChooser::is_in_resize_zone(double x, double y) { + int w = get_width(); if (region && y < nbDimensions * h && x >= label_width && x < w) { int ydim = int(y / h); int dim; @@ -588,9 +627,14 @@ return false; } -sigc::signal DimRegionChooser::signal_sel_changed() +sigc::signal& DimRegionChooser::signal_dimregion_selected() +{ + return dimregion_selected; +} + +sigc::signal& DimRegionChooser::signal_region_changed() { - return sel_changed_signal; + return region_changed; } bool DimRegionChooser::on_focus(Gtk::DirectionType direction)