--- gigedit/trunk/src/gigedit/dimregionchooser.cpp 2007/08/26 09:29:52 1303 +++ gigedit/trunk/src/gigedit/dimregionchooser.cpp 2013/09/04 20:23:05 2462 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006, 2007 Andreas Persson + * Copyright (C) 2006-2011 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,25 +18,17 @@ */ #include "dimregionchooser.h" +#include #include +#include -DimRegionChooser::DimRegionChooser() +#include "global.h" + +DimRegionChooser::DimRegionChooser() : + red("#8070ff"), + black("black"), + white("white") { - // get_window() would return 0 because the Gdk::Window has not yet been realized - // So we can only allocate the colors here - the rest will happen in on_realize(). - Glib::RefPtr colormap = get_default_colormap(); - - black = Gdk::Color("black"); - white = Gdk::Color("white"); - red = Gdk::Color("#8070ff"); - blue = Gdk::Color("blue"); - green = Gdk::Color("green"); - - colormap->alloc_color(black); - colormap->alloc_color(white); - colormap->alloc_color(red); - colormap->alloc_color(blue); - colormap->alloc_color(green); instrument = 0; region = 0; dimregno = -1; @@ -44,178 +36,300 @@ resize.active = false; cursor_is_resize = false; h = 20; - w = 800; - set_flags(Gtk::CAN_FOCUS); + set_can_focus(); add_events(Gdk::BUTTON_PRESS_MASK | Gdk::POINTER_MOTION_MASK | Gdk::POINTER_MOTION_HINT_MASK); for (int i = 0 ; i < 256 ; i++) dimvalue[i] = 0; + labels_changed = true; } DimRegionChooser::~DimRegionChooser() { } -void DimRegionChooser::on_realize() +#if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2 +bool DimRegionChooser::on_expose_event(GdkEventExpose* e) { - // 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); -} + double clipx1 = e->area.x; + double clipx2 = e->area.x + e->area.width; + double clipy1 = e->area.y; + double clipy2 = e->area.y + e->area.height; + + const Cairo::RefPtr& cr = + get_window()->create_cairo_context(); +#if 0 +} +#endif +#else +bool DimRegionChooser::on_draw(const Cairo::RefPtr& cr) +{ + double clipx1, clipx2, clipy1, clipy2; + cr->get_clip_extents(clipx1, clipy1, clipx2, clipy2); +#endif -bool DimRegionChooser::on_expose_event(GdkEventExpose* event) -{ if (!region) return true; // This is where we draw on the window - Glib::RefPtr window = get_window(); + int w = get_width(); Glib::RefPtr context = get_pango_context(); Glib::RefPtr layout = Pango::Layout::create(context); + cr->set_line_width(1); - window->clear(); - - // draw labels on the left (reflecting the dimension type) int y = 0; - double maxwidth = 0; - for (int i = 0 ; i < region->Dimensions ; i++) { - int nbZones = region->pDimensionDefinitions[i].zones; - if (nbZones) { - 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; - default: - sprintf(dstrbuf, "%d", - region->pDimensionDefinitions[i].dimension); - dstr = dstrbuf; - break; - } - layout->set_text(dstr); - - Pango::Rectangle rectangle = layout->get_logical_extents(); - 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); - + if (labels_changed || label_width - 10 > clipx1) { + // draw labels on the left (reflecting the dimension type) + double maxwidth = 0; + for (int i = 0 ; i < region->Dimensions ; i++) { + int nbZones = region->pDimensionDefinitions[i].zones; + if (nbZones) { + 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=_("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); + dstr = dstrbuf; + break; + } + layout->set_text(dstr); + + Pango::Rectangle rectangle = layout->get_logical_extents(); + double text_w = double(rectangle.get_width()) / Pango::SCALE; + if (text_w > maxwidth) maxwidth = text_w; + + if (y + h > clipy1 && y < clipy2 && text_w >= clipx1) { + double text_h = double(rectangle.get_height()) / + Pango::SCALE; +#if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2 + const Gdk::Color fg = get_style()->get_fg(get_state()); +#else + const Gdk::RGBA fg = + get_style_context()->get_color(get_state_flags()); +#endif + Gdk::Cairo::set_source_rgba(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; } - y += h; + label_width = int(maxwidth + 10); + labels_changed = false; } + if (label_width >= clipx2) return true; // draw dimensions' zones areas y = 0; int bitpos = 0; - label_width = int(maxwidth + 10); for (int i = 0 ; i < region->Dimensions ; i++) { int nbZones = region->pDimensionDefinitions[i].zones; if (nbZones) { - // draw focus rectangle around dimension's label and zones - if (has_focus() && focus_line == i) { - Gdk::Rectangle farea(0, y, 150, 20); - get_style()->paint_focus(window, get_state(), farea, *this, "", - 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); - // 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); - - int c = 0; - if (dimregno >= 0) { - int mask = ~(((1 << region->pDimensionDefinitions[i].bits) - 1) << bitpos); - c = dimregno & mask; // mask away this dimension - } - bool customsplits = - ((region->pDimensionDefinitions[i].split_type == gig::split_type_normal && - region->pDimensionRegions[c]->DimensionUpperLimits[i]) || - (region->pDimensionDefinitions[i].dimension == gig::dimension_velocity && - region->pDimensionRegions[c]->VelocityUpperLimit)); + if (y >= clipy2) break; + if (y + h > clipy1) { + // draw focus rectangle around dimension's label and zones + if (has_focus() && focus_line == i) { +#if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2 + Gdk::Rectangle farea(0, y, 150, 20); + get_style()->paint_focus(get_window(), get_state(), farea, + *this, "", + 0, y, label_width, 20); +#else + get_style_context()->render_focus(cr, + 0, y, label_width, 20); +#endif + } + + // draw top and bottom lines of dimension's zones + Gdk::Cairo::set_source_rgba(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 + Gdk::Cairo::set_source_rgba(cr, white); + cr->rectangle(label_width + 1, y + 1, + (w - label_width - 2), h - 2); + cr->fill(); + + int c = 0; + if (dimregno >= 0) { + int mask = + ~(((1 << region->pDimensionDefinitions[i].bits) - 1) << + bitpos); + c = dimregno & mask; // mask away this dimension + } + bool customsplits = + ((region->pDimensionDefinitions[i].split_type == + gig::split_type_normal && + region->pDimensionRegions[c]->DimensionUpperLimits[i]) || + (region->pDimensionDefinitions[i].dimension == + gig::dimension_velocity && + region->pDimensionRegions[c]->VelocityUpperLimit)); - // draw dimension's zone borders - if (customsplits) { - window->draw_line(black, label_width, y + 1, label_width, y + h - 2); - 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); - } - } 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); - } - } - - // draw fill for currently selected zone - if (dimregno >= 0) { - gc->set_foreground(red); - int dr = (dimregno >> bitpos) & ((1 << region->pDimensionDefinitions[i].bits) - 1); + // draw dimension's zone borders + Gdk::Cairo::set_source_rgba(cr, black); if (customsplits) { - int x1 = 0; + 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)]; + gig::DimensionRegion* d = + region->pDimensionRegions[c + (j << bitpos)]; int upperLimit = d->DimensionUpperLimits[i]; if (!upperLimit) upperLimit = d->VelocityUpperLimit; 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); - break; - } - x1 = x2; + int x = int((w - label_width - 1) * v / 128.0 + 0.5) + + label_width; + if (x >= clipx2) break; + if (x < clipx1) continue; + cr->move_to(x + 0.5, y + 1); + cr->line_to(x + 0.5, y + h - 1); } } else { - 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); + for (int j = 0 ; j <= nbZones ; j++) { + int x = int((w - label_width - 1) * j / + double(nbZones) + 0.5) + label_width; + if (x >= clipx2) break; + if (x < clipx1) continue; + cr->move_to(x + 0.5, y + 1); + cr->line_to(x + 0.5, y + h - 1); + } + } + cr->stroke(); + + // draw fill for currently selected zone + if (dimregno >= 0) { + Gdk::Cairo::set_source_rgba(cr, red); + int dr = (dimregno >> bitpos) & + ((1 << region->pDimensionDefinitions[i].bits) - 1); + + int x1 = -1, x2 = -1; + if (customsplits) { + x1 = label_width; + for (int j = 0 ; j < nbZones && x1 + 1 < clipx2 ; j++) { + gig::DimensionRegion* d = + region->pDimensionRegions[c + (j << bitpos)]; + int upperLimit = d->DimensionUpperLimits[i]; + if (!upperLimit) { + upperLimit = d->VelocityUpperLimit; + } + int v = upperLimit + 1; + x2 = int((w - label_width - 1) * v / 128.0 + + 0.5) + label_width; + if (j == dr && x1 < x2) { + cr->rectangle(x1 + 1, y + 1, + (x2 - x1) - 1, h - 2); + cr->fill(); + break; + } + x1 = x2; + } + } else { + if (dr < nbZones) { + x1 = int((w - label_width - 1) * dr / + double(nbZones) + 0.5); + x2 = int((w - label_width - 1) * (dr + 1) / + double(nbZones) + 0.5); + cr->rectangle(label_width + x1 + 1, y + 1, + (x2 - x1) - 1, h - 2); + cr->fill(); + } + } + + // draw text showing the beginning of the dimension zone + // as numeric value to the user + if (x1 >= 0) { + Glib::RefPtr layout = Pango::Layout::create(context); + int v = roundf(float(x1 - label_width) / float(w - label_width) * 127.f); + if (dr > 0) v++; + layout->set_text(Glib::Ascii::dtostr(v)); + Gdk::Cairo::set_source_rgba(cr, black); + Pango::Rectangle rect = layout->get_logical_extents(); + + int text_width, text_height; + // get the text dimensions + layout->get_pixel_size(text_width, text_height); + // move text to the right end of the dimension zone + cr->move_to(x1 + 1, y + 1); +#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 + } + // draw text showing the end of the dimension zone + // as numeric value to the user + if (x2 >= 0) { + Glib::RefPtr layout = Pango::Layout::create(context); + const int v = roundf(float(x2 - label_width) / float(w - label_width) * 127.f); + layout->set_text(Glib::Ascii::dtostr(v)); + Gdk::Cairo::set_source_rgba(cr, black); + Pango::Rectangle rect = layout->get_logical_extents(); + + int text_width, text_height; + // get the text dimensions + layout->get_pixel_size(text_width, text_height); + // move text to the right end of the dimension zone + cr->move_to(x2 - text_width - 1, y + 1); +#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 } } } @@ -228,14 +342,6 @@ return true; } -void DimRegionChooser::on_size_request(GtkRequisition* requisition) -{ - printf("DimRegionChooser::on_size_request\n"); - *requisition = GtkRequisition(); - requisition->height = region ? nbDimensions * 20 : 0; - requisition->width = 800; -} - void DimRegionChooser::set_region(gig::Region* region) { this->region = region; @@ -249,10 +355,6 @@ int z = std::min(dimvalue[region->pDimensionDefinitions[dim].dimension], region->pDimensionDefinitions[dim].zones - 1); - int mask = - ~(((1 << region->pDimensionDefinitions[dim].bits) - 1) << - bitcount); - dimregno &= mask; dimregno |= (z << bitcount); bitcount += region->pDimensionDefinitions[dim].bits; } @@ -261,86 +363,120 @@ dimreg = 0; } dimregion_selected(); + set_size_request(800, region ? nbDimensions * 20 : 0); + + labels_changed = true; queue_resize(); } -bool DimRegionChooser::on_button_release_event(GdkEventButton* event) + +void DimRegionChooser::get_dimregions(const gig::Region* region, bool stereo, + std::set& dimregs) const { - if (resize.active) { - get_window()->pointer_ungrab(event->time); - resize.active = false; + 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]); +} - if (region->pDimensionDefinitions[resize.dimension].dimension == gig::dimension_velocity) { +void DimRegionChooser::update_after_resize() +{ + if (region->pDimensionDefinitions[resize.dimension].dimension == gig::dimension_velocity) { - int bitpos = 0; - for (int j = 0 ; j < resize.dimension ; j++) { - bitpos += region->pDimensionDefinitions[j].bits; + int bitpos = 0; + for (int j = 0 ; j < resize.dimension ; j++) { + bitpos += region->pDimensionDefinitions[j].bits; + } + int mask = + ~(((1 << region->pDimensionDefinitions[resize.dimension].bits) - 1) << bitpos); + int c = dimregno & mask; // mask away this dimension + + if (region->pDimensionRegions[c]->DimensionUpperLimits[resize.dimension] == 0) { + // the velocity dimension didn't previously have + // custom v3 splits, so we initialize all splits with + // default values + int nbZones = region->pDimensionDefinitions[resize.dimension].zones; + for (int j = 0 ; j < nbZones ; j++) { + gig::DimensionRegion* d = region->pDimensionRegions[c + (j << bitpos)]; + d->DimensionUpperLimits[resize.dimension] = int(128.0 * (j + 1) / nbZones - 1); + } + } + if (region->pDimensionRegions[c]->VelocityUpperLimit == 0) { + // the velocity dimension didn't previously have + // custom v2 splits, so we initialize all splits with + // default values + int nbZones = region->pDimensionDefinitions[resize.dimension].zones; + for (int j = 0 ; j < nbZones ; j++) { + gig::DimensionRegion* d = region->pDimensionRegions[c + (j << bitpos)]; + d->VelocityUpperLimit = int(128.0 * (j + 1) / nbZones - 1); } - int mask = - ~(((1 << region->pDimensionDefinitions[resize.dimension].bits) - 1) << bitpos); - int c = dimregno & mask; // mask away this dimension + } - if (region->pDimensionRegions[c]->DimensionUpperLimits[resize.dimension] == 0) { - // the velocity dimension didn't previously have - // custom v3 splits, so we initialize all splits with - // default values - int nbZones = region->pDimensionDefinitions[resize.dimension].zones; - for (int j = 0 ; j < nbZones ; j++) { - gig::DimensionRegion *d = region->pDimensionRegions[c + (j << bitpos)]; - d->DimensionUpperLimits[resize.dimension] = int(128.0 * (j + 1) / nbZones - 1); + gig::DimensionRegion* d = region->pDimensionRegions[c + resize.offset]; + // update both v2 and v3 values + d->DimensionUpperLimits[resize.dimension] = resize.pos - 1; + d->VelocityUpperLimit = resize.pos - 1; + + } else { + for (int i = 0 ; i < region->DimensionRegions ; ) { + + if (region->pDimensionRegions[i]->DimensionUpperLimits[resize.dimension] == 0) { + // the dimension didn't previously have custom + // limits, so we have to set default limits for + // all the dimension regions + int bitpos = 0; + for (int j = 0 ; j < resize.dimension ; j++) { + bitpos += region->pDimensionDefinitions[j].bits; } - } - if (region->pDimensionRegions[c]->VelocityUpperLimit == 0) { - // the velocity dimension didn't previously have - // custom v2 splits, so we initialize all splits with - // default values int nbZones = region->pDimensionDefinitions[resize.dimension].zones; + for (int j = 0 ; j < nbZones ; j++) { - gig::DimensionRegion *d = region->pDimensionRegions[c + (j << bitpos)]; - d->VelocityUpperLimit = int(128.0 * (j + 1) / nbZones - 1); + gig::DimensionRegion* d = region->pDimensionRegions[i + (j << bitpos)]; + d->DimensionUpperLimits[resize.dimension] = int(128.0 * (j + 1) / nbZones - 1); } } - - gig::DimensionRegion *d = region->pDimensionRegions[c + resize.offset]; - // update both v2 and v3 values + gig::DimensionRegion* d = region->pDimensionRegions[i + resize.offset]; d->DimensionUpperLimits[resize.dimension] = resize.pos - 1; - d->VelocityUpperLimit = resize.pos - 1; - } else { - for (int i = 0 ; i < region->DimensionRegions ; ) { - - if (region->pDimensionRegions[i]->DimensionUpperLimits[resize.dimension] == 0) { - // the dimension didn't previously have custom - // limits, so we have to set default limits for - // all the dimension regions - int bitpos = 0; - for (int j = 0 ; j < resize.dimension ; j++) { - bitpos += region->pDimensionDefinitions[j].bits; - } - int nbZones = region->pDimensionDefinitions[resize.dimension].zones; - - for (int j = 0 ; j < nbZones ; j++) { - gig::DimensionRegion *d = region->pDimensionRegions[i + (j << bitpos)]; - d->DimensionUpperLimits[resize.dimension] = int(128.0 * (j + 1) / nbZones - 1); - } - } - gig::DimensionRegion *d = region->pDimensionRegions[i + resize.offset]; - d->DimensionUpperLimits[resize.dimension] = resize.pos - 1; - - int bitpos = 0; - int j; - for (j = 0 ; j < region->Dimensions ; j++) { - if (j != resize.dimension) { - int maxzones = 1 << region->pDimensionDefinitions[j].bits; - int dimj = (i >> bitpos) & (maxzones - 1); - if (dimj + 1 < region->pDimensionDefinitions[j].zones) break; - } - bitpos += region->pDimensionDefinitions[j].bits; + int bitpos = 0; + int j; + for (j = 0 ; j < region->Dimensions ; j++) { + if (j != resize.dimension) { + int maxzones = 1 << region->pDimensionDefinitions[j].bits; + int dimj = (i >> bitpos) & (maxzones - 1); + if (dimj + 1 < region->pDimensionDefinitions[j].zones) break; } - if (j == region->Dimensions) break; - i = (i & ~((1 << bitpos) - 1)) + (1 << bitpos); + bitpos += region->pDimensionDefinitions[j].bits; } + if (j == region->Dimensions) break; + i = (i & ~((1 << bitpos) - 1)) + (1 << bitpos); } + } +} + +bool DimRegionChooser::on_button_release_event(GdkEventButton* event) +{ + if (resize.active) { +#if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2 + get_window()->pointer_ungrab(event->time); +#else + Glib::wrap(event->device, true)->ungrab(event->time); +#endif + resize.active = false; + region_changed(); if (!is_in_resize_zone(event->x, event->y) && cursor_is_resize) { @@ -353,16 +489,28 @@ 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) { if (is_in_resize_zone(event->x, event->y)) { - Gdk::Cursor double_arrow(Gdk::SB_H_DOUBLE_ARROW); +#if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2 get_window()->pointer_grab(false, Gdk::BUTTON_RELEASE_MASK | Gdk::POINTER_MOTION_MASK | Gdk::POINTER_MOTION_HINT_MASK, - double_arrow, event->time); + Gdk::Cursor(Gdk::SB_H_DOUBLE_ARROW), + event->time); +#else + Glib::wrap(event->device, true)->grab(get_window(), + Gdk::OWNERSHIP_NONE, + false, + Gdk::BUTTON_RELEASE_MASK | + Gdk::POINTER_MOTION_MASK | + Gdk::POINTER_MOTION_HINT_MASK, + Gdk::Cursor::create(Gdk::SB_H_DOUBLE_ARROW), + event->time); +#endif resize.active = true; } else { int ydim = int(event->y / h); @@ -395,12 +543,12 @@ if (region->pDimensionRegions[c]->DimensionUpperLimits[i]) { for (z = 0 ; z < nbZones ; z++) { - gig::DimensionRegion *d = region->pDimensionRegions[c + (z << bitpos)]; + gig::DimensionRegion* d = region->pDimensionRegions[c + (z << bitpos)]; if (val <= d->DimensionUpperLimits[i]) break; } } else { for (z = 0 ; z < nbZones ; z++) { - gig::DimensionRegion *d = region->pDimensionRegions[c + (z << bitpos)]; + gig::DimensionRegion* d = region->pDimensionRegions[c + (z << bitpos)]; if (val <= d->VelocityUpperLimit) break; } } @@ -435,6 +583,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; @@ -443,48 +592,31 @@ 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(); - 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; int y = resize.dimension * h; - - 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); - } + int x1, x2; + if (k > resize.pos) { + x1 = prevx; + x2 = x; } else { - gc->set_foreground(red); - - Glib::RefPtr left; - Glib::RefPtr right; - if (resize.selected == resize.left) { - left = gc; - right = white; - } else { - left = white; - right = gc; - } - - 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); - } else { - int xx = resize.pos == resize.max ? 0 : 1; - window->draw_rectangle(right, true, - x, y + 1, prevx - x + xx, h - 2); - } + x1 = x; + x2 = prevx; } - window->draw_line(black, x, y + 1, x, y + h - 2); + Gdk::Rectangle rect(x1, y + 1, x2 - x1 + 1, h - 2); + resize.pos = k; + update_after_resize(); + get_window()->invalidate_rect(rect, false); } } else { if (is_in_resize_zone(x, y)) { if (!cursor_is_resize) { - Gdk::Cursor double_arrow(Gdk::SB_H_DOUBLE_ARROW); - window->set_cursor(double_arrow); +#if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2 + window->set_cursor(Gdk::Cursor(Gdk::SB_H_DOUBLE_ARROW)); +#else + window->set_cursor(Gdk::Cursor::create(Gdk::SB_H_DOUBLE_ARROW)); +#endif cursor_is_resize = true; } } else if (cursor_is_resize) { @@ -497,6 +629,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; @@ -524,7 +657,7 @@ if (region->pDimensionDefinitions[dim].split_type != gig::split_type_bit) { int prev_limit = 0; for (int iZone = 0 ; iZone < nbZones - 1 ; iZone++) { - gig::DimensionRegion *d = region->pDimensionRegions[c + (iZone << bitpos)]; + gig::DimensionRegion* d = region->pDimensionRegions[c + (iZone << bitpos)]; const int upperLimit = (customsplits) ? (d->DimensionUpperLimits[dim]) ? @@ -545,7 +678,7 @@ dr == iZone + 1 ? resize.right : resize.none; iZone++; - gig::DimensionRegion *d = region->pDimensionRegions[c + (iZone << bitpos)]; + gig::DimensionRegion* d = region->pDimensionRegions[c + (iZone << bitpos)]; const int upperLimit = (customsplits) ? @@ -564,12 +697,12 @@ return false; } -sigc::signal DimRegionChooser::signal_dimregion_selected() +sigc::signal& DimRegionChooser::signal_dimregion_selected() { return dimregion_selected; } -sigc::signal DimRegionChooser::signal_region_changed() +sigc::signal& DimRegionChooser::signal_region_changed() { return region_changed; }