X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftrackcanvas.C;h=fced464be14fb6386c88a1fe02521bd4073b0bb5;hp=fdd3112bb6b2fb62f315fc7c2f3fb70de94bf9ba;hb=d5d61fcb8b007418eb9f481ae61be2b4f738cd5b;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1

diff --git a/cinelerra-5.1/cinelerra/trackcanvas.C b/cinelerra-5.1/cinelerra/trackcanvas.C
index fdd3112b..fced464b 100644
--- a/cinelerra-5.1/cinelerra/trackcanvas.C
+++ b/cinelerra-5.1/cinelerra/trackcanvas.C
@@ -76,6 +76,7 @@
 #include "theme.h"
 #include "trackcanvas.h"
 #include "tracking.h"
+#include "trackpopup.h"
 #include "tracks.h"
 #include "transition.h"
 #include "transitionhandles.h"
@@ -144,7 +145,7 @@ void TrackCanvas::create_objects()
 	pankeyframe_pixmap = new BC_Pixmap(this, mwindow->theme->pankeyframe_data, PIXMAP_ALPHA);
 	projectorkeyframe_pixmap = new BC_Pixmap(this, mwindow->theme->projectorkeyframe_data, PIXMAP_ALPHA);
 	maskkeyframe_pixmap = new BC_Pixmap(this, mwindow->theme->maskkeyframe_data, PIXMAP_ALPHA);
-	draw();
+	draw(NORMAL_DRAW, 1);
 	update_cursor(0);
 	flash(0);
 }
@@ -152,7 +153,7 @@ void TrackCanvas::create_objects()
 void TrackCanvas::resize_event()
 {
 //printf("TrackCanvas::resize_event 1\n");
-	draw(0, 0);
+	draw(NORMAL_DRAW, 0);
 	flash(0);
 //printf("TrackCanvas::resize_event 2\n");
 }
@@ -183,17 +184,27 @@ int TrackCanvas::drag_motion_event()
 	return gui->drag_motion();
 }
 
-int TrackCanvas::drag_motion(Track **over_track,
-	Edit **over_edit,
-	PluginSet **over_pluginset,
-	Plugin **over_plugin)
+int TrackCanvas::drag_motion(
+		Track **over_track, Edit **over_edit,
+		PluginSet **over_pluginset, Plugin **over_plugin)
 {
 	int cursor_x = get_relative_cursor_x();
 	int cursor_y = get_relative_cursor_y();
+	if( get_cursor_over_window() ) {
+		drag_cursor_motion(cursor_x, cursor_y,
+			over_track, over_edit, over_pluginset, over_plugin);
+	}
+        if( over_track && !*over_track )
+		*over_track = pane->over_patchbay();
+	return 0;
+}
 
-	if( get_cursor_over_window() &&
-		cursor_x >= 0 && cursor_y >= 0 &&
-		cursor_x < get_w() && cursor_y < get_h() )
+int TrackCanvas::drag_cursor_motion(int cursor_x, int cursor_y,
+		Track **over_track, Edit **over_edit,
+		PluginSet **over_pluginset, Plugin **over_plugin)
+{
+	if( cursor_x >= 0 && cursor_y >= 0 &&
+	    cursor_x < get_w() && cursor_y < get_h() )
 	{
 //printf("TrackCanvas::drag_motion %d %d\n", __LINE__, pane->number);
 // Find the edit and track the cursor is over
@@ -259,9 +270,6 @@ int TrackCanvas::drag_motion(Track **over_track,
 		}
 	}
 
-        if( !*over_track )
-		*over_track = pane->over_patchbay();
-
 	return 0;
 }
 
@@ -545,7 +553,7 @@ int64_t TrackCanvas::drop_edit_position(int *is_insertion, Edit *moved_edit, int
 	Edit *last_edit = track->edits->last;
 	if( !last_edit || edit_position >= (last_edit->startproject+last_edit->length) ) {
 		*is_insertion = 0;
-		return grab_position;
+		return edit_position;
 	}
 
 	int64_t drop_start = 0, drop_end = 0;  // drop zone boundries
@@ -650,7 +658,6 @@ void TrackCanvas::draw(int mode, int hide_cursor)
 {
 	const int debug = 0;
 
-
 // Swap pixmap layers
 	if(get_w() != background_pixmap->get_w() ||
 		get_h() != background_pixmap->get_h())
@@ -699,7 +706,7 @@ void TrackCanvas::draw_indexes(Indexable *indexable)
 // Don't redraw raw samples
 	if(index_state->index_zoom > mwindow->edl->local_session->zoom_sample)
 		return;
-	draw_resources(0, 1, indexable);
+	draw_resources(NORMAL_DRAW, 1, indexable);
 	draw_overlays();
 	flash(0);
 }
@@ -1198,7 +1205,7 @@ void TrackCanvas::draw_paste_destination()
 					}
 					if( paste_position >= 0 ) {
 						position = paste_position;
-						current_vedit++;
+						current_vtrack++;
 						//draw_box = 1;
 					}
 					else
@@ -1591,10 +1598,22 @@ void TrackCanvas::draw_highlighting()
 
 	}
 
-
-	if(draw_box)
-	{
+	if( draw_box )
 		draw_highlight_rectangle(x, y, w, h);
+
+	for( Track *track=mwindow->edl->tracks->first; track; track=track->next ) {
+		for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
+			if( !edit->is_selected ) continue;
+			edit_dimensions(edit, x, y, w, h);
+			if( !MWindowGUI::visible(x, x + w, 0, get_w()) ) continue;
+			if( !MWindowGUI::visible(y, y + h, 0, get_h()) ) continue;
+			set_color(GREEN | BLUE);
+			set_inverse();
+			draw_rectangle(x, y, w, h);
+			set_color(RED);
+			draw_rectangle(x-1, y-1, w+2, h+2);
+			set_opaque();
+		}
 	}
 }
 
@@ -2092,6 +2111,12 @@ int TrackCanvas::do_keyframes(int cursor_x,
 // auto_operations[i]);
 					if(buttonpress)
 					{
+						if (buttonpress == 2 && auto_keyframe )
+						{
+							double position = track->from_units(auto_keyframe->position);
+							mwindow->edl->local_session->set_selectionstart(position);
+							mwindow->edl->local_session->set_selectionend(position);
+						}
 						if (buttonpress != 3)
 						{
 							if(i == AUTOMATION_FADE || i == AUTOMATION_SPEED)
@@ -2744,7 +2769,7 @@ void TrackCanvas::fill_ganged_autos(int all, float change, Track *skip, FloatAut
 				CLAMP(new_value, auto_min, auto_max);
 				keyframe->adjust_to_new_coordinates(current_position, new_value);
 			}
-			else if( mwindow->edl->session->auto_keyframes ) {
+			else {
 // create keyframe on neighbouring track at the point in time given by fauto
 				FloatAuto *previous = 0, *next = 0;
 				float value = fade_autos->get_value(current_position, PLAY_FORWARD, previous, next);
@@ -2753,8 +2778,6 @@ void TrackCanvas::fill_ganged_autos(int all, float change, Track *skip, FloatAut
 				keyframe = (FloatAuto*)fade_autos->insert_auto(current_position);
 				keyframe->set_value(new_value);
 			}
-			else
-				continue;
 			mwindow->session->drag_auto_gang->append((Auto *)keyframe);
 		}
 	}
@@ -4177,6 +4200,10 @@ int TrackCanvas::cursor_update(int in_motion)
 			}
 			break;
 
+		case DROP_TARGETING:
+			new_cursor = GRABBED_CURSOR;
+			break;
+
 		default:
 			if(is_event_win() && cursor_inside()) {
 // Update clocks
@@ -4441,6 +4468,17 @@ int TrackCanvas::button_release_event()
 // Trap in drag stop
 			break;
 
+		case DROP_TARGETING: {
+			int cursor_x = get_cursor_x(), cursor_y = get_cursor_y();
+			Track *track=0;  Edit *edit=0;  PluginSet *pluginset=0;  Plugin *plugin=0;
+			drag_cursor_motion(cursor_x, cursor_y,
+				&track, &edit, &pluginset, &plugin);
+			double position =
+				mwindow->edl->get_cursor_position(cursor_x, pane->number);
+			gui->edit_menu->activate_menu(track, edit, pluginset, plugin, position);
+			mwindow->session->current_operation = NO_OPERATION;
+			result = 1;
+			break; }
 
 		default:
 			if(mwindow->session->current_operation) {
@@ -4664,19 +4702,24 @@ int TrackCanvas::do_tracks(int cursor_x, int cursor_y, int button_press)
 {
 	int result = 0;
 
-	for(Track *track = mwindow->edl->tracks->first;
-		track && !result;
-		track = track->next) {
-		int64_t track_x, track_y, track_w, track_h;
-		track_dimensions(track, track_x, track_y, track_w, track_h);
-
-		if( button_press && get_buttonpress() == RIGHT_BUTTON &&
-		    cursor_y >= track_y && cursor_y < track_y + track_h) {
-			double pos = mwindow->edl->get_cursor_position(cursor_x, pane->number);
-			int64_t position = track->to_units(pos, 0);
-			gui->edit_menu->update(track, track->edits->editof(position, PLAY_FORWARD, 0));
-			gui->edit_menu->activate_menu();
+	Track *track=0;  Edit *edit=0;  PluginSet *pluginset=0;  Plugin *plugin=0;
+	drag_cursor_motion(cursor_x, cursor_y,
+		&track, &edit, &pluginset, &plugin);
+
+	if( button_press && track ) {
+		switch( get_buttonpress() ) {
+		case RIGHT_BUTTON: {
+			double position =
+				mwindow->edl->get_cursor_position(cursor_x, pane->number);
+			gui->track_menu->activate_menu(track, edit, pluginset, plugin, position);
+			mwindow->session->current_operation = NO_OPERATION;
+			result = 1;
+			break; }
+		case MIDDLE_BUTTON:
+			set_cursor(GRABBED_CURSOR, 0, 1);
+			mwindow->session->current_operation = DROP_TARGETING;
 			result = 1;
+			break;
 		}
 	}
 
@@ -4699,7 +4742,7 @@ int TrackCanvas::do_edits(int cursor_x, int cursor_y, int button_press, int drag
 				cursor_y >= edit_y && cursor_y < edit_y + edit_h) {
 // Select duration of edit
 				if(button_press) {
-					if(get_double_click() && !drag_start) {
+					if( !drag_start && get_double_click() ) {
 						mwindow->edl->local_session->set_selectionstart(edit->track->from_units(edit->startproject));
 						mwindow->edl->local_session->set_selectionend(edit->track->from_units(edit->startproject) +
 							edit->track->from_units(edit->length));
@@ -4710,31 +4753,33 @@ int TrackCanvas::do_edits(int cursor_x, int cursor_y, int button_press, int drag
 							mwindow->edl->local_session->set_selectionend(
 								mwindow->edl->align_to_frame(mwindow->edl->local_session->get_selectionend(1), 1));
 						}
+						result = 1;
+					}
+					if( ctrl_down() && get_buttonpress() == 1 &&
+					    mwindow->edl->session->editing_mode == EDITING_ARROW ) {
+						edit->is_selected = !edit->is_selected ? 1 : 0;
+						result = 1;
+					}
+					if( result ) {
 						redraw = 1;
 						rerender = 1;
 						update_cursor = -1;
-						result = 1;
 					}
 				}
-				else if(drag_start && track->record) {
-					if(mwindow->edl->session->editing_mode == EDITING_ARROW) {
+				else if( drag_start && track->record ) {
+					if( mwindow->edl->session->editing_mode == EDITING_ARROW ) {
 // Need to create drag window
 						mwindow->session->current_operation = DRAG_EDIT;
 						mwindow->session->drag_edit = edit;
-//printf("TrackCanvas::do_edits 2\n");
-
-// Drag only one edit if ctrl is initially down
-						if(ctrl_down()) {
-							mwindow->session->drag_edits->remove_all();
-							mwindow->session->drag_edits->append(edit);
-						}
-						else {
 // Construct list of all affected edits
-							mwindow->edl->tracks->get_affected_edits(
-								mwindow->session->drag_edits,
+						mwindow->edl->tracks->clear_selected_edits();
+						if( ctrl_down() )
+							edit->is_selected = 1;
+						else
+							mwindow->edl->tracks->select_affected_edits(
 								edit->track->from_units(edit->startproject),
 								edit->track);
-						}
+						mwindow->edl->tracks->get_selected_edits(mwindow->session->drag_edits);
 						mwindow->session->drag_origin_x = cursor_x;
 						mwindow->session->drag_origin_y = cursor_y;
 						// Where the drag started, so we know relative position inside the edit later
@@ -4994,7 +5039,7 @@ int TrackCanvas::button_press_event()
 					update_cursor) ) break;
 
 				if( do_edits(cursor_x, cursor_y, 1, 0,
-					update_cursor, rerender, new_cursor,
+					update_overlay, rerender, new_cursor,
 					update_cursor) ) break;
 
 				if( do_plugins(cursor_x, cursor_y, 0, 1,