add edit clear submenu/clear hard_edges, fix tessy gl segv, mask toolgui layout,...
[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / cwindowtool.C
index c38daafb0420a3502fff4087d5b89a9d0ff4c0a1..d3d0b4945e6ef936b5a405de96794f68a0eee5e8 100644 (file)
@@ -1482,6 +1482,18 @@ int CWindowProjectorBottom::handle_event()
 }
 
 
+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)
@@ -1527,9 +1539,6 @@ int CWindowMaskName::handle_event()
                                (MaskAuto*)autos->first : (MaskAuto*)NEXT;
                }
 #endif
-               int total_buttons = sizeof(gui->mask_buttons)/sizeof(gui->mask_buttons[0]);
-               for( int i=0; i<total_buttons; ++i )
-                       gui->mask_buttons[i]->update(i==k ? 1 : 0);
                gui->update();
                gui->update_preview();
        }
@@ -1539,10 +1548,15 @@ 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);
@@ -1565,10 +1579,8 @@ CWindowMaskButton::~CWindowMaskButton()
 int CWindowMaskButton::handle_event()
 {
        mwindow->edl->session->cwindow_mask = no;
-       int total_buttons = sizeof(gui->mask_buttons)/sizeof(gui->mask_buttons[0]);
-       for( int i=0; i<total_buttons; ++i )
-               gui->mask_buttons[i]->update(i==no ? 1 : 0);
        gui->name->update(gui->name->mask_items[no]->get_text());
+       gui->update();
        gui->update_preview();
        return 1;
 }
@@ -1601,10 +1613,8 @@ int CWindowMaskThumbler::do_event(int dir)
        if( (k+=dir) >= SUBMASKS ) k = 0;
        else if( k < 0 ) k = SUBMASKS-1;
        mwindow->edl->session->cwindow_mask = k;
-       int total_buttons = sizeof(gui->mask_buttons)/sizeof(gui->mask_buttons[0]);
-       for( int i=0; i<total_buttons; ++i )
-               gui->mask_buttons[i]->update(i==k ? 1 : 0);
        gui->name->update(gui->name->mask_items[k]->get_text());
+       gui->update();
        gui->update_preview();
        return 1;
 }
@@ -1789,7 +1799,7 @@ CWindowMaskFocus::CWindowMaskFocus(MWindow *mwindow, CWindowToolGUI *gui, int x,
 {
        this->mwindow = mwindow;
        this->gui = gui;
-       set_tooltip("Center for rotate/scale");
+       set_tooltip(_("Center for rotate/scale"));
 }
 
 CWindowMaskFocus::~CWindowMaskFocus()
@@ -1804,6 +1814,26 @@ int CWindowMaskFocus::handle_event()
        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"))
 {
@@ -2222,7 +2252,7 @@ int CWindowMaskGangFeather::handle_event()
 
 CWindowMaskGUI::CWindowMaskGUI(MWindow *mwindow, CWindowTool *thread)
  : CWindowToolGUI(mwindow, thread,
-       _(PROGRAM_NAME ": Mask"), 360, 500)
+       _(PROGRAM_NAME ": Mask"), 360, 620)
 {
        this->mwindow = mwindow;
        this->thread = thread;
@@ -2230,6 +2260,7 @@ CWindowMaskGUI::CWindowMaskGUI(MWindow *mwindow, CWindowTool *thread)
        fade = 0;
        feather = 0;
        focused = 0;
+       center_mark = 0;
        markers = 1;
        boundary = 1;
 }
@@ -2253,9 +2284,16 @@ 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 + 70;
        name = new CWindowMaskName(mwindow, this, x1, y, "");
        name->create_objects();
        add_subwindow(clr_mask = new CWindowMaskClrMask(mwindow, this, clr_x, y));
@@ -2281,7 +2319,9 @@ void CWindowMaskGUI::create_objects()
                mask_blabels[i] = new BC_Title(x2+tx, y, text);
                add_subwindow(mask_blabels[i]);
        }
-       y += bh + 2*margin;
+       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:")));
        fade = new CWindowMaskFade(mwindow, this, x1, y);
@@ -2298,7 +2338,9 @@ void CWindowMaskGUI::create_objects()
        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() + 3*margin;
+       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:")));
        active_point = new CWindowMaskAffectedPoint(mwindow, this, x1, y);
@@ -2314,10 +2356,9 @@ void CWindowMaskGUI::create_objects()
        this->y = new CWindowCoord(this, x1, y, (float)0.0);
        this->y->create_objects();
        add_subwindow(draw_boundary = new CWindowMaskDrawBoundary(mwindow, this, del_x, y));
-       y += this->y->get_h() + margin;
-       BC_Bar *bar;
-       add_subwindow(bar = new BC_Bar(x, y, get_w()-2*x));
-       y += bar->get_h() + margin;
+       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);
@@ -2327,7 +2368,11 @@ void CWindowMaskGUI::create_objects()
        add_subwindow(title = new BC_Title(x, y, "Y:"));
        focus_y = new CWindowCoord(this, x1, y, (float)0.0);
        focus_y->create_objects();
-       y += focus_x->get_h() + margin;
+       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();
        add_subwindow(this->disable_opengl_masking = new CWindowDisableOpenGLMasking(this, 10, y));
@@ -2393,35 +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)
-       {
+       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;
+       if( k >= 0 && k < sz )
+               text = keyframe->masks[k]->name;
+       name->update(text);
+       update_buttons(keyframe, k);
+       if( point ) {
+               x->update(point->x);
+               y->update(point->y);
+       }
+       if( track ) {
+               double position = mwindow->edl->local_session->get_selectionstart(1);
                int64_t position_i = track->to_units(position, 0);
-
-               if(point) {
-                       x->update(point->x);
-                       y->update(point->y);
-               }
-
-               if(mask) {
-                       int k = mwindow->edl->session->cwindow_mask;
-                       feather->update(autos->get_feather(position_i, k, PLAY_FORWARD));
-                       fade->update(autos->get_fader(position_i, k, PLAY_FORWARD));
-                       apply_before_plugins->update(keyframe->apply_before_plugins);
-                       disable_opengl_masking->update(keyframe->disable_opengl_masking);
-               }
+               feather->update(autos->get_feather(position_i, k, PLAY_FORWARD));
+               fade->update(autos->get_fader(position_i, k, PLAY_FORWARD));
        }
-
-       active_point->update((int64_t)mwindow->cwindow->gui->affected_point);
-       const char *text = "";
        if( keyframe ) {
-               name->update_items(keyframe);
-               int k = mwindow->edl->session->cwindow_mask;
-               if( k >= 0 && k < keyframe->masks.size() )
-                       text = keyframe->masks[k]->name;
+               apply_before_plugins->update(keyframe->apply_before_plugins);
+               disable_opengl_masking->update(keyframe->disable_opengl_masking);
        }
-       name->update(text);
+       active_point->update((int64_t)mwindow->cwindow->gui->affected_point);
 }
 
 void CWindowMaskGUI::handle_event()
@@ -2483,12 +2523,24 @@ void CWindowMaskGUI::set_focused(int v, float cx, float 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)
 {
 }