Fixes for GCC 4.3.
[ardour.git] / libs / gtkmm2ext / barcontroller.cc
index 3529d23e12b736de9877d33dd26c4a70327f3992..a3b2a13bf5aaf37ed08a4e5bab6910c7cd95a880 100644 (file)
@@ -23,7 +23,7 @@
 #include <cmath>
 #include <algorithm>
 
-#include <midi++/controllable.h>
+#include <pbd/controllable.h>
 
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/utils.h>
@@ -36,16 +36,13 @@ using namespace Gtk;
 using namespace Gtkmm2ext;
 
 BarController::BarController (Gtk::Adjustment& adj,
-                             MIDI::Controllable *mc,
+                             PBD::Controllable& mc,
                              sigc::slot<void,char*,unsigned int> lc) 
 
        : adjustment (adj),
-         prompter (Gtk::WIN_POS_MOUSE, 30000, false),
-         midi_control (mc),
+         binding_proxy (mc),
          label_callback (lc),
-         spinner (adjustment),
-         bind_button (2),
-         bind_statemask (Gdk::CONTROL_MASK)
+         spinner (adjustment)
 
 {                        
        _style = LeftToRight;
@@ -73,20 +70,10 @@ 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);
@@ -96,29 +83,29 @@ BarController::BarController (Gtk::Adjustment& adj,
 }
 
 void
-BarController::set_bind_button_state (guint button, guint statemask)
-{
-       bind_button = button;
-       bind_statemask = statemask;
-}
-
-void
-BarController::get_bind_button_state (guint &button, guint &statemask)
+BarController::drop_grab ()
 {
-       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 +118,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 +135,8 @@ BarController::button_press (GdkEventButton* ev)
 bool
 BarController::button_release (GdkEventButton* ev)
 {
+       drop_grab ();
+       
        switch (ev->button) {
        case 1:
                if (switch_on_release) {
@@ -157,7 +149,7 @@ BarController::button_release (GdkEventButton* ev)
                } else {
                        double scale;
 
-                       if (ev->state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK) == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) {
+                       if ((ev->state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) {
                                scale = 0.01;
                        } else if (ev->state & GDK_CONTROL_MASK) {
                                scale = 0.1;
@@ -167,26 +159,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,7 +179,7 @@ BarController::scroll (GdkEventScroll* ev)
 {
        double scale;
 
-       if (ev->state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK) == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) {
+       if ((ev->state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) {
                scale = 0.01;
        } else if (ev->state & GDK_CONTROL_MASK) {
                scale = 0.1;
@@ -230,14 +208,14 @@ BarController::motion (GdkEventMotion* ev)
        double scale;
        
        if (!grabbed) {
-               return TRUE;
+               return true;
        }
 
        if ((ev->state & (GDK_SHIFT_MASK|GDK_CONTROL_MASK)) == GDK_SHIFT_MASK) {
                return TRUE;
        }
 
-       if (ev->state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK) == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) {
+       if ((ev->state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) {
                scale = 0.01;
        } else if (ev->state & GDK_CONTROL_MASK) {
                scale = 0.1;
@@ -251,7 +229,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) {
@@ -285,18 +263,17 @@ BarController::expose (GdkEventExpose* event)
 {
        Glib::RefPtr<Gdk::Window> win (darea.get_window());
        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;
-
        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;
@@ -307,28 +284,28 @@ BarController::expose (GdkEventExpose* event)
                        
                        if (parent) {
                                win->draw_rectangle (parent->get_style()->get_fg_gc (parent->get_state()),
-                                                   true,
-                                                   0, 0, darea.get_width(), darea.get_height());
+                                                    true,
+                                                    0, 0, darea.get_width(), darea.get_height());
                        }
-               } else {
-                       win->draw_rectangle (get_style()->get_bg_gc (get_state()),
-                                           true,
-                                           0, 0, darea.get_width(), darea.get_height());
-               }
 
-               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);
+
+                       win->draw_rectangle (get_style()->get_bg_gc (get_state()),
+                                            true,
+                                            0, 0, darea.get_width() - ((darea.get_width()+1) % 2), darea.get_height());
                }
+               
+               win->draw_line (get_style()->get_fg_gc (get_state()), x1, 0, x1, h);
                break;
 
        case CenterOut:
                break;
 
        case LeftToRight:
+
+               w = darea.get_width() - 2;
+               h = darea.get_height() - 2;
+
                x1 = 0;
                x2 = (gint) floor (w * fract);
                y1 = 0;
@@ -372,7 +349,8 @@ BarController::expose (GdkEventExpose* event)
                char buf[64];
                buf[0] = '\0';
 
-               label_callback (buf, 64);
+               if (label_callback)
+                       label_callback (buf, 64);
 
                if (buf[0] != '\0') {
 
@@ -405,61 +383,6 @@ BarController::set_with_text (bool yn)
        }
 }
 
-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);
-               
-               unprompting = false;
-       }
-}
-
-gint
-BarController::prompter_hiding (GdkEventAny *ev)
-{
-       if (unprompting) {
-               if (midi_control) {
-                       midi_control->stop_learning();
-               }
-               unprompting = false;
-       }
-       
-       return FALSE;
-}
-
-
 void
 BarController::set_style (Style s)
 {
@@ -504,6 +427,7 @@ BarController::switch_to_spinner ()
        remove ();
        add (spinner);
        spinner.show ();
+       spinner.select_region (0, spinner.get_text_length());
        spinner.grab_focus ();
 
        switching = false;
@@ -536,3 +460,10 @@ 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);
+}