projects / goodguy / cinelerra.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
add BC_SCALE env var for hi def monitors, cleanup theme data
[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / cwindowgui.C
diff --git a/cinelerra-5.1/cinelerra/cwindowgui.C b/cinelerra-5.1/cinelerra/cwindowgui.C
index a15942ae6b325348c9a97508eaccf9295886df9c..13ac058bbfe60677e242d9337030a106907fb786 100644 (file)
--- a/cinelerra-5.1/cinelerra/cwindowgui.C
+++ b/cinelerra-5.1/cinelerra/cwindowgui.C
@@ -81,7 +81,7 @@ CWindowGUI::CWindowGUI(MWindow *mwindow, CWindow *cwindow)
        mwindow->session->cwindow_y,
        mwindow->session->cwindow_w,
        mwindow->session->cwindow_h,
-       100, 100, 1, 1, 1,
+       xS(100), yS(100), 1, 1, 1,
        BC_WindowBase::get_resources()->bg_color,
        mwindow->get_cwindow_display())
 {
@@ -946,14 +946,7 @@ int CWindowZoom::handle_event()
 
 #ifdef USE_SLIDER
 CWindowSlider::CWindowSlider(MWindow *mwindow, CWindow *cwindow, int x, int y, int pixels)
- : BC_PercentageSlider(x,
-                       y,
-                       0,
-                       pixels,
-                       pixels,
-                       0,
-                       1,
-                       0)
+ : BC_PercentageSlider(x, y, 0, pixels, pixels, 0, 1, 0)
 {
        this->mwindow = mwindow;
        this->cwindow = cwindow;
@@ -1036,15 +1029,10 @@ void CWindowTransport::goto_end()
 
 
 CWindowCanvas::CWindowCanvas(MWindow *mwindow, CWindowGUI *gui)
- : Canvas(mwindow,
-       gui,
-       mwindow->theme->ccanvas_x,
-       mwindow->theme->ccanvas_y,
-       mwindow->theme->ccanvas_w,
-       mwindow->theme->ccanvas_h,
-       0,
-       0,
-       mwindow->edl->session->cwindow_scrollbars)
+ : Canvas(mwindow, gui,
+       mwindow->theme->ccanvas_x, mwindow->theme->ccanvas_y,
+       mwindow->theme->ccanvas_w, mwindow->theme->ccanvas_h,
+       0, 0, mwindow->edl->session->cwindow_scrollbars)
 {
        this->mwindow = mwindow;
        this->gui = gui;
@@ -1132,8 +1120,8 @@ void CWindowCanvas::draw_refresh(int flush)
 //printf("CWindowCanvas::draw_refresh 10\n");
 }
 
-#define CROPHANDLE_W 10
-#define CROPHANDLE_H 10
+#define CROPHANDLE_W xS(10)
+#define CROPHANDLE_H yS(10)
 
 void CWindowCanvas::draw_crophandle(int x, int y)
 {
@@ -1141,20 +1129,18 @@ void CWindowCanvas::draw_crophandle(int x, int y)
 }
 
 
-#define CONTROL_W 10
-#define CONTROL_H 10
-#define FIRST_CONTROL_W 20
-#define FIRST_CONTROL_H 20
+#define CONTROL_W xS(10)
+#define CONTROL_H yS(10)
+#define FIRST_CONTROL_W xS(20)
+#define FIRST_CONTROL_H yS(20)
 #undef BC_INFINITY
 #define BC_INFINITY 65536
 
-#define RULERHANDLE_W 16
-#define RULERHANDLE_H 16
+#define RULERHANDLE_W xS(16)
+#define RULERHANDLE_H yS(16)
 
-int CWindowCanvas::do_ruler(int draw,
-       int motion,
-       int button_press,
-       int button_release)
+int CWindowCanvas::do_ruler(int draw, int motion,
+               int button_press, int button_release)
 {
        int result = 0;
        float x1 = mwindow->edl->session->ruler_x1;
@@ -1265,9 +1251,7 @@ int CWindowCanvas::do_ruler(int draw,
                                        {
                                                double angle_value = fabs(atan((mwindow->edl->session->ruler_y2 - mwindow->edl->session->ruler_y1) /
                                                        (mwindow->edl->session->ruler_x2 - mwindow->edl->session->ruler_x1)) *
-                                                       360 /
-                                                       2 /
-                                                       M_PI);
+                                                       360 / 2 / M_PI);
                                                double distance_value =
                                                        sqrt(SQR(mwindow->edl->session->ruler_x2 - mwindow->edl->session->ruler_x1) +
                                                        SQR(mwindow->edl->session->ruler_y2 - mwindow->edl->session->ruler_y1));
@@ -1315,9 +1299,7 @@ int CWindowCanvas::do_ruler(int draw,
                                        {
                                                double angle_value = fabs(atan((mwindow->edl->session->ruler_y2 - mwindow->edl->session->ruler_y1) /
                                                        (mwindow->edl->session->ruler_x2 - mwindow->edl->session->ruler_x1)) *
-                                                       360 /
-                                                       2 /
-                                                       M_PI);
+                                                       360 / 2 / M_PI);
                                                double distance_value =
                                                        sqrt(SQR(mwindow->edl->session->ruler_x2 - mwindow->edl->session->ruler_x1) +
                                                        SQR(mwindow->edl->session->ruler_y2 - mwindow->edl->session->ruler_y1));
@@ -1756,6 +1738,8 @@ int CWindowCanvas::do_mask(int &redraw, int &rerender,
                if( draw && mask_gui && mask_gui->focused ) {
                        float fx = atof(mask_gui->focus_x->get_text());
                        float fy = atof(mask_gui->focus_y->get_text());
+                       fx = (fx - half_track_w) * projector_z + projector_x;
+                       fy = (fy - half_track_h) * projector_z + projector_y;
                        output_to_canvas(mwindow->edl, 0, fx, fy);
                        float r = bmax(cvs_win->get_w(), cvs_win->get_h());
                        float d = 0.005*r;
@@ -1811,15 +1795,13 @@ int CWindowCanvas::do_mask(int &redraw, int &rerender,
 // Make copy of current parameters in local keyframe
                        gui->mask_keyframe =
                                (MaskAuto*)gui->cwindow->calculate_affected_auto(
-                                       mask_autos,
-                                       0);
+                                       mask_autos, 0);
                        gui->orig_mask_keyframe->copy_data(gui->mask_keyframe);
 #else
 
                        gui->mask_keyframe =
                                (MaskAuto*)gui->cwindow->calculate_affected_auto(
-                                       mask_autos,
-                                       1);
+                                       mask_autos, 1);
 #endif
                }
                SubMask *mask = gui->mask_keyframe->get_submask(mwindow->edl->session->cwindow_mask);
@@ -2275,9 +2257,23 @@ int CWindowCanvas::do_mask(int &redraw, int &rerender,
 
 int CWindowCanvas::do_mask_focus()
 {
-       CWindowMaskGUI *mask_gui = (CWindowMaskGUI*) gui->tool_panel->tool_gui;
+       Track *track = gui->cwindow->calculate_affected_track();
+       int64_t position = track->to_units(
+               mwindow->edl->local_session->get_selectionstart(1),
+               0);
+       float projector_x, projector_y, projector_z;
+       track->automation->get_projector(
+               &projector_x, &projector_y, &projector_z,
+               position, PLAY_FORWARD);
        float cx = get_cursor_x(), cy = get_cursor_y();
        canvas_to_output(mwindow->edl, 0, cx, cy);
+       projector_x += mwindow->edl->session->output_w / 2;
+       projector_y += mwindow->edl->session->output_h / 2;
+       float half_track_w = (float)track->track_w / 2;
+       float half_track_h = (float)track->track_h / 2;
+       cx = (cx - projector_x) / projector_z + half_track_w;
+       cy = (cy - projector_y) / projector_z + half_track_h;
+       CWindowMaskGUI *mask_gui = (CWindowMaskGUI*) gui->tool_panel->tool_gui;
        mask_gui->set_focused(1, cx, cy);
        return 1;
 }
@@ -3112,7 +3108,7 @@ int CWindowCanvas::test_bezier(int button_press,
                        float z_val = gui->affected_z->get_value();
 
                        if( gui->translating_zoom ) {
-                               float z = gui->center_z + (cursor_y - gui->y_origin) / 128;
+                               float z = gui->center_z + (cursor_y - gui->y_origin) / yS(128);
                                if( z < 0 ) z = 0;
                                if( !EQUIV(z_val, z) ) {
                                        rerender = 1;
@@ -3536,5 +3532,10 @@ int CWindowCanvas::get_cwindow_controls()
        return mwindow->session->cwindow_controls;
 }
 
-
+int CWindowCanvas::get_clear_color()
+{
+       int color = mwindow->edl->session->cwindow_clear_color;
+       if( color < 0 ) color = get_canvas()->get_bg_color();
+       return color;
+}
 
Cinelerra-GG