merge changes for 2.0.1/2.0.2, plus some fixes to issues made apparent by conflicts

git-svn-id: svn://localhost/ardour2/branches/midi@1812 d708f5d6-7413-0410-9779-e7cbd77b26cf

2 files changed, 14 insertions, 7 deletions

diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 96b1ab591e..6a449b35f4 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -3244,7 +3244,7 @@ Editor::region_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event
 	   motion handler. 
 	*/
 
-	if (drag_info.first_move) {
+	if (drag_info.first_move && !(drag_info.copy && drag_info.x_constrained)) {
 		/* just a click */
 		goto out;
 	}
@@ -3320,7 +3320,7 @@ Editor::region_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event
 
 			boost::shared_ptr<Playlist> from_playlist = rv->region()->playlist();
 			boost::shared_ptr<Playlist> to_playlist = rtv2->playlist();
-	    
+
 			where = (nframes_t) (unit_to_frame (ix1) * speed);
 			boost::shared_ptr<Region> new_region (RegionFactory::create (rv->region()));
 
@@ -3455,7 +3455,7 @@ Editor::region_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event
 				}
 
 				/* add it */
-				
+
 				latest_regionview = 0;
 				sigc::connection c = rtv->view()->RegionViewAdded.connect (mem_fun(*this, &Editor::collect_new_region_view));
 				to_playlist->add_region (newregion, (nframes_t) (where * rtv->get_diskstream()->speed()));
diff --git a/gtk2_ardour/redirect_box.cc b/gtk2_ardour/redirect_box.cc
index 1c881c4838..d98e51ca2c 100644
--- a/gtk2_ardour/redirect_box.cc
+++ b/gtk2_ardour/redirect_box.cc
@@ -294,7 +294,7 @@ RedirectBox::redirect_button_press_event (GdkEventButton *ev)
 		
 	}
 
-	if (redirect && (Keyboard::is_edit_event (ev) || (ev->button == 1 && ev->type == GDK_2BUTTON_PRESS && ev->state == 0))) {
+	if (redirect && (Keyboard::is_edit_event (ev) || (ev->button == 1 && ev->type == GDK_2BUTTON_PRESS))) {
 		
 		if (_session.engine().connected()) {
 			/* XXX giving an error message here is hard, because we may be in the midst of a button press */
@@ -339,7 +339,7 @@ RedirectBox::redirect_button_release_event (GdkEventButton *ev)
 		show_redirect_menu(ev->time);
 		ret = true;
 
-	} else if (redirect && ev->button == 2 && ev->state == GDK_BUTTON2_MASK) {
+	} else if (redirect && ev->button == 2 && Keyboard::modifier_state_equals (ev->state, Gdk::BUTTON2_MASK)) {
 		
 		redirect->set_active (!redirect->active(), this);
 		ret = true;
@@ -1071,6 +1071,7 @@ RedirectBox::edit_redirect (boost::shared_ptr<Redirect> redirect)
 			send_ui->get_window()->raise ();
 		} else {
 			send_ui->show_all ();
+			send_ui->present ();
 		}
 		
 	} else {
@@ -1115,6 +1116,7 @@ RedirectBox::edit_redirect (boost::shared_ptr<Redirect> redirect)
 					plugin_ui->get_window()->raise ();
 				} else {
 					plugin_ui->show_all ();
+					plugin_ui->present ();
 				}
 #ifdef HAVE_AUDIOUNIT
 			} else if (type == ARDOUR::AudioUnit) {
@@ -1125,7 +1127,12 @@ RedirectBox::edit_redirect (boost::shared_ptr<Redirect> redirect)
 					plugin_ui = reinterpret_cast<AUPluginUI*> (plugin_insert->get_gui());
 				}
 				
-				// raise window, somehow
+				if (plugin_ui->is_visible()) {
+					plugin_ui->get_window()->raise ();
+				} else {
+					plugin_ui->show_all ();
+					plugin_ui->present ();
+				}
 #endif				
 			} else {
 				warning << "Unsupported plugin sent to RedirectBox::edit_redirect()" << endmsg;
@@ -1153,7 +1160,7 @@ RedirectBox::edit_redirect (boost::shared_ptr<Redirect> redirect)
 			if (io_selector->is_visible()) {
 				io_selector->get_window()->raise ();
 			} else {
-				io_selector->show_all ();
+				io_selector->present ();
 			}
 		}
 	}