X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftrackcanvas.C;h=3d152c71bfa5eb6bc272a7eabfd878699f3bb6ed;hp=fced464be14fb6386c88a1fe02521bd4073b0bb5;hb=7028b139b11904216808777100c0bac9079f1c8c;hpb=e51e8d64881ef494548697203c82e5be8646cd4b

diff --git a/cinelerra-5.1/cinelerra/trackcanvas.C b/cinelerra-5.1/cinelerra/trackcanvas.C
index fced464b..3d152c71 100644
--- a/cinelerra-5.1/cinelerra/trackcanvas.C
+++ b/cinelerra-5.1/cinelerra/trackcanvas.C
@@ -194,7 +194,7 @@ int TrackCanvas::drag_motion(
 		drag_cursor_motion(cursor_x, cursor_y,
 			over_track, over_edit, over_pluginset, over_plugin);
 	}
-        if( over_track && !*over_track )
+	if( over_track && !*over_track )
 		*over_track = pane->over_patchbay();
 	return 0;
 }
@@ -278,6 +278,7 @@ int TrackCanvas::drag_stop_event()
 {
 	int result = gui->drag_stop();
 	if( !result && mwindow->session->current_operation ) {
+		mwindow->edl->tracks->clear_selected_edits();
 		mwindow->session->current_operation = NO_OPERATION;
 		drag_scroll = 0;
 	}
@@ -499,6 +500,37 @@ int TrackCanvas::drag_stop(int *redraw)
 				result = 1;
 			}
 			break;
+		case DRAG_GROUP:
+			mwindow->session->current_operation = NO_OPERATION;
+			EDL *drag_group = mwindow->session->drag_group;
+			if( drag_group ) {
+				Track *drop_track = mwindow->session->track_highlighted;
+				Track *drag_track = mwindow->session->drag_group_first_track;
+				Edit *drag_edit = mwindow->session->drag_group_edit;
+				Track *edit_track = drag_edit ? drag_edit->track : 0;
+				while( drop_track && edit_track ) {
+					if( edit_track == drag_track ) break;
+					edit_track = edit_track->previous;
+					drop_track = drop_track->previous;
+				}
+				if( drop_track ) {
+					double cur_pos = mwindow->session->drag_group_position;
+					double new_pos = mwindow->edl->get_cursor_position(cursor_x, pane->number);
+					new_pos -= mwindow->session->drag_position - cur_pos;
+					new_pos = mwindow->edl->align_to_frame(new_pos, 0);
+					double drop_position = new_pos;
+					int ret = test_track_group(drag_group, drop_track, new_pos);
+					if( !ret && new_pos != drop_position ) {
+						ret = test_track_group(drag_group, drop_track, new_pos);
+					}
+					if( ret )
+						mwindow->move_group(drag_group, drop_track, new_pos);
+					drag_group->remove_user();
+					mwindow->session->drag_group = 0;
+				}
+			}
+			result = 1;
+			break;
 		}
 	}
 
@@ -512,7 +544,10 @@ int TrackCanvas::drag_start_event()
 	int rerender = 0;
 	int new_cursor, update_cursor;
 
-	if(mwindow->session->current_operation != NO_OPERATION) return 0;
+	if( mwindow->session->current_operation == GROUP_TOGGLE )
+		mwindow->session->current_operation = NO_OPERATION;
+	else if( mwindow->session->current_operation != NO_OPERATION )
+		return 0;
 
 	if(is_event_win()) {
 		if(do_plugins(get_drag_x(), get_drag_y(),
@@ -1537,7 +1572,40 @@ void TrackCanvas::draw_highlighting()
 //				}
 			}
 			break;
-
+		case DRAG_GROUP:
+			if( mwindow->session->track_highlighted && mwindow->session->drag_group &&
+			    mwindow->session->drag_group_edit && mwindow->session->drag_group_first_track ) {
+				Track *track = mwindow->session->track_highlighted;
+				EDL *drag_group = mwindow->session->drag_group;
+				Track *edit_track = mwindow->session->drag_group_edit->track;
+				Track *drag_track = mwindow->session->drag_group_first_track;
+				while( track && edit_track && edit_track != drag_track ) {
+					edit_track = edit_track->previous;
+					track = track->previous;
+				}
+				int cx = get_cursor_x();
+				double cur_pos = mwindow->session->drag_group_position;
+				double new_pos = mwindow->edl->get_cursor_position(cx, pane->number);
+				new_pos -= mwindow->session->drag_position - cur_pos;
+				new_pos = mwindow->edl->align_to_frame(new_pos, 0);
+				double drop_position = new_pos;
+				int color = GREEN;
+				int ret = test_track_group(drag_group, track, new_pos);
+				if( !ret && new_pos != drop_position ) {
+					double pos = new_pos;
+					pos += mwindow->session->drag_position - cur_pos;
+					cx = mwindow->edl->get_position_cursorx(pos, pane->number);
+					ret = test_track_group(drag_group, track, new_pos);
+					color = ret ? YELLOW : RED;
+				}
+				else if( !ret )
+					color = RED;
+				track_dimensions(mwindow->session->track_highlighted, x, y, w, h);
+				int dx = cx - mwindow->session->drag_origin_x;
+				int dy = y - mwindow->session->drag_origin_y;
+				draw_selected_edits(mwindow->edl, dx, dy, color, -1);
+			}
+			break;
 // Dragging an effect from the timeline
 		case DRAG_AEFFECT_COPY:
 		case DRAG_VEFFECT_COPY:
@@ -1601,18 +1669,28 @@ void TrackCanvas::draw_highlighting()
 	if( draw_box )
 		draw_highlight_rectangle(x, y, w, h);
 
-	for( Track *track=mwindow->edl->tracks->first; track; track=track->next ) {
+	draw_selected_edits(mwindow->edl, 0, 0, GREEN+BLUE, RED);
+}
+
+void TrackCanvas::draw_selected_edits(EDL *edl, int dx, int dy, int color0, int color1)
+{
+	for( Track *track=edl->tracks->first; track; track=track->next ) {
 		for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
 			if( !edit->is_selected ) continue;
+			int64_t x, y, w, h;
 			edit_dimensions(edit, x, y, w, h);
+			x += dx;  y += dy;
 			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();
+			set_opaque();
+			int inner = color1 < 0 ? color0 : !edit->group_id ? color0 :
+				mwindow->get_group_color(edit->group_id);
+			set_color(inner);
 			draw_rectangle(x, y, w, h);
-			set_color(RED);
+			int outer = color1 < 0 ? color0 : !edit->group_id ? color1 : inner;
+			set_color(outer);
 			draw_rectangle(x-1, y-1, w+2, h+2);
-			set_opaque();
+			draw_rectangle(x-2, y-2, w+1, h+1);
 		}
 	}
 }
@@ -2205,13 +2283,13 @@ void TrackCanvas::draw_keyframe_reticle()
 	int autoidx = dragging && keyframe_hairline != HAIRLINE_ALWAYS ?
 		mwindow->session->drag_auto->autos->autoidx : -1;
 
-	if( get_buttonpress() == 1 && dragging &&
-            keyframe_hairline == HAIRLINE_DRAGGING ) {
+	if( get_buttonpress() == LEFT_BUTTON && dragging &&
+	    keyframe_hairline == HAIRLINE_DRAGGING ) {
 		draw_hairline(mwindow->session->drag_auto, RED, 1);
 		return;
 	}
 
-	if( keyframe_hairline == HAIRLINE_ALWAYS || ( get_buttonpress() == 2 &&
+	if( keyframe_hairline == HAIRLINE_ALWAYS || ( get_buttonpress() == MIDDLE_BUTTON &&
 	    keyframe_hairline == HAIRLINE_DRAGGING && dragging ) ) {
 		int show = dragging || keyframe_hairline == HAIRLINE_ALWAYS ? 1 : 0;
 		for( Track *track = mwindow->edl->tracks->first; track; track=track->next ) {
@@ -3493,6 +3571,9 @@ int TrackCanvas::draw_hairline(Auto *auto_keyframe, int color, int show)
 
 	calculate_viewport(track, view_start, unit_start, view_end, unit_end,
 			yscale, center_pixel, zoom_sample, zoom_units);
+	if( auto_keyframe->position < unit_start ||
+	    auto_keyframe->position >= unit_end )
+		return 0;
 
 	double ax = 0, ay = 0;
 	calculate_auto_position(&ax, &ay, 0, 0, 0, 0,
@@ -4202,21 +4283,16 @@ int TrackCanvas::cursor_update(int in_motion)
 
 		case DROP_TARGETING:
 			new_cursor = GRABBED_CURSOR;
+			result = 1;
 			break;
 
 		default:
 			if(is_event_win() && cursor_inside()) {
 // Update clocks
 				cursor_x = get_cursor_x();
-				position = (double)cursor_x *
-					(double)mwindow->edl->local_session->zoom_sample /
-					(double)mwindow->edl->session->sample_rate +
-					(double)mwindow->edl->local_session->view_start[pane->number] *
-					(double)mwindow->edl->local_session->zoom_sample /
-					(double)mwindow->edl->session->sample_rate;
+				position = mwindow->edl->get_cursor_position(cursor_x, pane->number);
 				position = mwindow->edl->align_to_frame(position, 0);
 				update_clock = 1;
-
 // set all timebars
 				for(int i = 0; i < TOTAL_PANES; i++)
 					if(gui->pane[i]) gui->pane[i]->canvas->timebar_position = position;
@@ -4463,6 +4539,7 @@ int TrackCanvas::button_release_event()
 			break;
 
 		case DRAG_EDIT:
+		case DRAG_GROUP:
 		case DRAG_AEFFECT_COPY:
 		case DRAG_VEFFECT_COPY:
 // Trap in drag stop
@@ -4480,16 +4557,42 @@ int TrackCanvas::button_release_event()
 			result = 1;
 			break; }
 
+		case GROUP_TOGGLE: {
+			Edit *edit = mwindow->session->drag_edit;
+			if( edit ) {
+				if( shift_down() && edit->is_selected ) {
+					if( edit->group_id > 0 ) {
+						mwindow->edl->tracks->clear_selected_edits();
+						mwindow->edl->tracks->del_group(edit->group_id);
+					}
+					else {
+						int id = mwindow->session->group_number++;
+						mwindow->edl->tracks->new_group(id);
+					}
+					redraw = 0;
+				}
+				else {
+					if( mwindow->preferences->ctrl_toggle && !ctrl_down() )
+						mwindow->edl->tracks->clear_selected_edits();
+					edit->set_selected(-1);
+				}
+			}
+			mwindow->session->current_operation = NO_OPERATION;
+			update_overlay = 1;
+			result = 1;
+			drag_scroll = 0;
+			break; }
+
 		default:
-			if(mwindow->session->current_operation) {
+			if( mwindow->session->current_operation ) {
 //				if(mwindow->session->current_operation == SELECT_REGION) {
 //					mwindow->undo->update_undo_after(_("select"), LOAD_SESSION, 0, 0);
 //				}
 
 				mwindow->session->current_operation = NO_OPERATION;
 				drag_scroll = 0;
-// Traps button release events
-//				result = 1;
+				//result = 0;
+				break;
 			}
 			break;
 		}
@@ -4740,62 +4843,86 @@ int TrackCanvas::do_edits(int cursor_x, int cursor_y, int button_press, int drag
 // Cursor inside an edit
 			if(cursor_x >= edit_x && cursor_x < edit_x + edit_w &&
 				cursor_y >= edit_y && cursor_y < edit_y + edit_h) {
+				if( button_press && get_buttonpress() == LEFT_BUTTON ) {
+					if( get_double_click() ) {
+						mwindow->edl->tracks->clear_selected_edits();
+						double start = edit->track->from_units(edit->startproject);
+						start =	mwindow->edl->align_to_frame(start, 0);
+						mwindow->edl->local_session->set_selectionstart(start);
+						if( ctrl_down() ) {
 // Select duration of edit
-				if(button_press) {
-					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));
-						if(mwindow->edl->session->cursor_on_frames)
-						{
-							mwindow->edl->local_session->set_selectionstart(
-								mwindow->edl->align_to_frame(mwindow->edl->local_session->get_selectionstart(1), 0));
-							mwindow->edl->local_session->set_selectionend(
-								mwindow->edl->align_to_frame(mwindow->edl->local_session->get_selectionend(1), 1));
+							double end = edit->track->from_units(edit->startproject+edit->length);
+							end = mwindow->edl->align_to_frame(end, 0);
+							mwindow->edl->local_session->set_selectionend(end);
+							mwindow->edl->tracks->select_affected_edits(
+								edit->track->from_units(edit->startproject),
+								edit->track, 1);
+						}
+						else {
+							mwindow->edl->local_session->set_selectionend(start);
+							edit->set_selected(1);
 						}
 						result = 1;
 					}
-					if( ctrl_down() && get_buttonpress() == 1 &&
-					    mwindow->edl->session->editing_mode == EDITING_ARROW ) {
-						edit->is_selected = !edit->is_selected ? 1 : 0;
+					else if( mwindow->edl->session->editing_mode == EDITING_ARROW ) {
+						mwindow->session->drag_edit = edit;
+						mwindow->session->current_operation = GROUP_TOGGLE;
 						result = 1;
 					}
 					if( result ) {
-						redraw = 1;
 						rerender = 1;
 						update_cursor = -1;
 					}
 				}
 				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;
-// Construct list of all affected edits
+					mwindow->session->drag_edit = edit;
+					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
+					mwindow->session->drag_position =
+						mwindow->edl->get_cursor_position(cursor_x, pane->number);
+					drag_start = 0; // if unselected "fast" drag
+					if( !ctrl_down() && !edit->silence() && !edit->is_selected ) {
 						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->select_affected_edits(
+							edit->track->from_units(edit->startproject),
+							edit->track, 1);
+						drag_start = 1;
+					}
+// Construct list of all affected edits
+					if( ctrl_down() || drag_start ) {
 						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
-						mwindow->session->drag_position = (double)cursor_x *
-							mwindow->edl->local_session->zoom_sample /
-							mwindow->edl->session->sample_rate +
-							(double)mwindow->edl->local_session->view_start[pane->number] *
-							mwindow->edl->local_session->zoom_sample /
-							mwindow->edl->session->sample_rate;
-
-						int cx, cy;
-						get_abs_cursor(cx, cy);
-						gui->drag_popup = new BC_DragWindow(gui,
-							mwindow->theme->get_image("clip_icon"), cx, cy);
-
-						result = 1;
+						if( mwindow->session->drag_edits->size() > 0 ) {
+							mwindow->session->current_operation = DRAG_EDIT;
+// Need to create drag window
+							int cx, cy;  get_abs_cursor(cx, cy);
+							gui->drag_popup = new BC_DragWindow(gui,
+								mwindow->theme->get_image("clip_icon"), cx, cy);
+							result = 1;
+						}
+						else {
+							rerender = start_selection(mwindow->session->drag_position);
+							mwindow->session->current_operation = SELECT_REGION;
+							update_cursor = 1;
+						}
+					}
+					else if( edit->is_selected ) {
+						if( mwindow->session->drag_group )
+							mwindow->session->drag_group->remove_user();
+						double start_position = 0;
+						mwindow->session->drag_group =
+							mwindow->selected_edits_to_clip(0, &start_position,
+								&mwindow->session->drag_group_first_track,
+								mwindow->edl->session->labels_follow_edits,
+								mwindow->edl->session->autos_follow_edits,
+								mwindow->edl->session->plugins_follow_edits);
+						if( mwindow->session->drag_group ) {
+							mwindow->session->current_operation = DRAG_GROUP;
+							mwindow->session->drag_group_position = start_position;
+							mwindow->session->drag_group_edit = edit;
+							mwindow->session->drag_origin_y = edit_y;
+							result = 1;
+						}
 					}
 				}
 			}
@@ -4805,6 +4932,50 @@ int TrackCanvas::do_edits(int cursor_x, int cursor_y, int button_press, int drag
 }
 
 
+int TrackCanvas::test_track_group(EDL *group, Track *first_track, double &pos)
+{
+	Track *src = group->tracks->first;
+	for( Track *track=first_track; track && src; track=track->next ) {
+		if( !track->record ) continue;
+		if( src->data_type != track->data_type ) return 0;
+		for( Edit *src_edit=src->edits->first; src_edit; src_edit=src_edit->next ) {
+			if( src_edit->silence() ) continue;
+			if( edit_intersects(track, src_edit, pos) ) return 0;
+		}
+		src = src->next;
+	}
+	return !src ? 1 : 0;
+}
+
+int TrackCanvas::edit_intersects(Track *track, Edit *src_edit, double &pos)
+{
+	if( pos < 0 ) { pos = 0;  return 1; }
+	int64_t src_start = src_edit->startproject;
+	int64_t src_end = src_start + src_edit->length;
+	double new_start = src_edit->track->from_units(src_start) + pos;
+	double new_end = src_edit->track->from_units(src_end) + pos;
+	int64_t trk_start = track->to_units(new_start, 0);
+	int64_t trk_end = track->to_units(new_end, 0);
+	for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
+		if( edit->is_selected || edit->silence() ) continue;
+		int64_t edit_start = edit->startproject;
+		if( edit_start >= trk_end ) continue;
+		int64_t edit_end = edit_start + edit->length;
+		if( trk_start >= edit_end ) continue;
+		int lt_dist = abs(trk_end - edit_start);
+		int rt_dist = abs(edit_end - trk_start);
+		if( lt_dist < rt_dist ) {
+			pos = edit->track->from_units(edit_start) -
+				src_edit->track->from_units(src_end);
+		}
+		else {
+			pos = edit->track->from_units(edit_end);
+		}
+		return 1;
+	}
+	return 0;
+}
+
 int TrackCanvas::test_resources(int cursor_x, int cursor_y)
 {
 	return 0;
@@ -4846,7 +5017,7 @@ int TrackCanvas::do_plugins(int cursor_x, int cursor_y, int drag_start,
 	if(plugin) {
 // Start plugin popup
 		if(button_press) {
-			if(get_buttonpress() == 3) {
+			if(get_buttonpress() == RIGHT_BUTTON ) {
 				gui->plugin_menu->update(plugin);
 				gui->plugin_menu->activate_menu();
 				result = 1;
@@ -4869,11 +5040,11 @@ int TrackCanvas::do_plugins(int cursor_x, int cursor_y, int drag_start,
 		}
 		else
 // Move plugin
-		if(drag_start && plugin->track->record) {
-			if(mwindow->edl->session->editing_mode == EDITING_ARROW) {
-				if(plugin->track->data_type == TRACK_AUDIO)
+		if( drag_start && plugin->track->record && !plugin->silence() ) {
+			if( mwindow->edl->session->editing_mode == EDITING_ARROW ) {
+				if( plugin->track->data_type == TRACK_AUDIO )
 					mwindow->session->current_operation = DRAG_AEFFECT_COPY;
-				else if(plugin->track->data_type == TRACK_VIDEO)
+				else if( plugin->track->data_type == TRACK_VIDEO )
 					mwindow->session->current_operation = DRAG_VEFFECT_COPY;
 
 				mwindow->session->drag_plugin = plugin;
@@ -4954,7 +5125,7 @@ int TrackCanvas::do_transitions(int cursor_x, int cursor_y,
 		if(!button_press) {
 			new_cursor = UPRIGHT_ARROW_CURSOR;
 		}
-		else if(get_buttonpress() == 3) {
+		else if(get_buttonpress() == RIGHT_BUTTON ) {
 			gui->transition_menu->update(transition);
 			gui->transition_menu->activate_menu();
 		}
@@ -5102,6 +5273,7 @@ int TrackCanvas::button_press_event()
 		if( update_cursor < 0 ) {
 // double_click edit
 			gui->swindow->update_selection();
+			gui->draw_canvas(0, 0);
 		}
 		if( update_cursor ) {
 			gui->update_timebar(0);
@@ -5193,7 +5365,7 @@ void TrackCanvas::show_message(Auto *current, int show_curve_type, const char *f
 	va_list ap;
 	va_start(ap, fmt);
 	vsnprintf(cp, ep-cp, fmt, ap);
-        va_end(ap);
+	va_end(ap);
 	gui->show_message(string);
 }