X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcanvas.C;h=2b3953002d58cc03f8dc56321dd223baea9ede1e;hp=dc6d44a58e0a13032704219c1dd666e96ab4b8d2;hb=26f3c4335351a3938db78303c57a2ba6551a2a10;hpb=5ac2037d8e5ab71a1915389cd08b458cfb60d64f

diff --git a/cinelerra-5.1/cinelerra/canvas.C b/cinelerra-5.1/cinelerra/canvas.C
index dc6d44a5..2b395300 100644
--- a/cinelerra-5.1/cinelerra/canvas.C
+++ b/cinelerra-5.1/cinelerra/canvas.C
@@ -739,23 +739,8 @@ void Canvas::create_canvas()
 			wdw->stop_video();
 		}
 
-		int x = subwindow->get_screen_x(0, -1);
-		int y = subwindow->get_screen_y(0, -1);
-		int w = root_w;
-		int h = root_h;
-		if( mwindow->screens == 1 && root_w > scr_w0 ) {
-			// Xinerama
-			if( subwindow->get_x() >= scr_w0 ) {
-				// assumes right side is the big one
-				w = root_w - scr_w0;
-				h = root_h;
-			}
-			else {
-				// use same aspect ratio to compute left height
-				w = scr_w0;
-				h = (w*root_h) / (root_w-scr_w0);
-			}
-		}
+		int x, y, w, h;
+		wdw->get_fullscreen_geometry(x, y, w, h);
 
 		if( canvas_fullscreen )
 		{
@@ -788,6 +773,10 @@ void Canvas::create_canvas()
 
 	if(video_on) get_canvas()->start_video();
 
+	get_canvas()->lock_window("Canvas::create_canvas 2");
+	get_canvas()->focus();
+	get_canvas()->unlock_window();
+
 	unlock_canvas();
 }
 
@@ -823,7 +812,6 @@ int Canvas::button_press_event_base(BC_WindowBase *caller)
 
 int Canvas::keypress_event(BC_WindowBase *caller)
 {
-	int caller_is_canvas = (caller == get_canvas());
 	int key = caller->get_keypress();
 	switch( key ) {
 	case 'f':
@@ -832,13 +820,13 @@ int Canvas::keypress_event(BC_WindowBase *caller)
 			stop_fullscreen();
 		else
 			start_fullscreen();
-		if(!caller_is_canvas) caller->lock_window("Canvas::keypress_event 1");
+		caller->lock_window("Canvas::keypress_event 1");
 		break;
 	case ESC:
 		caller->unlock_window();
 		if(get_fullscreen())
 			stop_fullscreen();
-		if(!caller_is_canvas) caller->lock_window("Canvas::keypress_event 2");
+		caller->lock_window("Canvas::keypress_event 2");
 		break;
 	default:
 		return 0;
@@ -856,7 +844,16 @@ void Canvas::update_refresh(VideoDevice *device, VFrame *output_frame)
 // OpenGL does YUV->RGB in the compositing step
 	if( use_opengl )
 		best_color_model = BC_RGB888;
-
+	else if( BC_CModels::has_alpha(best_color_model) ) {
+		best_color_model =
+			BC_CModels::is_float(best_color_model ) ?
+				BC_RGB_FLOAT :
+			BC_CModels::is_yuv(best_color_model ) ?
+				( BC_CModels::calculate_pixelsize(best_color_model) > 8 ?
+					BC_YUV161616 : BC_YUV888 ) :
+				( BC_CModels::calculate_pixelsize(best_color_model) > 8 ?
+					BC_RGB161616 : BC_RGB888 ) ;
+	}
 	int out_w = output_frame->get_w();
 	int out_h = output_frame->get_h();
 	if( refresh_frame &&
@@ -881,7 +878,7 @@ void Canvas::update_refresh(VideoDevice *device, VFrame *output_frame)
 		get_canvas()->lock_window(" Canvas::output_refresh");
 	}
 	else
-		refresh_frame->copy_from(output_frame);
+		refresh_frame->transfer_from(output_frame, -1);
 }
 
 
@@ -914,17 +911,17 @@ CanvasOutput::~CanvasOutput()
 
 int CanvasOutput::cursor_leave_event()
 {
-	return canvas->cursor_leave_event_base(this);
+	return canvas->cursor_leave_event_base(canvas->get_canvas());
 }
 
 int CanvasOutput::cursor_enter_event()
 {
-	return canvas->cursor_enter_event_base(this);
+	return canvas->cursor_enter_event_base(canvas->get_canvas());
 }
 
 int CanvasOutput::button_press_event()
 {
-	return canvas->button_press_event_base(this);
+	return canvas->button_press_event_base(canvas->get_canvas());
 }
 
 int CanvasOutput::button_release_event()
@@ -939,31 +936,13 @@ int CanvasOutput::cursor_motion_event()
 
 int CanvasOutput::keypress_event()
 {
-	return canvas->keypress_event(this);
+	return canvas->keypress_event(canvas->get_canvas());
 }
 
 
 
-
-
-
-
-
-
-
-
-
-
-CanvasFullScreen::CanvasFullScreen(Canvas *canvas,
-    int w,
-    int h)
- : BC_FullScreen(canvas->subwindow,
- 	w,
-	h,
-	BLACK,
-	0,
-	0,
-	0)
+CanvasFullScreen::CanvasFullScreen(Canvas *canvas, int w, int h)
+ : BC_FullScreen(canvas->subwindow, w, h, BLACK, 0, 0, 0)
 {
 	this->canvas = canvas;
 }
@@ -973,32 +952,9 @@ CanvasFullScreen::~CanvasFullScreen()
 }
 
 
-
-
-
-
-
-
-
-
-
-
-
-CanvasXScroll::CanvasXScroll(EDL *edl,
-	Canvas *canvas,
-    int x,
-    int y,
-	int length,
-	int position,
-	int handle_length,
-    int pixels)
- : BC_ScrollBar(x,
-		y,
-		SCROLL_HORIZ,
-		pixels,
-		length,
-		position,
-		handle_length)
+CanvasXScroll::CanvasXScroll(EDL *edl, Canvas *canvas, int x, int y,
+	int length, int position, int handle_length, int pixels)
+ : BC_ScrollBar(x, y, SCROLL_HORIZ, pixels, length, position, handle_length)
 {
 	this->canvas = canvas;
 }
@@ -1016,25 +972,9 @@ int CanvasXScroll::handle_event()
 }
 
 
-
-
-
-
-CanvasYScroll::CanvasYScroll(EDL *edl,
-	Canvas *canvas,
-    int x,
-    int y,
-	int length,
-	int position,
-	int handle_length,
-    int pixels)
- : BC_ScrollBar(x,
-		y,
-		SCROLL_VERT,
-		pixels,
-		length,
-		position,
-		handle_length)
+CanvasYScroll::CanvasYScroll(EDL *edl, Canvas *canvas, int x, int y,
+	int length, int position, int handle_length, int pixels)
+ : BC_ScrollBar(x, y, SCROLL_VERT, pixels, length, position, handle_length)
 {
 	this->canvas = canvas;
 }
@@ -1052,10 +992,6 @@ int CanvasYScroll::handle_event()
 }
 
 
-
-
-
-
 CanvasFullScreenPopup::CanvasFullScreenPopup(Canvas *canvas)
  : BC_PopupMenu(0, 0, 0, "", 0)
 {
@@ -1090,12 +1026,6 @@ int CanvasSubWindowItem::handle_event()
 }
 
 
-
-
-
-
-
-
 CanvasPopup::CanvasPopup(Canvas *canvas)
  : BC_PopupMenu(0, 0, 0, "", 0)
 {