X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fgtkmm2ext%2Fbarcontroller.cc;h=59c313621ea66b24df847b2585d81d731e79cfd8;hb=47faebb36791f02e2fca7aa6c9f38548d27608a8;hp=3529d23e12b736de9877d33dd26c4a70327f3992;hpb=17b18acda3447214bd739107d9a46eecfaa6ef70;p=ardour.git diff --git a/libs/gtkmm2ext/barcontroller.cc b/libs/gtkmm2ext/barcontroller.cc index 3529d23e12..59c313621e 100644 --- a/libs/gtkmm2ext/barcontroller.cc +++ b/libs/gtkmm2ext/barcontroller.cc @@ -18,16 +18,19 @@ */ #include +#include #include #include #include #include -#include +#include +#include -#include -#include -#include +#include "gtkmm2ext/gtk_ui.h" +#include "gtkmm2ext/utils.h" +#include "gtkmm2ext/keyboard.h" +#include "gtkmm2ext/barcontroller.h" #include "i18n.h" @@ -36,24 +39,19 @@ using namespace Gtk; using namespace Gtkmm2ext; BarController::BarController (Gtk::Adjustment& adj, - MIDI::Controllable *mc, - sigc::slot lc) + boost::shared_ptr mc) : adjustment (adj), - prompter (Gtk::WIN_POS_MOUSE, 30000, false), - midi_control (mc), - label_callback (lc), - spinner (adjustment), - bind_button (2), - bind_statemask (Gdk::CONTROL_MASK) + binding_proxy (mc), + spinner (adjustment) { _style = LeftToRight; grabbed = false; switching = false; switch_on_release = false; - with_text = true; use_parent = false; + logarithmic = false; layout = darea.create_pango_layout(""); @@ -73,52 +71,45 @@ BarController::BarController (Gtk::Adjustment& adj, darea.signal_expose_event().connect (mem_fun (*this, &BarController::expose)); darea.signal_motion_notify_event().connect (mem_fun (*this, &BarController::motion)); - darea.signal_button_press_event().connect (mem_fun (*this, &BarController::button_press)); - darea.signal_button_release_event().connect (mem_fun (*this, &BarController::button_release)); + darea.signal_button_press_event().connect (mem_fun (*this, &BarController::button_press), false); + darea.signal_button_release_event().connect (mem_fun (*this, &BarController::button_release), false); darea.signal_scroll_event().connect (mem_fun (*this, &BarController::scroll)); - prompter.signal_unmap_event().connect (mem_fun (*this, &BarController::prompter_hiding)); - - prompting = false; - unprompting = false; - - if (mc) { - mc->learning_started.connect (mem_fun (*this, &BarController::midicontrol_prompt)); - mc->learning_stopped.connect (mem_fun (*this, &BarController::midicontrol_unprompt)); - } - spinner.signal_activate().connect (mem_fun (*this, &BarController::entry_activated)); spinner.signal_focus_out_event().connect (mem_fun (*this, &BarController::entry_focus_out)); - spinner.set_digits (3); + spinner.signal_input().connect (mem_fun (*this, &BarController::entry_input)); + spinner.signal_output().connect (mem_fun (*this, &BarController::entry_output)); + spinner.set_digits (9); + spinner.set_numeric (true); add (darea); show_all (); } void -BarController::set_bind_button_state (guint button, guint statemask) +BarController::drop_grab () { - bind_button = button; - bind_statemask = statemask; -} - -void -BarController::get_bind_button_state (guint &button, guint &statemask) -{ - button = bind_button; - statemask = bind_statemask; + if (grabbed) { + grabbed = false; + darea.remove_modal_grab(); + StopGesture (); + } } - bool BarController::button_press (GdkEventButton* ev) { + double fract; + + if (binding_proxy.button_press_handler (ev)) { + return true; + } + switch (ev->button) { case 1: if (ev->type == GDK_2BUTTON_PRESS) { switch_on_release = true; - grabbed = false; - darea.remove_modal_grab(); + drop_grab (); } else { switch_on_release = false; darea.add_modal_grab(); @@ -131,6 +122,9 @@ BarController::button_press (GdkEventButton* ev) break; case 2: + fract = ev->x / (darea.get_width() - 2.0); + adjustment.set_value (adjustment.get_lower() + fract * (adjustment.get_upper() - adjustment.get_lower())); + case 3: break; @@ -145,6 +139,8 @@ BarController::button_press (GdkEventButton* ev) bool BarController::button_release (GdkEventButton* ev) { + drop_grab (); + switch (ev->button) { case 1: if (switch_on_release) { @@ -152,14 +148,14 @@ BarController::button_release (GdkEventButton* ev) return true; } - if ((ev->state & (GDK_SHIFT_MASK|GDK_CONTROL_MASK)) == GDK_SHIFT_MASK) { + if ((ev->state & (Keyboard::TertiaryModifier|Keyboard::PrimaryModifier)) == Keyboard::TertiaryModifier) { adjustment.set_value (initial_value); } else { double scale; - if (ev->state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK) == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) { + if ((ev->state & (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier)) == (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier)) { scale = 0.01; - } else if (ev->state & GDK_CONTROL_MASK) { + } else if (ev->state & Keyboard::PrimaryModifier) { scale = 0.1; } else { scale = 1.0; @@ -167,26 +163,12 @@ BarController::button_release (GdkEventButton* ev) mouse_control (ev->x, ev->window, scale); } - darea.remove_modal_grab(); - StopGesture (); break; case 2: - if ((ev->state & bind_statemask) && bind_button == 2) { - midi_learn (); - } else { - double fract; - fract = ev->x / (darea.get_width() - 2.0); - adjustment.set_value (adjustment.get_lower() + - fract * (adjustment.get_upper() - adjustment.get_lower())); - } - return true; - + break; + case 3: - if ((ev->state & bind_statemask) && bind_button == 3) { - midi_learn (); - return TRUE; - } return false; default: @@ -201,9 +183,9 @@ BarController::scroll (GdkEventScroll* ev) { double scale; - if (ev->state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK) == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) { + if ((ev->state & (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier)) == (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier)) { scale = 0.01; - } else if (ev->state & GDK_CONTROL_MASK) { + } else if (ev->state & Keyboard::PrimaryModifier) { scale = 0.1; } else { scale = 1.0; @@ -230,16 +212,16 @@ BarController::motion (GdkEventMotion* ev) double scale; if (!grabbed) { - return TRUE; + return true; } - if ((ev->state & (GDK_SHIFT_MASK|GDK_CONTROL_MASK)) == GDK_SHIFT_MASK) { + if ((ev->state & (Keyboard::TertiaryModifier|Keyboard::PrimaryModifier)) == Keyboard::TertiaryModifier) { return TRUE; } - if (ev->state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK) == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) { + if ((ev->state & (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier)) == (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier)) { scale = 0.01; - } else if (ev->state & GDK_CONTROL_MASK) { + } else if (ev->state & Keyboard::PrimaryModifier) { scale = 0.1; } else { scale = 1.0; @@ -251,7 +233,7 @@ BarController::motion (GdkEventMotion* ev) gint BarController::mouse_control (double x, GdkWindow* window, double scaling) { - double fract; + double fract = 0.0; double delta; if (window != grab_window) { @@ -262,16 +244,17 @@ BarController::mouse_control (double x, GdkWindow* window, double scaling) delta = x - grab_x; grab_x = x; - + switch (_style) { case Line: + case Blob: case LeftToRight: + case CenterOut: fract = scaling * (delta / (darea.get_width() - 2)); fract = min (1.0, fract); fract = max (-1.0, fract); adjustment.set_value (adjustment.get_value() + fract * (adjustment.get_upper() - adjustment.get_lower())); break; - default: fract = 0.0; } @@ -281,22 +264,24 @@ BarController::mouse_control (double x, GdkWindow* window, double scaling) } bool -BarController::expose (GdkEventExpose* event) +BarController::expose (GdkEventExpose* /*event*/) { Glib::RefPtr win (darea.get_window()); + Cairo::RefPtr context = win->create_cairo_context(); + Gdk::Color c; Widget* parent; - gint x1, x2, y1, y2; + gint x1=0, x2=0, y1=0, y2=0; gint w, h; double fract; - - w = darea.get_width() - 2; - h = darea.get_height() - 2; + float r, g, b; fract = ((adjustment.get_value() - adjustment.get_lower()) / (adjustment.get_upper() - adjustment.get_lower())); switch (_style) { case Line: + w = darea.get_width() - 1; + h = darea.get_height(); x1 = (gint) floor (w * fract); x2 = x1; y1 = 0; @@ -304,57 +289,147 @@ BarController::expose (GdkEventExpose* event) if (use_parent) { parent = get_parent(); - + if (parent) { - win->draw_rectangle (parent->get_style()->get_fg_gc (parent->get_state()), - true, - 0, 0, darea.get_width(), darea.get_height()); + c = parent->get_style()->get_fg (parent->get_state()); + r = c.get_red_p (); + g = c.get_green_p (); + b = c.get_blue_p (); + context->set_source_rgb (r, g, b); + context->rectangle (0, 0, darea.get_width(), darea.get_height()); + context->fill (); } + } else { - win->draw_rectangle (get_style()->get_bg_gc (get_state()), - true, - 0, 0, darea.get_width(), darea.get_height()); + + c = get_style()->get_bg (get_state()); + r = c.get_red_p (); + g = c.get_green_p (); + b = c.get_blue_p (); + context->set_source_rgb (r, g, b); + context->rectangle (0, 0, darea.get_width() - ((darea.get_width()+1) % 2), darea.get_height()); + context->fill (); } + + c = get_style()->get_fg (get_state()); + r = c.get_red_p (); + g = c.get_green_p (); + b = c.get_blue_p (); + context->set_source_rgb (r, g, b); + context->move_to (x1, 0); + context->line_to (x1, h); + context->stroke (); + break; + + case Blob: + w = darea.get_width() - 1; + h = darea.get_height(); + x1 = (gint) floor (w * fract); + x2 = min (w-2,h-2); + + if (use_parent) { + parent = get_parent(); + + if (parent) { + c = parent->get_style()->get_fg (parent->get_state()); + r = c.get_red_p (); + g = c.get_green_p (); + b = c.get_blue_p (); + context->set_source_rgb (r, g, b); + context->rectangle (0, 0, darea.get_width(), darea.get_height()); + context->fill (); + } - if (fract == 0.0) { - win->draw_rectangle (get_style()->get_fg_gc (get_state()), - true, x1, 1, 2, darea.get_height() - 2); } else { - win->draw_rectangle (get_style()->get_fg_gc (get_state()), - true, x1 - 1, 1, 3, darea.get_height() - 2); + + c = get_style()->get_bg (get_state()); + r = c.get_red_p (); + g = c.get_green_p (); + b = c.get_blue_p (); + context->set_source_rgb (r, g, b); + context->rectangle (0, 0, darea.get_width() - ((darea.get_width()+1) % 2), darea.get_height()); + context->fill (); } + + c = get_style()->get_fg (get_state()); + r = c.get_red_p (); + g = c.get_green_p (); + b = c.get_blue_p (); + context->arc (x1, ((h-2)/2)-1, x2, 0, 2*M_PI); break; case CenterOut: + w = darea.get_width(); + h = darea.get_height()-2; + if (use_parent) { + parent = get_parent(); + if (parent) { + c = parent->get_style()->get_fg (parent->get_state()); + r = c.get_red_p (); + g = c.get_green_p (); + b = c.get_blue_p (); + context->set_source_rgb (r, g, b); + context->rectangle (0, 0, darea.get_width(), darea.get_height()); + context->fill (); + } + } else { + c = get_style()->get_bg (get_state()); + r = c.get_red_p (); + g = c.get_green_p (); + b = c.get_blue_p (); + context->set_source_rgb (r, g, b); + context->rectangle (0, 0, darea.get_width(), darea.get_height()); + context->fill (); + } + c = get_style()->get_fg (get_state()); + r = c.get_red_p (); + g = c.get_green_p (); + b = c.get_blue_p (); + x1 = (w/2) - ((w*fract)/2); // center, back up half the bar width + context->set_source_rgb (r, g, b); + context->rectangle (x1, 1, w*fract, h); + context->fill (); break; case LeftToRight: + + w = darea.get_width() - 2; + h = darea.get_height() - 2; + x1 = 0; x2 = (gint) floor (w * fract); y1 = 0; - y2 = h - 1; + y2 = h; + + /* bounding box */ - win->draw_rectangle (get_style()->get_bg_gc (get_state()), - false, - 0, 0, darea.get_width() - 1, darea.get_height() - 1); + c = get_style()->get_bg (get_state()); + r = c.get_red_p (); + g = c.get_green_p (); + b = c.get_blue_p (); + context->set_source_rgb (r, g, b); + rounded_rectangle (context, 0, 0, darea.get_width(), darea.get_height()); + context->stroke (); /* draw active box */ - win->draw_rectangle (get_style()->get_fg_gc (get_state()), - true, - 1 + x1, - 1 + y1, - x2, - 1 + y2); - + c = get_style()->get_fg (get_state()); + r = c.get_red_p (); + g = c.get_green_p (); + b = c.get_blue_p (); + context->set_source_rgb (r, g, b); + rounded_rectangle (context, 1 + x1, 1 + y1, x2, y2); + context->fill (); + /* draw inactive box */ - win->draw_rectangle (get_style()->get_fg_gc (STATE_INSENSITIVE), - true, - 1 + x2, - 1 + y1, - w - x2, - 1 + y2); + c = get_style()->get_fg (STATE_INSENSITIVE); + r = c.get_red_p (); + g = c.get_green_p (); + b = c.get_blue_p (); + context->set_source_rgb (r, g, b); + rounded_rectangle (context, 1 + x2, 1 + y1, w - x2, y2); + context->fill (); break; @@ -366,102 +441,39 @@ BarController::expose (GdkEventExpose* event) break; } - if (with_text) { - /* draw label */ - - char buf[64]; - buf[0] = '\0'; - - label_callback (buf, 64); - - if (buf[0] != '\0') { - - layout->set_text (buf); - - int width, height; - layout->get_pixel_size (width, height); - - int xpos; - - xpos = max (3, 1 + (x2 - (width/2))); - xpos = min (darea.get_width() - width - 3, xpos); - - win->draw_layout (get_style()->get_text_gc (get_state()), - xpos, - (darea.get_height()/2) - (height/2), - layout); - } - } + /* draw label */ - return true; -} + double xpos = -1; + std::string const label = get_label (xpos); -void -BarController::set_with_text (bool yn) -{ - if (with_text != yn) { - with_text = yn; - queue_draw (); - } -} - -void -BarController::midicontrol_set_tip () -{ - if (midi_control) { - // Gtkmm2ext::UI::instance()->set_tip (&darea, midi_control->control_description()); - } -} - -void -BarController::midi_learn() -{ - if (midi_control) { - prompting = true; - midi_control->learn_about_external_control (); - } -} - - -void -BarController::midicontrol_prompt () -{ - if (prompting) { - string prompt = _("operate MIDI controller now"); - prompter.set_text (prompt); - Gtkmm2ext::UI::instance()->touch_display (&prompter); - - unprompting = true; - prompting = false; - } -} - -void -BarController::midicontrol_unprompt () -{ - if (unprompting) { - Gtkmm2ext::UI::instance()->touch_display (&prompter); + if (!label.empty()) { - unprompting = false; - } -} + layout->set_text (label); + + int width, height, x; + layout->get_pixel_size (width, height); -gint -BarController::prompter_hiding (GdkEventAny *ev) -{ - if (unprompting) { - if (midi_control) { - midi_control->stop_learning(); - } - unprompting = false; + if (xpos == -1) { + x = max (3, 1 + (x2 - (width/2))); + x = min (darea.get_width() - width - 3, (int) lrint (xpos)); + } else { + x = lrint (darea.get_width() * xpos); + } + + c = get_style()->get_text (get_state()); + r = c.get_red_p (); + g = c.get_green_p (); + b = c.get_blue_p (); + context->set_source_rgb (r, g, b); + context->move_to (x, (darea.get_height()/2) - (height/2)); + layout->show_in_cairo_context (context); } - return FALSE; + return true; } - void -BarController::set_style (Style s) +BarController::set_style (barStyle s) { _style = s; darea.queue_draw (); @@ -485,6 +497,9 @@ BarController::switch_to_bar () darea.show (); switching = false; + + SpinnerActive (false); /* EMIT SIGNAL */ + return FALSE; } @@ -504,27 +519,24 @@ BarController::switch_to_spinner () remove (); add (spinner); spinner.show (); + spinner.select_region (0, spinner.get_text_length()); spinner.grab_focus (); switching = false; + + SpinnerActive (true); /* EMIT SIGNAL */ + return FALSE; } void BarController::entry_activated () { - string text = spinner.get_text (); - float val; - - if (sscanf (text.c_str(), "%f", &val) == 1) { - adjustment.set_value (val); - } - switch_to_bar (); } bool -BarController::entry_focus_out (GdkEventFocus* ev) +BarController::entry_focus_out (GdkEventFocus* /*ev*/) { entry_activated (); return true; @@ -536,3 +548,89 @@ BarController::set_use_parent (bool yn) use_parent = yn; queue_draw (); } + +void +BarController::set_sensitive (bool yn) +{ + Frame::set_sensitive (yn); + darea.set_sensitive (yn); +} + +/* + This is called when we need to update the adjustment with the value + from the spinner's text entry. + + We need to use Gtk::Entry::get_text to avoid recursive nastiness :) + + If we're not in logarithmic mode we can return false to use the + default conversion. + + In theory we should check for conversion errors but set numeric + mode to true on the spinner prevents invalid input. +*/ +int +BarController::entry_input (double* new_value) +{ + if (!logarithmic) { + return false; + } + + // extract a double from the string and take its log + Entry *entry = dynamic_cast(&spinner); + double value; + + { + // Switch to user's preferred locale so that + // if they use different LC_NUMERIC conventions, + // we will honor them. + + PBD::LocaleGuard lg (""); + sscanf (entry->get_text().c_str(), "%lf", &value); + } + + *new_value = log(value); + + return true; +} + +/* + This is called when we need to update the spinner's text entry + with the value of the adjustment. + + We need to use Gtk::Entry::set_text to avoid recursive nastiness :) + + If we're not in logarithmic mode we can return false to use the + default conversion. +*/ +bool +BarController::entry_output () +{ + if (!logarithmic) { + return false; + } + + // generate the exponential and turn it into a string + // convert to correct locale. + + stringstream stream; + string str; + + char buf[128]; + + { + // Switch to user's preferred locale so that + // if they use different LC_NUMERIC conventions, + // we will honor them. + + PBD::LocaleGuard lg (""); + snprintf (buf, sizeof (buf), "%g", exp (spinner.get_adjustment()->get_value())); + } + + Entry *entry = dynamic_cast(&spinner); + entry->set_text(buf); + + return true; +} + + +