X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowgui.C;h=02ed52d32ad93ae559acb39554362dd0ce85e5d1;hp=19ff101e3f0383a56ba20b8e9df6a2c981922416;hb=b4184445f396e16260ed90e645a280149aeda8c0;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1

diff --git a/cinelerra-5.1/cinelerra/cwindowgui.C b/cinelerra-5.1/cinelerra/cwindowgui.C
index 19ff101e..02ed52d3 100644
--- a/cinelerra-5.1/cinelerra/cwindowgui.C
+++ b/cinelerra-5.1/cinelerra/cwindowgui.C
@@ -463,113 +463,141 @@ int CWindowGUI::keypress_event()
 	int result = 0;
 	int cwindow_operation = CWINDOW_NONE;
 
-	switch(get_keypress())
-	{
-		case 'w':
-		case 'W':
-			close_event();
-			result = 1;
-			break;
-		case '+':
-		case '=':
-			keyboard_zoomin();
-			result = 1;
-			break;
-		case '-':
-			keyboard_zoomout();
-			result = 1;
-			break;
-		case 'f':
+	switch( get_keypress() ) {
+	case 'w':
+	case 'W':
+		close_event();
+		result = 1;
+		break;
+	case '+':
+	case '=':
+		keyboard_zoomin();
+		result = 1;
+		break;
+	case '-':
+		keyboard_zoomout();
+		result = 1;
+		break;
+	case 'f':
+		unlock_window();
+		if(mwindow->session->cwindow_fullscreen)
+			canvas->stop_fullscreen();
+		else
+			canvas->start_fullscreen();
+		lock_window("CWindowGUI::keypress_event 1");
+		result = 1;
+		break;
+	case 'x':
+		if( ctrl_down() || shift_down() || alt_down() ) break;
+		unlock_window();
+		mwindow->gui->lock_window("CWindowGUI::keypress_event 2");
+		mwindow->cut();
+		mwindow->gui->unlock_window();
+		lock_window("CWindowGUI::keypress_event 2");
+		result = 1;
+		break;
+	case DELETE:
+		unlock_window();
+		mwindow->gui->lock_window("CWindowGUI::keypress_event 2");
+		mwindow->clear_entry();
+		mwindow->gui->unlock_window();
+		lock_window("CWindowGUI::keypress_event 3");
+		result = 1;
+		break;
+	case ESC:
+		unlock_window();
+		if(mwindow->session->cwindow_fullscreen)
+			canvas->stop_fullscreen();
+		lock_window("CWindowGUI::keypress_event 4");
+		result = 1;
+		break;
+	case LEFT:
+		if( !ctrl_down() ) {
+			int alt_down = this->alt_down();
+			int shift_down = this->shift_down();
 			unlock_window();
-			if(mwindow->session->cwindow_fullscreen)
-				canvas->stop_fullscreen();
+			stop_transport(0);
+			mwindow->gui->lock_window("CWindowGUI::keypress_event 5");
+			if( alt_down )
+				mwindow->prev_edit_handle(shift_down);
 			else
-				canvas->start_fullscreen();
-			lock_window("CWindowGUI::keypress_event 1");
-			break;
-		case 'x':
-			if( ctrl_down() || shift_down() || alt_down() ) break;
+				mwindow->move_left();
+			mwindow->gui->unlock_window();
+			lock_window("CWindowGUI::keypress_event 6");
+ 			result = 1;
+		}
+		break;
+
+	case ',':
+		if( !ctrl_down() && !alt_down() ) {
 			unlock_window();
-			mwindow->gui->lock_window("CWindowGUI::keypress_event 2");
-			mwindow->cut();
+			stop_transport(0);
+			mwindow->gui->lock_window("CWindowGUI::keypress_event 7");
+			mwindow->move_left();
 			mwindow->gui->unlock_window();
-			lock_window("CWindowGUI::keypress_event 2");
-			break;
-		case DELETE:
+			lock_window("CWindowGUI::keypress_event 8");
+			result = 1;
+		}
+		break;
+
+	case RIGHT:
+		if( !ctrl_down() ) {
+			int alt_down = this->alt_down();
+			int shift_down = this->shift_down();
 			unlock_window();
-			mwindow->gui->lock_window("CWindowGUI::keypress_event 2");
-			mwindow->clear_entry();
+			stop_transport(0);
+			mwindow->gui->lock_window("CWindowGUI::keypress_event 8");
+			if( alt_down )
+				mwindow->next_edit_handle(shift_down);
+			else
+				mwindow->move_right();
 			mwindow->gui->unlock_window();
-			lock_window("CWindowGUI::keypress_event 3");
-			break;
-		case ESC:
+			lock_window("CWindowGUI::keypress_event 9");
+			result = 1;
+		}
+		break;
+
+	case '.':
+		if( !ctrl_down() && !alt_down() ) {
 			unlock_window();
-			if(mwindow->session->cwindow_fullscreen)
-				canvas->stop_fullscreen();
-			lock_window("CWindowGUI::keypress_event 4");
-			break;
-		case LEFT:
-			if( !ctrl_down() ) {
-				int alt_down = this->alt_down();
-				int shift_down = this->shift_down();
-				unlock_window();
-				stop_transport(0);
-				mwindow->gui->lock_window("CWindowGUI::keypress_event 5");
-				if( alt_down )
-					mwindow->prev_edit_handle(shift_down);
-				else
-					mwindow->move_left();
-				mwindow->gui->unlock_window();
-				lock_window("CWindowGUI::keypress_event 6");
- 				result = 1;
-			}
-			break;
+			stop_transport(0);
+			mwindow->gui->lock_window("CWindowGUI::keypress_event 10");
+			mwindow->move_right();
+			mwindow->gui->unlock_window();
+			lock_window("CWindowGUI::keypress_event 11");
+			result = 1;
+		}
+		break;
+	}
 
-		case ',':
-			if( !ctrl_down() && !alt_down() ) {
-				unlock_window();
-				stop_transport(0);
-				mwindow->gui->lock_window("CWindowGUI::keypress_event 7");
-				mwindow->move_left();
-				mwindow->gui->unlock_window();
-				lock_window("CWindowGUI::keypress_event 8");
-				result = 1;
-			}
+	if( !result && cwindow_operation < 0 && ctrl_down() && shift_down() ) {
+		switch( get_keypress() ) {
+		case KEY_F1 ... KEY_F4: // mainmenu, load layout
+			resend_event(mwindow->gui);
+			result = 1;
 			break;
-
-		case RIGHT:
-			if( !ctrl_down() ) {
-				int alt_down = this->alt_down();
-				int shift_down = this->shift_down();
-				unlock_window();
-				stop_transport(0);
-				mwindow->gui->lock_window("CWindowGUI::keypress_event 8");
-				if( alt_down )
-					mwindow->next_edit_handle(shift_down);
-				else
-					mwindow->move_right();
-				mwindow->gui->unlock_window();
-				lock_window("CWindowGUI::keypress_event 9");
-				result = 1;
+		}
+	}
+	if( !result && !ctrl_down() ) {
+		switch( get_keypress() ) {
+		case KEY_F1:
+			if( shift_down() ) {
+				mwindow->toggle_camera_xyz();  result = 1;
 			}
+			else
+				cwindow_operation = CWINDOW_PROTECT;
 			break;
-
-		case '.':
-			if( !ctrl_down() && !alt_down() ) {
-				unlock_window();
-				stop_transport(0);
-				mwindow->gui->lock_window("CWindowGUI::keypress_event 10");
-				mwindow->move_right();
-				mwindow->gui->unlock_window();
-				lock_window("CWindowGUI::keypress_event 11");
-				result = 1;
+		case KEY_F2:
+			if( shift_down() ) {
+				mwindow->toggle_projector_xyz();  result = 1;
 			}
+			else
+				cwindow_operation = CWINDOW_ZOOM;
 			break;
-
-		case KEY_F1: if( shift_down() ) { mwindow->toggle_camera_xyz();  break; }
-				cwindow_operation = CWINDOW_PROTECT;	break;
-		case KEY_F2: if( shift_down() ) { mwindow->toggle_projector_xyz();  break; }
-				cwindow_operation = CWINDOW_ZOOM;	break;
+		}
+	}
+	if( !result && cwindow_operation < 0 && !ctrl_down() && !shift_down() ) {
+		switch( get_keypress() ) {
 		case KEY_F3:	cwindow_operation = CWINDOW_MASK;	break;
 		case KEY_F4:	cwindow_operation = CWINDOW_RULER;	break;
 		case KEY_F5:	cwindow_operation = CWINDOW_CAMERA;	break;
@@ -578,8 +606,25 @@ int CWindowGUI::keypress_event()
 		case KEY_F8:	cwindow_operation = CWINDOW_EYEDROP;	break;
 		case KEY_F9:	cwindow_operation = CWINDOW_TOOL_WINDOW; break;
 		case KEY_F10:	cwindow_operation = CWINDOW_TITLESAFE;	break;
-		case KEY_F11:	canvas->reset_camera();			break;
-		case KEY_F12:	canvas->reset_projector();		break;
+		}
+	}
+	if( !result && cwindow_operation < 0 && !ctrl_down() ) {
+		switch( get_keypress() ) {
+		case KEY_F11:
+			if( !shift_down() )
+				canvas->reset_camera();
+			else
+				canvas->camera_keyframe();
+			result = 1;
+			break;
+		case KEY_F12:
+			if( !shift_down() )
+				canvas->reset_projector();
+			else
+				canvas->projector_keyframe();
+			result = 1;
+			break;
+		}
 	}
 
 	if( cwindow_operation >= 0 ) {
@@ -587,7 +632,8 @@ int CWindowGUI::keypress_event()
 		result = 1;
 	}
 
-	if(!result) result = transport->keypress_event();
+	if( !result )
+		result = transport->keypress_event();
 
 	return result;
 }
@@ -622,6 +668,25 @@ void CWindowGUI::keyboard_zoomout()
 //	}
 }
 
+void CWindowGUI::sync_parameters(int change_type, int redraw, int overlay)
+{
+	if( redraw ) {
+		update_tool();
+		canvas->draw_refresh();
+	}
+	if( change_type < 0 && !overlay ) return;
+	unlock_window();
+	if( change_type >= 0 ) {
+		mwindow->restart_brender();
+		mwindow->sync_parameters(change_type);
+	}
+	if( overlay ) {
+		mwindow->gui->lock_window("CWindow::camera_keyframe");
+		mwindow->gui->draw_overlays(1);
+		mwindow->gui->unlock_window();
+	}
+	lock_window("CWindowGUI::sync_parameters");
+}
 
 void CWindowGUI::drag_motion()
 {
@@ -689,10 +754,10 @@ int CWindowGUI::drag_stop()
 		{
 			mwindow->save_backup();
 			mwindow->restart_brender();
-			mwindow->gui->update(1, 1, 1, 1, 0, 1, 0);
+			mwindow->gui->update(1, NORMAL_DRAW, 1, 1, 0, 1, 0);
 			mwindow->undo->update_undo_after(_("insert assets"), LOAD_ALL);
 			mwindow->gui->unlock_window();
-			mwindow->sync_parameters(CHANGE_ALL);
+			sync_parameters(CHANGE_ALL);
 		}
 	}
 
@@ -746,8 +811,6 @@ CWindowEditing::CWindowEditing(MWindow *mwindow, CWindow *cwindow)
 		1, // use_keyframe
 		0, // use_splice
 		0, // use_overwrite
-		1, // use_lift
-		1, // use_extract
 		1, // use_copy
 		1, // use_paste
 		1, // use_undo
@@ -765,51 +828,72 @@ CWindowEditing::CWindowEditing(MWindow *mwindow, CWindow *cwindow)
 	this->cwindow = cwindow;
 }
 
-#define CWrapper(fn) void CWindowEditing::fn() { \
-	mwindow->gui->lock_window("CWrapper::" #fn); \
-	EditPanel::fn(); \
-	mwindow->gui->unlock_window(); \
-}
+#define relock_cm(s) \
+ cwindow->gui->unlock_window(); \
+ mwindow->gui->lock_window("CWindowEditing::" s)
+#define relock_mc(s) \
+ mwindow->gui->unlock_window(); \
+ cwindow->gui->lock_window("CWindowEditing::" s)
+#define panel_fn(fn, args, s) \
+ CWindowEditing::fn args { relock_cm(#fn); s; relock_mc(#fn); }
+
+// transmit lock to mwindow, and run mbutton->edit_panel->s
+#define panel_btn(fn, args, s) \
+ panel_fn(panel_##fn, args, mwindow->gui->mbuttons->edit_panel->panel_##s)
 
-CWrapper(copy_selection)
-CWrapper(splice_selection)
-CWrapper(overwrite_selection)
-CWrapper(set_inpoint)
-CWrapper(set_outpoint)
-CWrapper(unset_inoutpoint)
-CWrapper(toggle_label)
 
-#define CWrapper_cut(fn) void CWindowEditing::fn(int cut) { \
-	mwindow->gui->lock_window("CWrapper::" #fn); \
-	EditPanel::fn(cut); \
-	mwindow->gui->unlock_window(); \
+double CWindowEditing::get_position()
+{
+	relock_cm("get_position");
+	double ret = mwindow->edl->local_session->get_selectionstart(1);
+	relock_mc("get_position");
+	return ret;
+}
+
+void CWindowEditing::set_position(double position)
+{
+	relock_cm("set_position");
+	mwindow->gui->mbuttons->edit_panel->set_position(position);
+	relock_mc("set_position");
 }
-CWrapper_cut(prev_label)
-CWrapper_cut(next_label)
-CWrapper_cut(prev_edit)
-CWrapper_cut(next_edit)
 
-void CWindowEditing::to_clip()
+void CWindowEditing::set_click_to_play(int v)
 {
-	mwindow->to_clip(mwindow->edl, _("composer window: "), 0);
+	relock_cm("set_position");
+	mwindow->edl->session->cwindow_click2play = v;
+	relock_mc("set_position");
+	click2play->update(v);
 }
 
 
+void panel_btn(stop_transport,(), stop_transport())
+void panel_btn(toggle_label,(), toggle_label())
+void panel_btn(next_label,(int cut), next_label(cut))
+void panel_btn(prev_label,(int cut), prev_label(cut))
+void panel_btn(next_edit,(int cut), next_edit(cut))
+void panel_btn(prev_edit,(int cut), prev_edit(cut))
+void panel_fn(panel_copy_selection,(), mwindow->copy())
+void CWindowEditing::panel_overwrite_selection() {} // not used
+void CWindowEditing::panel_splice_selection() {} // not used
+void panel_btn(set_inpoint,(), set_inpoint())
+void panel_btn(set_outpoint,(), set_outpoint())
+void panel_btn(unset_inoutpoint,(), unset_inoutpoint())
+void panel_fn(panel_to_clip,(), mwindow->to_clip(mwindow->edl, _("main window: "), 0))
+void panel_btn(cut,(), cut())
+void panel_btn(paste,(), paste())
+void panel_btn(fit_selection,(), fit_selection())
+void panel_btn(fit_autos,(int all), fit_autos(all))
+void panel_btn(set_editing_mode,(int mode), set_editing_mode(mode))
+void panel_btn(set_auto_keyframes,(int v), set_auto_keyframes(v))
+void panel_btn(set_labels_follow_edits,(int v), set_labels_follow_edits(v))
+
+
 CWindowMeters::CWindowMeters(MWindow *mwindow,
-	CWindowGUI *gui,
-	int x,
-	int y,
-	int h)
- : MeterPanel(mwindow,
-		gui,
-		x,
-		y,
-		-1,
-		h,
+	CWindowGUI *gui, int x, int y, int h)
+ : MeterPanel(mwindow, gui, x, y, -1, h,
 		mwindow->edl->session->audio_channels,
 		mwindow->edl->session->cwindow_meter,
-		0,
-		0)
+		0, 0)
 {
 	this->mwindow = mwindow;
 	this->gui = gui;
@@ -2449,44 +2533,60 @@ void CWindowCanvas::draw_safe_regions()
 	get_canvas()->set_opaque();
 }
 
-void CWindowCanvas::reset_keyframe(int do_camera)
-{
-	FloatAuto *x_keyframe = 0;
-	FloatAuto *y_keyframe = 0;
-	FloatAuto *z_keyframe = 0;
-	Track *affected_track = 0;
 
-	affected_track = gui->cwindow->calculate_affected_track();
+void CWindowCanvas::create_keyframe(int do_camera)
+{
+	Track *affected_track = gui->cwindow->calculate_affected_track();
+	if( affected_track ) {
+		double pos = mwindow->edl->local_session->get_selectionstart(1);
+		int64_t position = affected_track->to_units(pos, 0);
+		int ix = do_camera ? AUTOMATION_CAMERA_X : AUTOMATION_PROJECTOR_X;
+		int iy = do_camera ? AUTOMATION_CAMERA_Y : AUTOMATION_PROJECTOR_Y;
+		int iz = do_camera ? AUTOMATION_CAMERA_Z : AUTOMATION_PROJECTOR_Z;
+		FloatAuto *prev, *next;
+		FloatAutos **autos = (FloatAutos**)affected_track->automation->autos;
+		FloatAutos *x_autos = autos[ix];  prev = 0;  next = 0;
+		float x_value = x_autos->get_value(position, PLAY_FORWARD, prev, next);
+		FloatAutos *y_autos = autos[iy];  prev = 0;  next = 0;
+		float y_value = y_autos->get_value(position, PLAY_FORWARD, prev, next);
+		FloatAutos *z_autos = autos[iz];  prev = 0;  next = 0;
+		float z_value = z_autos->get_value(position, PLAY_FORWARD, prev, next);
+		FloatAuto *x_keyframe = 0, *y_keyframe = 0, *z_keyframe = 0;
+
+		gui->cwindow->calculate_affected_autos(affected_track,
+			&x_keyframe, &y_keyframe, &z_keyframe,
+			do_camera, -1, -1, -1, 0);
+		x_keyframe->set_value(x_value);
+		y_keyframe->set_value(y_value);
+		z_keyframe->set_value(z_value);
+
+		gui->sync_parameters(CHANGE_PARAMS, 1, 1);
+	}
+}
+
+void CWindowCanvas::camera_keyframe() { create_keyframe(1); }
+void CWindowCanvas::projector_keyframe() { create_keyframe(0); }
 
-	if(affected_track)
-	{
-		gui->cwindow->calculate_affected_autos(&x_keyframe,
-			&y_keyframe,
-			&z_keyframe,
-			affected_track,
-			do_camera,
-			1,
-			1,
-			1);
+void CWindowCanvas::reset_keyframe(int do_camera)
+{
+	Track *affected_track = gui->cwindow->calculate_affected_track();
+	if( affected_track ) {
+		FloatAuto *x_keyframe = 0, *y_keyframe = 0, *z_keyframe = 0;
+		gui->cwindow->calculate_affected_autos(affected_track,
+			&x_keyframe, &y_keyframe, &z_keyframe,
+			do_camera, 1, 1, 1);
 
 		x_keyframe->set_value(0);
 		y_keyframe->set_value(0);
 		z_keyframe->set_value(1);
 
-		mwindow->sync_parameters(CHANGE_PARAMS);
-		gui->update_tool();
+		gui->sync_parameters(CHANGE_PARAMS, 1, 1);
 	}
 }
 
-void CWindowCanvas::reset_camera()
-{
-	reset_keyframe(1);
-}
+void CWindowCanvas::reset_camera() { reset_keyframe(1); }
+void CWindowCanvas::reset_projector() { reset_keyframe(0); }
 
-void CWindowCanvas::reset_projector()
-{
-	reset_keyframe(0);
-}
 
 int CWindowCanvas::test_crop(int button_press, int &redraw)
 {
@@ -2802,12 +2902,15 @@ void CWindowCanvas::draw_bezier(int do_camera)
 	int64_t position = track->to_units(
 		mwindow->edl->local_session->get_selectionstart(1),
 		0);
-
-	track->automation->get_projector(&center_x,
-		&center_y,
-		&center_z,
-		position,
-		PLAY_FORWARD);
+	if( do_camera ) {
+		track->automation->get_camera(&center_x,
+			&center_y, &center_z, position, PLAY_FORWARD);
+// follow image, not camera
+		center_x = -center_x;  center_y = -center_y;
+	}
+	else
+		track->automation->get_projector(&center_x,
+			&center_y, &center_z, position, PLAY_FORWARD);
 
 //	center_x += track->track_w / 2;
 //	center_y += track->track_h / 2;
@@ -2996,6 +3099,7 @@ int CWindowCanvas::test_bezier(int button_press,
 				last_center_y = gui->affected_y->get_value();
 				float dx = cursor_x - gui->x_origin;
 				float dy = cursor_y - gui->y_origin;
+// follow image, not camera
 				if(gui->current_operation == CWINDOW_CAMERA ) {
 					dx = -dx;  dy = -dy;
 				}
@@ -3027,7 +3131,7 @@ int CWindowCanvas::test_bezier(int button_press,
 
 		if(gui->affected_track)
 		{
-			if(gui->current_operation == CWINDOW_CAMERA)
+			if( do_camera )
 				mwindow->undo->update_undo_before(_("camera"), this);
 			else
 				mwindow->undo->update_undo_before(_("projector"), this);
@@ -3239,38 +3343,9 @@ int CWindowCanvas::cursor_motion_event()
 		}
 	}
 
+	int change_type = rerender ? CHANGE_PARAMS : -1;
+	gui->sync_parameters(change_type, redraw, redraw_canvas);
 
-// If the window is never unlocked before calling send_command the
-// display shouldn't get stuck on the old video frame although it will
-// flicker between the old video frame and the new video frame.
-
-	if(redraw)
-	{
-		draw_refresh();
-		gui->update_tool();
-	}
-
-	if(redraw_canvas)
-	{
-		gui->unlock_window();
-
-
-		mwindow->gui->lock_window("CWindowCanvas::cursor_motion_event 1");
-		mwindow->gui->draw_overlays(1);
-		mwindow->gui->unlock_window();
-
-		gui->lock_window("CWindowCanvas::cursor_motion_event 1");
-	}
-
-	if(rerender)
-	{
-		gui->unlock_window();
-		mwindow->restart_brender();
-		mwindow->sync_parameters(CHANGE_PARAMS);
-		mwindow->cwindow->refresh_frame(CHANGE_NONE);
-		if(!redraw) gui->update_tool();
-		gui->lock_window("CWindowCanvas::cursor_motion_event 2");
-	}
 	return result;
 }
 
@@ -3336,31 +3411,9 @@ int CWindowCanvas::button_press_event()
 		}
 	}
 
-	if(redraw)
-	{
-		draw_refresh();
-		gui->unlock_window();
-
-
-		mwindow->gui->lock_window("CWindowCanvas::button_press_event 1");
-		mwindow->gui->draw_overlays(1);
-		mwindow->gui->unlock_window();
-		gui->update_tool();
-
-		gui->lock_window("CWindowCanvas::button_press_event 1");
-	}
-
-// rerendering can also be caused by press event
-	if(rerender)
-	{
-		gui->unlock_window();
+	int change_type = rerender ? CHANGE_PARAMS : -1;
+	gui->sync_parameters(change_type, redraw, redraw_canvas);
 
-		mwindow->restart_brender();
-		mwindow->sync_parameters(CHANGE_PARAMS);
-		mwindow->cwindow->refresh_frame(CHANGE_NONE);
-		if(!redraw) gui->update_tool();
-		gui->lock_window("CWindowCanvas::button_press_event 2");
-	}
 	return result;
 }