fullscreen segv fix, popup for 4opts preview, renderfarm print fix, pan widget upgrad...
[goodguy/cinelerra.git] / cinelerra-5.1 / guicast / vicon.C
index ecd555129aeae8f9a07a66d7c89158d14619333c..b1535546778f7a7d73e06259e2f5e91cc968c19d 100644 (file)
@@ -8,10 +8,10 @@
 #include "condition.h"
 
 VIcon::
-VIcon(int vw, int vh, double rate)
+VIcon(int w, int h, double rate)
 {
-       this->vw = vw;
-       this->vh = vh;
+       this->w = w;
+       this->h = h;
        this->frame_rate = rate;
 
        cycle_start = 0;
@@ -45,20 +45,31 @@ draw_vframe(VIconThread *vt, BC_WindowBase *wdw, int x, int y)
 {
        VFrame *vfrm = frame();
        if( !vfrm ) return;
-       int sx0 = 0, sx1 = sx0 + vt->view_w;
-       int sy0 = 0, sy1 = sy0 + vt->view_h;
-       int dx0 = x, dx1 = dx0 + vw;
-       int dy0 = y, dy1 = dy0 + vh;
-       if( (x=vt->draw_x0-dx0) > 0 ) { sx0 += (x*vt->view_w)/vw;  dx0 = vt->draw_x0; }
-       if( (x=dx1-vt->draw_x1) > 0 ) { sx1 -= (x*vt->view_w)/vw;  dx1 = vt->draw_x1; }
-       if( (y=vt->draw_y0-dy0) > 0 ) { sy0 += (y*vt->view_h)/vh;  dy0 = vt->draw_y0; }
-       if( (y=dy1-vt->draw_y1) > 0 ) { sy1 -= (y*vt->view_h)/vh;  dy1 = vt->draw_y1; }
+       int sx0 = 0, sx1 = sx0 + vt->vw;
+       int sy0 = 0, sy1 = sy0 + vt->vh;
+       int dx0 = x, dx1 = dx0 + w;
+       int dy0 = y, dy1 = dy0 + h;
+       if( (x=vt->draw_x0-dx0) > 0 ) { sx0 += (x*vt->vw)/w;  dx0 = vt->draw_x0; }
+       if( (x=dx1-vt->draw_x1) > 0 ) { sx1 -= (x*vt->vw)/w;  dx1 = vt->draw_x1; }
+       if( (y=vt->draw_y0-dy0) > 0 ) { sy0 += (y*vt->vh)/h;  dy0 = vt->draw_y0; }
+       if( (y=dy1-vt->draw_y1) > 0 ) { sy1 -= (y*vt->vh)/h;  dy1 = vt->draw_y1; }
        int sw = sx1 - sx0, sh = sy1 - sy0;
        int dw = dx1 - dx0, dh = dy1 - dy0;
        if( dw > 0 && dh > 0 && sw > 0 && sh > 0 )
                wdw->draw_vframe(vfrm, dx0,dy0, dw,dh, sx0,sy0, sw,sh);
 }
 
+
+int VIconThread::cursor_inside(int x, int y)
+{
+       if( !viewing ) return 0;
+       int vx = viewing->get_vx();
+       if( x < vx || x >= vx+vw ) return 0;
+       int vy = viewing->get_vy();
+       if( y < vy || y >= vy+vh ) return 0;
+       return 1;
+}
+
 void VIconThread::
 set_drawing_area(int x0, int y0, int x1, int y1)
 {
@@ -91,18 +102,22 @@ void VIconThread::remove_vicon(int i)
 
 
 VIconThread::
-VIconThread(BC_WindowBase *wdw, int vw, int vh)
+VIconThread(BC_WindowBase *wdw, int vw, int vh, int view_w, int view_h)
  : Thread(1, 0, 0)
 {
        this->wdw = wdw;
-       this->view_win = 0;  this->vicon = 0;
-       this->view_w = vw;   this->view_h = vh;
-       this->viewing = 0;
-       this->draw_x0 = 0;   this->draw_x1 = wdw->get_w();
-       this->draw_y0 = 0;   this->draw_y1 = wdw->get_h();
+       this->vw = vw;         this->vh = vh;
+       this->view_w = view_w; this->view_h = view_h;
+       this->view_win = 0;    this->vicon = 0;
+       this->viewing = 0;     this->solo = 0;
+       this->draw_x0 = 0;     this->draw_x1 = wdw->get_w();
+       this->draw_y0 = 0;     this->draw_y1 = wdw->get_h();
        draw_lock = new Condition(0, "VIconThread::draw_lock", 1);
        timer = new Timer();
        this->refresh_rate = VICON_RATE;
+       this->draw_flash = 0;
+       this->seq_no = 0;
+       this->now = 0;
        done = 0;
        interrupted = -1;
        stop_age = 0;
@@ -148,6 +163,15 @@ stop_drawing()
        wdw->unlock_window();
 }
 
+void VIconThread::
+stop_viewing()
+{
+       if( viewing ) {
+               viewing->stop_audio();
+               viewing = 0;
+       }
+}
+
 int VIconThread::keypress_event(int key)
 {
        if( key != ESC ) return 0;
@@ -159,9 +183,9 @@ bool VIconThread::
 visible(VIcon *vicon, int x, int y)
 {
        if( vicon->hidden ) return false;
-       if( y+vicon->vh <= draw_y0 ) return false;
+       if( y+vicon->h <= draw_y0 ) return false;
        if( y >= draw_y1 ) return false;
-       if( x+vicon->vw <= draw_x0 ) return false;
+       if( x+vicon->w <= draw_x0 ) return false;
        if( x >= draw_x1 ) return false;
        return true;
 }
@@ -172,21 +196,8 @@ int ViewPopup::keypress_event()
        return vt->keypress_event(key);
 }
 
-int ViewPopup::button_press_event()
-{
-       return vt->popup_button_press(get_cursor_x(), get_cursor_y());
-}
-int ViewPopup::button_release_event()
-{
-       return vt->popup_button_release(get_cursor_x(), get_cursor_y());
-}
-int ViewPopup::cursor_motion_event()
-{
-       return vt->popup_cursor_motion(get_cursor_x(), get_cursor_y());
-}
-
 
-ViewPopup::ViewPopup(VIconThread *vt, VFrame *frame, int x, int y, int w, int h)
+ViewPopup::ViewPopup(VIconThread *vt, int x, int y, int w, int h)
  : BC_Popup(vt->wdw, x, y, w, h, BLACK)
 {
        this->vt = vt;
@@ -197,7 +208,7 @@ ViewPopup::~ViewPopup()
        vt->wdw->set_active_subwindow(0);
 }
 
-ViewPopup *VIconThread::new_view_window(VFrame *frame)
+ViewPopup *VIconThread::new_view_window()
 {
        BC_WindowBase *parent = wdw->get_parent();
        XineramaScreenInfo *info = parent->get_xinerama_info(-1);
@@ -206,13 +217,14 @@ ViewPopup *VIconThread::new_view_window(VFrame *frame)
        int vx = viewing->get_vx(), rx = 0;
        int vy = viewing->get_vy(), ry = 0;
        wdw->get_root_coordinates(vx, vy, &rx, &ry);
-       rx += (rx >= cx ? -view_w : viewing->vw);
-       ry += (ry >= cy ? -view_h : viewing->vh);
-       ViewPopup *vwin = new ViewPopup(this, frame, rx, ry, view_w, view_h);
+       rx += (rx >= cx ? -view_w+viewing->w/4 : viewing->w-viewing->w/4);
+       ry += (ry >= cy ? -view_h+viewing->h/4 : viewing->h-viewing->h/4);
+       ViewPopup *vwin = new ViewPopup(this, rx, ry, view_w, view_h);
        wdw->set_active_subwindow(vwin);
        return vwin;
 }
 
+
 void VIconThread::
 reset_images()
 {
@@ -239,16 +251,19 @@ int VIconThread::del_vicon(VIcon *vicon)
        return 1;
 }
 
-void VIconThread::draw_vframe(BC_WindowBase *wdw, VFrame *frame)
+void ViewPopup::draw_vframe(VFrame *frame)
 {
-       if( !wdw || !frame ) return;
-       wdw->draw_vframe(frame, 0,0, wdw->get_w(),wdw->get_h());
+       if( !frame ) return;
+       BC_WindowBase::draw_vframe(frame, 0,0, get_w(),get_h());
 }
 
-void VIconThread::set_view_popup(VIcon *vicon, VIconDrawVFrame *draw_vfrm)
+void VIconThread::set_view_popup(VIcon *vicon)
 {
+       if( viewing == vicon && !this->vicon ) return;
        this->vicon = vicon;
-       this->draw_vfrm = vicon && !draw_vfrm ? VIconThread::draw_vframe : draw_vfrm;
+       if( interrupted )
+               update_view(0);
+
 }
 
 void VIconThread::close_view_popup()
@@ -257,20 +272,32 @@ void VIconThread::close_view_popup()
 }
 
 int VIconThread::
-update_view()
+update_view(int do_audio)
 {
        if( viewing ) viewing->stop_audio();
        delete view_win;  view_win = 0;
        if( (viewing=vicon) != 0 ) {
-               VFrame *frame = viewing->frame();
-               view_win = new_view_window(frame);
+               view_win = new_view_window();
+               view_win->draw_vframe(viewing->frame());
+               view_win->flash(0);
                view_win->show_window();
-               vicon->start_audio();
+               if( do_audio ) vicon->start_audio();
        }
        wdw->set_active_subwindow(view_win);
        return 1;
 }
 
+int VIconThread::zoom_scale(int dir)
+{
+       int view_h = this->view_h;
+       view_h += dir*view_h/10 + dir;
+       bclamp(view_h, 16,512);
+       this->view_h = view_h;
+       this->view_w = view_h * vw/vh;
+       stop_viewing();
+       return 1;
+}
+
 
 void VIconThread::
 draw_images()
@@ -301,7 +328,7 @@ draw(VIcon *vicon)
                img_dirty = 1;
        }
        if( draw_win ) {
-               draw_vfrm(view_win, vicon->frame());
+               view_win->draw_vframe(vicon->frame());
                win_dirty = 1;
        }
        return 1;
@@ -315,6 +342,26 @@ void VIconThread::hide_vicons(int v)
        }
 }
 
+int VIconThread::show_vicon(VIcon *next)
+{
+       now = timer->get_difference();
+       if( now >= draw_flash ) return 1;
+       draw(next);
+       if( !next->seq_no ) {
+               next->cycle_start = now;
+               if( next->playing_audio > 0 )
+                       next->start_audio();
+       }
+       int64_t ref_no = (now - next->cycle_start) / 1000. * refresh_rate;
+       int count = ref_no - next->seq_no;
+       if( count < 1 ) count = 1;
+       ref_no = next->seq_no + count;
+       next->age =  next->cycle_start + 1000. * ref_no / refresh_rate;
+       if( !next->set_seq_no(ref_no) )
+               next->age = now + 1000.;
+       return 0;
+}
+
 void VIconThread::
 run()
 {
@@ -324,35 +371,25 @@ run()
                wdw->lock_window("BC_WindowBase::run 1");
                drawing_started();
                reset_images();
-               int64_t seq_no = 0, now = 0;
-               int64_t draw_flash = 1000 / refresh_rate;
+               draw_flash = 1000 / refresh_rate;
+               seq_no = 0;  now = 0;
                while( !interrupted ) {
                        if( viewing != vicon )
                                update_view();
-                       VIcon *next = low_vicon();
-                       while( next && next->age < draw_flash ) {
-                               now = timer->get_difference();
-                               if( now >= draw_flash ) break;
-                               draw(next);
-                               if( !next->seq_no ) {
-                                       next->cycle_start = now;
-                                       if( next->playing_audio > 0 )
-                                               next->start_audio();
+                       if( !solo ) {
+                               VIcon *next = low_vicon();
+                               while( next && next->age < draw_flash ) {
+                                       if( show_vicon(next) ) break;
+                                       add_vicon(next);
+                                       next = low_vicon();
                                }
-                               int64_t ref_no = (now - next->cycle_start) / 1000. * refresh_rate;
-                               int count = ref_no - next->seq_no;
-                               if( count < 1 ) count = 1;
-                               ref_no = next->seq_no + count;
-                               next->age =  next->cycle_start + 1000. * ref_no / refresh_rate;
-                               if( !next->set_seq_no(ref_no) )
-                                       next->age = now + 1000.;
+                               if( !next ) break;
                                add_vicon(next);
-                               next = low_vicon();
+                               if( draw_flash < now+1 )
+                                       draw_flash = now+1;
                        }
-                       if( !next ) break;
-                       add_vicon(next);
-                       if( draw_flash < now+1 )
-                               draw_flash = now+1;
+                       else
+                               show_vicon(solo);
                        wdw->unlock_window();
                        while( !interrupted ) {
                                now = timer->get_difference();