--- gigedit/trunk/src/gigedit/regionchooser.cpp 2007/12/01 10:21:07 1533 +++ gigedit/trunk/src/gigedit/regionchooser.cpp 2011/03/06 07:51:04 2169 @@ -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,30 +18,89 @@ */ #include "regionchooser.h" + +#include +#include + +#include +#include #include #include #include #include -#include #include "global.h" -RegionChooser::RegionChooser() -{ - Glib::RefPtr colormap = get_default_colormap(); +#define REGION_BLOCK_HEIGHT 20 +#define KEYBOARD_HEIGHT 40 - red = Gdk::Color("#8070ff"); - grey1 = Gdk::Color("#b0b0b0"); +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() : + 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); - colormap->alloc_color(red); - colormap->alloc_color(grey1); 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"), NULL }; + 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(); actionGroup = Gtk::ActionGroup::create(); actionGroup->add(Gtk::Action::create("Properties", @@ -89,170 +148,262 @@ 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) + ); } RegionChooser::~RegionChooser() { } -void RegionChooser::on_realize() -{ - // We need to call the base on_realize() - Gtk::DrawingArea::on_realize(); +template inline std::string ToString(T o) { + std::stringstream ss; + ss << o; + return ss.str(); +} - // Now we can allocate any additional resources we need - Glib::RefPtr window = get_window(); - gc = Gdk::GC::create(window); - window->clear(); +void RegionChooser::on_note_on_event(int key, int velocity) { + draw_key(key, activeKeyColor); + m_VirtKeybVelocityLabel.set_text(ToString(velocity)); } -bool RegionChooser::on_expose_event(GdkEventExpose* event) +void RegionChooser::on_note_off_event(int key, int velocity) { + if (is_black_key(key)) { + draw_key(key, black); + } else { + draw_key(key, key >= 21 && key <= 108 ? white : grey1); + } + m_VirtKeybOffVelocityLabel.set_text(ToString(velocity)); +} + +#if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2 +bool RegionChooser::on_expose_event(GdkEventExpose* e) { - Glib::RefPtr window = get_window(); - window->clear(); - const int h = 40; - const int w = width - 1; + return on_draw(get_window()->create_cairo_context()); +} +#endif + +bool RegionChooser::on_draw(const Cairo::RefPtr& cr) +{ + const int h = KEYBOARD_HEIGHT; + const int w = get_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(); + cr->save(); + cr->set_line_width(1); - Glib::RefPtr context = get_pango_context(); - Glib::RefPtr layout = Pango::Layout::create(context); +#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(); + + Gdk::Cairo::set_source_rgba(cr, black); + cr->rectangle(0.5, h1 + 0.5, w, h - 1); + cr->stroke(); - 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; + + Gdk::Cairo::set_source_rgba(cr, grey1); + cr->rectangle(1, h1 + 1, x1 - 1, h - 2); + cr->fill(); + + 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(); + + Gdk::Cairo::set_source_rgba(cr, black); 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) { + 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); + cr->move_to(x2 + 0.5, h1 + bh + 0.5); + cr->line_to(x2 + 0.5, h1 + h - 1); + cr->stroke(); int x3 = int(w * (i + 1) / 128.0 + 0.5); - window->draw_rectangle(black, true, x, h1 + 1, x3 - x + 1, bh); + cr->rectangle(x, h1 + 1, x3 - x + 1, bh); + cr->fill(); } 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++; + cr->move_to(x + 0.5, h1 + 1); + cr->line_to(x + 0.5, h1 + h - 1); + cr->stroke(); + + if (note == 3) draw_digit(i); } } if (instrument) { int i = 0; - gig::Region *next_region; + gig::Region* next_region; int x3 = -1; - for (gig::Region *r = instrument->GetFirstRegion() ; - r ; - r = next_region) { + for (gig::Region* r = regions.first() ; r ; r = next_region) { 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) { + next_region = regions.next(); + 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); + 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, white); + cr->rectangle(x3 + 1, 1, x2 - x3 - 1, h1 - 2); + cr->fill(); + Gdk::Cairo::set_source_rgba(cr, black); + x3 = -1; } i++; } - for (gig::Region *r = instrument->GetFirstRegion() ; - r ; - r = instrument->GetNextRegion()) { + for (gig::Region* r = regions.first() ; r ; r = regions.next()) { int x = int(w * (r->KeyRange.low) / 128.0 + 0.5); - window->draw_line(black, x, 1, x, h1 - 2); + cr->move_to(x + 0.5, 1); + cr->line_to(x + 0.5, h1 - 1); + cr->stroke(); } 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); + Gdk::Cairo::set_source_rgba(cr, red); + cr->rectangle(x1 + 1, 1, x2 - x1 - 1, h1 - 2); + cr->fill(); } } + + cr->restore(); + return true; } -void RegionChooser::on_size_request(GtkRequisition* requisition) -{ - *requisition = GtkRequisition(); - requisition->height = 40 + 20; - requisition->width = 500; +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(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; + Cairo::RefPtr cr = get_window()->create_cairo_context(); + 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 } - -// not used -void RegionChooser::draw_region(int from, int to, const Gdk::Color& color) +void RegionChooser::draw_key(int key, const Gdk::RGBA& color) { - const int h = 40; - const int w = width; + 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); + Cairo::RefPtr cr = get_window()->create_cairo_context(); + Gdk::Cairo::set_source_rgba(cr, color); - 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 = int(w * key / 128.0 + 0.5) + 1; + int x2 = int(w * (key + 1.5) / 128.0 + 0.5); + int x3 = int(w * (key + 1) / 128.0 + 0.5); + int x4 = int(w * (key - 0.5) / 128.0 + 0.5); + 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(); + if (note == 3) draw_digit(key); + break; + default: + cr->rectangle(x, h1 + 1, w1, bh - 1); + cr->fill(); + break; } } 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 = int(event->x / (get_width() - 1) * 128.0); + + // 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) { @@ -262,6 +413,7 @@ resize.region->KeyRange.low, // low resize.pos - 1 // high ); + regions.update(instrument); instrument_changed.emit(); instrument_struct_changed_signal.emit(instrument); } @@ -272,6 +424,7 @@ resize.pos, // low resize.region->KeyRange.high // high ); + regions.update(instrument); instrument_changed.emit(); instrument_struct_changed_signal.emit(instrument); } @@ -282,7 +435,11 @@ 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) { @@ -291,12 +448,17 @@ region->KeyRange.low + move.pos, region->KeyRange.high + move.pos ); + regions.update(instrument); instrument_changed.emit(); 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; } } @@ -307,14 +469,25 @@ { if (!instrument) return true; - int k = int(event->x / (width - 1) * 128.0); + const int k = int(event->x / (get_width() - 1) * 128.0); + + 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 +495,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,12 +519,25 @@ 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; @@ -353,9 +551,8 @@ { 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(); if (key < r->KeyRange.low) return 0; if (key <= r->KeyRange.high) { @@ -370,8 +567,7 @@ 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); @@ -379,6 +575,9 @@ else if (k > resize.max) k = resize.max; if (k != resize.pos) { + Cairo::RefPtr cr = get_window()->create_cairo_context(); + cr->set_line_width(1); + if (resize.mode == resize.undecided) { if (k < resize.pos) { // edit high limit of prev_region @@ -391,44 +590,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); + const Gdk::RGBA white = region == resize.region ? red : this->white; +#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 + int prevx = int(w * resize.pos / 128.0 + 0.5); x = int(w * k / 128.0 + 0.5); 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); + Gdk::Cairo::set_source_rgba(cr, white); + cr->rectangle(prevx, 1, x - prevx, h1 - 2); + cr->fill(); + + Gdk::Cairo::set_source_rgba(cr, black); + cr->move_to(prevx, 0.5); + cr->line_to(x + 1, 0.5); + cr->move_to(prevx, h1 - 0.5); + cr->line_to(x + 1, h1 - 0.5); + cr->stroke(); } else { - int xx = ((resize.pos == resize.max && resize.max != 128) ? 1 : 0); - window->draw_rectangle(bg, true, x + 1, 0, prevx - x - xx, h1); + int xx = (resize.pos == resize.max && + resize.max != 128) ? 1 : 0; + Gdk::Cairo::set_source_rgba(cr, bg); + cr->rectangle(x + 1, 0, prevx - x - xx, h1); + cr->fill(); } } 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); + Gdk::Cairo::set_source_rgba(cr, white); + cr->rectangle(x + 1, 1, prevx - x, h1 - 2); + cr->fill(); + + Gdk::Cairo::set_source_rgba(cr, black); + cr->move_to(x, 0.5); + cr->line_to(prevx, 0.5); + cr->move_to(x, h1 - 0.5); + cr->line_to(prevx, h1 - 0.5); + cr->stroke(); } else { - int xx = ((resize.pos == resize.min && resize.min != 0) ? 1 : 0); - window->draw_rectangle(bg, true, prevx + xx, 0, x - prevx - xx, h1); + int xx = (resize.pos == resize.min && + resize.min != 0) ? 1 : 0; + Gdk::Cairo::set_source_rgba(cr, bg); + cr->rectangle(prevx + xx, 0, x - prevx - xx, h1); + cr->fill(); } } - window->draw_line(black, x, 1, x, h1 - 2); + Gdk::Cairo::set_source_rgba(cr, black); + cr->move_to(x + 0.5, 1); + cr->line_to(x + 0.5, h1 - 1); + cr->stroke(); resize.pos = k; } } 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; + Cairo::RefPtr cr = get_window()->create_cairo_context(); + cr->set_line_width(1); int k = int(double(x - move.from_x) / w * 128.0 + 0.5); if (k == move.pos) return; @@ -437,8 +660,7 @@ bool new_touch_right; int a = 0; if (k > move.pos) { - 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; @@ -468,8 +690,7 @@ } } } 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; @@ -503,35 +724,65 @@ k = new_k; if (k == move.pos) return; - Glib::RefPtr bg = get_style()->get_bg_gc(Gtk::STATE_NORMAL); +#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 + 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 (!new_touch_left) { + Gdk::Cairo::set_source_rgba(cr, black); + cr->move_to(x + 0.5, 1); + cr->line_to(x + 0.5, h1 - 1); + cr->stroke(); + } + if (!new_touch_right) { + Gdk::Cairo::set_source_rgba(cr, black); + cr->move_to(x2 + 0.5, 1); + cr->line_to(x2 + 0.5, h1 - 1); + cr->stroke(); + } 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); + Gdk::Cairo::set_source_rgba(cr, bg); + cr->rectangle(prevx + (move.touch_left ? 1 : 0), 0, + std::min(x, prevx2 + 1 - (move.touch_right ? 1 : 0)) - + (prevx + (move.touch_left ? 1 : 0)), h1); + cr->fill(); + + Gdk::Cairo::set_source_rgba(cr, black); + cr->move_to(std::max(x, prevx2 + 1), 0.5); + cr->line_to(x2 + 1, 0.5); + cr->move_to(std::max(x, prevx2 + 1), h1 - 0.5); + cr->line_to(x2 + 1, h1 - 0.5); + cr->stroke(); + + Gdk::Cairo::set_source_rgba(cr, red); + cr->rectangle(std::max(x + 1, prevx2), 1, + x2 - std::max(x + 1, prevx2), h1 - 2); + cr->fill(); } 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); - - window->draw_rectangle(gc, true, x + 1, 1, std::min(x2 - 1, prevx) - x, h1 - 2); + Gdk::Cairo::set_source_rgba(cr, bg); + cr->rectangle(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); + cr->fill(); + + Gdk::Cairo::set_source_rgba(cr, black); + cr->move_to(x, 0.5); + cr->line_to(std::min(x2, prevx - 1) + 1, 0.5); + cr->move_to(x, h1 - 0.5); + cr->line_to(std::min(x2, prevx - 1) + 1, h1 - 0.5); + cr->stroke(); + + Gdk::Cairo::set_source_rgba(cr, red); + cr->rectangle(x + 1, 1, std::min(x2 - 1, prevx) - x, h1 - 2); + cr->fill(); } move.pos = k; @@ -547,6 +798,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 = int(event->x / (get_width() - 1) * 128.0); + 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 +824,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,13 +841,13 @@ } 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); if (x <= lo - 2) break; @@ -589,13 +863,13 @@ 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); @@ -607,7 +881,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 +903,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 +937,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 +950,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 +986,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; +}