X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowtool.C;h=d3d0b4945e6ef936b5a405de96794f68a0eee5e8;hp=4a76981c229588077cc50221bd692a90c7e9c164;hb=da1e39d85e138b0d552e932d875c05e8dc743244;hpb=c857b2fb7965d27d86d5785fb9f1b8957a871a1a

diff --git a/cinelerra-5.1/cinelerra/cwindowtool.C b/cinelerra-5.1/cinelerra/cwindowtool.C
index 4a76981c..d3d0b494 100644
--- a/cinelerra-5.1/cinelerra/cwindowtool.C
+++ b/cinelerra-5.1/cinelerra/cwindowtool.C
@@ -23,6 +23,7 @@
 
 #include "automation.h"
 #include "bccolors.h"
+#include "bctimer.h"
 #include "clip.h"
 #include "condition.h"
 #include "cpanel.h"
@@ -1481,8 +1482,20 @@ int CWindowProjectorBottom::handle_event()
 }
 
 
-CWindowMaskName::CWindowMaskName(MWindow *mwindow,
-	CWindowToolGUI *gui, int x, int y, const char *text)
+CWindowMaskTrack::CWindowMaskTrack(MWindow *mwindow, CWindowMaskGUI *gui,
+		int x, int y, const char *text)
+ : BC_Title(x, y, text, MEDIUMFONT, get_resources()->button_highlighted)
+{
+	this->mwindow = mwindow;
+	this->gui = gui;
+}
+
+CWindowMaskTrack::~CWindowMaskTrack()
+{
+}
+
+CWindowMaskName::CWindowMaskName(MWindow *mwindow, CWindowMaskGUI *gui,
+		int x, int y, const char *text)
  : BC_PopupTextBox(gui, 0, text, x, y, 100, 160)
 {
 	this->mwindow = mwindow;
@@ -1501,7 +1514,7 @@ int CWindowMaskName::handle_event()
 	SubMask *mask;
 	MaskPoint *point;
 //printf("CWindowMaskGUI::update 1\n");
-	((CWindowMaskGUI*)gui)->get_keyframe(track, autos, keyframe, mask, point, 0);
+	gui->get_keyframe(track, autos, keyframe, mask, point, 0);
 	if( track ) {
 		int k = get_number();
 		if( k < 0 ) k = mwindow->edl->session->cwindow_mask;
@@ -1535,16 +1548,78 @@ int CWindowMaskName::handle_event()
 void CWindowMaskName::update_items(MaskAuto *keyframe)
 {
 	mask_items.remove_all_objects();
-	int sz = keyframe->masks.size();
-	for( int i=0; i<sz; ++i ) {
-		SubMask *sub_mask = keyframe->masks.get(i);
-		char *text = sub_mask->name;
+	int sz = !keyframe ? 0 : keyframe->masks.size();
+	for( int i=0; i<SUBMASKS; ++i ) {
+		char text[BCSTRLEN];
+		if( i < sz ) {
+			SubMask *sub_mask = keyframe->masks.get(i);
+			strncpy(text, sub_mask->name, sizeof(text));
+		}
+		else
+			sprintf(text, "%d", i);
 		mask_items.append(new BC_ListBoxItem(text));
 	}
 	update_list(&mask_items);
 }
 
 
+CWindowMaskButton::CWindowMaskButton(MWindow *mwindow, CWindowMaskGUI *gui,
+		 int x, int y, int no, int v)
+ : BC_CheckBox(x, y, v)
+{
+	this->mwindow = mwindow;
+	this->gui = gui;
+	this->no = no;
+}
+
+CWindowMaskButton::~CWindowMaskButton()
+{
+}
+
+int CWindowMaskButton::handle_event()
+{
+	mwindow->edl->session->cwindow_mask = no;
+	gui->name->update(gui->name->mask_items[no]->get_text());
+	gui->update();
+	gui->update_preview();
+	return 1;
+}
+
+CWindowMaskThumbler::CWindowMaskThumbler(MWindow *mwindow, CWindowMaskGUI *gui,
+		int x, int y)
+ : BC_Tumbler(x, y)
+{
+	this->mwindow = mwindow;
+	this->gui = gui;
+}
+
+CWindowMaskThumbler::~CWindowMaskThumbler()
+{
+}
+
+int CWindowMaskThumbler::handle_up_event()
+{
+	return do_event(1);
+}
+
+int CWindowMaskThumbler::handle_down_event()
+{
+	return do_event(-1);
+}
+
+int CWindowMaskThumbler::do_event(int dir)
+{
+	int k = mwindow->edl->session->cwindow_mask;
+	if( (k+=dir) >= SUBMASKS ) k = 0;
+	else if( k < 0 ) k = SUBMASKS-1;
+	mwindow->edl->session->cwindow_mask = k;
+	gui->name->update(gui->name->mask_items[k]->get_text());
+	gui->update();
+	gui->update_preview();
+	return 1;
+}
+
+
 CWindowMaskDelMask::CWindowMaskDelMask(MWindow *mwindow,
 	CWindowToolGUI *gui, int x, int y)
  : BC_GenericButton(x, y, _("Delete"))
@@ -1561,6 +1636,7 @@ int CWindowMaskDelMask::handle_event()
 	Track *track;
 	MaskPoint *point;
 	SubMask *mask;
+	int total_points;
 
 // Get existing keyframe
 	((CWindowMaskGUI*)gui)->get_keyframe(track, autos, keyframe, mask, point, 0);
@@ -1572,19 +1648,24 @@ int CWindowMaskDelMask::handle_event()
 // Create temp keyframe
 		MaskAuto temp_keyframe(mwindow->edl, autos);
 		temp_keyframe.copy_data(keyframe);
-// Update parameter
 		SubMask *submask = temp_keyframe.get_submask(mwindow->edl->session->cwindow_mask);
 		submask->points.remove_all_objects();
+		total_points = 0;
 // Commit change to span of keyframes
 		((MaskAutos*)track->automation->autos[AUTOMATION_MASK])->update_parameter(&temp_keyframe);
 #else
 		for(MaskAuto *current = (MaskAuto*)autos->default_auto; current; ) {
 			SubMask *submask = current->get_submask(mwindow->edl->session->cwindow_mask);
-			submask->points.remove_all_objects();
+			submask->points.clear();
 			current = current == (MaskAuto*)autos->default_auto ?
 				(MaskAuto*)autos->first : (MaskAuto*)NEXT;
 		}
+		total_points = 0;
 #endif
+		if( mwindow->cwindow->gui->affected_point >= total_points )
+			mwindow->cwindow->gui->affected_point =
+				total_points > 0 ? total_points-1 : 0;
+
 		gui->update();
 		gui->update_preview();
 		mwindow->undo->update_undo_after(_("mask delete"), LOAD_AUTOMATION);
@@ -1702,7 +1783,7 @@ int CWindowMaskAffectedPoint::handle_event()
 	int active_point = affected_point;
 	if( affected_point >= total_points )
 		affected_point = total_points - 1;
-	else if( affected_point < 0 )
+	if( affected_point < 0 )
 		affected_point = 0;
 	if( active_point != affected_point )
 		update((int64_t)affected_point);
@@ -1713,8 +1794,89 @@ int CWindowMaskAffectedPoint::handle_event()
 }
 
 
+CWindowMaskFocus::CWindowMaskFocus(MWindow *mwindow, CWindowToolGUI *gui, int x, int y)
+ : BC_CheckBox(x, y, ((CWindowMaskGUI*)gui)->focused, _("Focus"))
+{
+	this->mwindow = mwindow;
+	this->gui = gui;
+	set_tooltip(_("Center for rotate/scale"));
+}
+
+CWindowMaskFocus::~CWindowMaskFocus()
+{
+}
+
+int CWindowMaskFocus::handle_event()
+{
+ 	((CWindowMaskGUI*)gui)->focused = get_value();
+	gui->update();
+	gui->update_preview();
+	return 1;
+}
+
+CWindowMaskDrawCenter::CWindowMaskDrawCenter(MWindow *mwindow, CWindowToolGUI *gui, int x, int y)
+ : BC_CheckBox(x, y, ((CWindowMaskGUI*)gui)->center_mark, _("Center Mark"))
+{
+	this->mwindow = mwindow;
+	this->gui = gui;
+	set_tooltip(_("show center of mask points"));
+}
+
+CWindowMaskDrawCenter::~CWindowMaskDrawCenter()
+{
+}
+
+int CWindowMaskDrawCenter::handle_event()
+{
+	((CWindowMaskGUI*)gui)->center_mark = get_value();
+	gui->update();
+	gui->update_preview();
+	return 1;
+}
+
+CWindowMaskDrawMarkers::CWindowMaskDrawMarkers(MWindow *mwindow, CWindowToolGUI *gui, int x, int y)
+ : BC_CheckBox(x, y, ((CWindowMaskGUI*)gui)->markers, _("Markers"))
+{
+	this->mwindow = mwindow;
+	this->gui = gui;
+	set_tooltip("Display points");
+}
+
+CWindowMaskDrawMarkers::~CWindowMaskDrawMarkers()
+{
+}
+
+int CWindowMaskDrawMarkers::handle_event()
+{
+	((CWindowMaskGUI*)gui)->markers = get_value();
+	gui->update();
+	gui->update_preview();
+	return 1;
+}
+
+CWindowMaskDrawBoundary::CWindowMaskDrawBoundary(MWindow *mwindow, CWindowToolGUI *gui, int x, int y)
+ : BC_CheckBox(x, y, ((CWindowMaskGUI*)gui)->boundary, _("Boundary"))
+{
+	this->mwindow = mwindow;
+	this->gui = gui;
+	set_tooltip("Display mask outline");
+}
+
+CWindowMaskDrawBoundary::~CWindowMaskDrawBoundary()
+{
+}
+
+int CWindowMaskDrawBoundary::handle_event()
+{
+	((CWindowMaskGUI*)gui)->boundary = get_value();
+	gui->update();
+	gui->update_preview();
+	return 1;
+}
+
+
 CWindowMaskFeather::CWindowMaskFeather(MWindow *mwindow, CWindowToolGUI *gui, int x, int y)
- : BC_TumbleTextBox(gui, 0, 0, 0xff, x, y, 64, 2)
+ : BC_TumbleTextBox(gui, 0, -FEATHER_MAX, FEATHER_MAX, x, y, 64, 2)
 {
 	this->mwindow = mwindow;
 	this->gui = gui;
@@ -1749,18 +1911,24 @@ int CWindowMaskFeather::update_value(float v)
 	((CWindowMaskGUI*)gui)->get_keyframe(track, autos, keyframe,
 			mask, point, create_it);
 	if( track ) {
+		int gang = ((CWindowMaskGUI*)gui)->gang_feather->get_value();
 #ifdef USE_KEYFRAME_SPANNING
-// Create temp keyframe
 		MaskAuto temp_keyframe(mwindow->edl, autos);
 		temp_keyframe.copy_data(keyframe);
-// Update parameter
-		temp_keyframe.feather = v;
-// Commit change to span of keyframes
-		autos->update_parameter(&temp_keyframe);
-#else
-		keyframe->feather = v;
+		keyframe = &temp_keyframe;
+#endif
+		float change = v - mask->feather;
+		int k = mwindow->edl->session->cwindow_mask;
+		int n = gang ? keyframe->masks.size() : k+1;
+		for( int i=gang? 0 : k; i<n; ++i ) {
+			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
+		autos->update_parameter(keyframe);
 #endif
-
 		gui->update_preview();
 	}
 
@@ -1778,22 +1946,44 @@ int CWindowMaskFeather::handle_event()
 
 CWindowMaskFeatherSlider::CWindowMaskFeatherSlider(MWindow *mwindow,
 		CWindowToolGUI *gui, int x, int y, int w, float v)
- : BC_FSlider(x, y, 0, w, w, 0.f, 255.f, v)
+ : BC_FSlider(x, y, 0, w, w, -FEATHER_MAX, FEATHER_MAX, v)
 {
 	this->mwindow = mwindow;
 	this->gui = gui;
 	set_precision(0.01);
+	timer = new Timer();
+	stick = 0;
+	last_v = 0;
 }
 
 CWindowMaskFeatherSlider::~CWindowMaskFeatherSlider()
 {
+	delete timer;
 }
 
 int CWindowMaskFeatherSlider::handle_event()
 {
 	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);
+		}
+		else {
+			stick = 0;
+			last_v = v;
+		}
+	}
+	else if( (last_v>=0 && v<0) || (last_v<0 && v>=0) ) {
+		stick = 16;
+		v = 0;
+	}
+	else
+		last_v = v;
+	timer->update();
 	CWindowMaskGUI * mask_gui = (CWindowMaskGUI*)gui;
-	mask_gui->feather->update(v);
+	mask_gui->feather->BC_TumbleTextBox::update(v);
 	return mask_gui->feather->update_value(v);
 }
 
@@ -1838,18 +2028,24 @@ int CWindowMaskFade::update_value(float v)
 	((CWindowMaskGUI*)gui)->get_keyframe(track, autos, keyframe,
 			mask, point, create_it);
 	if( track ) {
+		int gang = ((CWindowMaskGUI*)gui)->gang_fader->get_value();
 #ifdef USE_KEYFRAME_SPANNING
-// Create temp keyframe
 		MaskAuto temp_keyframe(mwindow->edl, autos);
 		temp_keyframe.copy_data(keyframe);
-// Update parameter
-		temp_keyframe.value = v;
-// Commit change to span of keyframes
-		autos->update_parameter(&temp_keyframe);
-#else
-		keyframe->value = v;
+		keyframe = &temp_keyframe;
+#endif
+		float change = v - mask->fader;
+		int k = mwindow->edl->session->cwindow_mask;
+		int n = gang ? keyframe->masks.size() : k+1;
+		for( int i=gang? 0 : k; i<n; ++i ) {
+			SubMask *sub_mask = keyframe->get_submask(i);
+			float fader = sub_mask->fader + change;
+			bclamp(fader, -100.f, 100.f);
+			sub_mask->fader = fader;
+		}
+#ifdef USE_KEYFRAME_SPANNING
+		autos->update_parameter(keyframe);
 #endif
-
 		gui->update_preview();
 	}
 
@@ -1871,15 +2067,37 @@ CWindowMaskFadeSlider::CWindowMaskFadeSlider(MWindow *mwindow, CWindowToolGUI *g
 {
 	this->mwindow = mwindow;
 	this->gui = gui;
+	timer = new Timer();
+	stick = 0;
+	last_v = 0;
 }
 
 CWindowMaskFadeSlider::~CWindowMaskFadeSlider()
 {
+	delete timer;
 }
 
 int CWindowMaskFadeSlider::handle_event()
 {
 	float v = 100*get_value()/200;
+	if( stick > 0 ) {
+		int64_t ms = timer->get_difference();
+		if( ms < 250 && --stick > 0 ) {
+			if( get_value() == 0 ) return 1;
+			update(v = 0);
+		}
+		else {
+			stick = 0;
+			last_v = v;
+		}
+	}
+	else if( (last_v>=0 && v<0) || (last_v<0 && v>=0) ) {
+		stick = 16;
+		v = 0;
+	}
+	else
+		last_v = v;
+	timer->update();
 	CWindowMaskGUI *mask_gui = (CWindowMaskGUI*)gui;
 	mask_gui->fade->BC_TumbleTextBox::update(v);
 	return mask_gui->fade->update_value(v);
@@ -1890,50 +2108,24 @@ int CWindowMaskFadeSlider::update(int64_t v)
 	return BC_ISlider::update(200*v/100);
 }
 
-CWindowMaskMode::CWindowMaskMode(MWindow *mwindow,
-	CWindowToolGUI *gui, int x, int y)
- : BC_Toggle(x, y, mwindow->theme->mask_mode_toggle, 0)
+CWindowMaskGangFader::CWindowMaskGangFader(MWindow *mwindow,
+		CWindowToolGUI *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(_("Mode"));
+        this->mwindow = mwindow;
+        this->gui = gui;
+        set_tooltip(_("Gang fader"));
 }
 
-CWindowMaskMode::~CWindowMaskMode()
+CWindowMaskGangFader::~CWindowMaskGangFader()
 {
 }
 
-int CWindowMaskMode::handle_event()
+int CWindowMaskGangFader::handle_event()
 {
-	MaskAutos *autos;
-	MaskAuto *keyframe;
-	Track *track;
-	MaskPoint *point;
-	SubMask *mask;
-// Get existing keyframe
-	((CWindowMaskGUI*)gui)->get_keyframe(track, autos, keyframe, mask, point, 0);
-	if( track ) {
-		mwindow->undo->update_undo_before(_("mask mode"), 0);
-#ifdef USE_KEYFRAME_SPANNING
-// Create temp keyframe
-		MaskAuto temp_keyframe(mwindow->edl, autos);
-		temp_keyframe.copy_data(keyframe);
-// Update parameter
-		temp_keyframe.mode = get_value();
-// Commit change to span of keyframes
-		autos->update_parameter(&temp_keyframe);
-#else
-		((MaskAuto*)autos->default_auto)->mode = get_value();
-#endif
-		mwindow->undo->update_undo_after(_("mask mode"), LOAD_AUTOMATION);
-	}
-
-//printf("CWindowMaskMode::handle_event 1\n");
-	gui->update_preview();
 	return 1;
 }
 
-
 CWindowMaskBeforePlugins::CWindowMaskBeforePlugins(CWindowToolGUI *gui, int x, int y)
  : BC_CheckBox(x,
  	y,
@@ -1953,7 +2145,15 @@ int CWindowMaskBeforePlugins::handle_event()
 	((CWindowMaskGUI*)gui)->get_keyframe(track, autos, keyframe, mask, point, 1);
 
 	if (keyframe) {
-		keyframe->apply_before_plugins = get_value();
+		int v = get_value();
+#ifdef USE_KEYFRAME_SPANNING
+		MaskAuto temp_keyframe(gui->mwindow->edl, autos);
+		temp_keyframe.copy_data(keyframe);
+		temp_keyframe.apply_before_plugins = v;
+		autos->update_parameter(&temp_keyframe);
+#else
+		keyframe->apply_before_plugins = v;
+#endif
 		gui->update_preview();
 	}
 	return 1;
@@ -1975,8 +2175,16 @@ int CWindowDisableOpenGLMasking::handle_event()
 	MaskPoint *point;
 	((CWindowMaskGUI*)gui)->get_keyframe(track, autos, keyframe, mask, point, 1);
 
-	if (keyframe) {
-		keyframe->disable_opengl_masking = get_value();
+	if( keyframe ) {
+		int v = get_value();
+#ifdef USE_KEYFRAME_SPANNING
+		MaskAuto temp_keyframe(gui->mwindow->edl, autos);
+		temp_keyframe.copy_data(keyframe);
+		temp_keyframe.disable_opengl_masking = v;
+		autos->update_parameter(&temp_keyframe);
+#else
+		keyframe->disable_opengl_masking = v;
+#endif
 		gui->update_preview();
 	}
 	return 1;
@@ -2024,73 +2232,37 @@ int CWindowMaskClrMask::handle_event()
 	return 1;
 }
 
-CWindowMaskClrPoint::CWindowMaskClrPoint(MWindow *mwindow,
-		CWindowMaskGUI *gui, int x, int y)
- : BC_Button(x, y, mwindow->theme->get_image_set("reset_button"))
+CWindowMaskGangFeather::CWindowMaskGangFeather(MWindow *mwindow,
+		CWindowToolGUI *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(_("Delete all points"));
+        this->mwindow = mwindow;
+        this->gui = gui;
+        set_tooltip(_("Gang feather"));
 }
 
-CWindowMaskClrPoint::~CWindowMaskClrPoint()
+CWindowMaskGangFeather::~CWindowMaskGangFeather()
 {
 }
 
-int CWindowMaskClrPoint::handle_event()
+int CWindowMaskGangFeather::handle_event()
 {
-	MaskAutos *autos;
-	MaskAuto *keyframe;
-	Track *track;
-	MaskPoint *point;
-	SubMask *mask;
-	int total_points;
-
-// Get existing keyframe
-	((CWindowMaskGUI*)gui)->get_keyframe(track, autos, keyframe, mask, point, 0);
-	if( track ) {
-		mwindow->undo->update_undo_before(_("clr points"), 0);
-#ifdef USE_KEYFRAME_SPANNING
-// Create temp keyframe
-		MaskAuto temp_keyframe(mwindow->edl, autos);
-		temp_keyframe.copy_data(keyframe);
-		SubMask *submask = temp_keyframe.get_submask(mwindow->edl->session->cwindow_mask);
-		submask->points.remove_all_objects();
-		total_points = 0;
-// Commit change to span of keyframes
-		((MaskAutos*)track->automation->autos[AUTOMATION_MASK])->update_parameter(&temp_keyframe);
-#else
-		MaskAuto *current = (MaskAuto*)autos->default_auto;
-		while( current ) {
-			SubMask *submask = current->get_submask(mwindow->edl->session->cwindow_mask);
-			submask->points.clear();
-			current = current == (MaskAuto*)autos->default_auto ?
-				(MaskAuto*)autos->first : (MaskAuto*)NEXT;
-		}
-		total_points = 0;
-#endif
-		if( mwindow->cwindow->gui->affected_point >= total_points )
-			mwindow->cwindow->gui->affected_point =
-				total_points > 0 ? total_points-1 : 0;
-
-		gui->update();
-		gui->update_preview();
-		mwindow->undo->update_undo_after(_("clr points"), LOAD_AUTOMATION);
-	}
-
 	return 1;
 }
 
-
 CWindowMaskGUI::CWindowMaskGUI(MWindow *mwindow, CWindowTool *thread)
  : CWindowToolGUI(mwindow, thread,
-	_(PROGRAM_NAME ": Mask"), 340, 350)
+	_(PROGRAM_NAME ": Mask"), 360, 620)
 {
 	this->mwindow = mwindow;
 	this->thread = thread;
 	active_point = 0;
 	fade = 0;
 	feather = 0;
+	focused = 0;
+	center_mark = 0;
+	markers = 1;
+	boundary = 1;
 }
 CWindowMaskGUI::~CWindowMaskGUI()
 {
@@ -2112,64 +2284,111 @@ void CWindowMaskGUI::create_objects()
 	//	keyframe = (MaskAuto*)mwindow->cwindow->calculate_affected_auto(track->automation->autos[AUTOMATION_MASK], 0);
 
 	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")));
+	y += title_bar->get_h() + margin;
+	int x1 = x + 70;
+	add_subwindow(mask_track = new CWindowMaskTrack(mwindow, this, x1, y, ""));
+	y += mask_track->get_h() + margin;
+	add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, 20, 10, _("Masks")));
+	y += title_bar->get_h() + margin;
 	BC_Title *title;
 	add_subwindow(title = new BC_Title(x, y, _("Mask:")));
-	int x1 = x + title->get_w() + margin;
-	name = new CWindowMaskName(mwindow, this, x + title->get_w() + margin, y, "");
+	name = new CWindowMaskName(mwindow, this, x1, y, "");
 	name->create_objects();
-	x1 = x + name->get_w() + 2*margin;
 	add_subwindow(clr_mask = new CWindowMaskClrMask(mwindow, this, clr_x, y));
 	add_subwindow(del_mask = new CWindowMaskDelMask(mwindow, this, del_x, y));
 	y += name->get_h() + margin;
+
+	int bw = 0, bh = 0;
+	BC_CheckBox::calculate_extents(this, &bw, &bh);
+	int bdx = bw + margin;
+	int x2 = x;
+	for( int i=0; i<SUBMASKS; x2+=bdx, ++i ) {
+		int v = i == mwindow->edl->session->cwindow_mask ? 1 : 0;
+		mask_buttons[i] = new CWindowMaskButton(mwindow, this, x2, y, i, v);
+		add_subwindow(mask_buttons[i]);
+	}
+	x2 += margin;
+	add_subwindow(mask_thumbler = new CWindowMaskThumbler(mwindow, this, x2, y));
+	y += bh + margin;
+	x2 = x;
+	for( int i=0; i<SUBMASKS; x2+=bdx, ++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);
+		add_subwindow(mask_blabels[i]);
+	}
+	y += mask_blabels[0]->get_h() + 2*margin;
+	add_subwindow(title_bar = new BC_TitleBar(x, y, get_w()-2*x, 20, 10, _("Fade & Feather")));
+	y += title_bar->get_h() + margin;
+
 	add_subwindow(title = new BC_Title(x, y, _("Fade:")));
-	x1 = x + title->get_w() + margin;
 	fade = new CWindowMaskFade(mwindow, this, x1, y);
 	fade->create_objects();
-	x1 += fade->get_w() + 2*margin;
-	int w1 = clr_x-2*margin - x1;
-	add_subwindow(fade_slider = new CWindowMaskFadeSlider(mwindow, this, x1, y, w1));
-	x1 += fade_slider->get_w() + 2*margin;
-	add_subwindow(mode = new CWindowMaskMode(mwindow, this, clr_x, y));
-	y += fade->get_h() + 3*margin;
+	x2 = x1 + fade->get_w() + 2*margin;
+	int w2 = clr_x-2*margin - x2;
+	add_subwindow(fade_slider = new CWindowMaskFadeSlider(mwindow, this, x2, y, w2));
+	add_subwindow(gang_fader = new CWindowMaskGangFader(mwindow, this, clr_x, y));
+	y += fade->get_h() + margin;
+	add_subwindow(title = new BC_Title(x, y, _("Feather:")));
+	feather = new CWindowMaskFeather(mwindow, this, x1, y);
+	feather->create_objects();
+	w2 = clr_x - 2*margin - x2;
+	feather_slider = new CWindowMaskFeatherSlider(mwindow, this, x2, y, w2, 0);
+	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")));
+	y += title_bar->get_h() + margin;
+
 	add_subwindow(title = new BC_Title(x, y, _("Point:")));
-	x1 = x + title->get_w() + margin;
 	active_point = new CWindowMaskAffectedPoint(mwindow, this, x1, y);
 	active_point->create_objects();
-	x1 += active_point->get_w() + margin;
-	add_subwindow(clr_point = new CWindowMaskClrPoint(mwindow, this, clr_x, y));
 	add_subwindow(del_point = new CWindowMaskDelPoint(mwindow, this, del_x, y));
 	y += active_point->get_h() + margin;
 	add_subwindow(title = new BC_Title(x, y, "X:"));
-	x1 = x + title->get_w() + margin;
 	this->x = new CWindowCoord(this, x1, y, (float)0.0);
 	this->x->create_objects();
-	x1 += this->x->get_w() + 3*margin;
-	add_subwindow(title = new BC_Title(x1, y, "Y:"));
-	x1 += title->get_w() + margin;
+	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();
-	y += this->x->get_h() + 3*margin;
-	add_subwindow(title = new BC_Title(x, y, _("Feather:")));
-	x1 = x + title->get_w() + margin;
-	feather = new CWindowMaskFeather(mwindow, this, x1, y);
-	feather->create_objects();
-	x1 += feather->get_w() + margin;
-	feather_slider = new CWindowMaskFeatherSlider(mwindow, this, x1, y, 140, 0);
-	add_subwindow(feather_slider);
-	y += feather->get_h() + margin;
+	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")));
+	y += title_bar->get_h() + margin;
+
+	add_subwindow(title = new BC_Title(x, y, "X:"));
+	focus_x = new CWindowCoord(this, x1, y, (float)0.0);
+	focus_x->create_objects();
+	add_subwindow(focus = new CWindowMaskFocus(mwindow, this, del_x, y));
+	y += focus_x->get_h() + margin;
+	add_subwindow(title = new BC_Title(x, y, "Y:"));
+	focus_y = new CWindowCoord(this, x1, y, (float)0.0);
+	focus_y->create_objects();
+	add_subwindow(draw_center = new CWindowMaskDrawCenter(mwindow, this, del_x, y));
+	y += focus_x->get_h() + 2*margin;
+	BC_Bar *bar;
+	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));
-	y += this->apply_before_plugins->get_h() + margin;
+	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() + 3*margin;
-	add_subwindow(new BC_Bar(x, y, get_w()-2*x));
-	y += 2*margin;
+	y += this->disable_opengl_masking->get_h() + margin;
+	add_subwindow(bar = new BC_Bar(x, y, get_w()-2*x));
+	y += bar->get_h() + margin;
+
+	y += 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 mask\n"
 		"Wheel Up/Dn: rotate around pointer\n"
 		"Shift+Wheel Up/Dn: scale around pointer\n"
-		"Alt+LMB: to drag translate the mask\n"
-		"Shift+Key Delete to delete the mask")));
+		"Shift+MMB: Toggle focus center at pointer")));
 	update();
 	unlock_window();
 }
@@ -2219,44 +2438,30 @@ void CWindowMaskGUI::update()
 //printf("CWindowMaskGUI::update 1\n");
 	get_keyframe(track, autos, keyframe, mask, point, 0);
 
-	double position = mwindow->edl->local_session->get_selectionstart(1);
-	position = mwindow->edl->align_to_frame(position, 0);
-	if(track)
-	{
-		int64_t position_i = track->to_units(position, 0);
-
-		if(point)
-		{
-			x->update(point->x);
-			y->update(point->y);
-		}
-
-		if(mask)
-		{
-			feather->update(autos->get_feather(position_i, PLAY_FORWARD));
-			fade->update(autos->get_value(position_i, PLAY_FORWARD));
-			apply_before_plugins->update(keyframe->apply_before_plugins);
-			disable_opengl_masking->update(keyframe->disable_opengl_masking);
-		}
-	}
-
-//printf("CWindowMaskGUI::update 1\n");
-	active_point->update((int64_t)mwindow->cwindow->gui->affected_point);
+	mask_track->update(!track ? "" : track->title);
 	name->update_items(keyframe);
+	const char *text = "";
+	int sz = !keyframe ? 0 : keyframe->masks.size();
 	int k = mwindow->edl->session->cwindow_mask;
-	const char *text = k >= 0 && k < keyframe->masks.size() ?
-		keyframe->masks[k]->name : "";
+	if( k >= 0 && k < sz )
+		text = keyframe->masks[k]->name;
 	name->update(text);
-
-//printf("CWindowMaskGUI::update 1\n");
+	update_buttons(keyframe, k);
+	if( point ) {
+		x->update(point->x);
+		y->update(point->y);
+	}
 	if( track ) {
-#ifdef USE_KEYFRAME_SPANNING
-		mode->update(keyframe->mode);
-#else
-		mode->set_text(((MaskAuto*)autos->default_auto)->mode);
-#endif
+		double position = mwindow->edl->local_session->get_selectionstart(1);
+		int64_t position_i = track->to_units(position, 0);
+		feather->update(autos->get_feather(position_i, k, PLAY_FORWARD));
+		fade->update(autos->get_fader(position_i, k, PLAY_FORWARD));
 	}
-//printf("CWindowMaskGUI::update 2\n");
+	if( keyframe ) {
+		apply_before_plugins->update(keyframe->apply_before_plugins);
+		disable_opengl_masking->update(keyframe->disable_opengl_masking);
+	}
+	active_point->update((int64_t)mwindow->cwindow->gui->affected_point);
 }
 
 void CWindowMaskGUI::handle_event()
@@ -2311,13 +2516,31 @@ void CWindowMaskGUI::update_preview()
 	lock_window("CWindowMaskGUI::update_preview");
 }
 
+void CWindowMaskGUI::set_focused(int v, float cx, float cy)
+{
+	focus_x->update(cx);
+	focus_y->update(cy);
+	focus->update(focused = v);
+}
+
+void CWindowMaskGUI::update_buttons(MaskAuto *keyframe, int k)
+{
+	int text_color = get_resources()->default_text_color;
+	int high_color = get_resources()->button_highlighted;
+	for( int i=0; i<SUBMASKS; ++i ) {
+		int color = text_color;
+		if( keyframe ) {
+			SubMask *submask = keyframe->get_submask(i);
+			if( submask && submask->points.size() )
+				color = high_color;
+		}
+		mask_blabels[i]->set_color(color);
+		mask_buttons[i]->update(i==k ? 1 : 0);
+	}
+}
 
 CWindowRulerGUI::CWindowRulerGUI(MWindow *mwindow, CWindowTool *thread)
- : CWindowToolGUI(mwindow,
- 	thread,
-	_(PROGRAM_NAME ": Ruler"),
-	320,
-	240)
+ : CWindowToolGUI(mwindow, thread, _(PROGRAM_NAME ": Ruler"), 320, 240)
 {
 }