X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowgui.C;h=1825191efc5638453ee7df57670aab37a204bf31;hp=0ee1d6751906ec6a4992c6feaf4c90ade928c9a5;hb=da1e39d85e138b0d552e932d875c05e8dc743244;hpb=f7444a58936e4ab8fa7e7062281567cbc74e175f

diff --git a/cinelerra-5.1/cinelerra/cwindowgui.C b/cinelerra-5.1/cinelerra/cwindowgui.C
index 0ee1d675..1825191e 100644
--- a/cinelerra-5.1/cinelerra/cwindowgui.C
+++ b/cinelerra-5.1/cinelerra/cwindowgui.C
@@ -129,6 +129,7 @@ CWindowGUI::~CWindowGUI()
  	delete zoom_panel;
 	delete active;
 	delete inactive;
+	delete focus_frame;
 	delete orig_mask_keyframe;
 }
 
@@ -139,6 +140,7 @@ void CWindowGUI::create_objects()
 
 	active = new BC_Pixmap(this, mwindow->theme->get_image("cwindow_active"));
 	inactive = new BC_Pixmap(this, mwindow->theme->get_image("cwindow_inactive"));
+	focus_frame = new VFramePng(mwindow->theme->get_image_data("cwindow_focus.png"));
 
 	mwindow->theme->get_cwindow_sizes(this, mwindow->session->cwindow_controls);
 	mwindow->theme->draw_cwindow_bg(this);
@@ -1798,12 +1800,39 @@ int CWindowCanvas::do_mask(int &redraw, int &rerender,
 			output_to_canvas(mwindow->edl, 0, fx, fy);
 			float r = bmax(cvs_win->get_w(), cvs_win->get_h());
 			float d = 0.005*r;
+#if 1
+			int fw = 2*d+3, fh = fw;
+			VFrame focus(fw,fh, BC_RGBA8888);
+			focus.transfer_from(gui->focus_frame);
+			fx -= fw/2.f;  fy -= fh/2.f;
+			BC_Pixmap focus_pixmap(cvs_win, &focus, PIXMAP_ALPHA);
+			cvs_win->draw_pixmap(&focus_pixmap,fx,fy);
+#else
 			cvs_win->set_line_width((int)(0.0025*r) + 1);
 			cvs_win->set_color(BLUE);
 			cvs_win->draw_line(fx-d,fy-d, fx+d, fy+d);
 			cvs_win->draw_line(fx-d,fy+d, fx+d, fy-d);
 			cvs_win->set_line_width(0);
 			cvs_win->set_color(WHITE);
+#endif
+		}
+		if( draw && mask_gui && mask_gui->center_mark && points.size() ) {
+			float cx = 0, cy = 0;
+			int n = points.size();
+			for( int i=0; i<n; ++i ) {
+				MaskPoint *point = points.get(i);
+				cx += point->x;  cy += point->y;
+			}
+			cx /= n;  cy /= n;
+			output_to_canvas(mwindow->edl, 0, cx, cy);
+			float r = bmax(cvs_win->get_w(), cvs_win->get_h());
+			float d = 0.003*r;
+			cvs_win->set_line_width((int)(0.002*r) + 1);
+			cvs_win->set_color(ORANGE);
+			cvs_win->draw_line(cx-d,cy, cx+d, cy);
+			cvs_win->draw_line(cx,cy-d, cx, cy+d);
+			cvs_win->set_line_width(0);
+			cvs_win->set_color(WHITE);
 		}
 //printf("CWindowCanvas::do_mask 1\n");
 	}
@@ -2018,13 +2047,21 @@ int CWindowCanvas::do_mask(int &redraw, int &rerender,
 		SubMask *mask = gui->mask_keyframe->get_submask(mwindow->edl->session->cwindow_mask);
 		ArrayList<MaskPoint*> &mask_points = mask->points;
 #endif
-		MaskPoint *point = mask_points.values[gui->affected_point];
-		gui->center_x = point->x;
-		gui->center_y = point->y;
-		gui->control_in_x = point->control_x1;
-		gui->control_in_y = point->control_y1;
-		gui->control_out_x = point->control_x2;
-		gui->control_out_y = point->control_y2;
+		int k = gui->affected_point;
+		if( k >= 0 && k < mask_points.size() ) {
+			MaskPoint *point = mask_points.values[k];
+			gui->center_x = point->x;
+			gui->center_y = point->y;
+			gui->control_in_x = point->control_x1;
+			gui->control_in_y = point->control_y1;
+			gui->control_out_x = point->control_x2;
+			gui->control_out_y = point->control_y2;
+		}
+		else {
+			gui->center_x = gui->center_y = 0;
+			gui->control_in_x = gui->control_in_y = 0;
+			gui->control_out_x = gui->control_out_y = 0;
+		}
 		gui->tool_panel->raise_window();
 	}
 
@@ -2114,6 +2151,8 @@ int CWindowCanvas::do_mask(int &redraw, int &rerender,
 					point->control_x2 = !rotate ? px*scale : px*ct + py*st;
 					point->control_y2 = !rotate ? py*scale : py*ct - px*st;
 				}
+				rerender = 1;
+				redraw = 1;
 				break; }
 			}