X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowgui.C;h=37dd35bf20c3c244aead401cf5705b10e811dac6;hp=4f899c57e7e9ba0c0c8df1e65c107b8d99f83899;hb=7ead44762b23da404eee89b63e0474153fdf58a1;hpb=ed1cab1d6cbde6129bbd09b9609f7bba03ab610f

diff --git a/cinelerra-5.1/cinelerra/cwindowgui.C b/cinelerra-5.1/cinelerra/cwindowgui.C
index 4f899c57..37dd35bf 100644
--- a/cinelerra-5.1/cinelerra/cwindowgui.C
+++ b/cinelerra-5.1/cinelerra/cwindowgui.C
@@ -92,23 +92,28 @@ CWindowGUI::CWindowGUI(MWindow *mwindow, CWindow *cwindow)
 	this->mwindow = mwindow;
 	this->cwindow = cwindow;
 	affected_track = 0;
-	affected_x = 0;
-	affected_y = 0;
-	affected_z = 0;
+	affected_x = affected_y = affected_z = 0;
 	mask_keyframe = 0;
 	orig_mask_keyframe = new MaskAuto(0, 0);
 	affected_point = 0;
-	x_offset = 0;
-	y_offset = 0;
-	x_origin = 0;
-	y_origin = 0;
+	x_offset = y_offset = 0;
+	x_origin = y_origin = 0;
 	current_operation = CWINDOW_NONE;
 	tool_panel = 0;
-	translating_zoom = 0;
 	active = 0;
 	inactive = 0;
-	crop_translate = 0;
+	crop_handle = -1; crop_translate = 0;
+	crop_origin_x = crop_origin_y = 0;
+	crop_origin_x1 = crop_origin_y1 = 0;
+	crop_origin_x2 = crop_origin_y2 = 0;
 	eyedrop_visible = 0;
+	eyedrop_x = eyedrop_y = 0;
+	ruler_origin_x = ruler_origin_y = 0;
+	ruler_handle = -1; ruler_translate = 0;
+	center_x = center_y = center_z = 0;
+	control_in_x = control_in_y = 0;
+	control_out_x = control_out_y = 0;
+	translating_zoom = 0;
 	highlighted = 0;
 }
 
@@ -200,9 +205,9 @@ void CWindowGUI::create_objects()
 		mwindow->theme->czoom_y,
 		mwindow->theme->czoom_w);
 	zoom_panel->create_objects();
-	auto_zoom = _(AUTO_ZOOM);
-	zoom_panel->zoom_text->add_item(new BC_MenuItem(auto_zoom));
-	if(!mwindow->edl->session->cwindow_scrollbars) zoom_panel->set_text(auto_zoom);
+	zoom_panel->zoom_text->add_item(new BC_MenuItem(auto_zoom = _(AUTO_ZOOM)));
+	if( !mwindow->edl->session->cwindow_scrollbars )
+		zoom_panel->set_text(auto_zoom);
 
 // 	destination = new CWindowDestination(mwindow,
 // 		this,
@@ -245,7 +250,7 @@ int CWindowGUI::resize_event(int w, int h)
 	flash(0);
 
 	composite_panel->reposition_buttons(mwindow->theme->ccomposite_x,
-		mwindow->theme->ccomposite_y);
+		mwindow->theme->ccomposite_y, mwindow->theme->ccomposite_h);
 
 	canvas->reposition_window(mwindow->edl,
 		mwindow->theme->ccanvas_x,
@@ -291,6 +296,32 @@ int CWindowGUI::resize_event(int w, int h)
 
 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:
+			if( !cwindow->playback_engine->is_playing_back ) {
+				double length = mwindow->edl->tracks->total_playable_length();
+				double position = cwindow->playback_engine->get_tracking_position();
+				if( position >= length ) transport->goto_start();
+			}
+			return transport->forward_play->handle_event();
+		case MIDDLE_BUTTON:
+			if( !cwindow->playback_engine->is_playing_back ) {
+				double position = cwindow->playback_engine->get_tracking_position();
+				if( position <= 0 ) transport->goto_end();
+			}
+			return transport->reverse_play->handle_event();
+		case RIGHT_BUTTON:  // activates popup
+			break;
+		case WHEEL_UP:
+			return transport->frame_forward_play->handle_event();
+		case WHEEL_DOWN:
+			return transport->frame_reverse_play->handle_event();
+		}
+	}
 	if(canvas->get_canvas())
 		return canvas->button_press_event_base(canvas->get_canvas());
 	return 0;
@@ -368,38 +399,26 @@ float CWindowGUI::get_auto_zoom()
 	return zoom_x < zoom_y ? zoom_x : zoom_y;
 }
 
-void CWindowGUI::zoom_canvas(int do_auto, double value, int update_menu)
+void CWindowGUI::zoom_canvas(double value, int update_menu)
 {
-	EDL *edl = mwindow->edl;
 	float x = 0, y = 0;
-	float old_zoom = mwindow->edl->session->cwindow_zoom;
-	float new_zoom = value;
-	edl->session->cwindow_scrollbars = do_auto ? 0 : 1;
-	if( !do_auto && canvas->scrollbars_exist() ) {
-		float z = 1 - old_zoom / new_zoom;
-		x = canvas->get_xscroll() + 0.5f*canvas->w_visible * z;
-		y = canvas->get_yscroll() + 0.5f*canvas->h_visible * z;
+	float zoom = !value ? get_auto_zoom() : value;
+	mwindow->edl->session->cwindow_scrollbars = !value ? 0 : 1;
+	if( value ) {
+		float cx = canvas->get_xscroll() + 0.5f*canvas->w_visible;
+		float cy = canvas->get_yscroll() + 0.5f*canvas->h_visible;
+		float output_x = cx, output_y = cy;
+		canvas->output_to_canvas(mwindow->edl, 0, cx, cy);
+		x = output_x - cx / zoom;
+		y = output_y - cy / zoom;
 	}
+	canvas->update_zoom((int)(x+0.5), (int)(y+0.5), zoom);
 
-	if( update_menu ) {
-		if( !do_auto ) {
-			int frac = new_zoom >= 1.0f ? 1 :
-				   new_zoom >= 0.1f ? 2 :
-				   new_zoom >= .01f ? 3 : 4;
-			char string[BCSTRLEN];
-			sprintf(string,"x %.*f", frac, new_zoom);
-			zoom_panel->update(string);
-		}
-		else {
-			zoom_panel->update(auto_zoom);
-			composite_panel->cpanel_zoom->update(new_zoom);
-		}
-	}
-	else if( mwindow->edl->session->cwindow_operation == CWINDOW_ZOOM ) {
-		composite_panel->cpanel_zoom->update(new_zoom);
-	}
+	if( update_menu )
+		zoom_panel->update(value);
+	if( mwindow->edl->session->cwindow_operation == CWINDOW_ZOOM )
+		composite_panel->cpanel_zoom->update(zoom);
 
-	canvas->update_zoom((int)x, (int)y, new_zoom);
 	canvas->reposition_window(mwindow->edl,
 		mwindow->theme->ccanvas_x, mwindow->theme->ccanvas_y,
 		mwindow->theme->ccanvas_w, mwindow->theme->ccanvas_h);
@@ -480,61 +499,63 @@ int CWindowGUI::keypress_event()
 			lock_window("CWindowGUI::keypress_event 4");
 			break;
 		case LEFT:
-			if(!ctrl_down())
-			{
-				if (alt_down())
-				{
-					int shift_down = this->shift_down();
-					unlock_window();
-					mwindow->gui->mbuttons->transport->handle_transport(STOP, 1, 0, 0);
-
-					mwindow->gui->lock_window("CWindowGUI::keypress_event 2");
+			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);
-					mwindow->gui->unlock_window();
-
-					lock_window("CWindowGUI::keypress_event 1");
-				}
 				else
-				{
-					unlock_window();
-
-					mwindow->gui->lock_window("CWindowGUI::keypress_event 3");
 					mwindow->move_left();
-					mwindow->gui->unlock_window();
-
-					lock_window("CWindowGUI::keypress_event 2");
-				}
+				mwindow->gui->unlock_window();
+				lock_window("CWindowGUI::keypress_event 6");
  				result = 1;
 			}
 			break;
-		case RIGHT:
-			if(!ctrl_down())
-			{
-				if (alt_down())
-				{
-					int shift_down = this->shift_down();
-					unlock_window();
-					mwindow->gui->mbuttons->transport->handle_transport(STOP, 1, 0, 0);
 
-					mwindow->gui->lock_window("CWindowGUI::keypress_event 2");
-					mwindow->next_edit_handle(shift_down);
-					mwindow->gui->unlock_window();
+		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;
 
-					lock_window("CWindowGUI::keypress_event 2");
-				}
+		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
-				{
-					unlock_window();
-
-					mwindow->gui->lock_window("CWindowGUI::keypress_event 4");
 					mwindow->move_right();
-					mwindow->gui->unlock_window();
+				mwindow->gui->unlock_window();
+				lock_window("CWindowGUI::keypress_event 9");
+				result = 1;
+			}
+			break;
 
-					lock_window("CWindowGUI::keypress_event 3");
-				}
+		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;
+
 	}
 
 	if(!result) result = transport->keypress_event();
@@ -683,30 +704,36 @@ void CWindowGUI::update_meters()
 	}
 }
 
+void CWindowGUI::stop_transport(const char *lock_msg)
+{
+	if( lock_msg ) unlock_window();
+	mwindow->stop_transport();
+	if( lock_msg ) lock_window(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;
@@ -723,15 +750,23 @@ CWrapper(splice_selection)
 CWrapper(overwrite_selection)
 CWrapper(set_inpoint)
 CWrapper(set_outpoint)
-CWrapper(clear_inpoint)
-CWrapper(clear_outpoint)
-CWrapper(to_clip)
+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: "), 0);
+}
 
 
 CWindowMeters::CWindowMeters(MWindow *mwindow,
@@ -780,11 +815,26 @@ CWindowZoom::~CWindowZoom()
 {
 }
 
+void CWindowZoom::update(double value)
+{
+	char string[BCSTRLEN];
+	const char *cp = string;
+	if( value ) {
+		this->value = value;
+		int frac = value >= 1.0f ? 1 :
+			   value >= 0.1f ? 2 :
+			   value >= .01f ? 3 : 4;
+		sprintf(string, "x %.*f", frac, value);
+	}
+	else
+		cp = gui->auto_zoom;
+	ZoomPanel::update(cp);
+}
+
 int CWindowZoom::handle_event()
 {
-	int do_auto = !strcasecmp(gui->auto_zoom, get_text()) ? 1 : 0;
-	float zoom = do_auto ? gui->get_auto_zoom() : get_value();
-	gui->zoom_canvas(do_auto, zoom, 0);
+	double value = !strcasecmp(gui->auto_zoom, get_text()) ? 0 : get_value();
+	gui->zoom_canvas(value, 0);
 	return 1;
 }
 
@@ -818,7 +868,7 @@ int CWindowSlider::handle_event()
 
 void CWindowSlider::set_position()
 {
-	double new_length = mwindow->edl->tracks->total_playable_length();
+	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;
@@ -966,7 +1016,7 @@ void CWindowCanvas::update_zoom(int x, int y, float zoom)
 
 void CWindowCanvas::zoom_auto()
 {
-	gui->zoom_canvas(1, gui->get_auto_zoom(), 1);
+	gui->zoom_canvas(0, 1);
 }
 
 int CWindowCanvas::get_xscroll()
@@ -2156,15 +2206,24 @@ int CWindowCanvas::do_eyedrop(int &rerender, int button_press, int draw)
 	float blue = (float)*row++ / max; \
 	if(do_yuv) \
 	{ \
-		mwindow->edl->local_session->red += red + V_TO_R * (blue - 0.5); \
-		mwindow->edl->local_session->green += red + U_TO_G * (green - 0.5) + V_TO_G * (blue - 0.5); \
-		mwindow->edl->local_session->blue += red + U_TO_B * (green - 0.5); \
+		float r = red + V_TO_R * (blue - 0.5); \
+		float g = red + U_TO_G * (green - 0.5) + V_TO_G * (blue - 0.5); \
+		float b = red + U_TO_B * (green - 0.5); \
+		mwindow->edl->local_session->red += r; \
+		mwindow->edl->local_session->green += g; \
+		mwindow->edl->local_session->blue += b; \
+		if(r > mwindow->edl->local_session->red_max) mwindow->edl->local_session->red_max = r; \
+		if(g > mwindow->edl->local_session->green_max) mwindow->edl->local_session->green_max = g; \
+		if(b > mwindow->edl->local_session->blue_max) mwindow->edl->local_session->blue_max = b; \
 	} \
 	else \
 	{ \
 		mwindow->edl->local_session->red += red; \
 		mwindow->edl->local_session->green += green; \
 		mwindow->edl->local_session->blue += blue; \
+		if(red > mwindow->edl->local_session->red_max) mwindow->edl->local_session->red_max = red; \
+		if(green > mwindow->edl->local_session->green_max) mwindow->edl->local_session->green_max = green; \
+		if(blue > mwindow->edl->local_session->blue_max) mwindow->edl->local_session->blue_max = blue; \
 	} \
 }
 
@@ -2173,6 +2232,9 @@ int CWindowCanvas::do_eyedrop(int &rerender, int button_press, int draw)
 			mwindow->edl->local_session->red = 0;
 			mwindow->edl->local_session->green = 0;
 			mwindow->edl->local_session->blue = 0;
+			mwindow->edl->local_session->red_max = 0;
+			mwindow->edl->local_session->green_max = 0;
+			mwindow->edl->local_session->blue_max = 0;
 			for(int i = row1; i < row2; i++)
 			{
 				for(int j = column1; j < column2; j++)
@@ -2934,86 +2996,49 @@ int CWindowCanvas::test_bezier(int button_press,
 int CWindowCanvas::test_zoom(int &redraw)
 {
 	int result = 0;
-	float zoom = get_zoom();
-	float x;
-	float y;
-
-	if(!mwindow->edl->session->cwindow_scrollbars)
-	{
-		mwindow->edl->session->cwindow_scrollbars = 1;
-		zoom = 1.0;
-		x = mwindow->edl->session->output_w / 2;
-		y = mwindow->edl->session->output_h / 2;
-		x = x - w / zoom / 2;
-		y = y - h / zoom / 2;
-	}
-	else
-	{
-// Cursor position relative to canvas
-		x = get_cursor_x();
-		y = get_cursor_y();
-// cursor position relative to output
-		float output_x = x;
-		float output_y = y;
-		canvas_to_output(mwindow->edl,
-				0,
-				output_x,
-				output_y);
-
-//printf("CWindowCanvas::test_zoom 1 %f %f\n", x, y);
+	float x, y;
+	float zoom = 0;
 
+	if( mwindow->edl->session->cwindow_scrollbars ) {
+		if( *gui->zoom_panel->get_text() != 'x' ) {
 // Find current zoom in table
-		int current_index = 0;
-		for(current_index = 0 ; current_index < total_zooms; current_index++)
-			if(EQUIV(my_zoom_table[current_index], zoom)) break;
-
-
-// Zoom out
-		if(get_buttonpress() == 5 ||
-			gui->ctrl_down() ||
-			gui->shift_down())
-		{
-			current_index--;
+			int idx = total_zooms;  float old_zoom = get_zoom();
+			while( --idx >= 0 && !EQUIV(my_zoom_table[idx], old_zoom) );
+			if( idx >= 0 ) {
+				idx += get_buttonpress() == 5 ||
+					 gui->ctrl_down() || gui->shift_down() ?  -1 : +1 ;
+				CLAMP(idx, 0, total_zooms-1);
+				zoom = my_zoom_table[idx];
+			}
 		}
-		else
-// Zoom in
-		{
-			current_index++;
+		x = get_cursor_x();  y = get_cursor_y();
+		if( !zoom ) {
+			mwindow->edl->session->cwindow_scrollbars = 0;
+			gui->zoom_panel->update(0);
+			zoom = gui->get_auto_zoom();
+		}
+		else {
+			gui->zoom_panel->ZoomPanel::update(zoom);
+			float output_x = x, output_y = y;
+			canvas_to_output(mwindow->edl, 0, output_x, output_y);
+			x = output_x - x / zoom;
+			y = output_y - y / zoom;
 		}
-
-		CLAMP(current_index, 0, total_zooms - 1);
-		zoom = my_zoom_table[current_index];
-
-		x = output_x - x / zoom;
-		y = output_y - y / zoom;
-
-
 	}
+	else {
+		mwindow->edl->session->cwindow_scrollbars = 1;
+		x = (mwindow->edl->session->output_w - w) / 2;
+		y = (mwindow->edl->session->output_h - h) / 2;
+		zoom = 1;
+	}
+	update_zoom((int)x, (int)y, zoom);
 
+	gui->composite_panel->cpanel_zoom->update(zoom);
 
-
-	int x_i = (int)x;
-	int y_i = (int)y;
-//	check_boundaries(mwindow->edl, x_i, y_i, zoom);
-
-//printf("CWindowCanvas::test_zoom 2 %d %d\n", x_i, y_i);
-
-	update_zoom(x_i,
-			y_i,
-			zoom);
 	reposition_window(mwindow->edl,
-			mwindow->theme->ccanvas_x,
-			mwindow->theme->ccanvas_y,
-			mwindow->theme->ccanvas_w,
-			mwindow->theme->ccanvas_h);
-	redraw = 1;
-	result = 1;
-
-
-	gui->zoom_panel->update(zoom);
-	if( gui->mwindow->edl->session->cwindow_operation == CWINDOW_ZOOM ) {
-		gui->composite_panel->cpanel_zoom->update(zoom);
-	}
+			mwindow->theme->ccanvas_x, mwindow->theme->ccanvas_y,
+			mwindow->theme->ccanvas_w, mwindow->theme->ccanvas_h);
+	redraw = 1;  result = 1;
 
 	return result;
 }
@@ -3192,10 +3217,7 @@ int CWindowCanvas::cursor_motion_event()
 		gui->unlock_window();
 		mwindow->restart_brender();
 		mwindow->sync_parameters(CHANGE_PARAMS);
-		gui->cwindow->playback_engine->que->send_command(CURRENT_FRAME,
-			CHANGE_NONE,
-			mwindow->edl,
-			1);
+		mwindow->cwindow->refresh_frame(CHANGE_NONE);
 		if(!redraw) gui->update_tool();
 		gui->lock_window("CWindowCanvas::cursor_motion_event 2");
 	}
@@ -3222,7 +3244,8 @@ int CWindowCanvas::button_press_event()
 	gui->y_offset = get_y_offset(mwindow->edl, 0, zoom_y, conformed_w, conformed_h);
 
 // Scroll view
-	if(get_buttonpress() == 2)
+	if( mwindow->edl->session->cwindow_operation != CWINDOW_PROTECT &&
+	    get_buttonpress() == 2 )
 	{
 		gui->current_operation = CWINDOW_SCROLL;
 		result = 1;
@@ -3284,10 +3307,7 @@ int CWindowCanvas::button_press_event()
 
 		mwindow->restart_brender();
 		mwindow->sync_parameters(CHANGE_PARAMS);
-		gui->cwindow->playback_engine->que->send_command(CURRENT_FRAME,
-			CHANGE_NONE,
-			mwindow->edl,
-			1);
+		mwindow->cwindow->refresh_frame(CHANGE_NONE);
 		if(!redraw) gui->update_tool();
 		gui->lock_window("CWindowCanvas::button_press_event 2");
 	}