X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowtool.C;h=8370ab97167c705e9aef302452c8ac8e3fa31407;hp=80122c529a5e392c1db085c2b8e1fa71a7ea5e93;hb=7ffa6954689f14a41a3bae7a0fdb3f2abeaa9679;hpb=9668279ccef86a9cc9138aaa1a659f158698f829

diff --git a/cinelerra-5.1/cinelerra/cwindowtool.C b/cinelerra-5.1/cinelerra/cwindowtool.C
index 80122c52..8370ab97 100644
--- a/cinelerra-5.1/cinelerra/cwindowtool.C
+++ b/cinelerra-5.1/cinelerra/cwindowtool.C
@@ -33,8 +33,11 @@
 #include "cwindowtool.h"
 #include "edl.h"
 #include "edlsession.h"
+#include "file.h"
+#include "filexml.h"
 #include "floatauto.h"
 #include "floatautos.h"
+#include "gwindowgui.h"
 #include "keys.h"
 #include "language.h"
 #include "localsession.h"
@@ -50,6 +53,7 @@
 #include "tracks.h"
 #include "trackcanvas.h"
 #include "transportque.h"
+#include "zoombar.h"
 
 
 CWindowTool::CWindowTool(MWindow *mwindow, CWindowGUI *gui)
@@ -131,6 +135,7 @@ void CWindowTool::start_tool(int operation)
 				mwindow->edl->session->tool_window = 1;
 				gui->composite_panel->operation[CWINDOW_TOOL_WINDOW]->update(1);
 			}
+			mwindow->edl->session->tool_window = new_gui ? 1 : 0;
 			update_show_window();
 
 // Signal thread to run next tool GUI
@@ -260,20 +265,10 @@ void CWindowTool::update_values()
 
 
 CWindowToolGUI::CWindowToolGUI(MWindow *mwindow,
-	CWindowTool *thread,
-	const char *title,
-	int w,
-	int h)
+	CWindowTool *thread, const char *title, int w, int h)
  : BC_Window(title,
- 	mwindow->session->ctool_x,
-	mwindow->session->ctool_y,
-	w,
-	h,
-	w,
-	h,
-	0,
-	0,
-	1)
+		mwindow->session->ctool_x, mwindow->session->ctool_y,
+		w, h, w, h, 0, 0, 1)
 {
 	this->mwindow = mwindow;
 	this->thread = thread;
@@ -350,40 +345,164 @@ void CWindowToolGUI::draw_preview(int changed_edl)
 }
 
 
-CWindowCoord::CWindowCoord(CWindowToolGUI *gui, int x, int y, float value, int log_increment = 0)
- : BC_TumbleTextBox(gui, (float)value, (float)-65536, (float)65536, x, y, 100, 3)
+CWindowCoord::CWindowCoord(CWindowToolGUI *gui, int x, int y, float value, int type)
+ : BC_TumbleTextBox(gui, (float)value, (float)-65536, (float)65536, x, y, xS(70), 3)
 {
 	this->gui = gui;
-	set_log_floatincrement(log_increment);
+	this->type = type;
+	slider = 0;
+	range = 0;
 }
 
-CWindowCoord::CWindowCoord(CWindowToolGUI *gui, int x, int y, int value)
- : BC_TumbleTextBox(gui, (int64_t)value, (int64_t)-65536, (int64_t)65536, x, y, 100, 3)
+CWindowCoord::CWindowCoord(CWindowToolGUI *gui, int x, int y, int value, int type)
+ : BC_TumbleTextBox(gui, (int64_t)value, (int64_t)-65536, (int64_t)65536, x, y, xS(70))
 {
 	this->gui = gui;
+	this->type = type;
+	slider = 0;
+	range = 0;
 }
+
+void CWindowCoord::create_objects()
+{
+	BC_TumbleTextBox::create_objects();
+	if( type >= 0 ) {
+		int x1 = get_x() + BC_TumbleTextBox::get_w() + xS(10), y1 = get_y();
+		int group = Automation::autogrouptype(type, 0);
+		float min = gui->mwindow->edl->local_session->automation_mins[group];
+		float max = gui->mwindow->edl->local_session->automation_maxs[group];
+		float v = atof(get_text());
+		gui->add_subwindow(slider = new CWindowCoordSlider(this,
+				x1, y1, xS(150), min, max, v));
+		x1 += slider->get_w() + xS(5);
+		gui->add_subwindow(range = new CWindowCoordRange(this, x1, y1));
+	}
+}
+
+void CWindowCoord::update_gui(float value)
+{
+	BC_TumbleTextBox::update(value);
+	if( slider ) {
+		int group = Automation::autogrouptype(type, 0);
+		LocalSession *local_session = gui->mwindow->edl->local_session;
+		slider->update(slider->get_pointer_motion_range(), value,
+			local_session->automation_mins[group],
+			local_session->automation_maxs[group]);
+		int x1 = range->get_x() + range->get_w() + xS(5);
+		int y1 = range->get_y() - yS(2), d = xS(16);
+		gui->set_color(GWindowGUI::auto_colors[type]);
+		gui->draw_disc(x1, y1, d, d);
+	}
+}
+
 int CWindowCoord::handle_event()
 {
+	if( slider )
+		slider->update(atof(get_text()));
 	gui->event_caller = this;
 	gui->handle_event();
 	return 1;
 }
 
+CWindowCoordSlider::CWindowCoordSlider(CWindowCoord *coord,
+		int x, int y, int w, float mn, float mx, float value)
+ : BC_FSlider(x, y, 0, w, w, mn, mx, value)
+{
+	this->coord = coord;
+	set_precision(0.01);
+}
+
+CWindowCoordSlider::~CWindowCoordSlider()
+{
+}
+
+int CWindowCoordSlider::handle_event()
+{
+	float value = get_value();
+	coord->update(value);
+	coord->gui->event_caller = coord;
+	coord->gui->handle_event();
+	return 1;
+}
+
+CWindowCoordRange::CWindowCoordRange(CWindowCoord *coord, int x, int y)
+ : BC_Tumbler(x, y)
+{
+	this->coord = coord;
+}
+CWindowCoordRange::~CWindowCoordRange()
+{
+}
+
+int CWindowCoordRange::update(float scale)
+{
+	MWindow *mwindow = coord->gui->mwindow;
+	LocalSession *local_session = mwindow->edl->local_session;
+	int group = Automation::autogrouptype(coord->type, 0);
+	float min = local_session->automation_mins[group];
+	float max = local_session->automation_maxs[group];
+	if( min >= max ) {
+		switch( group ) {
+		case AUTOGROUPTYPE_ZOOM: min = 0.005;  max = 5.0;  break;
+		case AUTOGROUPTYPE_X:    min = -100;   max = 100;  break;
+		case AUTOGROUPTYPE_Y:    min = -100;   max = 100;  break;
+		}
+	}
+	float range = max - min;
+	min -= range * scale;
+	max += range * scale;
+	switch( group ) {
+	case AUTOGROUPTYPE_ZOOM:
+		if( min < 0.001 ) min = 0.001;
+		if( max > 1000. ) max = 1000.;
+		break;
+	case AUTOGROUPTYPE_X:
+	case AUTOGROUPTYPE_Y:
+		if( min < -32767 ) min = -32767;
+		if( max >  32767 ) max =  32767;
+		break;
+	}
+	CWindowCoordSlider *slider = coord->slider;
+	coord->slider->update(slider->get_pointer_motion_range(),
+			slider->get_value(), min, max);
+	unlock_window();
+	MWindowGUI *mgui = mwindow->gui;
+	mgui->lock_window("CWindowCoordRange::update");
+	local_session->zoombar_showautotype = group;
+	local_session->automation_mins[group] = min;
+	local_session->automation_maxs[group] = max;
+	mgui->zoombar->update_autozoom();
+	mgui->draw_overlays(0);
+	mgui->update_patchbay();
+	mgui->flash_canvas(1);
+	mgui->unlock_window();
+	lock_window("CWindowCoordRange::update");
+	return 1;
+}
+
+int CWindowCoordRange::handle_up_event()
+{
+	return update(0.5);
+}
+int CWindowCoordRange::handle_down_event()
+{
+	return update(-0.25);
+}
 
-CWindowCropOK::CWindowCropOK(MWindow *mwindow, CWindowToolGUI *gui, int x, int y)
- : BC_GenericButton(x, y, _("Do it"))
+CWindowCropApply::CWindowCropApply(MWindow *mwindow, CWindowCropGUI *crop_gui, int x, int y)
+ : BC_GenericButton(x, y, _("Apply"))
 {
 	this->mwindow = mwindow;
-	this->gui = gui;
+	this->crop_gui = crop_gui;
 }
-int CWindowCropOK::handle_event()
+int CWindowCropApply::handle_event()
 {
-	mwindow->crop_video();
+	mwindow->crop_video(crop_gui->crop_mode->mode);
 	return 1;
 }
 
 
-int CWindowCropOK::keypress_event()
+int CWindowCropApply::keypress_event()
 {
 	if(get_keypress() == 0xd)
 	{
@@ -393,18 +512,57 @@ int CWindowCropOK::keypress_event()
 	return 0;
 }
 
+const char *CWindowCropOpMode::crop_ops[] = {
+	N_("Reformat"),
+	N_("Resize"),
+	N_("Shrink"),
+};
+
+CWindowCropOpMode::CWindowCropOpMode(MWindow *mwindow, CWindowCropGUI *crop_gui,
+			int mode, int x, int y)
+ : BC_PopupMenu(x, y, xS(140), _(crop_ops[mode]), 1)
+{
+	this->mwindow = mwindow;
+	this->crop_gui = crop_gui;
+	this->mode = mode;
+}
+CWindowCropOpMode::~CWindowCropOpMode()
+{
+}
+
+void CWindowCropOpMode::create_objects()
+{
+	for( int id=0,nid=sizeof(crop_ops)/sizeof(crop_ops[0]); id<nid; ++id )
+		add_item(new CWindowCropOpItem(this, _(crop_ops[id]), id));
+	handle_event();
+}
+
+int CWindowCropOpMode::handle_event()
+{
+	set_text(_(crop_ops[mode]));
+	return 1;
+}
+
+CWindowCropOpItem::CWindowCropOpItem(CWindowCropOpMode *popup, const char *text, int id)
+ : BC_MenuItem(text)
+{
+	this->popup = popup;
+	this->id = id;
+}
 
+int CWindowCropOpItem::handle_event()
+{
+	popup->set_text(get_text());
+	popup->mode = id;
+	return popup->handle_event();
+}
 
 
 
 
 
 CWindowCropGUI::CWindowCropGUI(MWindow *mwindow, CWindowTool *thread)
- : CWindowToolGUI(mwindow,
- 	thread,
-	_(PROGRAM_NAME ": Crop"),
-	330,
-	100)
+ : CWindowToolGUI(mwindow, thread, _(PROGRAM_NAME ": Crop"), xS(330), yS(100))
 {
 }
 
@@ -415,34 +573,38 @@ CWindowCropGUI::~CWindowCropGUI()
 
 void CWindowCropGUI::create_objects()
 {
-	int x = 10, y = 10;
+	int xs5 = xS(5), xs10 = xS(10);
+	int ys5 = yS(5), ys10 = yS(10);
+	int x = xs10, y = ys10;
 	BC_Title *title;
 
 	lock_window("CWindowCropGUI::create_objects");
 	int column1 = 0;
 	int pad = MAX(BC_TextBox::calculate_h(this, MEDIUMFONT, 1, 1),
-		BC_Title::calculate_h(this, "X")) + 5;
+		BC_Title::calculate_h(this, "X")) + ys5;
 	add_subwindow(title = new BC_Title(x, y, "X1:"));
 	column1 = MAX(column1, title->get_w());
 	y += pad;
 	add_subwindow(title = new BC_Title(x, y, _("W:")));
 	column1 = MAX(column1, title->get_w());
 	y += pad;
-	add_subwindow(new CWindowCropOK(mwindow, thread->tool_gui, x, y));
+	add_subwindow(new CWindowCropApply(mwindow, this, x, y));
 
-	x += column1 + 5;
-	y = 10;
+	x += column1 + xs5;
+	y = ys10;
 	x1 = new CWindowCoord(thread->tool_gui, x, y,
 		mwindow->edl->session->crop_x1);
 	x1->create_objects();
+	x1->set_boundaries((int64_t)0, (int64_t)65536);
 	y += pad;
 	width = new CWindowCoord(thread->tool_gui, x, y,
 		mwindow->edl->session->crop_x2 - mwindow->edl->session->crop_x1);
 	width->create_objects();
+	width->set_boundaries((int64_t)1, (int64_t)65536);
 
 
-	x += x1->get_w() + 10;
-	y = 10;
+	x += x1->get_w() + xs10;
+	y = ys10;
 	int column2 = 0;
 	add_subwindow(title = new BC_Title(x, y, "Y1:"));
 	column2 = MAX(column2, title->get_w());
@@ -451,15 +613,24 @@ void CWindowCropGUI::create_objects()
 	column2 = MAX(column2, title->get_w());
 	y += pad;
 
-	y = 10;
-	x += column2 + 5;
+	y = ys10;
+	x += column2 + xs5;
 	y1 = new CWindowCoord(thread->tool_gui, x, y,
 		mwindow->edl->session->crop_y1);
 	y1->create_objects();
+	y1->set_boundaries((int64_t)0, (int64_t)65536);
 	y += pad;
+
 	height = new CWindowCoord(thread->tool_gui, x, y,
 		mwindow->edl->session->crop_y2 - mwindow->edl->session->crop_y1);
 	height->create_objects();
+	height->set_boundaries((int64_t)1, (int64_t)65536);
+	y += pad;
+
+	add_subwindow(crop_mode = new CWindowCropOpMode(mwindow, this,
+				CROP_REFORMAT, x, y));
+	crop_mode->create_objects();
+
 	unlock_window();
 }
 
@@ -482,10 +653,10 @@ void CWindowCropGUI::handle_event()
 			mwindow->edl->session->crop_y1;
 		mwindow->edl->session->crop_y1 = atol(y1->get_text());
 	}
- 	mwindow->edl->session->crop_x2 = atol(width->get_text()) +
- 		mwindow->edl->session->crop_x1;
- 	mwindow->edl->session->crop_y2 = atol(height->get_text()) +
- 		mwindow->edl->session->crop_y1;
+	mwindow->edl->session->crop_x2 = atol(width->get_text()) +
+		mwindow->edl->session->crop_x1;
+	mwindow->edl->session->crop_y2 = atol(height->get_text()) +
+		mwindow->edl->session->crop_y1;
 	update();
 	mwindow->cwindow->gui->canvas->redraw(1);
 }
@@ -502,7 +673,7 @@ void CWindowCropGUI::update()
 
 
 CWindowEyedropGUI::CWindowEyedropGUI(MWindow *mwindow, CWindowTool *thread)
- : CWindowToolGUI(mwindow, thread, _(PROGRAM_NAME ": Color"), 220, 290)
+ : CWindowToolGUI(mwindow, thread, _(PROGRAM_NAME ": Color"), xS(220), yS(290))
 {
 }
 
@@ -512,10 +683,11 @@ CWindowEyedropGUI::~CWindowEyedropGUI()
 
 void CWindowEyedropGUI::create_objects()
 {
+	int xs10 = xS(10), ys10 = yS(10);
 	int margin = mwindow->theme->widget_border;
-	int x = 10 + margin;
-	int y = 10 + margin;
-	int x2 = 70, x3 = x2 + 60;
+	int x = xs10 + margin;
+	int y = ys10 + margin;
+	int x2 = xS(70), x3 = x2 + xS(60);
 	lock_window("CWindowEyedropGUI::create_objects");
 	BC_Title *title0, *title1, *title2, *title3, *title4, *title5, *title6, *title7;
 	add_subwindow(title0 = new BC_Title(x, y,_("X,Y:")));
@@ -554,7 +726,7 @@ void CWindowEyedropGUI::create_objects()
 	add_subwindow(yuv_hex = new BC_Title(x3, this->y->get_y(), "#000000"));
 
 	y = title6->get_y() + this->v->get_h() + 2*margin;
-	add_subwindow(sample = new BC_SubWindow(x, y, 50, 50));
+	add_subwindow(sample = new BC_SubWindow(x, y, xS(50), yS(50)));
 	y += sample->get_h() + margin;
 	add_subwindow(use_max = new CWindowEyedropCheckBox(mwindow, this, x, y));
 	update();
@@ -590,8 +762,8 @@ void CWindowEyedropGUI::update()
 	float y, u, v;
 	YUV::yuv.rgb_to_yuv_f(r, g, b, y, u, v);
 	this->y->update(y);
-	this->u->update(u);  u += 0.5;
-	this->v->update(v);  v += 0.5;
+	this->u->update(u += 0.5);
+	this->v->update(v += 0.5);
 
 	int yx = 255*y + 0.5;  bclamp(yx,0,255);
 	int ux = 255*u + 0.5;  bclamp(ux,0,255);
@@ -707,10 +879,10 @@ void CWindowCurveToggle::check_toggle_state(FloatAuto *x, FloatAuto *y, FloatAut
 // three automation lines have the same curve mode.
 // For mixed states the toggle stays off.
 	set_value( x->curve_mode == this->cfg.mode &&
-	           y->curve_mode == this->cfg.mode &&
-	           z->curve_mode == this->cfg.mode
-	         ,true // redraw to show new state
-	         );
+		   y->curve_mode == this->cfg.mode &&
+		   z->curve_mode == this->cfg.mode
+		   ,true // redraw to show new state
+		);
 }
 
 int CWindowCurveToggle::handle_event()
@@ -732,7 +904,7 @@ int CWindowCurveToggle::handle_event()
 }
 
 
-CWindowEyedropCheckBox::CWindowEyedropCheckBox(MWindow *mwindow, 
+CWindowEyedropCheckBox::CWindowEyedropCheckBox(MWindow *mwindow,
 	CWindowEyedropGUI *gui, int x, int y)
  : BC_CheckBox(x, y, mwindow->edl->local_session->use_max, _("Use maximum"))
 {
@@ -750,11 +922,7 @@ int CWindowEyedropCheckBox::handle_event()
 
 
 CWindowCameraGUI::CWindowCameraGUI(MWindow *mwindow, CWindowTool *thread)
- : CWindowToolGUI(mwindow,
- 	thread,
-	_(PROGRAM_NAME ": Camera"),
-	170,
-	170)
+ : CWindowToolGUI(mwindow, thread, _(PROGRAM_NAME ": Camera"), xS(340), yS(170))
 {
 }
 CWindowCameraGUI::~CWindowCameraGUI()
@@ -763,7 +931,9 @@ CWindowCameraGUI::~CWindowCameraGUI()
 
 void CWindowCameraGUI::create_objects()
 {
-	int x = 10, y = 10, x1;
+	int xs10 = xS(10), xs15 = xS(15);
+	int ys10 = yS(10), ys30 = yS(30);
+	int x = xs10, y = ys10;
 	Track *track = mwindow->cwindow->calculate_affected_track();
 	FloatAuto *x_auto = 0, *y_auto = 0, *z_auto = 0;
 	BC_Title *title;
@@ -776,48 +946,50 @@ void CWindowCameraGUI::create_objects()
 	}
 
 	add_subwindow(title = new BC_Title(x, y, "X:"));
-	x += title->get_w();
-	this->x = new CWindowCoord(this, x, y,
-		x_auto ? x_auto->get_value() : (float)0);
+	int x1 = x + title->get_w() + xS(3);
+	float xvalue = x_auto ? x_auto->get_value() : 0;
+	this->x = new CWindowCoord(this, x1, y, xvalue, AUTOMATION_CAMERA_X);
 	this->x->create_objects();
-
-
-	y += 30;
-	x = 10;
-	add_subwindow(title = new BC_Title(x, y, "Y:"));
-	x += title->get_w();
-	this->y = new CWindowCoord(this, x, y,
-		y_auto ? y_auto->get_value() : (float)0);
+	this->x->range->set_tooltip(_("expand X range"));
+	y += ys30;
+	add_subwindow(title = new BC_Title(x = xs10, y, "Y:"));
+	float yvalue = y_auto ? y_auto->get_value() : 0;
+	this->y = new CWindowCoord(this, x1, y, yvalue, AUTOMATION_CAMERA_Y);
 	this->y->create_objects();
-	y += 30;
-	x = 10;
-	add_subwindow(title = new BC_Title(x, y, "Z:"));
+	this->y->range->set_tooltip(_("expand Y range"));
+	y += ys30;
+	add_subwindow(title = new BC_Title(x = xs10, y, "Z:"));
 	x += title->get_w();
-	this->z = new CWindowCoord(this, x, y,
-		z_auto ? z_auto->get_value() : (float)1);
+	float zvalue = z_auto ? z_auto->get_value() : 1;
+	this->z = new CWindowCoord(this, x1, y, zvalue, AUTOMATION_CAMERA_Z);
 	this->z->create_objects();
 	this->z->set_increment(0.01);
+	this->z->range->set_tooltip(_("expand Zoom range"));
 
-	y += 30;
-	x1 = 10;
+	y += ys30;
+	x1 = xs10;
 	add_subwindow(button = new CWindowCameraLeft(mwindow, this, x1, y));
 	x1 += button->get_w();
 	add_subwindow(button = new CWindowCameraCenter(mwindow, this, x1, y));
 	x1 += button->get_w();
 	add_subwindow(button = new CWindowCameraRight(mwindow, this, x1, y));
+// additional Buttons to control the curve mode of the "current" keyframe
+	x1 += button->get_w() + xs15;
+	add_subwindow(this->t_smooth = new CWindowCurveToggle(Camera_Crv_Smooth, mwindow, this, x1, y));
+	x1 += button->get_w() + xs10;
+	add_subwindow(this->t_linear = new CWindowCurveToggle(Camera_Crv_Linear, mwindow, this, x1, y));
 
 	y += button->get_h();
-	x1 = 10;
+	x1 = xs10;
 	add_subwindow(button = new CWindowCameraTop(mwindow, this, x1, y));
 	x1 += button->get_w();
 	add_subwindow(button = new CWindowCameraMiddle(mwindow, this, x1, y));
 	x1 += button->get_w();
 	add_subwindow(button = new CWindowCameraBottom(mwindow, this, x1, y));
-// additional Buttons to control the curve mode of the "current" keyframe
-	x1 += button->get_w() + 15;
-	add_subwindow(this->t_smooth = new CWindowCurveToggle(Camera_Crv_Smooth, mwindow, this, x1, y));
-	x1 += button->get_w();
-	add_subwindow(this->t_linear = new CWindowCurveToggle(Camera_Crv_Linear, mwindow, this, x1, y));
+	x1 += button->get_w() + xs15;
+	add_subwindow(this->add_keyframe = new CWindowCameraAddKeyframe(mwindow, this, x1, y));
+	x1 += button->get_w() + xs10;
+	add_subwindow(this->reset = new CWindowCameraReset(mwindow, this, x1, y));
 
 // fill in current auto keyframe values, set toggle states.
 	this->update();
@@ -836,8 +1008,7 @@ void CWindowCameraGUI::handle_event()
 		if(event_caller == x)
 		{
 			x_auto = (FloatAuto*)mwindow->cwindow->calculate_affected_auto(
-				track->automation->autos[AUTOMATION_CAMERA_X],
-				1);
+				track->automation->autos[AUTOMATION_CAMERA_X], 1);
 			if(x_auto)
 			{
 				x_auto->set_value(atof(x->get_text()));
@@ -849,8 +1020,7 @@ void CWindowCameraGUI::handle_event()
 		if(event_caller == y)
 		{
 			y_auto = (FloatAuto*)mwindow->cwindow->calculate_affected_auto(
-				track->automation->autos[AUTOMATION_CAMERA_Y],
-				1);
+				track->automation->autos[AUTOMATION_CAMERA_Y], 1);
 			if(y_auto)
 			{
 				y_auto->set_value(atof(y->get_text()));
@@ -862,8 +1032,7 @@ void CWindowCameraGUI::handle_event()
 		if(event_caller == z)
 		{
 			z_auto = (FloatAuto*)mwindow->cwindow->calculate_affected_auto(
-				track->automation->autos[AUTOMATION_CAMERA_Z],
-				1);
+				track->automation->autos[AUTOMATION_CAMERA_Z], 1);
 			if(z_auto)
 			{
 				float zoom = atof(z->get_text());
@@ -898,20 +1067,23 @@ void CWindowCameraGUI::update()
 			&x_auto, &y_auto, &z_auto, 1, 0, 0, 0);
 	}
 
-	if(x_auto)
-		x->update(x_auto->get_value());
-	if(y_auto)
-		y->update(y_auto->get_value());
-	if(z_auto) {
-		float value = z_auto->get_value();
-		z->update(value);
+	if( x_auto ) {
+		float xvalue = x_auto->get_value();
+		x->update_gui(xvalue);
+	}
+	if( y_auto ) {
+		float yvalue = y_auto->get_value();
+		y->update_gui(yvalue);
+	}
+	if( z_auto ) {
+		float zvalue = z_auto->get_value();
+		z->update_gui(zvalue);
 		thread->gui->lock_window("CWindowCameraGUI::update");
-		thread->gui->composite_panel->cpanel_zoom->update(value);
+		thread->gui->composite_panel->cpanel_zoom->update(zvalue);
 		thread->gui->unlock_window();
 	}
 
-	if( x_auto && y_auto && z_auto )
-	{
+	if( x_auto && y_auto && z_auto ) {
 		t_smooth->check_toggle_state(x_auto, y_auto, z_auto);
 		t_linear->check_toggle_state(x_auto, y_auto, z_auto);
 	}
@@ -942,8 +1114,7 @@ int CWindowCameraLeft::handle_event()
 		int w = 0, h = 0;
 		track->get_source_dimensions(
 			mwindow->edl->local_session->get_selectionstart(1),
-			w,
-			h);
+			w, h);
 
 		if(w && h)
 		{
@@ -974,8 +1145,7 @@ int CWindowCameraCenter::handle_event()
 	Track *track = mwindow->cwindow->calculate_affected_track();
 	if(track)
 		x_auto = (FloatAuto*)mwindow->cwindow->calculate_affected_auto(
-			track->automation->autos[AUTOMATION_CAMERA_X],
-			1);
+			track->automation->autos[AUTOMATION_CAMERA_X], 1);
 
 	if(x_auto)
 	{
@@ -1012,8 +1182,7 @@ int CWindowCameraRight::handle_event()
 		int w = 0, h = 0;
 		track->get_source_dimensions(
 			mwindow->edl->local_session->get_selectionstart(1),
-			w,
-			h);
+			w, h);
 
 		if(w && h)
 		{
@@ -1052,8 +1221,7 @@ int CWindowCameraTop::handle_event()
 		int w = 0, h = 0;
 		track->get_source_dimensions(
 			mwindow->edl->local_session->get_selectionstart(1),
-			w,
-			h);
+			w, h);
 
 		if(w && h)
 		{
@@ -1120,8 +1288,7 @@ int CWindowCameraBottom::handle_event()
 		int w = 0, h = 0;
 		track->get_source_dimensions(
 			mwindow->edl->local_session->get_selectionstart(1),
-			w,
-			h);
+			w, h);
 
 		if(w && h)
 		{
@@ -1137,13 +1304,37 @@ int CWindowCameraBottom::handle_event()
 	return 1;
 }
 
+CWindowCameraAddKeyframe::CWindowCameraAddKeyframe(MWindow *mwindow,
+		CWindowToolGUI *gui, int x, int y)
+ : BC_Button(x, y, mwindow->theme->get_image_set("keyframe_button"))
+{
+	this->mwindow = mwindow;
+	this->gui = gui;
+	set_tooltip(_("Add Keyframe: Shift-F11"));
+}
+
+int CWindowCameraAddKeyframe::handle_event()
+{
+	return gui->press(&CWindowCanvas::camera_keyframe);
+}
+
+CWindowCameraReset::CWindowCameraReset(MWindow *mwindow,
+		CWindowToolGUI *gui, int x, int y)
+ : BC_Button(x, y, mwindow->theme->get_image_set("reset_button"))
+{
+	this->mwindow = mwindow;
+	this->gui = gui;
+	set_tooltip(_("Reset Camera: F11"));
+}
+
+int CWindowCameraReset::handle_event()
+{
+	return gui->press(&CWindowCanvas::reset_camera);
+}
+
 
 CWindowProjectorGUI::CWindowProjectorGUI(MWindow *mwindow, CWindowTool *thread)
- : CWindowToolGUI(mwindow,
- 	thread,
-	_(PROGRAM_NAME ": Projector"),
-	170,
-	170)
+ : CWindowToolGUI(mwindow, thread, _(PROGRAM_NAME ": Projector"), xS(340), yS(170))
 {
 }
 CWindowProjectorGUI::~CWindowProjectorGUI()
@@ -1151,7 +1342,9 @@ CWindowProjectorGUI::~CWindowProjectorGUI()
 }
 void CWindowProjectorGUI::create_objects()
 {
-	int x = 10, y = 10, x1;
+	int xs10 = xS(10), xs15 = xS(15);
+	int ys30 = yS(30);
+	int x = xs10, y = yS(10);
 	Track *track = mwindow->cwindow->calculate_affected_track();
 	FloatAuto *x_auto = 0;
 	FloatAuto *y_auto = 0;
@@ -1165,48 +1358,50 @@ void CWindowProjectorGUI::create_objects()
 			&x_auto, &y_auto, &z_auto, 0, 0, 0, 0);
 	}
 
-	add_subwindow(title = new BC_Title(x, y, "X:"));
-	x += title->get_w();
-	this->x = new CWindowCoord(this, x, y,
-		x_auto ? x_auto->get_value() : (float)0);
+	add_subwindow(title = new BC_Title(x = xs10, y, "X:"));
+	int x1 = x + title->get_w() + xS(3);
+	float xvalue = x_auto ? x_auto->get_value() : 0;
+	this->x = new CWindowCoord(this, x1, y, xvalue, AUTOMATION_PROJECTOR_X);
 	this->x->create_objects();
-	y += 30;
-	x = 10;
-	add_subwindow(title = new BC_Title(x, y, "Y:"));
-	x += title->get_w();
-	this->y = new CWindowCoord(this, x, y,
-		y_auto ? y_auto->get_value() : (float)0);
+	this->x->range->set_tooltip(_("expand X range"));
+	y += ys30;
+	add_subwindow(title = new BC_Title(x = xs10, y, "Y:"));
+	float yvalue = y_auto ? y_auto->get_value() : 0;
+	this->y = new CWindowCoord(this, x1, y, yvalue, AUTOMATION_PROJECTOR_Y);
 	this->y->create_objects();
-	y += 30;
-	x = 10;
-	add_subwindow(title = new BC_Title(x, y, "Z:"));
-	x += title->get_w();
-	this->z = new CWindowCoord(this, x, y,
-		z_auto ? z_auto->get_value() : (float)1);
+	this->y->range->set_tooltip(_("expand Y range"));
+	y += ys30;
+	add_subwindow(title = new BC_Title(x = xs10, y, "Z:"));
+	float zvalue = z_auto ? z_auto->get_value() : 1;
+	this->z = new CWindowCoord(this, x1, y, zvalue, AUTOMATION_PROJECTOR_Z);
 	this->z->create_objects();
+	this->z->range->set_tooltip(_("expand Zoom range"));
 	this->z->set_increment(0.01);
 
-	y += 30;
-	x1 = 10;
+	y += ys30;
+	x1 = xs10;
 	add_subwindow(button = new CWindowProjectorLeft(mwindow, this, x1, y));
 	x1 += button->get_w();
 	add_subwindow(button = new CWindowProjectorCenter(mwindow, this, x1, y));
 	x1 += button->get_w();
 	add_subwindow(button = new CWindowProjectorRight(mwindow, this, x1, y));
+// additional Buttons to control the curve mode of the "current" keyframe
+	x1 += button->get_w() + xs15;
+	add_subwindow(this->t_smooth = new CWindowCurveToggle(Projector_Crv_Smooth, mwindow, this, x1, y));
+	x1 += button->get_w() + xs10;
+	add_subwindow(this->t_linear = new CWindowCurveToggle(Projector_Crv_Linear, mwindow, this, x1, y));
 
 	y += button->get_h();
-	x1 = 10;
+	x1 = xs10;
 	add_subwindow(button = new CWindowProjectorTop(mwindow, this, x1, y));
 	x1 += button->get_w();
 	add_subwindow(button = new CWindowProjectorMiddle(mwindow, this, x1, y));
 	x1 += button->get_w();
 	add_subwindow(button = new CWindowProjectorBottom(mwindow, this, x1, y));
-
-// additional Buttons to control the curve mode of the "current" keyframe
-	x1 += button->get_w() + 15;
-	add_subwindow(this->t_smooth = new CWindowCurveToggle(Projector_Crv_Smooth, mwindow, this, x1, y));
-	x1 += button->get_w();
-	add_subwindow(this->t_linear = new CWindowCurveToggle(Projector_Crv_Linear, mwindow, this, x1, y));
+	x1 += button->get_w() + xs15;
+	add_subwindow(this->add_keyframe = new CWindowProjectorAddKeyframe(mwindow, this, x1, y));
+	x1 += button->get_w() + xs10;
+	add_subwindow(this->reset = new CWindowProjectorReset(mwindow, this, x1, y));
 
 // fill in current auto keyframe values, set toggle states.
 	this->update();
@@ -1226,8 +1421,7 @@ void CWindowProjectorGUI::handle_event()
 		if(event_caller == x)
 		{
 			x_auto = (FloatAuto*)mwindow->cwindow->calculate_affected_auto(
-				track->automation->autos[AUTOMATION_PROJECTOR_X],
-				1);
+				track->automation->autos[AUTOMATION_PROJECTOR_X], 1);
 			if(x_auto)
 			{
 				x_auto->set_value(atof(x->get_text()));
@@ -1239,8 +1433,7 @@ void CWindowProjectorGUI::handle_event()
 		if(event_caller == y)
 		{
 			y_auto = (FloatAuto*)mwindow->cwindow->calculate_affected_auto(
-				track->automation->autos[AUTOMATION_PROJECTOR_Y],
-				1);
+				track->automation->autos[AUTOMATION_PROJECTOR_Y], 1);
 			if(y_auto)
 			{
 				y_auto->set_value(atof(y->get_text()));
@@ -1252,8 +1445,7 @@ void CWindowProjectorGUI::handle_event()
 		if(event_caller == z)
 		{
 			z_auto = (FloatAuto*)mwindow->cwindow->calculate_affected_auto(
-				track->automation->autos[AUTOMATION_PROJECTOR_Z],
-				1);
+				track->automation->autos[AUTOMATION_PROJECTOR_Z], 1);
 			if(z_auto)
 			{
 				float zoom = atof(z->get_text());
@@ -1286,20 +1478,23 @@ void CWindowProjectorGUI::update()
 			&x_auto, &y_auto, &z_auto, 0, 0, 0, 0);
 	}
 
-	if(x_auto)
-		x->update(x_auto->get_value());
-	if(y_auto)
-		y->update(y_auto->get_value());
-	if(z_auto) {
-		float value = z_auto->get_value();
-		z->update(value);
+	if( x_auto ) {
+		float xvalue = x_auto->get_value();
+		x->update_gui(xvalue);
+	}
+	if( y_auto ) {
+		float yvalue = y_auto->get_value();
+		y->update_gui(yvalue);
+	}
+	if( z_auto ) {
+		float zvalue = z_auto->get_value();
+		z->update_gui(zvalue);
 		thread->gui->lock_window("CWindowProjectorGUI::update");
-		thread->gui->composite_panel->cpanel_zoom->update(value);
+		thread->gui->composite_panel->cpanel_zoom->update(zvalue);
 		thread->gui->unlock_window();
 	}
 
-	if( x_auto && y_auto && z_auto )
-	{
+	if( x_auto && y_auto && z_auto ) {
 		t_smooth->check_toggle_state(x_auto, y_auto, z_auto);
 		t_linear->check_toggle_state(x_auto, y_auto, z_auto);
 	}
@@ -1348,8 +1543,7 @@ int CWindowProjectorCenter::handle_event()
 	Track *track = mwindow->cwindow->calculate_affected_track();
 	if(track)
 		x_auto = (FloatAuto*)mwindow->cwindow->calculate_affected_auto(
-			track->automation->autos[AUTOMATION_PROJECTOR_X],
-			1);
+			track->automation->autos[AUTOMATION_PROJECTOR_X], 1);
 
 	if(x_auto)
 	{
@@ -1484,10 +1678,48 @@ int CWindowProjectorBottom::handle_event()
 	return 1;
 }
 
+CWindowProjectorAddKeyframe::CWindowProjectorAddKeyframe(MWindow *mwindow,
+		CWindowToolGUI *gui, int x, int y)
+ : BC_Button(x, y, mwindow->theme->get_image_set("keyframe_button"))
+{
+	this->mwindow = mwindow;
+	this->gui = gui;
+	set_tooltip(_("Add Keyframe: Shift-F12"));
+}
+
+int CWindowProjectorAddKeyframe::handle_event()
+{
+	return gui->press(&CWindowCanvas::projector_keyframe);
+}
+
+CWindowProjectorReset::CWindowProjectorReset(MWindow *mwindow,
+		CWindowToolGUI *gui, int x, int y)
+ : BC_Button(x, y, mwindow->theme->get_image_set("reset_button"))
+{
+	this->mwindow = mwindow;
+	this->gui = gui;
+	set_tooltip(_("Reset Projector: F12"));
+}
+
+int CWindowProjectorReset::handle_event()
+{
+	return gui->press(&CWindowCanvas::reset_projector);
+}
+
+int CWindowToolGUI::press(void (CWindowCanvas::*fn)())
+{
+	unlock_window();
+	CWindowGUI *cw_gui = thread->gui;
+	cw_gui->lock_window("CWindowGUI::press");
+	(cw_gui->canvas->*fn)();
+	cw_gui->unlock_window();
+	lock_window("CWindowToolGUI::press");
+	return 1;
+}
 
 CWindowMaskOnTrack::CWindowMaskOnTrack(MWindow *mwindow, CWindowMaskGUI *gui,
 		int x, int y, int w, const char *text)
- : BC_PopupTextBox(gui, 0, text, x, y, w, 120)
+ : BC_PopupTextBox(gui, 0, text, x, y, w, yS(120))
 {
 	this->mwindow = mwindow;
 	this->gui = gui;
@@ -1499,18 +1731,25 @@ CWindowMaskOnTrack::~CWindowMaskOnTrack()
 
 int CWindowMaskOnTrack::handle_event()
 {
-	int k = get_number();
+	CWindowMaskItem *track_item = 0;
+	int k = get_number(), track_id = -1;
 //printf("selected %d = %s\n", k, k<0 ? "()" : track_items[k]->get_text());
-	CWindowMaskItem *track_item = k >= 0 ? (CWindowMaskItem *)track_items[k] : 0;
-	Track *track = track_item ? mwindow->edl->tracks->get_track_by_id(track_item->id) : 0;
-	int track_id = track_item && track && track->record ? track_item->id : -1;
+	if( k >= 0 ) {
+		track_item = (CWindowMaskItem *)track_items[k];
+		Track *track = track_item ? mwindow->edl->tracks->get_track_by_id(track_item->id) : 0;
+		if( track && track->record ) track_id = track->get_id();
+	}
+	else
+		track_id = mwindow->cwindow->mask_track_id;
 	set_back_color(track_id >= 0 ?
 		gui->get_resources()->text_background :
 		gui->get_resources()->text_background_disarmed);
-	gui->mask_on_track->update(track_item ? track_item->get_text() : "");
+	if( mwindow->cwindow->mask_track_id != track_id )
+		gui->mask_on_track->update(track_item ? track_item->get_text() : "");
 	mwindow->cwindow->mask_track_id = track_id;
 	mwindow->edl->local_session->solo_track_id = -1;
 	gui->mask_solo_track->update(0);
+	gui->update();
 	gui->update_preview(1);
 	return 1;
 }
@@ -1518,9 +1757,14 @@ int CWindowMaskOnTrack::handle_event()
 void CWindowMaskOnTrack::update_items()
 {
 	track_items.remove_all_objects();
+	int high_color = gui->get_resources()->button_highlighted;
 	for( Track *track=mwindow->edl->tracks->first; track; track=track->next ) {
 		if( track->data_type != TRACK_VIDEO ) continue;
-		int color = track->record ? -1 : RED;
+		MaskAutos *mask_autos = (MaskAutos*)track->automation->autos[AUTOMATION_MASK];
+		int color = !track->record ? RED : mask_autos->first ?  high_color : -1;
+		MaskAuto *mask_auto = (MaskAuto*)mask_autos->default_auto;
+		for( int i=0; color<0 && i<mask_auto->masks.size(); ++i )
+			if( mask_auto->masks[i]->points.size() > 0 ) color = high_color;
 		track_items.append(new CWindowMaskItem(track->title, track->get_id(), color));
 	}
 	update_list(&track_items);
@@ -1573,6 +1817,7 @@ int CWindowMaskTrackTumbler::do_event(int dir)
 	mwindow->cwindow->mask_track_id = track_item ? track_item->id : -1;
 	mwindow->edl->local_session->solo_track_id = -1;
 	gui->mask_solo_track->update(0);
+	gui->update();
 	gui->update_preview(1);
 	return 1;
 }
@@ -1580,7 +1825,7 @@ int CWindowMaskTrackTumbler::do_event(int dir)
 
 CWindowMaskName::CWindowMaskName(MWindow *mwindow, CWindowMaskGUI *gui,
 		int x, int y, const char *text)
- : BC_PopupTextBox(gui, 0, text, x, y, 100, 160)
+ : BC_PopupTextBox(gui, 0, text, x, y, xS(100), yS(160))
 {
 	this->mwindow = mwindow;
 	this->gui = gui;
@@ -1618,12 +1863,12 @@ int CWindowMaskName::handle_event()
 		for(MaskAuto *current = (MaskAuto*)autos->default_auto; current; ) {
 			SubMask *submask = current->get_submask(mwindow->edl->session->cwindow_mask);
 			memset(submask->name, 0, sizeof(submask->name));
-			strncpy(submask->name, get_text(), sizeof(submask->name));
+			strncpy(submask->name, get_text(), sizeof(submask->name)-1);
 			current = current == (MaskAuto*)autos->default_auto ?
 				(MaskAuto*)autos->first : (MaskAuto*)NEXT;
 		}
 #endif
-	        gui->update();
+		gui->update();
 		gui->update_preview();
 	}
 	return 1;
@@ -1634,10 +1879,10 @@ void CWindowMaskName::update_items(MaskAuto *keyframe)
 	mask_items.remove_all_objects();
 	int sz = !keyframe ? 0 : keyframe->masks.size();
 	for( int i=0; i<SUBMASKS; ++i ) {
-		char text[BCSTRLEN];
+		char text[BCSTRLEN];  memset(text, 0, sizeof(text));
 		if( i < sz ) {
 			SubMask *sub_mask = keyframe->masks.get(i);
-			strncpy(text, sub_mask->name, sizeof(text));
+			strncpy(text, sub_mask->name, sizeof(text)-1);
 		}
 		else
 			sprintf(text, "%d", i);
@@ -1734,8 +1979,8 @@ int CWindowMaskEnable::handle_event()
 }
 
 CWindowMaskUnclear::CWindowMaskUnclear(MWindow *mwindow,
-	CWindowMaskGUI *gui, int x, int y, int w)
- : BC_GenericButton(x, y, w, _("Enable"))
+	CWindowMaskGUI *gui, int x, int y)
+ : BC_Button(x, y, mwindow->theme->get_image_set("unclear_button"))
 {
 	this->mwindow = mwindow;
 	this->gui = gui;
@@ -1820,7 +2065,7 @@ int CWindowMaskDelMask::handle_event()
 #else
 		for(MaskAuto *current = (MaskAuto*)autos->default_auto; current; ) {
 			SubMask *submask = current->get_submask(mwindow->edl->session->cwindow_mask);
-			submask->points.clear();
+			submask->points.remove_all_objects();
 			current = current == (MaskAuto*)autos->default_auto ?
 				(MaskAuto*)autos->first : (MaskAuto*)NEXT;
 		}
@@ -1879,11 +2124,12 @@ int CWindowMaskDelPoint::handle_event()
 // Commit change to span of keyframes
 		((MaskAutos*)track->automation->autos[AUTOMATION_MASK])->update_parameter(&temp_keyframe);
 #else
+		total_points = 0;
 		MaskAuto *current = (MaskAuto*)autos->default_auto;
 		while( current ) {
 			SubMask *submask = current->get_submask(mwindow->edl->session->cwindow_mask);
 			int i = mwindow->cwindow->gui->affected_point;
-			for( ; i<submask->points.total-1; ++i ) {
+			for( ; i<submask->points.total-1; ++i )
 				*submask->points.values[i] = *submask->points.values[i+1];
 			if( submask->points.total > 0 ) {
 				point = submask->points.values[submask->points.total-1];
@@ -1900,28 +2146,18 @@ int CWindowMaskDelPoint::handle_event()
 
 		gui->update();
 		gui->update_preview();
-		mwindow->undo->update_undo_after(_("mask delete"), LOAD_AUTOMATION);
+		mwindow->undo->update_undo_after(_("point delete"), LOAD_AUTOMATION);
 	}
 
 	return 1;
 }
 
-int CWindowMaskDelPoint::keypress_event()
-{
-	if( get_keypress() == BACKSPACE ||
-	    get_keypress() == DELETE )
-		return handle_event();
-	return 0;
-}
-
-
-
 
 CWindowMaskAffectedPoint::CWindowMaskAffectedPoint(MWindow *mwindow,
 	CWindowMaskGUI *gui, int x, int y)
  : BC_TumbleTextBox(gui,
 		(int64_t)mwindow->cwindow->gui->affected_point,
-		(int64_t)0, INT64_MAX, x, y, 100)
+		(int64_t)0, INT64_MAX, x, y, xS(70))
 {
 	this->mwindow = mwindow;
 	this->gui = gui;
@@ -1978,6 +2214,57 @@ int CWindowMaskFocus::handle_event()
 	return 1;
 }
 
+int CWindowMaskFocus::calculate_w(CWindowMaskGUI *gui)
+{
+	int w, h;
+	calculate_extents(gui, &w, &h, _("Focus"));
+	return w;
+}
+
+CWindowMaskScaleXY::CWindowMaskScaleXY(MWindow *mwindow, CWindowMaskGUI *gui,
+		int x, int y, VFrame **data, int v, int id, const char *tip)
+ : BC_Toggle(x, y, data, v)
+{
+	this->id = id;
+	this->mwindow = mwindow;
+	this->gui = gui;
+	set_tooltip(tip);
+}
+
+CWindowMaskScaleXY::~CWindowMaskScaleXY()
+{
+}
+
+int CWindowMaskScaleXY::handle_event()
+{
+	gui->scale_mode = id;
+	gui->mask_scale_x->update(id == MASK_SCALE_X);
+	gui->mask_scale_y->update(id == MASK_SCALE_Y);
+	gui->mask_scale_xy->update(id == MASK_SCALE_XY);
+	return 1;
+}
+
+CWindowMaskHelp::CWindowMaskHelp(MWindow *mwindow, CWindowMaskGUI *gui, int x, int y)
+ : BC_CheckBox(x, y, 0, _("Help"))
+{
+	this->mwindow = mwindow;
+	this->gui = gui;
+	set_tooltip(_("Show help text"));
+}
+
+CWindowMaskHelp::~CWindowMaskHelp()
+{
+}
+
+int CWindowMaskHelp::handle_event()
+{
+	gui->helped = get_value();
+	gui->resize_window(gui->get_w(),
+		gui->helped ? gui->help_h : gui->help_y);
+	gui->update();
+	return 1;
+}
+
 CWindowMaskDrawMarkers::CWindowMaskDrawMarkers(MWindow *mwindow, CWindowMaskGUI *gui, int x, int y)
  : BC_CheckBox(x, y, gui->markers, _("Markers"))
 {
@@ -2020,7 +2307,7 @@ int CWindowMaskDrawBoundary::handle_event()
 
 
 CWindowMaskFeather::CWindowMaskFeather(MWindow *mwindow, CWindowMaskGUI *gui, int x, int y)
- : BC_TumbleTextBox(gui, 0, -FEATHER_MAX, FEATHER_MAX, x, y, 64, 2)
+ : BC_TumbleTextBox(gui, 0, INT_MIN, INT_MAX, x, y, xS(64), 2)
 {
 	this->mwindow = mwindow;
 	this->gui = gui;
@@ -2064,9 +2351,9 @@ int CWindowMaskFeather::update_value(float v)
 		int k = mwindow->edl->session->cwindow_mask;
 		int n = gang ? keyframe->masks.size() : k+1;
 		for( int i=gang? 0 : k; i<n; ++i ) {
+			if( !gui->mask_enables[i]->get_value() ) continue;
 			SubMask *sub_mask = keyframe->get_submask(i);
 			float feather = sub_mask->feather + change;
-			bclamp(feather, -FEATHER_MAX, FEATHER_MAX);
 			sub_mask->feather = feather;
 		}
 #ifdef USE_KEYFRAME_SPANNING
@@ -2082,13 +2369,15 @@ int CWindowMaskFeather::update_value(float v)
 int CWindowMaskFeather::handle_event()
 {
 	float v = atof(get_text());
+	if( fabsf(v) > MAX_FEATHER )
+		BC_TumbleTextBox::update((float)(v>=0 ? MAX_FEATHER : -MAX_FEATHER));
 	gui->feather_slider->update(v);
 	return gui->feather->update_value(v);
 }
 
 CWindowMaskFeatherSlider::CWindowMaskFeatherSlider(MWindow *mwindow,
 		CWindowMaskGUI *gui, int x, int y, int w, float v)
- : BC_FSlider(x, y, 0, w, w, -FEATHER_MAX, FEATHER_MAX, v)
+ : BC_FSlider(x, y, 0, w, w, -FEATHER_MAX-5, FEATHER_MAX+5, v)
 {
 	this->mwindow = mwindow;
 	this->gui = gui;
@@ -2096,6 +2385,7 @@ CWindowMaskFeatherSlider::CWindowMaskFeatherSlider(MWindow *mwindow,
 	timer = new Timer();
 	stick = 0;
 	last_v = 0;
+	max = FEATHER_MAX;
 }
 
 CWindowMaskFeatherSlider::~CWindowMaskFeatherSlider()
@@ -2105,36 +2395,50 @@ CWindowMaskFeatherSlider::~CWindowMaskFeatherSlider()
 
 int CWindowMaskFeatherSlider::handle_event()
 {
+	int sticky = 0;
 	float v = get_value();
-	if( stick > 0 ) {
-		int64_t ms = timer->get_difference();
-		if( ms < 250 && --stick > 0 ) {
-			if( get_value() == 0 ) return 1;
-			update(v = 0);
+	if( fabsf(v) > MAX_FEATHER )
+		v = v>=0 ? MAX_FEATHER : -MAX_FEATHER;
+	if( stick && timer->get_difference() >= 250 )
+		stick = 0; // no events for .25 sec
+	if( stick && (last_v * (v-last_v)) < 0 )
+		stick = 0; // dv changed direction
+	if( stick ) {
+		if( --stick > 0 ) {
+			timer->update();
+			update(last_v);
+			return 1;
 		}
-		else {
-			stick = 0;
-			last_v = v;
+		if( last_v ) {
+			max *= 1.25;
+			if( max > MAX_FEATHER ) max = MAX_FEATHER;
+			update(get_w(), v=last_v, -max-5, max+5);
+			button_release_event();
 		}
 	}
-	else if( (last_v>=0 && v<0) || (last_v<0 && v>=0) ) {
-		stick = 16;
-		v = 0;
-	}
-	else
-		last_v = v;
-	timer->update();
+	else if( v > max ) { v = max;  sticky = 24; }
+	else if( v < -max ) { v = -max; sticky = 24; }
+	else if( v>=0 ? last_v<0 : last_v>=0 ) { v = 0;  sticky = 16; }
+	if( sticky ) { update(v);  stick = sticky;  timer->update(); }
+	last_v = v;
 	gui->feather->BC_TumbleTextBox::update(v);
 	return gui->feather->update_value(v);
 }
 
 int CWindowMaskFeatherSlider::update(float v)
 {
-	return BC_FSlider::update(v);
+	float vv = fabsf(v);
+	if( vv > MAX_FEATHER ) vv = MAX_FEATHER;
+	while( max < vv ) max *= 1.25;
+	return update(get_w(), v, -max-5, max+5);
+}
+int CWindowMaskFeatherSlider::update(int r, float v, float mn, float mx)
+{
+	return BC_FSlider::update(r, v, mn, mx);
 }
 
 CWindowMaskFade::CWindowMaskFade(MWindow *mwindow, CWindowMaskGUI *gui, int x, int y)
- : BC_TumbleTextBox(gui, 0, -100.f, 100.f, x, y, 64, 2)
+ : BC_TumbleTextBox(gui, 0, -100.f, 100.f, x, y, xS(64), 2)
 {
 	this->mwindow = mwindow;
 	this->gui = gui;
@@ -2178,6 +2482,7 @@ int CWindowMaskFade::update_value(float v)
 		int k = mwindow->edl->session->cwindow_mask;
 		int n = gang ? keyframe->masks.size() : k+1;
 		for( int i=gang? 0 : k; i<n; ++i ) {
+			if( !gui->mask_enables[i]->get_value() ) continue;
 			SubMask *sub_mask = keyframe->get_submask(i);
 			float fader = sub_mask->fader + change;
 			bclamp(fader, -100.f, 100.f);
@@ -2250,9 +2555,9 @@ CWindowMaskGangFader::CWindowMaskGangFader(MWindow *mwindow,
 		CWindowMaskGUI *gui, int x, int y)
  : BC_Toggle(x, y, mwindow->theme->get_image_set("gangpatch_data"), 0)
 {
-        this->mwindow = mwindow;
-        this->gui = gui;
-        set_tooltip(_("Gang fader"));
+	this->mwindow = mwindow;
+	this->gui = gui;
+	set_tooltip(_("Gang fader"));
 }
 
 CWindowMaskGangFader::~CWindowMaskGangFader()
@@ -2264,11 +2569,61 @@ int CWindowMaskGangFader::handle_event()
 	return 1;
 }
 
+CWindowMaskGangFocus::CWindowMaskGangFocus(MWindow *mwindow,
+		CWindowMaskGUI *gui, int x, int y)
+ : BC_Toggle(x, y, mwindow->theme->get_image_set("gangpatch_data"), 0)
+{
+	this->mwindow = mwindow;
+	this->gui = gui;
+	set_tooltip(_("Gang rotate/scale/translate"));
+}
+
+CWindowMaskGangFocus::~CWindowMaskGangFocus()
+{
+}
+
+int CWindowMaskGangFocus::handle_event()
+{
+	return 1;
+}
+
+CWindowMaskGangPoint::CWindowMaskGangPoint(MWindow *mwindow,
+		CWindowMaskGUI *gui, int x, int y)
+ : BC_Toggle(x, y, mwindow->theme->get_image_set("gangpatch_data"), 0)
+{
+	this->mwindow = mwindow;
+	this->gui = gui;
+	set_tooltip(_("Gang points"));
+}
+
+CWindowMaskGangPoint::~CWindowMaskGangPoint()
+{
+}
+
+int CWindowMaskGangPoint::handle_event()
+{
+	return 1;
+}
+
+
+CWindowMaskSmoothButton::CWindowMaskSmoothButton(MWindow *mwindow, CWindowMaskGUI *gui,
+		const char *tip, int type, int on, int x, int y, const char *images)
+ : BC_Button(x, y, mwindow->theme->get_image_set(images))
+{
+	this->mwindow = mwindow;
+	this->gui = gui;
+	this->type = type;
+	this->on = on;
+	set_tooltip(tip);
+}
+
+int CWindowMaskSmoothButton::handle_event()
+{
+	return gui->smooth_mask(type, on);
+}
+
 CWindowMaskBeforePlugins::CWindowMaskBeforePlugins(CWindowMaskGUI *gui, int x, int y)
- : BC_CheckBox(x,
- 	y,
-	1,
-	_("Apply mask before plugins"))
+ : BC_CheckBox(x, y, 1, _("Apply mask before plugins"))
 {
 	this->gui = gui;
 }
@@ -2374,9 +2729,9 @@ CWindowMaskGangFeather::CWindowMaskGangFeather(MWindow *mwindow,
 		CWindowMaskGUI *gui, int x, int y)
  : BC_Toggle(x, y, mwindow->theme->get_image_set("gangpatch_data"), 0)
 {
-        this->mwindow = mwindow;
-        this->gui = gui;
-        set_tooltip(_("Gang feather"));
+	this->mwindow = mwindow;
+	this->gui = gui;
+	set_tooltip(_("Gang feather"));
 }
 
 CWindowMaskGangFeather::~CWindowMaskGangFeather()
@@ -2390,7 +2745,7 @@ int CWindowMaskGangFeather::handle_event()
 
 CWindowMaskGUI::CWindowMaskGUI(MWindow *mwindow, CWindowTool *thread)
  : CWindowToolGUI(mwindow, thread,
-	_(PROGRAM_NAME ": Mask"), 420, 680)
+	_(PROGRAM_NAME ": Mask"), xS(440), yS(700))
 {
 	this->mwindow = mwindow;
 	this->thread = thread;
@@ -2398,8 +2753,10 @@ CWindowMaskGUI::CWindowMaskGUI(MWindow *mwindow, CWindowTool *thread)
 	fade = 0;
 	feather = 0;
 	focused = 0;
+	scale_mode = 2;
 	markers = 1;
 	boundary = 1;
+	preset_dialog = 0;
 }
 CWindowMaskGUI::~CWindowMaskGUI()
 {
@@ -2409,75 +2766,110 @@ CWindowMaskGUI::~CWindowMaskGUI()
 	delete fade;
 	delete feather;
 	unlock_window();
+	delete preset_dialog;
 }
 
 void CWindowMaskGUI::create_objects()
 {
-	int x = 10, y = 10, margin = mwindow->theme->widget_border;
+	int t[SUBMASKS];
+	Theme *theme = mwindow->theme;
+	int xs10 = xS(10), ys10 = yS(10);
+	int x = xs10, y = ys10;
+	int margin = theme->widget_border;
 	int clr_w = CWindowMaskClrMask::calculate_w(mwindow);
 	int clr_x = get_w()-x - clr_w;
-	int del_w = CWindowMaskDelMask::calculate_w(this,_("Delete"));
-	int del_x = clr_x-2*margin - del_w;
 
 	lock_window("CWindowMaskGUI::create_objects");
 	BC_TitleBar *title_bar;
-	add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, 20, 10, _("Masks on Track")));
+	add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, xS(20), xS(10),
+			_("Masks on Track")));
 	y += title_bar->get_h() + margin;
 	BC_Title *title;
 	add_subwindow(title = new BC_Title(x,y, _("Track:")));
-	int x1 = x + 90;
+	int x1 = x + xS(90), ww = clr_x-2*margin - x1;
+	for( int i=0,n=sizeof(t)/sizeof(t[0]); i<n; ++i ) t[i] = x1+(i*ww)/n;
+	int del_x = t[5];
 	Track *track = mwindow->cwindow->calculate_affected_track();
 	const char *text = track ? track->title : "";
 	mwindow->cwindow->mask_track_id = track ? track->get_id() : -1;
-	mask_on_track = new CWindowMaskOnTrack(mwindow, this, x1, y, 100, text);
+	mask_on_track = new CWindowMaskOnTrack(mwindow, this, x1, y, xS(100), text);
 	mask_on_track->create_objects();
 	mask_on_track->set_tooltip(_("Video track"));
 	int x2 = x1 + mask_on_track->get_w();
 	add_subwindow(mask_track_tumbler = new CWindowMaskTrackTumbler(mwindow, this, x2, y));
 	mwindow->edl->local_session->solo_track_id = -1;
-	x2 = del_x + (del_w - CWindowMaskSoloTrack::calculate_w(this)) / 2;
-	add_subwindow(mask_solo_track = new CWindowMaskSoloTrack(mwindow, this, x2, y, 0));
+	add_subwindow(mask_solo_track = new CWindowMaskSoloTrack(mwindow, this, del_x, y, 0));
 	y += mask_on_track->get_h() + margin;
-	add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, 20, 10, _("Masks")));
+	add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, xS(20), xS(10),
+			_("Masks")));
 	y += title_bar->get_h() + margin;
 	add_subwindow(title = new BC_Title(x, y, _("Mask:")));
 	mask_name = new CWindowMaskName(mwindow, this, x1, y, "");
 	mask_name->create_objects();
 	mask_name->set_tooltip(_("Mask name"));
-	add_subwindow(clr_mask = new CWindowMaskClrMask(mwindow, this, clr_x, y));
-	add_subwindow(del_mask = new CWindowMaskDelMask(mwindow, this, del_x, y));
+	add_subwindow(mask_clr = new CWindowMaskClrMask(mwindow, this, clr_x, y));
+	add_subwindow(mask_del = new CWindowMaskDelMask(mwindow, this, del_x, y));
 	y += mask_name->get_h() + 2*margin;
+	BC_Bar *bar;
+//	add_subwindow(bar = new BC_Bar(x, y, get_w()-2*x));
+//	y += bar->get_h() + 2*margin;
 
 	add_subwindow(title = new BC_Title(x, y, _("Select:")));
 	int bw = 0, bh = 0;
 	BC_CheckBox::calculate_extents(this, &bw, &bh);
-	int bdx = bw + 2*margin;
-	x2 = x1;
-	for( int i=0; i<SUBMASKS; x2+=bdx, ++i ) {
+	for( int i=0; i<SUBMASKS; ++i ) {
 		int v = i == mwindow->edl->session->cwindow_mask ? 1 : 0;
-		mask_buttons[i] = new CWindowMaskButton(mwindow, this, x2, y, i, v);
+		mask_buttons[i] = new CWindowMaskButton(mwindow, this, t[i], y, i, v);
 		add_subwindow(mask_buttons[i]);
 	}
-	x2 += margin;
-	add_subwindow(mask_thumbler = new CWindowMaskThumbler(mwindow, this, x2, y));
+	add_subwindow(mask_thumbler = new CWindowMaskThumbler(mwindow, this, clr_x, y));
 	y += bh + margin;
-	x2 = x1;
-	for( int i=0; i<SUBMASKS; x2+=bdx, ++i ) {
+	for( int i=0; i<SUBMASKS; ++i ) {
 		char text[BCSTRLEN];  sprintf(text, "%d", i);
 		int tx = (bw - get_text_width(MEDIUMFONT, text)) / 2;
-		mask_blabels[i] = new BC_Title(x2+tx, y, text);
+		mask_blabels[i] = new BC_Title(t[i]+tx, y, text);
 		add_subwindow(mask_blabels[i]);
 	}
 	y += mask_blabels[0]->get_h() + margin;
-	add_subwindow(unclr_mask = new CWindowMaskUnclear(mwindow, this, x, y, x1-x-2*margin));
-	x2 = x1;
-	for( int i=0; i<SUBMASKS; x2+=bdx, ++i ) {
-		mask_enables[i] = new CWindowMaskEnable(mwindow, this, x2, y, i, 1);
+	add_subwindow(title = new BC_Title(x, y, _("Enable:")));
+	for( int i=0; i<SUBMASKS; ++i ) {
+		mask_enables[i] = new CWindowMaskEnable(mwindow, this, t[i], y, i, 1);
 		add_subwindow(mask_enables[i]);
 	}
+	add_subwindow(mask_unclr = new CWindowMaskUnclear(mwindow, this, clr_x, y));
 	y += mask_enables[0]->get_h() + 2*margin;
-	add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, 20, 10, _("Fade & Feather")));
+	add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, xS(20), xS(10),
+			_("Preset Shapes")));
 	y += title_bar->get_h() + margin;
+	add_subwindow(mask_shape_sqr = new CWindowMaskShape(mwindow, this,
+		"mask_prst_sqr_images", MASK_SHAPE_SQUARE, t[0], y, _("Square")));
+	add_subwindow(mask_shape_crc = new CWindowMaskShape(mwindow, this,
+		"mask_prst_crc_images", MASK_SHAPE_CIRCLE, t[1], y, _("Circle")));
+	add_subwindow(mask_shape_tri = new CWindowMaskShape(mwindow, this,
+		"mask_prst_tri_images", MASK_SHAPE_TRIANGLE, t[2], y, _("Triangle")));
+	add_subwindow(mask_shape_ovl = new CWindowMaskShape(mwindow, this,
+		"mask_prst_ovl_images", MASK_SHAPE_OVAL, t[3], y, _("Oval")));
+	add_subwindow(mask_load_list = new CWindowMaskLoadList(mwindow, this));
+	add_subwindow(mask_load = new CWindowMaskLoad(mwindow, this, t[5], y, xS(80)));
+	add_subwindow(mask_save = new CWindowMaskSave(mwindow, this, t[6], y, xS(80)));
+	add_subwindow(mask_delete = new CWindowMaskDelete(mwindow, this, t[7], y, xS(80)));
+	y += mask_load->get_h() + 2*margin;
+	add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, xS(20), xS(10),
+			_("Position & Scale")));
+	y += title_bar->get_h() + 2*margin;
+	add_subwindow(mask_center = new CWindowMaskCenter(mwindow, this, t[0], y, xS(80)));
+	add_subwindow(mask_normal = new CWindowMaskNormal(mwindow, this, t[1], y, xS(80)));
+
+	add_subwindow(mask_scale_x = new CWindowMaskScaleXY(mwindow, this,
+		t[5], y, theme->get_image_set("mask_scale_x"), 0, MASK_SCALE_X, _("xlate/scale x")));
+	add_subwindow(mask_scale_y = new CWindowMaskScaleXY(mwindow, this,
+		t[6], y, theme->get_image_set("mask_scale_y"), 0, MASK_SCALE_Y, _("xlate/scale y")));
+	add_subwindow(mask_scale_xy = new CWindowMaskScaleXY(mwindow, this,
+		t[7], y, theme->get_image_set("mask_scale_xy"), 1, MASK_SCALE_XY, _("xlate/scale xy")));
+	y += mask_center->get_h() + 2*margin;
+	add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, xS(20), xS(10),
+			_("Fade & Feather")));
+	y += title_bar->get_h() + 2*margin;
 
 	add_subwindow(title = new BC_Title(x, y, _("Fade:")));
 	fade = new CWindowMaskFade(mwindow, this, x1, y);
@@ -2495,25 +2887,43 @@ void CWindowMaskGUI::create_objects()
 	add_subwindow(feather_slider);
 	add_subwindow(gang_feather = new CWindowMaskGangFeather(mwindow, this, clr_x, y));
 	y += feather->get_h() + 2*margin;
-	add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, 20, 10, _("Mask Points")));
+	add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, xS(20), xS(10),
+			_("Mask Points")));
 	y += title_bar->get_h() + margin;
 
 	add_subwindow(title = new BC_Title(x, y, _("Point:")));
-	active_point = new CWindowMaskAffectedPoint(mwindow, this, x1, y);
+	active_point = new CWindowMaskAffectedPoint(mwindow, this, t[0], y);
 	active_point->create_objects();
+// typ=0, this mask, this point
+	add_subwindow(mask_pnt_linear = new CWindowMaskSmoothButton(mwindow, this,
+		_("linear point"), 0, 0, t[3], y, "mask_pnt_linear_images"));
+	add_subwindow(mask_pnt_smooth = new CWindowMaskSmoothButton(mwindow, this,
+		_("smooth point"), 0, 1, t[4], y, "mask_pnt_smooth_images"));
 	add_subwindow(del_point = new CWindowMaskDelPoint(mwindow, this, del_x, y));
+	add_subwindow(gang_point = new CWindowMaskGangPoint(mwindow, this, clr_x, y));
 	y += active_point->get_h() + margin;
 	add_subwindow(title = new BC_Title(x, y, "X:"));
-	this->x = new CWindowCoord(this, x1, y, (float)0.0);
+	this->x = new CWindowCoord(this, t[0], y, (float)0.0);
 	this->x->create_objects();
+// typ>0, this mask, all points
+	add_subwindow(mask_crv_linear = new CWindowMaskSmoothButton(mwindow, this,
+		_("linear curve"), 1, 0, t[3], y, "mask_crv_linear_images"));
+	add_subwindow(mask_crv_smooth = new CWindowMaskSmoothButton(mwindow, this,
+		_("smooth curve"), 1, 1, t[4], y, "mask_crv_smooth_images"));
 	add_subwindow(draw_markers = new CWindowMaskDrawMarkers(mwindow, this, del_x, y));
 	y += this->x->get_h() + margin;
 	add_subwindow(title = new BC_Title(x, y, "Y:"));
 	this->y = new CWindowCoord(this, x1, y, (float)0.0);
 	this->y->create_objects();
+// typ<0, all masks, all points
+	add_subwindow(mask_all_linear = new CWindowMaskSmoothButton(mwindow, this,
+		_("linear all"), -1, 0, t[3], y, "mask_all_linear_images"));
+	add_subwindow(mask_all_smooth = new CWindowMaskSmoothButton(mwindow, this,
+		_("smooth all"), -1, 1, t[4], y, "mask_all_smooth_images"));
 	add_subwindow(draw_boundary = new CWindowMaskDrawBoundary(mwindow, this, del_x, y));
 	y += this->y->get_h() + 2*margin;
-	add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, 20, 10, _("Pivot Point")));
+	add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, xS(20), xS(10),
+			_("Pivot Point")));
 	y += title_bar->get_h() + margin;
 
 	add_subwindow(title = new BC_Title(x, y, "X:"));
@@ -2521,32 +2931,34 @@ void CWindowMaskGUI::create_objects()
 	focus_x = new CWindowCoord(this, x1, y, cx);
 	focus_x->create_objects();
 	add_subwindow(focus = new CWindowMaskFocus(mwindow, this, del_x, y));
+	add_subwindow(gang_focus = new CWindowMaskGangFocus(mwindow, this, clr_x, y));
 	y += focus_x->get_h() + margin;
 	add_subwindow(title = new BC_Title(x, y, "Y:"));
 	float cy = mwindow->edl->session->output_h / 2.f;
 	focus_y = new CWindowCoord(this, x1, y, cy);
 	focus_y->create_objects();
-	y += focus_x->get_h() + 2*margin;
-	BC_Bar *bar;
+	y += focus_y->get_h() + 2*margin;
 	add_subwindow(bar = new BC_Bar(x, y, get_w()-2*x));
 	y += bar->get_h() + margin;
-	add_subwindow(this->apply_before_plugins = new CWindowMaskBeforePlugins(this, 10, y));
+	add_subwindow(this->apply_before_plugins = new CWindowMaskBeforePlugins(this, x, y));
 	y += this->apply_before_plugins->get_h();
-	add_subwindow(this->disable_opengl_masking = new CWindowDisableOpenGLMasking(this, 10, y));
-	y += this->disable_opengl_masking->get_h() + margin;
+	add_subwindow(this->disable_opengl_masking = new CWindowDisableOpenGLMasking(this, x, y));
+	add_subwindow(help = new CWindowMaskHelp(mwindow, this, del_x, y));
+	y += this->disable_opengl_masking->get_h() + 2*margin;
+	help_y = y;
 	add_subwindow(bar = new BC_Bar(x, y, get_w()-2*x));
-	y += bar->get_h() + margin;
-
-	y += margin;
+	y += bar->get_h() + 2*margin;
 	add_subwindow(title = new BC_Title(x, y, _(
 		"Shift+LMB: move an end point\n"
 		"Ctrl+LMB: move a control point\n"
 		"Alt+LMB: to drag translate the mask\n"
-		"Shift+Key Delete to delete the point\n"
-		"Wheel Up/Dn: rotate around pointer\n"
-		"Shift+Wheel Up/Dn: scale around pointer\n"
-		"Shift+MMB: Toggle focus center at pointer")));
+		"Shift+MMB: Set Pivot Point at pointer\n"
+		"Wheel: rotate around Pivot Point\n"
+		"Shift+Wheel: scale around Pivot Point\n"
+		"Ctrl+Wheel: rotate/scale around pointer")));
+	help_h = y + title->get_h() + 2*margin;
 	update();
+	resize_window(get_w(), help_y);
 	unlock_window();
 }
 
@@ -2643,44 +3055,53 @@ void CWindowMaskGUI::update()
 
 void CWindowMaskGUI::handle_event()
 {
-	Track *track;
-	MaskAuto *keyframe;
-	MaskAutos *autos;
-	SubMask *mask;
-	MaskPoint *point;
-	get_keyframe(track, autos, keyframe, mask, point, 0);
-
-	mwindow->undo->update_undo_before(_("mask point"), this);
-
-	if(point)
-	{
+	int redraw = 0;
+	if( event_caller == this->focus_x ||
+	    event_caller == this->focus_y ) {
+		redraw = 1;
+	}
+	else if( event_caller == this->x ||
+		 event_caller == this->y ) {
+		Track *track;
+		MaskAuto *keyframe;
+		MaskAutos *autos;
+		SubMask *mask;
+		MaskPoint *point;
+		get_keyframe(track, autos, keyframe, mask, point, 0);
+
+		mwindow->undo->update_undo_before(_("mask point"), this);
+
+		if( point ) {
+			float px = atof(x->get_text());
+			float py = atof(y->get_text());
+			float dx = px - point->x, dy = py - point->y;
 #ifdef USE_KEYFRAME_SPANNING
 // Create temp keyframe
-		MaskAuto temp_keyframe(mwindow->edl, autos);
-		temp_keyframe.copy_data(keyframe);
+			MaskAuto temp_keyframe(mwindow->edl, autos);
+			temp_keyframe.copy_data(keyframe);
 // Get affected point in temp keyframe
-		mask = temp_keyframe.get_submask(mwindow->edl->session->cwindow_mask);
-		if(mwindow->cwindow->gui->affected_point < mask->points.total &&
-			mwindow->cwindow->gui->affected_point >= 0)
-		{
-			point = mask->points.values[mwindow->cwindow->gui->affected_point];
-		}
-
-		if(point)
-		{
-			point->x = atof(x->get_text());
-			point->y = atof(y->get_text());
+			mask = temp_keyframe.get_submask(mwindow->edl->session->cwindow_mask);
+#endif
+			MaskPoints &points = mask->points;
+			int gang = gang_point->get_value();
+			int k = mwindow->cwindow->gui->affected_point;
+			int n = gang ? points.size() : k+1;
+			for( int i=gang? 0 : k; i<n; ++i ) {
+				if( i < 0 || i >= points.size() ) continue;
+				MaskPoint *point = points[i];
+				point->x += dx;  point->y += dy;
+			}
+#ifdef USE_KEYFRAME_SPANNING
 // Commit to spanned keyframes
 			autos->update_parameter(&temp_keyframe);
-		}
-#else
-		point->x = atof(x->get_text());
-		point->y = atof(y->get_text());
 #endif
+		}
+		mwindow->undo->update_undo_after(_("mask point"), LOAD_AUTOMATION);
+		redraw = 1;
 	}
 
-	update_preview();
-	mwindow->undo->update_undo_after(_("mask point"), LOAD_AUTOMATION);
+	if( redraw )
+		update_preview();
 }
 
 void CWindowMaskGUI::set_focused(int v, float cx, float cy)
@@ -2712,8 +3133,657 @@ void CWindowMaskGUI::update_buttons(MaskAuto *keyframe, int k)
 	}
 }
 
+// typ=0, this mask, this point
+// typ>0, this mask, all points
+// typ<0, all masks, all points
+// dxy= on? pt[+1]-pt[-1] : dxy=0
+int CWindowMaskGUI::smooth_mask(int typ, int on)
+{
+	MaskAutos *autos;
+	MaskAuto *keyframe;
+	Track *track;
+	MaskPoint *point;
+	SubMask *mask;
+#ifdef USE_KEYFRAME_SPANNING
+	int create_it = 0;
+#else
+	int create_it = 1;
+#endif
+
+	mwindow->undo->update_undo_before(_("mask smooth"), this);
+
+// Get existing keyframe
+	get_keyframe(track, autos, keyframe,
+			mask, point, create_it);
+	if( track ) {
+#ifdef USE_KEYFRAME_SPANNING
+		MaskAuto temp_keyframe(mwindow->edl, autos);
+		temp_keyframe.copy_data(keyframe);
+		keyframe = &temp_keyframe;
+#endif
+		int k = mwindow->edl->session->cwindow_mask;
+		int n = typ>=0 ? k+1 : keyframe->masks.size();
+		for( int j=typ<0? 0 : k; j<n; ++j ) {
+			if( !mask_enables[j]->get_value() ) continue;
+			SubMask *sub_mask = keyframe->get_submask(j);
+			MaskPoints &points = sub_mask->points;
+			int psz = points.size();
+			if( psz < 3 ) continue;
+			int l = mwindow->cwindow->gui->affected_point;
+			if( l > psz ) l = psz;
+			int m = typ ? psz : l+1;
+			for( int i=typ ? 0 : l; i<m; ++i ) {
+				int i0 = i-1, i1 = i+1;
+				if( i0 < 0 ) i0 = psz-1;
+				if( i1 >= psz ) i1 = 0;
+				MaskPoint *p0 = points[i0];
+				MaskPoint *p  = points[i];
+				MaskPoint *p1 = points[i1];
+				float dx = !on ? 0 : p1->x - p0->x;
+				float dy = !on ? 0 : p1->y - p0->y;
+				p->control_x1 = -dx/4;  p->control_y1 = -dy/4;
+				p->control_x2 =  dx/4;  p->control_y2 =  dy/4;
+			}
+		}
+#ifdef USE_KEYFRAME_SPANNING
+		autos->update_parameter(keyframe);
+#endif
+		update_preview();
+	}
+
+	mwindow->undo->update_undo_after(_("mask smooth"), LOAD_AUTOMATION);
+	return 1;
+}
+
+int CWindowMaskGUI::save_mask(const char *nm)
+{
+	int k = mwindow->edl->session->cwindow_mask;
+	MaskAutos *autos;
+	MaskAuto *keyframe;
+	Track *track;
+	MaskPoint *point;
+	SubMask *mask;
+	get_keyframe(track, autos, keyframe, mask, point, 0);
+	if( !track ) return 0;
+	SubMask *sub_mask = keyframe->get_submask(k);
+	ArrayList<SubMask *> masks;
+	load_masks(masks);
+	int i = masks.size();
+	while( --i >= 0 ) {
+		if( strcmp(masks[i]->name, nm) ) continue;
+		masks.remove_object_number(i++);
+	}
+	mask = new SubMask(0, -1);
+	strncpy(mask->name, nm, sizeof(mask->name)-1);
+	mask->copy_from(*sub_mask, 0);
+	masks.append(mask);
+	save_masks(masks);
+	masks.remove_all_objects();
+	return 1;
+}
+
+int CWindowMaskGUI::del_mask(const char *nm)
+{
+	ArrayList<SubMask *> masks;
+	load_masks(masks);
+	int i = masks.size();
+	while( --i >= 0 ) {
+		if( strcmp(masks[i]->name, nm) ) continue;
+		masks.remove_object_number(i++);
+	}
+	save_masks(masks);
+	masks.remove_all_objects();
+	return 1;
+}
+
+int CWindowMaskGUI::center_mask()
+{
+	int k = mwindow->edl->session->cwindow_mask;
+	MaskAutos *autos;
+	MaskAuto *keyframe;
+	Track *track;
+	MaskPoint *point;
+	SubMask *mask;
+#ifdef USE_KEYFRAME_SPANNING
+	int create_it = 0;
+#else
+	int create_it = 1;
+#endif
+	get_keyframe(track, autos, keyframe,
+			mask, point, create_it);
+	if( !track ) return 0;
+	mwindow->undo->update_undo_before(_("mask center"), this);
+
+// Get existing keyframe
+#ifdef USE_KEYFRAME_SPANNING
+	MaskAuto temp_keyframe(mwindow->edl, autos);
+	temp_keyframe.copy_data(keyframe);
+	keyframe = &temp_keyframe;
+#endif
+	SubMask *sub_mask = keyframe->get_submask(k);
+	MaskPoints &points = sub_mask->points;
+	int psz = points.size();
+	if( psz > 0 ) {
+		float cx = 0, cy = 0;
+		for( int i=0; i<psz; ++i ) {
+			MaskPoint *p  = points[i];
+			cx += p->x;  cy += p->y;
+		}
+		cx /= psz;  cy /= psz;
+		cx -= mwindow->edl->session->output_w / 2.f;
+		cy -= mwindow->edl->session->output_h / 2.f;
+		for( int i=0; i<psz; ++i ) {
+			MaskPoint *p  = points[i];
+			p->x -= cx;  p->y -= cy;
+		}
+	}
+#ifdef USE_KEYFRAME_SPANNING
+	autos->update_parameter(keyframe);
+#endif
+	update_preview();
+	mwindow->undo->update_undo_after(_("mask center"), LOAD_AUTOMATION);
+	return 1;
+}
+
+int CWindowMaskGUI::normal_mask()
+{
+	int k = mwindow->edl->session->cwindow_mask;
+	MaskAutos *autos;
+	MaskAuto *keyframe;
+	Track *track;
+	MaskPoint *point;
+	SubMask *mask;
+#ifdef USE_KEYFRAME_SPANNING
+	int create_it = 0;
+#else
+	int create_it = 1;
+#endif
+// Get existing keyframe
+	get_keyframe(track, autos, keyframe,
+			mask, point, create_it);
+	if( !track ) return 0;
+	mwindow->undo->update_undo_before(_("mask normal"), this);
+
+#ifdef USE_KEYFRAME_SPANNING
+	MaskAuto temp_keyframe(mwindow->edl, autos);
+	temp_keyframe.copy_data(keyframe);
+	keyframe = &temp_keyframe;
+#endif
+	SubMask *sub_mask = keyframe->get_submask(k);
+	MaskPoints &points = sub_mask->points;
+	int psz = points.size();
+	float cx = 0, cy = 0;
+	double dr = 0;
+	if( psz > 0 ) {
+		for( int i=0; i<psz; ++i ) {
+			MaskPoint *p  = points[i];
+			cx += p->x;  cy += p->y;
+		}
+		cx /= psz;  cy /= psz;
+		for( int i=0; i<psz; ++i ) {
+			MaskPoint *p  = points[i];
+			float dx = fabsf(p->x-cx), dy = fabsf(p->y-cy);
+			double d = sqrt(dx*dx + dy*dy);
+			if( dr < d ) dr = d;
+		}
+	}
+	if( dr > 0 ) {
+		float out_w = mwindow->edl->session->output_w;
+		float out_h = mwindow->edl->session->output_h;
+		float r = bmax(out_w, out_h);
+		float s = r / (4 * dr * sqrt(2.));
+		for( int i=0; i<psz; ++i ) {
+			MaskPoint *p  = points[i];
+			float x = p->x, y = p->y;
+			p->x = (x-cx) * s + cx;
+			p->y = (y-cy) * s + cy;
+			p->control_x1 *= s;  p->control_y1 *= s;
+			p->control_x2 *= s;  p->control_y2 *= s;
+		}
+	}
+#ifdef USE_KEYFRAME_SPANNING
+	autos->update_parameter(keyframe);
+#endif
+	update_preview();
+
+	mwindow->undo->update_undo_after(_("mask normal"), LOAD_AUTOMATION);
+	return 1;
+}
+
+
+CWindowMaskLoadList::CWindowMaskLoadList(MWindow *mwindow, CWindowMaskGUI *gui)
+ : BC_ListBox(-1, -1, 1, 1, LISTBOX_TEXT, 0, 0, 0, 1, 0, 1)
+{
+	this->mwindow = mwindow;
+	this->gui = gui;
+	set_use_button(0);
+}
+
+CWindowMaskLoadList::~CWindowMaskLoadList()
+{
+}
+
+
+int CWindowMaskLoadList::handle_event()
+{
+	MaskAutos *autos;
+	MaskAuto *keyframe;
+	Track *track;
+	MaskPoint *point;
+	SubMask *mask;
+#ifdef USE_KEYFRAME_SPANNING
+	int create_it = 0;
+#else
+	int create_it = 1;
+#endif
+
+	mwindow->undo->update_undo_before(_("mask shape"), this);
+
+// Get existing keyframe
+	gui->get_keyframe(track, autos, keyframe,
+			mask, point, create_it);
+	CWindowMaskItem *item = (CWindowMaskItem *) get_selection(0, 0);
+	if( track && item ) {
+#ifdef USE_KEYFRAME_SPANNING
+		MaskAuto temp_keyframe(mwindow->edl, autos);
+		temp_keyframe.copy_data(keyframe);
+		keyframe = &temp_keyframe;
+		mask = temp_keyframe.get_submask(mwindow->edl->session->cwindow_mask);
+#endif
+		ArrayList<SubMask *> masks;
+		gui->load_masks(masks);
+		mask->copy_from(*masks[item->id], 0);
+		masks.remove_all_objects();
+#ifdef USE_KEYFRAME_SPANNING
+		autos->update_parameter(keyframe);
+#endif
+		gui->update();
+		gui->update_preview(1);
+	}
+	mwindow->undo->update_undo_after(_("mask shape"), LOAD_AUTOMATION);
+	return 1;
+}
+
+void CWindowMaskLoadList::create_objects()
+{
+	shape_items.remove_all_objects();
+	ArrayList<SubMask *> masks;
+	gui->load_masks(masks);
+	for( int i=0; i<masks.size(); ++i )
+		shape_items.append(new CWindowMaskItem(masks[i]->name, i));
+	masks.remove_all_objects();
+	update(&shape_items, 0, 0, 1);
+}
+
+CWindowMaskLoad::CWindowMaskLoad(MWindow *mwindow,
+	CWindowMaskGUI *gui, int x, int y, int w)
+ : BC_Button(x, y, mwindow->theme->get_image_set("mask_prst_load_images"))
+{
+	this->mwindow = mwindow;
+	this->gui = gui;
+	set_tooltip(_("Load preset"));
+}
+
+int CWindowMaskLoad::handle_event()
+{
+	gui->mask_load_list->create_objects();
+	int px, py;
+	get_abs_cursor(px, py);
+	return gui->mask_load_list->activate(px, py, xS(120),yS(160));
+}
+
+
+CWindowMaskSave::CWindowMaskSave(MWindow *mwindow,
+	CWindowMaskGUI *gui, int x, int y, int w)
+ : BC_Button(x, y, mwindow->theme->get_image_set("mask_prst_save_images"))
+{
+	this->mwindow = mwindow;
+	this->gui = gui;
+	set_tooltip(_("Save preset"));
+}
+
+CWindowMaskSave::~CWindowMaskSave()
+{
+}
+
+int CWindowMaskSave::handle_event()
+{
+	Track *track;
+	MaskAutos *autos;
+	MaskAuto *keyframe;
+	SubMask *mask;
+	MaskPoint *point;
+	gui->get_keyframe(track, autos, keyframe, mask, point, 0);
+	if( track ) {
+		int sx = 0, sy = 0;
+		gui->get_abs_cursor(sx, sy);
+		if( !gui->preset_dialog )
+			gui->preset_dialog = new CWindowMaskPresetDialog(mwindow, gui);
+		gui->preset_dialog->start_dialog(sx, sy, keyframe);
+	}
+	return 1;
+}
+
+CWindowMaskPresetDialog::CWindowMaskPresetDialog(MWindow *mwindow, CWindowMaskGUI *gui)
+ : BC_DialogThread()
+{
+	this->mwindow = mwindow;
+	this->gui = gui;
+	pgui = 0;
+}
+
+CWindowMaskPresetDialog::~CWindowMaskPresetDialog()
+{
+	close_window();
+}
+
+void CWindowMaskPresetDialog::handle_close_event(int result)
+{
+	pgui = 0;
+}
+
+void CWindowMaskPresetDialog::handle_done_event(int result)
+{
+	if( result ) return;
+	const char *nm = pgui->preset_text->get_text();
+	if( keyframe )
+		gui->save_mask(nm);
+	else
+		gui->del_mask(nm);
+}
+
+BC_Window* CWindowMaskPresetDialog::new_gui()
+{
+	pgui = new CWindowMaskPresetGUI(this, sx, sy,
+		keyframe ? _(PROGRAM_NAME ": Save Mask") :
+			   _(PROGRAM_NAME ": Delete Mask"));
+	pgui->create_objects();
+	return pgui;
+}
+
+void CWindowMaskPresetDialog::start_dialog(int sx, int sy, MaskAuto *keyframe)
+{
+	close_window();
+	this->sx = sx;  this->sy = sy;
+	this->keyframe = keyframe;
+	start();
+}
+
+CWindowMaskPresetGUI::CWindowMaskPresetGUI(CWindowMaskPresetDialog *preset_dialog,
+			int x, int y, const char *title)
+ : BC_Window(title, x, y, xS(320), yS(100), xS(320), yS(100), 0, 0, 1)
+{
+	this->preset_dialog = preset_dialog;
+}
+
+void CWindowMaskPresetGUI::create_objects()
+{
+	int xs8 = xS(8), xs10 = xS(10);
+	int ys10 = yS(10);
+	int x = xs10, y = ys10;
+	lock_window("CWindowMaskPresetGUI::create_objects");
+	BC_Title *title;
+	add_subwindow(title = new BC_Title(x, y,
+		preset_dialog->keyframe ? _("Save mask:") : _("Delete mask:")));
+	int x1 = x + title->get_w() + xs8;
+	int x2 = get_w() - x - xs8 - x1 -
+		BC_WindowBase::get_resources()->listbox_button[0]->get_w();
+	CWindowMaskGUI *gui = preset_dialog->gui;
+	preset_text = new CWindowMaskPresetText(this,
+		x1, y, x2, yS(120), gui->mask_name->get_text());
+	preset_text->create_objects();
+	preset_text->set_tooltip(_("Mask name"));
+	preset_text->update_items();
+	add_subwindow(new BC_OKButton(this));
+	add_subwindow(new BC_CancelButton(this));
+	show_window();
+	raise_window();
+	unlock_window();
+}
+
+CWindowMaskPresetText::CWindowMaskPresetText(CWindowMaskPresetGUI *pgui,
+		int x, int y, int w, int h, const char *text)
+ : BC_PopupTextBox(pgui, 0, text, x, y, w, h)
+{
+	this->pgui = pgui;
+}
+
+int CWindowMaskPresetText::handle_event()
+{
+	int k = get_number();
+	if( k >= 0 && k<mask_items.size() )
+		update(mask_items[k]->get_text());
+	return 1;
+}
+
+void CWindowMaskPresetText::update_items()
+{
+	mask_items.remove_all_objects();
+	ArrayList<SubMask *> masks;
+	pgui->preset_dialog->gui->load_masks(masks);
+	for( int i=0; i<masks.size(); ++i ) {
+		char text[BCSTRLEN];  memset(text, 0, sizeof(text));
+		strncpy(text, masks[i]->name, sizeof(text)-1);
+		mask_items.append(new CWindowMaskItem(text));
+	}
+	masks.remove_all_objects();
+	update_list(&mask_items);
+}
+
+
+CWindowMaskDelete::CWindowMaskDelete(MWindow *mwindow,
+	CWindowMaskGUI *gui, int x, int y, int w)
+ : BC_Button(x, y, mwindow->theme->get_image_set("mask_prst_trsh_images"))
+{
+	this->mwindow = mwindow;
+	this->gui = gui;
+	set_tooltip(_("Delete preset"));
+}
+
+int CWindowMaskDelete::handle_event()
+{
+	int sx = 0, sy = 0;
+	gui->get_abs_cursor(sx, sy);
+	if( !gui->preset_dialog )
+		gui->preset_dialog = new CWindowMaskPresetDialog(mwindow, gui);
+	gui->preset_dialog->start_dialog(sx, sy, 0);
+	return 1;
+}
+
+
+CWindowMaskCenter::CWindowMaskCenter(MWindow *mwindow,
+	CWindowMaskGUI *gui, int x, int y, int w)
+ : BC_Button(x, y, mwindow->theme->get_image_set("mask_pstn_cen_images"))
+{
+	this->mwindow = mwindow;
+	this->gui = gui;
+	set_tooltip(_("center mask"));
+}
+
+int CWindowMaskCenter::handle_event()
+{
+	return gui->center_mask();
+}
+
+
+CWindowMaskNormal::CWindowMaskNormal(MWindow *mwindow,
+	CWindowMaskGUI *gui, int x, int y, int w)
+ : BC_Button(x, y, mwindow->theme->get_image_set("mask_pstn_nrm_images"))
+{
+	this->mwindow = mwindow;
+	this->gui = gui;
+	set_tooltip(_("normalize mask"));
+}
+
+int CWindowMaskNormal::handle_event()
+{
+	return gui->normal_mask();
+}
+
+
+CWindowMaskShape::CWindowMaskShape(MWindow *mwindow, CWindowMaskGUI *gui,
+		const char *images, int shape, int x, int y, const char *tip)
+ : BC_Button(x, y, mwindow->theme->get_image_set(images))
+{
+	this->mwindow = mwindow;
+	this->gui = gui;
+	this->shape = shape;
+	set_tooltip(tip);
+}
+
+CWindowMaskShape::~CWindowMaskShape()
+{
+}
+
+void CWindowMaskShape::builtin_shape(int i, SubMask *sub_mask)
+{
+	int out_w = mwindow->edl->session->output_w;
+	int out_h = mwindow->edl->session->output_h;
+	float cx = out_w/2.f, cy = out_h/2.f;
+	float r = bmax(cx, cy) / 4.f;
+	double c = 4*(sqrt(2.)-1)/3; // bezier aprox circle
+	float r2 = r / 2.f, rc = r*c, r4 = r / 4.f;
+	MaskPoint *pt = 0;
+	MaskPoints &points = sub_mask->points;
+	points.remove_all_objects();
+	switch( i ) {
+	case MASK_SHAPE_SQUARE:
+		points.append(pt = new MaskPoint());
+		pt->x = cx - r;  pt->y = cy - r;
+		points.append(pt = new MaskPoint());
+		pt->x = cx + r;  pt->y = cy - r;
+		points.append(pt = new MaskPoint());
+		pt->x = cx + r;  pt->y = cy + r;
+		points.append(pt = new MaskPoint());
+		pt->x = cx - r;  pt->y = cy + r;
+		break;
+	case MASK_SHAPE_CIRCLE:
+		points.append(pt = new MaskPoint());
+		pt->x = cx - r;  pt->y = cy - r;
+		pt->control_x1 = -rc;  pt->control_y1 =  rc;
+		pt->control_x2 =  rc;  pt->control_y2 = -rc;
+		points.append(pt = new MaskPoint());
+		pt->x = cx + r;  pt->y = cy - r;
+		pt->control_x1 = -rc;  pt->control_y1 = -rc;
+		pt->control_x2 =  rc;  pt->control_y2 =  rc;
+		points.append(pt = new MaskPoint());
+		pt->x = cx + r;  pt->y = cy + r;
+		pt->control_x1 =  rc;  pt->control_y1 = -rc;
+		pt->control_x2 = -rc;  pt->control_y2 =  rc;
+		points.append(pt = new MaskPoint());
+		pt->x = cx - r;  pt->y = cy + r;
+		pt->control_x1 =  rc;  pt->control_y1 =  rc;
+		pt->control_x2 = -rc;  pt->control_y2 = -rc;
+		break;
+	case MASK_SHAPE_TRIANGLE:
+		points.append(pt = new MaskPoint());
+		pt->x = cx + 0;  pt->y = cy - r*(sqrt(3.)-1.);
+		points.append(pt = new MaskPoint());
+		pt->x = cx + r;  pt->y = cy + r;
+		points.append(pt = new MaskPoint());
+		pt->x = cx - r;  pt->y = cy + r;
+		break;
+	case MASK_SHAPE_OVAL:
+		points.append(pt = new MaskPoint());
+		pt->x = cx - r;  pt->y = cy - r2;
+		pt->control_x1 = -r2;  pt->control_y1 =  r4;
+		pt->control_x2 =  r2;  pt->control_y2 = -r4;
+		points.append(pt = new MaskPoint());
+		pt->x = cx + r;  pt->y = cy - r2;
+		pt->control_x1 = -r2;  pt->control_y1 = -r4;
+		pt->control_x2 =  r2;  pt->control_y2 =  r4;
+		points.append(pt = new MaskPoint());
+		pt->x = cx + r;  pt->y = cy + r2;
+		pt->control_x1 =  r2;  pt->control_y1 = -r4;
+		pt->control_x2 = -r2;  pt->control_y2 =  r4;
+		points.append(pt = new MaskPoint());
+		pt->x = cx - r;  pt->y = cy + r2;
+		pt->control_x1 =  r2;  pt->control_y1 =  r4;
+		pt->control_x2 = -r2;  pt->control_y2 = -r4;
+		break;
+	}
+}
+
+int CWindowMaskShape::handle_event()
+{
+	MaskAutos *autos;
+	MaskAuto *keyframe;
+	Track *track;
+	MaskPoint *point;
+	SubMask *mask;
+#ifdef USE_KEYFRAME_SPANNING
+	int create_it = 0;
+#else
+	int create_it = 1;
+#endif
+
+	mwindow->undo->update_undo_before(_("mask shape"), this);
+
+// Get existing keyframe
+	gui->get_keyframe(track, autos, keyframe,
+			mask, point, create_it);
+	if( track ) {
+#ifdef USE_KEYFRAME_SPANNING
+		MaskAuto temp_keyframe(mwindow->edl, autos);
+		temp_keyframe.copy_data(keyframe);
+		keyframe = &temp_keyframe;
+		mask = temp_keyframe.get_submask(mwindow->edl->session->cwindow_mask);
+#endif
+		if( mask ) {
+			builtin_shape(shape, mask);
+#ifdef USE_KEYFRAME_SPANNING
+			autos->update_parameter(keyframe);
+#endif
+			gui->update();
+			gui->update_preview(1);
+		}
+	}
+	mwindow->undo->update_undo_after(_("mask shape"), LOAD_AUTOMATION);
+	return 1;
+}
+
+void CWindowMaskGUI::load_masks(ArrayList<SubMask *> &masks)
+{
+        char path[BCTEXTLEN];
+        sprintf(path, "%s/%s", File::get_config_path(), MASKS_FILE);
+        FileSystem fs;
+        fs.complete_path(path);
+	FileXML file;
+	file.read_from_file(path, 1);
+
+	masks.remove_all_objects();
+	int result;
+	while( !(result = file.read_tag()) ) {
+		if( file.tag.title_is("MASK") ) {
+			SubMask *sub_mask = new SubMask(0, -1);
+			char name[BCTEXTLEN];  name[0] = 0;
+			file.tag.get_property("NAME", name);
+			strncpy(sub_mask->name, name, sizeof(sub_mask->name));
+			sub_mask->load(&file);
+			masks.append(sub_mask);
+		}
+	}
+}
+
+void CWindowMaskGUI::save_masks(ArrayList<SubMask *> &masks)
+{
+	FileXML file;
+	for( int i=0; i<masks.size(); ++i ) {
+		SubMask *sub_mask = masks[i];
+		sub_mask->copy(&file);
+	}
+	file.terminate_string();
+
+        char path[BCTEXTLEN];
+        sprintf(path, "%s/%s", File::get_config_path(), MASKS_FILE);
+        FileSystem fs;
+        fs.complete_path(path);
+	file.write_to_file(path);
+}
+
+
 CWindowRulerGUI::CWindowRulerGUI(MWindow *mwindow, CWindowTool *thread)
- : CWindowToolGUI(mwindow, thread, _(PROGRAM_NAME ": Ruler"), 320, 240)
+ : CWindowToolGUI(mwindow, thread, _(PROGRAM_NAME ": Ruler"), xS(320), yS(240))
 {
 }
 
@@ -2723,28 +3793,30 @@ CWindowRulerGUI::~CWindowRulerGUI()
 
 void CWindowRulerGUI::create_objects()
 {
-	int x = 10, y = 10, x1 = 100;
+	int xs10 = xS(10), xs200 = xS(200);
+	int ys5 = yS(5), ys10 = yS(10);
+	int x = xs10, y = ys10, x1 = xS(100);
 	BC_Title *title;
 
 	lock_window("CWindowRulerGUI::create_objects");
 	add_subwindow(title = new BC_Title(x, y, _("Current:")));
-	add_subwindow(current = new BC_TextBox(x1, y, 200, 1, ""));
-	y += title->get_h() + 5;
+	add_subwindow(current = new BC_TextBox(x1, y, xs200, 1, ""));
+	y += title->get_h() + ys5;
 	add_subwindow(title = new BC_Title(x, y, _("Point 1:")));
-	add_subwindow(point1 = new BC_TextBox(x1, y, 200, 1, ""));
-	y += title->get_h() + 5;
+	add_subwindow(point1 = new BC_TextBox(x1, y, xs200, 1, ""));
+	y += title->get_h() + ys5;
 	add_subwindow(title = new BC_Title(x, y, _("Point 2:")));
-	add_subwindow(point2 = new BC_TextBox(x1, y, 200, 1, ""));
-	y += title->get_h() + 5;
+	add_subwindow(point2 = new BC_TextBox(x1, y, xs200, 1, ""));
+	y += title->get_h() + ys5;
 	add_subwindow(title = new BC_Title(x, y, _("Deltas:")));
-	add_subwindow(deltas = new BC_TextBox(x1, y, 200, 1, ""));
-	y += title->get_h() + 5;
+	add_subwindow(deltas = new BC_TextBox(x1, y, xs200, 1, ""));
+	y += title->get_h() + ys5;
 	add_subwindow(title = new BC_Title(x, y, _("Distance:")));
-	add_subwindow(distance = new BC_TextBox(x1, y, 200, 1, ""));
-	y += title->get_h() + 5;
+	add_subwindow(distance = new BC_TextBox(x1, y, xs200, 1, ""));
+	y += title->get_h() + ys5;
 	add_subwindow(title = new BC_Title(x, y, _("Angle:")));
-	add_subwindow(angle = new BC_TextBox(x1, y, 200, 1, ""));
-	y += title->get_h() + 10;
+	add_subwindow(angle = new BC_TextBox(x1, y, xs200, 1, ""));
+	y += title->get_h() + ys10;
 	char string[BCTEXTLEN];
 	sprintf(string,
 		 _("Press Ctrl to lock ruler to the\nnearest 45%c%c angle."),
@@ -2752,7 +3824,7 @@ void CWindowRulerGUI::create_objects()
 	add_subwindow(title = new BC_Title(x,
 		y,
 		string));
-	y += title->get_h() + 10;
+	y += title->get_h() + ys10;
 	sprintf(string, _("Press Alt to translate the ruler."));
 	add_subwindow(title = new BC_Title(x,
 		y,
@@ -2791,6 +3863,3 @@ void CWindowRulerGUI::handle_event()
 {
 }
 
-
-
-