X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fvdevicex11.C;h=8cd64fe67f9ce485e7fe6b704c5c593daac2c5da;hp=ea8720dbf2f777eea591644eba51bd3a1c13d4ae;hb=017728ea68874203d45b3f16050626d540608e35;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1

diff --git a/cinelerra-5.1/cinelerra/vdevicex11.C b/cinelerra-5.1/cinelerra/vdevicex11.C
index ea8720db..8cd64fe6 100644
--- a/cinelerra-5.1/cinelerra/vdevicex11.C
+++ b/cinelerra-5.1/cinelerra/vdevicex11.C
@@ -77,10 +77,6 @@ int VDeviceX11::reset_parameters()
 	capture_bitmap = 0;
 	color_model_selected = 0;
 	is_cleared = 0;
-
-	for( int i = 0; i < SCREENCAP_BORDERS; i++ ) {
-		screencap_border[i] = 0;
-	}
 	return 0;
 }
 
@@ -91,33 +87,9 @@ int VDeviceX11::open_input()
 		device->in_config->h,
 		device->in_config->screencapture_display);
 //printf("VDeviceX11::open_input 2\n");
-
-// create overlay
-	device->mwindow->gui->lock_window("VDeviceX11::close_all");
-
-	screencap_border[0] = new BC_Popup(device->mwindow->gui,
-			device->input_x - SCREENCAP_PIXELS, device->input_y - SCREENCAP_PIXELS,
-			device->in_config->w + SCREENCAP_PIXELS * 2, SCREENCAP_PIXELS,
-			SCREENCAP_COLOR, 1);
-	screencap_border[1] = new BC_Popup(device->mwindow->gui,
-			device->input_x - SCREENCAP_PIXELS, device->input_y,
-			SCREENCAP_PIXELS, device->in_config->h,
-			SCREENCAP_COLOR, 1);
-	screencap_border[2] = new BC_Popup(device->mwindow->gui,
-			device->input_x - SCREENCAP_PIXELS, device->input_y + device->in_config->h,
-			device->in_config->w + SCREENCAP_PIXELS * 2, SCREENCAP_PIXELS,
-			SCREENCAP_COLOR, 1);
-	screencap_border[3] = new BC_Popup(device->mwindow->gui,
-			device->input_x + device->in_config->w, device->input_y,
-			SCREENCAP_PIXELS, device->in_config->h,
-			SCREENCAP_COLOR, 1);
-usleep(500000);	// avoids a bug in gnome-shell 2017/10/19
-
-	for( int i=0; i<SCREENCAP_BORDERS; ++i )
-		screencap_border[i]->show_window(0);
-
-	device->mwindow->gui->flush();
-	device->mwindow->gui->unlock_window();
+	capture_bitmap->bars_on(SCREENCAP_PIXELS, SCREENCAP_COLOR,
+		device->input_x, device->input_y,
+		device->in_config->w, device->in_config->h);
 
 	return 0;
 }
@@ -172,8 +144,11 @@ int VDeviceX11::close_all()
 		if( output_frame ) {
 			output->update_refresh(device, output_frame);
 // if the last frame is good, don't draw over it
-			if( !video_on || output->need_overlays() )
+			if( !video_on || output->need_overlays() ) {
+				output->unlock_canvas();
 				output->draw_refresh(1);
+				output->lock_canvas("VDeviceX11::close_all 2");
+			}
 		}
 	}
 
@@ -186,15 +161,6 @@ int VDeviceX11::close_all()
 		output->unlock_canvas();
 	}
 
-	if( device->mwindow ) {
-		device->mwindow->gui->lock_window("VDeviceX11::close_all");
-		for( int i=0; i<SCREENCAP_BORDERS; ++i ) {
-			delete screencap_border[i];
-			screencap_border[i] = 0;
-		}
-		device->mwindow->gui->unlock_window();
-	}
-
 	reset_parameters();
 
 	return 0;
@@ -202,20 +168,9 @@ int VDeviceX11::close_all()
 
 int VDeviceX11::read_buffer(VFrame *frame)
 {
-//printf("VDeviceX11::read_buffer %d colormodel=%d\n", __LINE__, frame->get_color_model());
-	device->mwindow->gui->lock_window("VDeviceX11::close_all");
-
-	screencap_border[0]->reposition_window(device->input_x - SCREENCAP_PIXELS,
-			device->input_y - SCREENCAP_PIXELS);
-	screencap_border[1]->reposition_window(device->input_x - SCREENCAP_PIXELS,
-			device->input_y);
-	screencap_border[2]->reposition_window(device->input_x - SCREENCAP_PIXELS,
-			device->input_y + device->in_config->h);
-	screencap_border[3]->reposition_window(device->input_x + device->in_config->w,
-			device->input_y);
-	device->mwindow->gui->flush();
-	device->mwindow->gui->unlock_window();
-
+	capture_bitmap->bars_reposition(
+		device->input_x, device->input_y,
+		device->in_config->w, device->in_config->h);
 
 	capture_bitmap->capture_frame(frame,
 		device->input_x, device->input_y, device->do_cursor);
@@ -597,8 +552,6 @@ int VDeviceX11::write_buffer(VFrame *output_channels, EDL *edl)
 				0);
 //printf("VDeviceX11::write_buffer %d bitmap=%p\n", __LINE__, bitmap);
 		}
-		if( !output->get_canvas()->get_video_on() )
-			output->get_canvas()->flash(0);
 	}
 
 	output->get_canvas()->unlock_window();