center, don't expand plugin widgets

[ardour.git] / gtk2_ardour / editor_mouse.cc

diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 392901b74cee43fcac804b0c9011fab56bdb50dd..5597c5b06e77991f3a2ec0581af67cb9fbb94f25 100644 (file)
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -446,7 +446,8 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp
        if (((mouse_mode != MouseObject) &&
             (mouse_mode != MouseAudition || item_type != RegionItem) &&
             (mouse_mode != MouseTimeFX || item_type != RegionItem) &&
-            (mouse_mode != MouseDraw)) ||
+            (mouse_mode != MouseDraw) &&
+            (mouse_mode != MouseContent || item_type == RegionItem)) ||
            ((event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE) || event->button.button > 3)) {
                return;
        }
@@ -512,7 +513,8 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp
                break;
 
        case ControlPointItem:
-               set_selected_track_as_side_effect (op);
+               /* for object/track exclusivity, we don't call set_selected_track_as_side_effect (op); */
+
                if (eff_mouse_mode != MouseRange) {
                        _mouse_changed_selection |= set_selected_control_point_from_click (press, op);
                }
@@ -525,7 +527,7 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp
                        set_selected_track_as_side_effect (op);
 
                        /* We won't get a release.*/
-                       begin_reversible_selection_op (_("Button 3 Menu Select"));
+                       begin_reversible_selection_op (X_("Button 3 Menu Select"));
                        commit_reversible_selection_op ();
                }
                break;
@@ -539,7 +541,7 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp
        }
 
        if ((!press) && _mouse_changed_selection) {
-               begin_reversible_selection_op (_("Button Selection"));
+               begin_reversible_selection_op (X_("Button Selection"));
                commit_reversible_selection_op ();
                _mouse_changed_selection = false;
        }
@@ -761,11 +763,21 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                        }
                        return true;
 
+               case GainLineItem:
+                       _drags->set (new LineDrag (this, item), event);
+                       return true;
+                       break;
+
                case ControlPointItem:
                        _drags->set (new ControlPointDrag (this, item), event);
                        return true;
                        break;
 
+               case AutomationLineItem:
+                       _drags->set (new LineDrag (this, item), event);
+                       return true;
+                       break;
+
                case StreamItem:
                        //in the past, we created a new midi region here, but perhaps that is best left to the Draw mode
                        break;
@@ -1127,7 +1139,7 @@ Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemTyp
        }
 
        //not rolling, range mode click + join_play_range :  locate the PH here
-       if ( !_drags->active () && !_session->transport_rolling() && ( effective_mouse_mode() == MouseRange ) && ARDOUR_UI::config()->get_follow_edits() ) {
+       if ( !_drags->active () && _session && !_session->transport_rolling() && ( effective_mouse_mode() == MouseRange ) && ARDOUR_UI::config()->get_follow_edits() ) {
                framepos_t where = canvas_event_sample (event);
                snap_to(where);
                _session->request_locate (where, false);
@@ -1216,10 +1228,10 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                        break;
 
                case TempoMarkerItem: {
-                       Marker* marker;
+                       ArdourMarker* marker;
                        TempoMarker* tempo_marker;
                        
-                       if ((marker = reinterpret_cast<Marker *> (item->get_data ("marker"))) == 0) {
+                       if ((marker = reinterpret_cast<ArdourMarker *> (item->get_data ("marker"))) == 0) {
                                fatal << _("programming error: tempo marker canvas item has no marker object pointer!") << endmsg;
                                abort(); /*NOTREACHED*/
                        }
@@ -1234,10 +1246,10 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                }
 
                case MeterMarkerItem: {
-                       Marker* marker;
+                       ArdourMarker* marker;
                        MeterMarker* meter_marker;
                        
-                       if ((marker = reinterpret_cast<Marker *> (item->get_data ("marker"))) == 0) {
+                       if ((marker = reinterpret_cast<ArdourMarker *> (item->get_data ("marker"))) == 0) {
                                fatal << _("programming error: tempo marker canvas item has no marker object pointer!") << endmsg;
                                abort(); /*NOTREACHED*/
                        }
@@ -1496,7 +1508,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                                default:
                                        break;
                                }
-                       } else {
+                       } else if (_session) {
                                /* make sure we stop */
                                _session->request_transport_speed (0.0);
                        }
@@ -1564,7 +1576,7 @@ bool
 Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type)
 {
        ControlPoint* cp;
-       Marker * marker;
+       ArdourMarker * marker;
        double fraction;
         bool ret = true;
 
@@ -1617,7 +1629,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
                break;
 
        case MarkerItem:
-               if ((marker = static_cast<Marker *> (item->get_data ("marker"))) == 0) {
+               if ((marker = static_cast<ArdourMarker *> (item->get_data ("marker"))) == 0) {
                        break;
                }
                entered_marker = marker;
@@ -1659,6 +1671,14 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
        case SelectionItem:
                break;
 
+       case WaveItem:
+       {
+               if (entered_regionview) {
+                       entered_regionview->entered();
+               }
+       }
+       break;
+
        default:
                break;
        }
@@ -1690,7 +1710,7 @@ bool
 Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent*, ItemType item_type)
 {
        AutomationLine* al;
-       Marker *marker;
+       ArdourMarker *marker;
        Location *loc;
        bool is_start;
        bool ret = true;
@@ -1716,7 +1736,7 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent*, ItemType item_type)
                break;
 
        case MarkerItem:
-               if ((marker = static_cast<Marker *> (item->get_data ("marker"))) == 0) {
+               if ((marker = static_cast<ArdourMarker *> (item->get_data ("marker"))) == 0) {
                        break;
                }
                entered_marker = 0;
@@ -2113,10 +2133,10 @@ Editor::point_trim (GdkEvent* event, framepos_t new_bound)
 void
 Editor::hide_marker (ArdourCanvas::Item* item, GdkEvent* /*event*/)
 {
-       Marker* marker;
+       ArdourMarker* marker;
        bool is_start;
 
-       if ((marker = static_cast<Marker *> (item->get_data ("marker"))) == 0) {
+       if ((marker = static_cast<ArdourMarker *> (item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
                abort(); /*NOTREACHED*/
        }
@@ -2192,7 +2212,7 @@ Editor::mouse_brush_insert_region (RegionView* rv, framepos_t pos)
 
        // playlist is frozen, so we have to update manually XXX this is disgusting
 
-       playlist->RegionAdded (new_region); /* EMIT SIGNAL */
+       //playlist->RegionAdded (new_region); /* EMIT SIGNAL */
 }
 
 gint
@@ -2254,8 +2274,6 @@ Editor::add_region_brush_drag (ArdourCanvas::Item* item, GdkEvent*, RegionView*
        }
 
        _drags->add (new RegionMoveDrag (this, item, region_view, selection->regions.by_layer(), true, false));
-
-       begin_reversible_command (Operations::drag_region_brush);
 }
 
 /** Start a grab where a time range is selected, track(s) are selected, and the
@@ -2295,7 +2313,6 @@ Editor::start_selection_grab (ArdourCanvas::Item* /*item*/, GdkEvent* event)
        /* A selection grab currently creates two undo/redo operations, one for
           creating the new region and another for moving it.
        */
-
        begin_reversible_command (Operations::selection_grab);
 
        boost::shared_ptr<Playlist> playlist = clicked_axisview->playlist();
@@ -2308,6 +2325,7 @@ Editor::start_selection_grab (ArdourCanvas::Item* /*item*/, GdkEvent* event)
 
        if (latest_regionviews.empty()) {
                /* something went wrong */
+               abort_reversible_command ();
                return;
        }