X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowgui.C;h=3b1d0ac8a05913895fb5aa0d6f78cc6ae38c9052;hb=11b3a0bebdfdfe15ca2985624244fd1acd978fe4;hp=11114bc91223807af309babfeac40c86c77db88a;hpb=576087eacf577a0fa5d3008d37c4d5b597f0990a;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/cwindowgui.C b/cinelerra-5.1/cinelerra/cwindowgui.C
index 11114bc9..3b1d0ac8 100644
--- a/cinelerra-5.1/cinelerra/cwindowgui.C
+++ b/cinelerra-5.1/cinelerra/cwindowgui.C
@@ -219,14 +219,7 @@ void CWindowGUI::create_objects()
 	tool_panel = new CWindowTool(mwindow, this);
 	tool_panel->Thread::start();
 
-
 	set_operation(mwindow->edl->session->cwindow_operation);
-
-
-
-	canvas->draw_refresh(0);
-
-
 	draw_status(0);
 	unlock_window();
 }
@@ -298,6 +291,7 @@ int CWindowGUI::button_press_event()
 {
 	if( current_operation == CWINDOW_NONE &&
 	    mwindow->edl != 0 && canvas->get_canvas() &&
+	    mwindow->edl->session->cwindow_click2play &&
 	    canvas->get_canvas()->get_cursor_over_window() ) {
 		switch( get_buttonpress() ) {
 		case LEFT_BUTTON:
@@ -424,15 +418,26 @@ void CWindowGUI::zoom_canvas(double value, int update_menu)
 	canvas->draw_refresh();
 }
 
-
-
 void CWindowGUI::set_operation(int value)
 {
-	mwindow->edl->session->cwindow_operation = value;
+	switch( value ) {
+	case CWINDOW_TOOL_WINDOW:
+		mwindow->edl->session->tool_window = !mwindow->edl->session->tool_window;
+		composite_panel->operation[CWINDOW_TOOL_WINDOW]->update(mwindow->edl->session->tool_window);
+		tool_panel->update_show_window();
+		return;
+	case CWINDOW_TITLESAFE:
+		mwindow->edl->session->safe_regions = !mwindow->edl->session->safe_regions;
+		composite_panel->operation[CWINDOW_TITLESAFE]->update(mwindow->edl->session->safe_regions);
+		value = mwindow->edl->session->cwindow_operation;
+		break;
+	default:
+		mwindow->edl->session->cwindow_operation = value;
+		composite_panel->set_operation(value);
+		break;
+	}
 
-	composite_panel->set_operation(value);
 	edit_panel->update();
-
 	tool_panel->start_tool(value);
 	canvas->draw_refresh();
 }
@@ -452,6 +457,7 @@ int CWindowGUI::close_event()
 int CWindowGUI::keypress_event()
 {
 	int result = 0;
+	int cwindow_operation = CWINDOW_NONE;
 
 	switch(get_keypress())
 	{
@@ -503,32 +509,75 @@ int CWindowGUI::keypress_event()
 				int shift_down = this->shift_down();
 				unlock_window();
 				stop_transport(0);
-				mwindow->gui->lock_window("CWindowGUI::keypress_event 2");
+				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 2");
+				lock_window("CWindowGUI::keypress_event 6");
  				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;
+			}
+			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 2");
+				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 2");
+				lock_window("CWindowGUI::keypress_event 9");
+				result = 1;
+			}
+			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;
 			}
 			break;
+
+		case KEY_F1:	cwindow_operation = CWINDOW_PROTECT;	break;
+		case KEY_F2:	cwindow_operation = CWINDOW_ZOOM;	break;
+		case KEY_F3:	cwindow_operation = CWINDOW_MASK;	break;
+		case KEY_F4:	cwindow_operation = CWINDOW_RULER;	break;
+		case KEY_F5:	cwindow_operation = CWINDOW_CAMERA;	break;
+		case KEY_F6:	cwindow_operation = CWINDOW_PROJECTOR;	break;
+		case KEY_F7:	cwindow_operation = CWINDOW_CROP;	break;
+		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( cwindow_operation >= 0 ) {
+		set_operation(cwindow_operation);
+		result = 1;
 	}
 
 	if(!result) result = transport->keypress_event();
@@ -597,14 +646,12 @@ int CWindowGUI::drag_stop()
 		if(mwindow->session->drag_assets->total ||
 			mwindow->session->drag_clips->total)
 		{
-			mwindow->gui->lock_window("CWindowGUI::drag_stop 5");
+			mwindow->gui->lock_window("CWindowGUI::drag_stop 1");
 			mwindow->undo->update_undo_before(_("insert assets"), 0);
-			mwindow->gui->unlock_window();
 		}
 
 		if(mwindow->session->drag_assets->total)
 		{
-			mwindow->gui->lock_window("CWindowGUI::drag_stop 1");
 			mwindow->clear(0);
 			mwindow->load_assets(mwindow->session->drag_assets,
 				mwindow->edl->local_session->get_selectionstart(),
@@ -619,7 +666,6 @@ int CWindowGUI::drag_stop()
 
 		if(mwindow->session->drag_clips->total)
 		{
-			mwindow->gui->lock_window("CWindowGUI::drag_stop 2");
 			mwindow->clear(0);
 			mwindow->paste_edls(mwindow->session->drag_clips,
 				LOADMODE_PASTE,
@@ -639,7 +685,7 @@ int CWindowGUI::drag_stop()
 			mwindow->gui->update(1, 1, 1, 1, 0, 1, 0);
 			mwindow->undo->update_undo_after(_("insert assets"), LOAD_ALL);
 			mwindow->gui->unlock_window();
-			mwindow->sync_parameters(LOAD_ALL);
+			mwindow->sync_parameters(CHANGE_ALL);
 		}
 	}
 
@@ -686,28 +732,27 @@ void CWindowGUI::stop_transport(const char *lock_msg)
 
 
 CWindowEditing::CWindowEditing(MWindow *mwindow, CWindow *cwindow)
- : EditPanel(mwindow,
-		cwindow->gui,
-		mwindow->theme->cedit_x,
-		mwindow->theme->cedit_y,
+ : EditPanel(mwindow, cwindow->gui, CWINDOW_ID,
+		mwindow->theme->cedit_x, mwindow->theme->cedit_y,
 		mwindow->edl->session->editing_mode,
-		0,
-		1,
-		0,
-		0,
-		1,
-		1,
-		1,
-		1,
-		1,
-		0,
+		0, // use_editing_mode
+		1, // use_keyframe
+		0, // use_splice
+		0, // use_overwrite
+		1, // use_lift
+		1, // use_extract
+		1, // use_copy
+		1, // use_paste
+		1, // use_undo
+		0, // use_fit
 		0, // locklabels
-		1,
-		1,
-		1,
-		0,
-		1,
-		0)
+		1, // use_labels
+		1, // use_toclip
+		1, // use_meters
+		1, // use_cut
+		0, // use_commerical
+		0, // use_goto
+		1) // use_clk2play
 {
 	this->mwindow = mwindow;
 	this->cwindow = cwindow;
@@ -726,14 +771,20 @@ CWrapper(set_inpoint)
 CWrapper(set_outpoint)
 CWrapper(unset_inoutpoint)
 CWrapper(toggle_label)
-CWrapper(prev_label)
-CWrapper(next_label)
-CWrapper(prev_edit)
-CWrapper(next_edit)
+
+#define CWrapper_cut(fn) void CWindowEditing::fn(int cut) { \
+	mwindow->gui->lock_window("CWrapper::" #fn); \
+	EditPanel::fn(cut); \
+	mwindow->gui->unlock_window(); \
+}
+CWrapper_cut(prev_label)
+CWrapper_cut(next_label)
+CWrapper_cut(prev_edit)
+CWrapper_cut(next_edit)
 
 void CWindowEditing::to_clip()
 {
-        mwindow->to_clip(mwindow->edl, _("composer window: "));
+	mwindow->to_clip(mwindow->edl, _("composer window: "), 0);
 }
 
 
@@ -837,20 +888,9 @@ int CWindowSlider::handle_event()
 void CWindowSlider::set_position()
 {
 	double new_length = mwindow->edl->tracks->total_length();
-// 	if(mwindow->edl->local_session->preview_end <= 0 ||
-// 		mwindow->edl->local_session->preview_end > new_length)
-// 		mwindow->edl->local_session->preview_end = new_length;
-// 	if(mwindow->edl->local_session->preview_start >
-// 		mwindow->edl->local_session->preview_end)
-// 		mwindow->edl->local_session->preview_start = 0;
-
-
 	update(mwindow->theme->cslider_w,
 		mwindow->edl->local_session->get_selectionstart(1),
-		0,
-		new_length);
-//		mwindow->edl->local_session->preview_start,
-//		mwindow->edl->local_session->preview_end);
+		0, new_length);
 }
 
 
@@ -1042,6 +1082,15 @@ void CWindowCanvas::draw_refresh(int flush)
 				in_x2 > in_x1 &&
 				in_y2 > in_y1)
 			{
+// input scaled from session to refresh frame coordinates
+				int ow = get_output_w(mwindow->edl);
+				int oh = get_output_h(mwindow->edl);
+				int rw = refresh_frame->get_w();
+				int rh = refresh_frame->get_h();
+				float xs = (float)rw / ow;
+				float ys = (float)rh / oh;
+				in_x1 *= xs;  in_x2 *= xs;
+				in_y1 *= ys;  in_y2 *= ys;
 // Can't use OpenGL here because it is called asynchronously of the
 // playback operation.
 				get_canvas()->draw_vframe(refresh_frame,
@@ -1065,6 +1114,9 @@ void CWindowCanvas::draw_refresh(int flush)
 		}
 
 		draw_overlays();
+// allow last opengl write to complete before redraw
+// tried sync_display, glFlush, glxMake*Current(0..)
+usleep(20000);
 		get_canvas()->flash(flush);
 	}
 //printf("CWindowCanvas::draw_refresh 10\n");
@@ -2265,6 +2317,24 @@ int CWindowCanvas::do_eyedrop(int &rerender, int button_press, int draw)
 	return result;
 }
 
+int CWindowCanvas::need_overlays()
+{
+	if( mwindow->edl->session->safe_regions ) return 1;
+	if( mwindow->edl->session->cwindow_scrollbars ) return 1;
+	if( gui->highlighted ) return 1;
+	switch( mwindow->edl->session->cwindow_operation ) {
+		case CWINDOW_EYEDROP:
+			if( ! gui->eyedrop_visible ) break;
+		case CWINDOW_CAMERA:
+		case CWINDOW_PROJECTOR:
+		case CWINDOW_CROP:
+		case CWINDOW_MASK:
+		case CWINDOW_RULER:
+			return 1;
+	}
+	return 0;
+}
+
 void CWindowCanvas::draw_overlays()
 {
 	if(mwindow->edl->session->safe_regions)
@@ -2513,7 +2583,7 @@ int CWindowCanvas::test_crop(int button_press, int &redraw)
 			redraw = 1;
 		}
 	}
-    else
+	else
 // Translate all 4 points
 	if(gui->current_operation == CWINDOW_CROP && gui->crop_translate)
 	{