--- gigedit/trunk/src/gigedit/regionchooser.cpp 2007/09/10 19:56:26 1339 +++ gigedit/trunk/src/gigedit/regionchooser.cpp 2014/04/21 17:49:17 2536 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006, 2007 Andreas Persson + * Copyright (C) 2006-2014 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,31 +18,89 @@ */ #include "regionchooser.h" + +#include + +#include +#include #include #include #include #include -#include -#include -#define _(String) gettext(String) +#include "global.h" + +#define REGION_BLOCK_HEIGHT 20 +#define KEYBOARD_HEIGHT 40 + +void SortedRegions::update(gig::Instrument* instrument) { + // Usually, the regions in a gig file are ordered after their key + // range, but there are files where they are not. The + // RegionChooser code needs a sorted list of regions. + regions.clear(); + if (instrument) { + for (gig::Region* r = instrument->GetFirstRegion() ; + r ; + r = instrument->GetNextRegion()) { + regions.push_back(r); + } + sort(regions.begin(), regions.end(), *this); + } +} + +gig::Region* SortedRegions::first() { + region_iterator = regions.begin(); + return region_iterator == regions.end() ? 0 : *region_iterator; +} + +gig::Region* SortedRegions::next() { + region_iterator++; + return region_iterator == regions.end() ? 0 : *region_iterator; +} -RegionChooser::RegionChooser() -{ - Glib::RefPtr colormap = get_default_colormap(); - red = Gdk::Color("#8070ff"); - grey1 = Gdk::Color("#b0b0b0"); - colormap->alloc_color(red); - colormap->alloc_color(grey1); +RegionChooser::RegionChooser() : + activeKeyColor("red"), + red("#8070ff"), + grey1("grey69"), + white("white"), + black("black"), + m_VirtKeybModeChoice(_("Virtual Keyboard Mode")), + currentActiveKey(-1) +{ + set_size_request(500, KEYBOARD_HEIGHT + REGION_BLOCK_HEIGHT); + instrument = 0; region = 0; resize.active = false; move.active = false; cursor_is_resize = false; - h1 = 20; - width = 800; + h1 = REGION_BLOCK_HEIGHT; + + // properties of the virtual keyboard + { + const char* choices[] = { _("normal"), _("chord"), 0 }; + static const virt_keyboard_mode_t values[] = { + VIRT_KEYBOARD_MODE_NORMAL, + VIRT_KEYBOARD_MODE_CHORD + }; + m_VirtKeybModeChoice.set_choices(choices, values); + m_VirtKeybModeChoice.set_value(VIRT_KEYBOARD_MODE_NORMAL); + } + m_VirtKeybVelocityLabelDescr.set_text(_("Note-On Velocity:")); + m_VirtKeybVelocityLabel.set_text("-"); + m_VirtKeybOffVelocityLabelDescr.set_text(_("Note-Off Velocity:")); + m_VirtKeybOffVelocityLabel.set_text("-"); + m_VirtKeybPropsBox.pack_start(m_VirtKeybModeChoice.label, Gtk::PACK_SHRINK); + m_VirtKeybPropsBox.pack_start(m_VirtKeybModeChoice.widget, Gtk::PACK_SHRINK); + m_VirtKeybPropsBox.pack_start(m_VirtKeybVelocityLabelDescr, Gtk::PACK_SHRINK); + m_VirtKeybPropsBox.pack_start(m_VirtKeybVelocityLabel, Gtk::PACK_SHRINK); + m_VirtKeybPropsBox.pack_start(m_VirtKeybOffVelocityLabelDescr, Gtk::PACK_SHRINK); + m_VirtKeybPropsBox.pack_start(m_VirtKeybOffVelocityLabel, Gtk::PACK_SHRINK); + m_VirtKeybPropsBox.set_spacing(10); + m_VirtKeybPropsBox.show(); + for (int i = 0 ; i < 128 ; i++) key_pressed[i] = false; actionGroup = Gtk::ActionGroup::create(); actionGroup->add(Gtk::Action::create("Properties", @@ -90,231 +148,397 @@ sigc::mem_fun(*this, &RegionChooser::on_dimension_manager_changed) ) ); + keyboard_key_hit_signal.connect( + sigc::mem_fun(*this, &RegionChooser::on_note_on_event) + ); + keyboard_key_released_signal.connect( + sigc::mem_fun(*this, &RegionChooser::on_note_off_event) + ); + set_tooltip_text(_("Right click here for adding new region. Use mouse pointer for moving (dragging) or resizing existing regions (by pointing at region's boundary). Right click on an existing region for more actions.")); } RegionChooser::~RegionChooser() { } -void RegionChooser::on_realize() -{ - // We need to call the base on_realize() - Gtk::DrawingArea::on_realize(); +void RegionChooser::invalidate_key(int key) { + const int h = KEYBOARD_HEIGHT; + const int w = get_width() - 1; + int x1 = key_to_x(key - 0.5, w); + int x2 = key_to_x(key + 1.5, w); - // Now we can allocate any additional resources we need - Glib::RefPtr window = get_window(); - gc = Gdk::GC::create(window); - window->clear(); + Gdk::Rectangle rect(x1 + 1, h1 + 1, x2 - x1 - 1, h - 2); + get_window()->invalidate_rect(rect, false); } -bool RegionChooser::on_expose_event(GdkEventExpose* event) -{ - Glib::RefPtr window = get_window(); - window->clear(); - const int h = 40; - const int w = width - 1; - const int bh = int(h * 0.55); - - Glib::RefPtr black = get_style()->get_black_gc(); - Glib::RefPtr white = get_style()->get_white_gc(); +void RegionChooser::on_note_on_event(int key, int velocity) { + key_pressed[key] = true; + invalidate_key(key); + m_VirtKeybVelocityLabel.set_text(ToString(velocity)); +} - Glib::RefPtr context = get_pango_context(); - Glib::RefPtr layout = Pango::Layout::create(context); +void RegionChooser::on_note_off_event(int key, int velocity) { + key_pressed[key] = false; + invalidate_key(key); + m_VirtKeybOffVelocityLabel.set_text(ToString(velocity)); +} - window->draw_rectangle(black, false, 0, h1, w, h - 1); - gc->set_foreground(grey1); - int x1 = int(w * 20.5 / 128.0 + 0.5); - int x2 = int(w * 109.5 / 128.0 + 0.5); - window->draw_rectangle(gc, true, 1, h1 + 1, - x1 - 1, h - 2); - window->draw_rectangle(white, true, x1 + 1, h1 + 1, x2 - x1 - 1, h - 2); - window->draw_rectangle(gc, true, x2 + 1, h1 + 1, - w - x2 - 1, h - 2); - int octave = -1; - for (int i = 0 ; i < 128 ; i++) { - int note = (i + 3) % 12; - int x = int(w * i / 128.0 + 0.5); - if (note == 1 || note == 4 || note == 6 || note == 9 || note == 11) { - int x2 = int(w * (i + 0.5) / 128.0 + 0.5); - window->draw_line(black, x2, h1 + bh, x2, h1 + h); +#if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2 +bool RegionChooser::on_expose_event(GdkEventExpose* e) { + 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; - int x3 = int(w * (i + 1) / 128.0 + 0.5); - window->draw_rectangle(black, true, x, h1 + 1, x3 - x + 1, bh); - } else if (note == 3 || note == 8) { - window->draw_line(black, x, h1 + 1, x, h1 + h); - } - if (note == 3) { - char buf[30]; - sprintf(buf, "%d", octave); - layout->set_markup(buf); - Pango::Rectangle rectangle = layout->get_logical_extents(); - double text_w = double(rectangle.get_width()) / Pango::SCALE; - double text_h = double(rectangle.get_height()) / Pango::SCALE; - double x2 = w * (i + 0.75) / 128.0; - window->draw_layout(black, int(x2 - text_w / 2 + 1), - int(h1 + h - text_h + 0.5), layout); - octave++; - } - } + const Cairo::RefPtr& cr = + get_window()->create_cairo_context(); +#if 0 +} +#endif +#else +bool RegionChooser::on_draw(const Cairo::RefPtr& cr) { + double clipx1, clipx2, clipy1, clipy2; + cr->get_clip_extents(clipx1, clipy1, clipx2, clipy2); +#endif - if (instrument) { - int i = 0; - gig::Region *next_region; - int x3 = -1; - for (gig::Region *r = instrument->GetFirstRegion() ; - r ; - r = next_region) { + cr->save(); + cr->set_line_width(1); - if (x3 < 0) x3 = int(w * (r->KeyRange.low) / 128.0 + 0.5); - next_region = instrument->GetNextRegion(); - if (!next_region || r->KeyRange.high + 1 != next_region->KeyRange.low) { - int x2 = int(w * (r->KeyRange.high + 1) / 128.0 + 0.5); - window->draw_line(black, x3, 0, x2, 0); - window->draw_line(black, x3, h1 - 1, x2, h1 - 1); - window->draw_line(black, x2, 1, x2, h1 - 2); - window->draw_rectangle(white, true, x3 + 1, 1, x2 - x3 - 1, h1 - 2); - x3 = -1; - } - i++; - } +#if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2 + const Gdk::Color bg = get_style()->get_bg(Gtk::STATE_NORMAL); +#else + const Gdk::RGBA bg = get_style_context()->get_background_color(); +#endif + Gdk::Cairo::set_source_rgba(cr, bg); + cr->paint(); - for (gig::Region *r = instrument->GetFirstRegion() ; - r ; - r = instrument->GetNextRegion()) { - int x = int(w * (r->KeyRange.low) / 128.0 + 0.5); - window->draw_line(black, x, 1, x, h1 - 2); - } + if (clipy2 > h1) { + draw_keyboard(cr, clipx1, clipx2); + } - if (region) { - int x1 = int(w * (region->KeyRange.low) / 128.0 + 0.5); - int x2 = int(w * (region->KeyRange.high + 1) / 128.0 + 0.5); - gc->set_foreground(red); - window->draw_rectangle(gc, true, x1 + 1, 1, x2 - x1 - 1, h1 - 2); - } + if (clipy1 < h1 && instrument) { + draw_regions(cr, clipx1, clipx2); } + + cr->restore(); + return true; } +void RegionChooser::draw_keyboard(const Cairo::RefPtr& cr, + int clip_low, int clip_high) { + const int h = KEYBOARD_HEIGHT; + const int w = get_width() - 1; + const int bh = int(h * 0.55); + + Gdk::Cairo::set_source_rgba(cr, black); + cr->rectangle(0.5, h1 + 0.5, w, h - 1); + cr->stroke(); + + int x1 = key_to_x(20.5, w); + Gdk::Cairo::set_source_rgba(cr, grey1); + cr->rectangle(1, h1 + 1, x1 - 1, h - 2); + cr->fill(); + + int x2 = key_to_x(109.5, w); + Gdk::Cairo::set_source_rgba(cr, white); + cr->rectangle(x1 + 1, h1 + 1, x2 - x1 - 1, h - 2); + cr->fill(); + + Gdk::Cairo::set_source_rgba(cr, grey1); + cr->rectangle(x2 + 1, h1 + 1, w - x2 - 1, h - 2); + cr->fill(); -void RegionChooser::on_size_request(GtkRequisition* requisition) -{ - *requisition = GtkRequisition(); - requisition->height = 40 + 20; - requisition->width = 500; + Gdk::Cairo::set_source_rgba(cr, black); + + int clipkey1 = std::max(0, x_to_key_right(clip_low - 1, w)); + int clipkey2 = std::min(x_to_key_right(clip_high - 1, w) + 1, 128); + + for (int i = clipkey1 ; i < clipkey2 ; i++) { + int note = (i + 3) % 12; + int x = key_to_x(i, w); + + if (note == 1 || note == 4 || note == 6 || + note == 9 || note == 11) { + // black key: short line in the middle, with a rectangle + // on top + int x2 = key_to_x(i + 0.5, w); + cr->move_to(x2 + 0.5, h1 + bh + 0.5); + cr->line_to(x2 + 0.5, h1 + h - 1); + cr->stroke(); + + int x3 = key_to_x(i + 1, w); + cr->rectangle(x, h1 + 1, x3 - x + 1, bh); + cr->fill(); + } else if (note == 3 || note == 8) { + // C or F: long line to the left + cr->move_to(x + 0.5, h1 + 1); + cr->line_to(x + 0.5, h1 + h - 1); + cr->stroke(); + } + + if (key_pressed[i]) draw_key(cr, i); + + if (note == 3) draw_digit(cr, i); + } } -// not used -void RegionChooser::draw_region(int from, int to, const Gdk::Color& color) -{ - const int h = 40; - const int w = width; +void RegionChooser::draw_regions(const Cairo::RefPtr& cr, + int clip_low, int clip_high) { + const int w = get_width() - 1; + + Gdk::Cairo::set_source_rgba(cr, black); + gig::Region* next_region; + int x3 = -1; + for (gig::Region* r = regions.first() ; r ; r = next_region) { + next_region = regions.next(); + + if (x3 < 0) { + x3 = key_to_x(r->KeyRange.low, w); + if (x3 >= clip_high) break; + } + if (!next_region || + r->KeyRange.high + 1 != next_region->KeyRange.low || + r == region || next_region == region) { + + int x2 = key_to_x(r->KeyRange.high + 1, w); + if (x2 >= clip_low) { + cr->move_to(x3, 0.5); + cr->line_to(x2 + 0.5, 0.5); + cr->line_to(x2 + 0.5, h1 - 0.5); + cr->line_to(x3, h1 - 0.5); + cr->stroke(); + + Gdk::Cairo::set_source_rgba(cr, region == r ? red : white); + cr->rectangle(x3 + 1, 1, x2 - x3 - 1, h1 - 2); + cr->fill(); + Gdk::Cairo::set_source_rgba(cr, black); + } + x3 = -1; + } + } + + for (gig::Region* r = regions.first() ; r ; r = regions.next()) { + int x = key_to_x(r->KeyRange.low, w); + + if (x < clip_low) continue; + if (x >= clip_high) break; + + cr->move_to(x + 0.5, 1); + cr->line_to(x + 0.5, h1 - 1); + cr->stroke(); + } + + // if there is no region yet, show the user some hint text that he may + // right click on this area to create a new region + if (!regions.first()) { + Glib::RefPtr context = get_pango_context(); + Glib::RefPtr layout = Pango::Layout::create(context); + layout->set_alignment(Pango::ALIGN_CENTER); + layout->set_text(Glib::ustring("*** ") + _("Right click here to create a region.") + " ***"); + layout->set_width(get_width() * Pango::SCALE); + Gdk::Cairo::set_source_rgba(cr, red); +#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 + } +} + +bool RegionChooser::is_black_key(int key) { + const int note = (key + 3) % 12; + return note == 1 || note == 4 || note == 6 || note == 9 || note == 11; +} + +void RegionChooser::draw_digit(const Cairo::RefPtr& cr, + int key) { + const int h = KEYBOARD_HEIGHT; + const int w = get_width() - 1; + Glib::RefPtr layout = + Pango::Layout::create(get_pango_context()); + char buf[30]; + sprintf(buf, "%d", key / 12 - 1); + layout->set_markup(buf); + Pango::Rectangle rectangle = layout->get_logical_extents(); + double text_w = double(rectangle.get_width()) / Pango::SCALE; + double text_h = double(rectangle.get_height()) / Pango::SCALE; + double x = w * (key + 0.75) / 128.0; + Gdk::Cairo::set_source_rgba(cr, black); + cr->move_to(int(x - text_w / 2 + 1), int(h1 + h - text_h + 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 +} + +void RegionChooser::draw_key(const Cairo::RefPtr& cr, + int key) { + const int h = KEYBOARD_HEIGHT; + const int w = get_width() - 1; const int bh = int(h * 0.55); - Glib::RefPtr window = get_window(); - gc->set_foreground(color); + Gdk::Cairo::set_source_rgba(cr, activeKeyColor); - for (int i = from ; i < to ; i++) { - int note = (i + 3) % 12; - int x = int(w * i / 128.0 + 0.5) + 1; - int x2 = int(w * (i + 1.5) / 128.0 + 0.5); - int x3 = int(w * (i + 1) / 128.0 + 0.5); - int x4 = int(w * (i - 0.5) / 128 + 0.5) + 1; - int w1 = x3 - x; - switch (note) { - case 0: case 5: case 10: - window->draw_rectangle(gc, true, x, h1 + 1, w1, bh); - window->draw_rectangle(gc, true, x4, h1 + bh + 1, x2 - x4, h - bh - 2); - break; - case 2: case 7: - window->draw_rectangle(gc, true, x, h1 + 1, w1, bh); - window->draw_rectangle(gc, true, x4, h1 + bh + 1, x3 - x4, h - bh - 2); - break; - case 3: case 8: - window->draw_rectangle(gc, true, x, h1 + 1, w1, bh); - window->draw_rectangle(gc, true, x, h1 + bh + 1, x2 - x, h - bh - 2); - break; - default: - window->draw_rectangle(gc, true, x, h1 + 1, w1, bh - 1); - break; - } + int note = (key + 3) % 12; + int x = key_to_x(key, w) + 1; + int x2 = key_to_x(key + 1.5, w); + int x3 = key_to_x(key + 1, w); + int x4 = key_to_x(key - 0.5, w); + int w1 = x3 - x; + switch (note) { + case 0: case 5: case 10: + cr->rectangle(x, h1 + 1, w1, bh); + cr->fill(); + cr->rectangle(x4 + 1, h1 + bh + 1, x2 - x4 - 1, h - bh - 2); + cr->fill(); + break; + case 2: case 7: + cr->rectangle(x, h1 + 1, w1, bh); + cr->fill(); + cr->rectangle(x4 + 1, h1 + bh + 1, x3 - x4 - 1, h - bh - 2); + cr->fill(); + break; + case 3: case 8: + cr->rectangle(x, h1 + 1, w1, bh); + cr->fill(); + cr->rectangle(x, h1 + bh + 1, x2 - x, h - bh - 2); + cr->fill(); + break; + default: + cr->rectangle(x, h1 + 1, w1, bh - 1); + cr->fill(); + break; } + Gdk::Cairo::set_source_rgba(cr, black); } void RegionChooser::set_instrument(gig::Instrument* instrument) { this->instrument = instrument; - region = instrument ? instrument->GetFirstRegion() : 0; + regions.update(instrument); + region = regions.first(); queue_draw(); region_selected(); + dimensionManager.set_region(region); } bool RegionChooser::on_button_release_event(GdkEventButton* event) { + const int k = x_to_key(event->x, get_width() - 1); + + // handle-note off on virtual keyboard + if (event->type == GDK_BUTTON_RELEASE) { + int velocity = (event->y >= REGION_BLOCK_HEIGHT + KEYBOARD_HEIGHT - 1) ? 127 : + int(float(event->y - REGION_BLOCK_HEIGHT) / float(KEYBOARD_HEIGHT) * 128.0f) + 1; + if (velocity <= 0) velocity = 1; + switch (m_VirtKeybModeChoice.get_value()) { + case VIRT_KEYBOARD_MODE_CHORD: + if (event->y >= REGION_BLOCK_HEIGHT) + keyboard_key_released_signal.emit(k, velocity); + break; + case VIRT_KEYBOARD_MODE_NORMAL: + default: + if (currentActiveKey >= 0 && currentActiveKey <= 127) { + keyboard_key_released_signal.emit(currentActiveKey, velocity); + currentActiveKey = -1; + } + break; + } + } + 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; - if (resize.mode == resize.moving_high_limit) { - if (resize.region->KeyRange.high != resize.pos - 1) { - instrument_struct_to_be_changed_signal.emit(instrument); - resize.region->SetKeyRange( - resize.region->KeyRange.low, // low - resize.pos - 1 // high - ); - instrument_changed.emit(); - instrument_struct_changed_signal.emit(instrument); - } - } else if (resize.mode == resize.moving_low_limit) { - if (resize.region->KeyRange.low != resize.pos) { - instrument_struct_to_be_changed_signal.emit(instrument); - resize.region->SetKeyRange( - resize.pos, // low - resize.region->KeyRange.high // high - ); - instrument_changed.emit(); - instrument_struct_changed_signal.emit(instrument); - } - } - if (!is_in_resize_zone(event->x, event->y) && cursor_is_resize) { get_window()->set_cursor(); cursor_is_resize = false; } } else if (move.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 move.active = false; - if (move.pos) { - instrument_struct_to_be_changed_signal.emit(instrument); - region->SetKeyRange( - region->KeyRange.low + move.pos, - region->KeyRange.high + move.pos - ); - instrument_struct_changed_signal.emit(instrument); - } - if (is_in_resize_zone(event->x, event->y)) { +#if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2 get_window()->set_cursor(Gdk::Cursor(Gdk::SB_H_DOUBLE_ARROW)); +#else + get_window()->set_cursor(Gdk::Cursor::create(Gdk::SB_H_DOUBLE_ARROW)); +#endif cursor_is_resize = true; } } return true; } +void RegionChooser::update_after_resize() +{ + if (resize.mode == resize.moving_high_limit) { + if (resize.region->KeyRange.high != resize.pos - 1) { + instrument_struct_to_be_changed_signal.emit(instrument); + resize.region->SetKeyRange(resize.region->KeyRange.low, + resize.pos - 1); + regions.update(instrument); + instrument_changed.emit(); + instrument_struct_changed_signal.emit(instrument); + } + } else if (resize.mode == resize.moving_low_limit) { + if (resize.region->KeyRange.low != resize.pos) { + instrument_struct_to_be_changed_signal.emit(instrument); + resize.region->SetKeyRange(resize.pos, + resize.region->KeyRange.high); + regions.update(instrument); + instrument_changed.emit(); + instrument_struct_changed_signal.emit(instrument); + } + } +} + +void RegionChooser::update_after_move(int pos) +{ + instrument_struct_to_be_changed_signal.emit(instrument); + region->SetKeyRange(pos, pos + region->KeyRange.high - + region->KeyRange.low); + regions.update(instrument); + instrument_changed.emit(); + instrument_struct_changed_signal.emit(instrument); +} + bool RegionChooser::on_button_press_event(GdkEventButton* event) { if (!instrument) return true; - int k = int(event->x / (width - 1) * 128.0); + const int w = get_width() - 1; + const int k = x_to_key(event->x, w); + + if (event->type == GDK_BUTTON_PRESS) { + if (event->y >= REGION_BLOCK_HEIGHT) { + int velocity = (event->y >= REGION_BLOCK_HEIGHT + KEYBOARD_HEIGHT - 1) ? 127 : + int(float(event->y - REGION_BLOCK_HEIGHT) / float(KEYBOARD_HEIGHT) * 128.0f) + 1; + currentActiveKey = k; + keyboard_key_hit_signal.emit(k, velocity); + } + } + if (event->y >= REGION_BLOCK_HEIGHT) return true; if (event->type == GDK_BUTTON_PRESS && event->button == 3) { gig::Region* r = get_region(k); if (r) { region = r; queue_draw(); region_selected(); + dimensionManager.set_region(region); popup_menu_inside_region->popup(event->button, event->time); } else { new_region_pos = k; @@ -322,11 +546,23 @@ } } else { if (is_in_resize_zone(event->x, event->y)) { +#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, - Gdk::Cursor(Gdk::SB_H_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 { gig::Region* r = get_region(k); @@ -334,15 +570,27 @@ region = r; queue_draw(); region_selected(); + dimensionManager.set_region(region); +#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, - Gdk::Cursor(Gdk::FLEUR), event->time); + Gdk::Cursor(Gdk::FLEUR), + 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::FLEUR), + event->time); +#endif move.active = true; - move.from_x = event->x; - move.pos = 0; + move.offset = event->x - key_to_x(region->KeyRange.low, w); } } } @@ -351,27 +599,16 @@ gig::Region* RegionChooser::get_region(int key) { - gig::Region* prev_region = 0; - gig::Region* next_region; - for (gig::Region *r = instrument->GetFirstRegion() ; r ; - r = next_region) { - next_region = instrument->GetNextRegion(); - + for (gig::Region* r = regions.first() ; r ; r = regions.next()) { if (key < r->KeyRange.low) return 0; - if (key <= r->KeyRange.high) { - move.touch_left = prev_region && prev_region->KeyRange.high + 1 == r->KeyRange.low; - move.touch_right = next_region && r->KeyRange.high + 1 == next_region->KeyRange.low; - return r; - } - prev_region = r; + if (key <= r->KeyRange.high) return r; } return 0; } void RegionChooser::motion_resize_region(int x, int y) { - const int w = width - 1; - Glib::RefPtr window = get_window(); + const int w = get_width() - 1; int k = int(double(x) / w * 128.0 + 0.5); @@ -391,76 +628,68 @@ resize.mode = resize.moving_low_limit; } } - Glib::RefPtr black = get_style()->get_black_gc(); - Glib::RefPtr white = get_style()->get_white_gc(); - if (region == resize.region) { - gc->set_foreground(red); - white = gc; - } - Glib::RefPtr bg = get_style()->get_bg_gc(Gtk::STATE_NORMAL); - int prevx = int(w * resize.pos / 128.0 + 0.5); - x = int(w * k / 128.0 + 0.5); + resize.pos = k; + int x1, x2; if (resize.mode == resize.moving_high_limit) { - if (k > resize.pos) { - window->draw_rectangle(white, true, prevx, 1, x - prevx, h1 - 2); - window->draw_line(black, prevx, 0, x, 0); - window->draw_line(black, prevx, h1 - 1, x, h1 - 1); + if (resize.region->KeyRange.high < resize.pos - 1) { + x1 = resize.region->KeyRange.high; + x2 = resize.pos - 1; } else { - int xx = ((resize.pos == resize.max && resize.max != 128) ? 1 : 0); - window->draw_rectangle(bg, true, x + 1, 0, prevx - x - xx, h1); + x1 = resize.pos - 1; + x2 = resize.region->KeyRange.high; } } else { - if (k < resize.pos) { - window->draw_rectangle(white, true, x + 1, 1, prevx - x, h1 - 2); - window->draw_line(black, x, 0, prevx, 0); - window->draw_line(black, x, h1 - 1, prevx, h1 - 1); + if (resize.region->KeyRange.low < resize.pos) { + x1 = resize.region->KeyRange.low; + x2 = resize.pos; } else { - int xx = ((resize.pos == resize.min && resize.min != 0) ? 1 : 0); - window->draw_rectangle(bg, true, prevx + xx, 0, x - prevx - xx, h1); + x1 = resize.pos; + x2 = resize.region->KeyRange.low; } } - window->draw_line(black, x, 1, x, h1 - 2); - resize.pos = k; + x1 = key_to_x(x1, w); + x2 = key_to_x(x2 + 1, w) + 1; + Gdk::Rectangle rect(x1, 0, x2 - x1, h1); + + update_after_resize(); + + get_window()->invalidate_rect(rect, false); } } void RegionChooser::motion_move_region(int x, int y) { - const int w = width - 1; - Glib::RefPtr window = get_window(); + const int w = get_width() - 1; + + int l = int(double(x - move.offset) / w * 128.0 + 0.5); - int k = int(double(x - move.from_x) / w * 128.0 + 0.5); - if (k == move.pos) return; - int new_k; - bool new_touch_left; - bool new_touch_right; + if (l == region->KeyRange.low) return; + int new_l; + int regionsize = region->KeyRange.high - region->KeyRange.low; int a = 0; - if (k > move.pos) { - for (gig::Region* r = instrument->GetFirstRegion() ; ; - r = instrument->GetNextRegion()) { + if (l > region->KeyRange.low) { + for (gig::Region* r = regions.first() ; ; r = regions.next()) { if (r != region) { int b = r ? r->KeyRange.low : 128; // gap: from a to b (not inclusive b) - if (region->KeyRange.high + move.pos >= b) { + if (region->KeyRange.high >= b) { // not found the current gap yet, just continue } else { - if (a > region->KeyRange.low + k) { + if (a > l) { // this gap is too far to the right, break break; } - int newhigh = std::min(region->KeyRange.high + k, b - 1); - int newlo = newhigh - (region->KeyRange.high - region->KeyRange.low); + int newhigh = std::min(l + regionsize, b - 1); + int newlo = newhigh - regionsize; if (newlo >= a) { // yes it fits - it's a candidate - new_k = newlo - region->KeyRange.low; - new_touch_left = a > 0 && a == newlo; - new_touch_right = b < 128 && newhigh + 1 == b; + new_l = newlo; } } if (!r) break; @@ -468,30 +697,27 @@ } } } else { - for (gig::Region* r = instrument->GetFirstRegion() ; ; - r = instrument->GetNextRegion()) { + for (gig::Region* r = regions.first() ; ; r = regions.next()) { if (r != region) { int b = r ? r->KeyRange.low : 128; // gap from a to b (not inclusive b) - if (region->KeyRange.high + k >= b) { + if (l + regionsize >= b) { // not found the current gap yet, just continue } else { - if (a > region->KeyRange.low + move.pos) { + if (a > region->KeyRange.low) { // this gap is too far to the right, break break; } - int newlo = std::max(region->KeyRange.low + k, a); - int newhigh = newlo + (region->KeyRange.high - region->KeyRange.low); + int newlo = std::max(l, a); + int newhigh = newlo + regionsize; if (newhigh < b) { // yes it fits - break as the first one is the best - new_k = newlo - region->KeyRange.low; - new_touch_left = a > 0 && a == newlo; - new_touch_right = b < 128 && newhigh + 1 == b; + new_l = newlo; break; } } @@ -500,43 +726,16 @@ } } } - k = new_k; - if (k == move.pos) return; + if (new_l == region->KeyRange.low) return; - Glib::RefPtr bg = get_style()->get_bg_gc(Gtk::STATE_NORMAL); - int prevx = int(w * (move.pos + region->KeyRange.low) / 128.0 + 0.5); - x = int(w * (k + region->KeyRange.low) / 128.0 + 0.5); - int prevx2 = int(w * (move.pos + region->KeyRange.high + 1) / 128.0 + 0.5); - int x2 = int(w * (k + region->KeyRange.high + 1) / 128.0 + 0.5); - Glib::RefPtr black = get_style()->get_black_gc(); - gc->set_foreground(red); - - if (!new_touch_left) window->draw_line(black, x, 1, x, h1 - 2); - if (!new_touch_right) window->draw_line(black, x2, 1, x2, h1 - 2); - - if (k > move.pos) { - window->draw_rectangle(bg, true, prevx + (move.touch_left ? 1 : 0), 0, - std::min(x, prevx2 + 1 - (move.touch_right ? 1 : 0)) - - (prevx + (move.touch_left ? 1 : 0)), h1); - - window->draw_line(black, std::max(x, prevx2 + 1), 0, x2, 0); - window->draw_line(black, std::max(x, prevx2 + 1), h1 - 1, x2, h1 - 1); - window->draw_rectangle(gc, true, std::max(x + 1, prevx2), 1, - x2 - std::max(x + 1, prevx2), h1 - 2); - } else { - window->draw_rectangle(bg, true, std::max(x2 + 1, prevx + (move.touch_left ? 1 : 0)), 0, - prevx2 + 1 - (move.touch_right ? 1 : 0) - - std::max(x2 + 1, prevx + (move.touch_left ? 1 : 0)), h1); - - window->draw_line(black, x, 0, std::min(x2, prevx - 1), 0); - window->draw_line(black, x, h1 - 1, std::min(x2, prevx - 1), h1 - 1); + int x1 = key_to_x(std::min(int(region->KeyRange.low), new_l), w); + int x2 = key_to_x(std::max(int(region->KeyRange.high), + new_l + regionsize) + 1, w) + 1; - window->draw_rectangle(gc, true, x + 1, 1, std::min(x2 - 1, prevx) - x, h1 - 2); - } + Gdk::Rectangle rect(x1, 0, x2 - x1, h1); + update_after_move(new_l); - move.pos = k; - move.touch_left = new_touch_left; - move.touch_right = new_touch_right; + get_window()->invalidate_rect(rect, false); } @@ -547,6 +746,25 @@ Gdk::ModifierType state = Gdk::ModifierType(0); window->get_pointer(x, y, state); + // handle virtual MIDI keyboard + if (m_VirtKeybModeChoice.get_value() != VIRT_KEYBOARD_MODE_CHORD && + currentActiveKey > 0 && + event->y >= REGION_BLOCK_HEIGHT && + event->y < REGION_BLOCK_HEIGHT + KEYBOARD_HEIGHT) + { + const int k = x_to_key(event->x, get_width() - 1); + if (k != currentActiveKey) { + int velocity = + (event->y >= REGION_BLOCK_HEIGHT + KEYBOARD_HEIGHT - 1) ? 127 : + int(float(event->y - REGION_BLOCK_HEIGHT) / + float(KEYBOARD_HEIGHT) * 128.0f) + 1; + if (velocity <= 0) velocity = 1; + keyboard_key_released_signal.emit(currentActiveKey, velocity); + currentActiveKey = k; + keyboard_key_hit_signal.emit(k, velocity); + } + } + if (resize.active) { motion_resize_region(x, y); } else if (move.active) { @@ -554,7 +772,11 @@ } else { if (is_in_resize_zone(x, y)) { if (!cursor_is_resize) { +#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) { @@ -567,15 +789,15 @@ } bool RegionChooser::is_in_resize_zone(double x, double y) { - const int w = width - 1; + const int w = get_width() - 1; if (instrument && y >= 0 && y <= h1) { gig::Region* prev_region = 0; gig::Region* next_region; - for (gig::Region* r = instrument->GetFirstRegion() ; r ; r = next_region) { - next_region = instrument->GetNextRegion(); + for (gig::Region* r = regions.first(); r ; r = next_region) { + next_region = regions.next(); - int lo = int(w * (r->KeyRange.low) / 128.0 + 0.5); + int lo = key_to_x(r->KeyRange.low, w); if (x <= lo - 2) break; if (x < lo + 2) { resize.region = r; @@ -589,16 +811,16 @@ resize.mode = resize.undecided; resize.min = prev_region->KeyRange.low + 1; resize.prev_region = prev_region; - return true; + return resize.min != resize.max; } // edit low limit resize.mode = resize.moving_low_limit; resize.min = prev_region ? prev_region->KeyRange.high + 1 : 0; - return true; + return resize.min != resize.max; } if (!next_region || r->KeyRange.high + 1 != next_region->KeyRange.low) { - int hi = int(w * (r->KeyRange.high + 1) / 128.0 + 0.5); + int hi = key_to_x(r->KeyRange.high + 1, w); if (x <= hi - 2) break; if (x < hi + 2) { // edit high limit @@ -607,7 +829,7 @@ resize.mode = resize.moving_high_limit; resize.min = r->KeyRange.low + 1; resize.max = next_region ? next_region->KeyRange.low : 128; - return true; + return resize.min != resize.max; } } prev_region = r; @@ -629,15 +851,19 @@ void RegionChooser::show_region_properties() { if (!region) return; - Gtk::Dialog dialog("Region Properties", true /*modal*/); + Gtk::Dialog dialog(_("Region Properties"), true /*modal*/); // add "Keygroup" checkbox - Gtk::CheckButton checkBoxKeygroup("Member of a Keygroup (Exclusive Group)"); + Gtk::CheckButton checkBoxKeygroup(_("Member of a Keygroup (Exclusive Group)")); checkBoxKeygroup.set_active(region->KeyGroup); dialog.get_vbox()->pack_start(checkBoxKeygroup); checkBoxKeygroup.show(); // add "Keygroup" spinbox - Gtk::Adjustment adjustment(1, 1, pow(2,32)); +#if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2 + Gtk::Adjustment adjustment(1, 1, 999); Gtk::SpinButton spinBox(adjustment); +#else + Gtk::SpinButton spinBox(Gtk::Adjustment::create(1, 1, 999)); +#endif if (region->KeyGroup) spinBox.set_value(region->KeyGroup); dialog.get_vbox()->pack_start(spinBox); spinBox.show(); @@ -659,9 +885,11 @@ region->SetKeyRange(new_region_pos, new_region_pos); instrument_struct_changed_signal.emit(instrument); + regions.update(instrument); queue_draw(); region_selected(); + dimensionManager.set_region(region); instrument_changed(); } @@ -670,10 +898,12 @@ instrument_struct_to_be_changed_signal.emit(instrument); instrument->DeleteRegion(region); instrument_struct_changed_signal.emit(instrument); + regions.update(instrument); region = 0; queue_draw(); region_selected(); + dimensionManager.set_region(region); instrument_changed(); } @@ -704,3 +934,11 @@ sigc::signal& RegionChooser::signal_region_changed_signal() { return region_changed_signal; } + +sigc::signal& RegionChooser::signal_keyboard_key_hit() { + return keyboard_key_hit_signal; +} + +sigc::signal& RegionChooser::signal_keyboard_key_released() { + return keyboard_key_released_signal; +}