X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fassetpopup.C;h=66b3361a29b7ec22aad033fad9fe8e9236b23740;hp=6b7173099b5b18d8ee08ff38714a1bb0126768e7;hb=HEAD;hpb=a0ed17a5d6ecf2b010d977bc1f9b7226f24c20f6

diff --git a/cinelerra-5.1/cinelerra/assetpopup.C b/cinelerra-5.1/cinelerra/assetpopup.C
index 6b717309..66b3361a 100644
--- a/cinelerra-5.1/cinelerra/assetpopup.C
+++ b/cinelerra-5.1/cinelerra/assetpopup.C
@@ -76,13 +76,16 @@ void AssetPopup::create_objects()
 	BC_SubMenu *submenu;
 	add_item(info = new AssetPopupInfo(mwindow, this));
 	add_item(format = new AWindowListFormat(mwindow, gui));
-	add_item(new AssetPopupSort(mwindow, this));
+	add_item(open_edl = new AssetPopupOpenEDL(mwindow, this));
+	add_item(close_edl = new AssetPopupCloseEDL(mwindow, gui));
+	add_item(to_clip = new AssetPopupToClip(mwindow, this));
+	add_item(sort = new AssetPopupSort(mwindow, this));
 	add_item(index = new AssetPopupBuildIndex(mwindow, this));
 	add_item(view = new AssetPopupView(mwindow, this));
 	add_item(view_window = new AssetPopupViewWindow(mwindow, this));
 	add_item(open_mixer = new AssetPopupOpenMixer(mwindow, this));
 	add_item(insert_mixer = new AssetPopupInsertMixer(mwindow, this));
-	add_item(new AssetPopupPaste(mwindow, this));
+	add_item(paste = new AssetPopupPaste(mwindow, this));
 	add_item(menu_item = new BC_MenuItem(_("Match...")));
 	menu_item->add_submenu(submenu = new BC_SubMenu());
 	submenu->add_submenuitem(new AssetMatchSize(mwindow, this));
@@ -96,19 +99,15 @@ void AssetPopup::create_objects()
 
 void AssetPopup::paste_assets()
 {
-// Collect items into the drag vectors for temporary storage
-	gui->lock_window("AssetPopup::paste_assets");
-	mwindow->gui->lock_window("AssetPopup::paste_assets");
-	mwindow->cwindow->gui->lock_window("AssetPopup::paste_assets");
-
 	int proxy = mwindow->edl->session->awindow_folder == AW_PROXY_FOLDER ? 1 : 0;
 	gui->collect_assets(proxy);
+// Collect items into the drag vectors for temporary storage
+	gui->unlock_window();
+	mwindow->gui->lock_window("AssetPopup::paste_assets");
 	mwindow->paste_assets(mwindow->edl->local_session->get_selectionstart(1),
 		mwindow->edl->tracks->first, 0);   // do not overwrite
-
-	gui->unlock_window();
 	mwindow->gui->unlock_window();
-	mwindow->cwindow->gui->unlock_window();
+	gui->lock_window("AssetPopup::paste_assets");
 }
 
 void AssetPopup::match_size()
@@ -143,6 +142,28 @@ int AssetPopup::update()
 	format->update();
 	int proxy = mwindow->edl->session->awindow_folder == AW_PROXY_FOLDER ? 1 : 0;
 	gui->collect_assets(proxy);
+	int enable_open = 0;
+	int assets_total = mwindow->session->drag_assets->size();
+	Indexable *idxbl = !assets_total ? 0 :
+		mwindow->session->drag_assets->get(0);
+	if( idxbl ) {
+		if( idxbl->is_asset ) {
+			Asset *asset = (Asset *)idxbl;
+			if( asset->format == FILE_REF )
+				enable_open = 1;
+		}
+		else
+			enable_open = 1;
+	}
+	open_edl->set_enabled(enable_open);
+	int enable_close = mwindow->stack.size() > 0 ? 1 : 0;
+	close_edl->set_enabled(enable_close);
+	int enable_clip = 0;
+	for( int i=0; !enable_clip && i<assets_total; ++i ) {
+		Indexable *idxbl = mwindow->session->drag_assets->get(i);
+		if( !idxbl->is_asset ) enable_clip = 1;
+	}
+	to_clip->set_enabled(enable_clip);
 	return 0;
 }
 
@@ -164,10 +185,11 @@ int AssetPopupInfo::handle_event()
 	popup->gui->get_abs_cursor(cur_x, cur_y);
 	int n = mwindow->session->drag_assets->size();
 	if( n > 0 ) {
+		int xs30 = xS(30), ys30 = yS(30);
 		for( int i=0; i<n; ++i ) {
 			AssetEdit *asset_edit = mwindow->awindow->get_asset_editor();
 			asset_edit->edit_asset(
-				mwindow->session->drag_assets->values[i], cur_x-30*i, cur_y-30*i);
+				mwindow->session->drag_assets->values[i], cur_x-xs30*i, cur_y-ys30*i);
 		}
 	}
 	else if( mwindow->session->drag_clips->size() ) {
@@ -178,6 +200,91 @@ int AssetPopupInfo::handle_event()
 }
 
 
+AssetPopupOpenEDL::AssetPopupOpenEDL(MWindow *mwindow, AssetPopup *popup)
+ : BC_MenuItem(_("Open EDL"))
+{
+	this->mwindow = mwindow;
+	this->popup = popup;
+}
+AssetPopupOpenEDL::~AssetPopupOpenEDL()
+{
+}
+
+int AssetPopupOpenEDL::handle_event()
+{
+	int assets_total = mwindow->session->drag_assets->size();
+	if( !assets_total ) return 1;
+	popup->unlock_window();
+	EDL *edl = 0;
+	Indexable *idxbl = mwindow->session->drag_assets->get(0);
+	if( idxbl->is_asset ) {
+		Asset *asset = (Asset *)idxbl;
+		if( asset->format == FILE_REF ) {
+			FileXML xml_file;
+			const char *filename = asset->path;
+			if( xml_file.read_from_file(filename, 1) ) {
+				eprintf(_("Error: unable to open:\n  %s"), filename);
+				return 1;
+			}
+			edl = new EDL;
+			edl->create_objects();
+			if( edl->load_xml(&xml_file, LOAD_ALL) ) {
+				eprintf(_("Error: unable to load:\n  %s"), filename);
+				edl->remove_user();
+				return 1;
+			}
+		}
+	}
+	else {
+		edl = (EDL *)idxbl;
+	}
+	if( edl )
+		mwindow->stack_push(edl, idxbl);
+	else
+		eprintf(_("media is not EDL:\n%s"), idxbl->path);
+	popup->lock_window("AssetPopupOpenEDL::handle_event");
+	return 1;
+}
+
+AssetPopupCloseEDL::AssetPopupCloseEDL(MWindow *mwindow, AWindowGUI *gui)
+ : BC_MenuItem(_("Close EDL"))
+{
+	this->mwindow = mwindow;
+	this->gui = gui;
+}
+AssetPopupCloseEDL::~AssetPopupCloseEDL()
+{
+}
+
+int AssetPopupCloseEDL::handle_event()
+{
+	gui->unlock_window();
+	mwindow->gui->lock_window("AssetPopupCloseEDL::handle_event");
+	mwindow->stack_pop();
+	mwindow->gui->unlock_window();
+	gui->lock_window("AssetPopupCloseEDL::handle_event");
+	return 1;
+}
+
+
+AssetPopupToClip::AssetPopupToClip(MWindow *mwindow, AssetPopup *popup)
+ : BC_MenuItem(_("EDL to clip"))
+{
+	this->mwindow = mwindow;
+	this->popup = popup;
+}
+
+AssetPopupToClip::~AssetPopupToClip()
+{
+}
+
+int AssetPopupToClip::handle_event()
+{
+	mwindow->media_to_clip();
+	return 1;
+}
+
+
 AssetPopupBuildIndex::AssetPopupBuildIndex(MWindow *mwindow, AssetPopup *popup)
  : BC_MenuItem(_("Rebuild index"))
 {
@@ -191,8 +298,10 @@ AssetPopupBuildIndex::~AssetPopupBuildIndex()
 
 int AssetPopupBuildIndex::handle_event()
 {
+	popup->unlock_window();
 //printf("AssetPopupBuildIndex::handle_event 1\n");
 	mwindow->rebuild_indices();
+	popup->lock_window("AssetPopupBuildIndex::handle_event");
 	return 1;
 }
 
@@ -283,9 +392,11 @@ AssetPopupOpenMixer::~AssetPopupOpenMixer()
 
 int AssetPopupOpenMixer::handle_event()
 {
+	popup->unlock_window();
 	mwindow->gui->lock_window("AssetPopupOpenMixer::handle_event");
 	mwindow->create_mixers();
 	mwindow->gui->unlock_window();
+	popup->lock_window("AssetPopupOpenMixer::handle_event");
 	return 1;
 }
 
@@ -302,14 +413,16 @@ AssetPopupInsertMixer::~AssetPopupInsertMixer()
 
 int AssetPopupInsertMixer::handle_event()
 {
+	popup->unlock_window();
 	mwindow->gui->lock_window("AssetPopupInsertMixer::handle_event");
 	mwindow->create_mixers(-1);
 	mwindow->gui->unlock_window();
+	popup->lock_window("AssetPopupInsertMixer::handle_event");
 	return 1;
 }
 
 AssetPopupPaste::AssetPopupPaste(MWindow *mwindow, AssetPopup *popup)
- : BC_MenuItem(_("Paste"))
+ : BC_MenuItem(C_("Paste"))
 {
 	this->mwindow = mwindow;
 	this->popup = popup;
@@ -380,9 +493,8 @@ AssetPopupProjectRemove::~AssetPopupProjectRemove()
 int AssetPopupProjectRemove::handle_event()
 {
 	popup->gui->unlock_window();
-	mwindow->remove_assets_from_project(1, 1,
-		mwindow->session->drag_assets,
-		mwindow->session->drag_clips);
+	mwindow->remove_assets_from_project(1, 1, 1,
+		mwindow->session->drag_assets, 0);
 	popup->gui->lock_window("AssetPopupProjectRemove::handle_event");
 	return 1;
 }
@@ -416,16 +528,13 @@ AssetListMenu::AssetListMenu(MWindow *mwindow, AWindowGUI *gui)
 
 AssetListMenu::~AssetListMenu()
 {
-	if( !shots_displayed ) {
-		delete asset_snapshot;
-		delete asset_grabshot;
-	}
 }
 
 void AssetListMenu::create_objects()
 {
 	add_item(load_file = new AssetPopupLoadFile(mwindow, gui));
 	add_item(format = new AWindowListFormat(mwindow, gui));
+	add_item(close_edl = new AssetPopupCloseEDL(mwindow, gui));
 	add_item(select_used = new AssetSelectUsed(mwindow, gui));
 	BC_SubMenu *submenu;
 	select_used->add_submenu(submenu = new BC_SubMenu());
@@ -450,7 +559,7 @@ void AssetListMenu::create_objects()
 	grabshot_submenu->add_submenuitem(new GrabshotMenuItem(grabshot_submenu, _("jpeg"), GRABSHOT_JPEG));
 	grabshot_submenu->add_submenuitem(new GrabshotMenuItem(grabshot_submenu, _("tiff"), GRABSHOT_TIFF));
 	grabshot_submenu->add_submenuitem(new GrabshotMenuItem(grabshot_submenu, _("ppm"),  GRABSHOT_PPM));
-	update_titles(shots_displayed = 1);
+	update_titles(1);
 }
 
 AssetPopupLoadFile::AssetPopupLoadFile(MWindow *mwindow, AWindowGUI *gui)
@@ -473,16 +582,10 @@ int AssetPopupLoadFile::handle_event()
 void AssetListMenu::update_titles(int shots)
 {
 	format->update();
-	if( shots && !shots_displayed ) {
-		shots_displayed = 1;
-		add_item(asset_snapshot);
-		add_item(asset_grabshot);
-	}
-	else if( !shots && shots_displayed ) {
-		shots_displayed = 0;
-		remove_item(asset_snapshot);
-		remove_item(asset_grabshot);
-	}
+	int enable_close = mwindow->stack.size() > 0 ? 1 : 0;
+	close_edl->set_enabled(enable_close);
+	asset_snapshot->set_enabled(shots);
+	asset_grabshot->set_enabled(shots);
 }
 
 AssetListCopy::AssetListCopy(MWindow *mwindow, AWindowGUI *gui)
@@ -573,13 +676,17 @@ void AssetCopyDialog::handle_close_event(int result)
 	copy_window = 0;
 }
 
+#define ACW_W xS(500)
+#define ACW_H yS(200)
 
 AssetCopyWindow::AssetCopyWindow(AssetCopyDialog *copy_dialog)
  : BC_Window(_(PROGRAM_NAME ": Copy File List"),
-	copy_dialog->x - 500/2, copy_dialog->y - 200/2,
-	500, 200, 500, 200, 1, 0, 1)
+	copy_dialog->x - ACW_W/2, copy_dialog->y - ACW_H/2,
+	ACW_W, ACW_H, ACW_W, ACW_H, 1, 0, 1)
 {
 	this->copy_dialog = copy_dialog;
+// *** CONTEXT_HELP ***
+	context_help_set_keyword("Moving clips");
 }
 
 AssetCopyWindow::~AssetCopyWindow()
@@ -590,11 +697,13 @@ void AssetCopyWindow::create_objects()
 {
 	lock_window("AssetCopyWindow::create_objects");
 	BC_Title *title;
-	int x = 10, y = 10, pad = 5;
+	int xs10 = xS(10);
+	int ys5 = yS(5), ys10 = yS(10);
+	int x = xs10, y = ys10;
 	add_subwindow(title = new BC_Title(x, y, _("List of asset paths:")));
-	y += title->get_h() + pad;
+	y += title->get_h() + ys5;
 	int text_w = get_w() - x - 10;
-	int text_h = get_h() - y - BC_OKButton::calculate_h() - pad;
+	int text_h = get_h() - y - BC_OKButton::calculate_h() - ys5;
 	int text_rows = BC_TextBox::pixels_to_rows(this, MEDIUMFONT, text_h);
 	char *text = copy_dialog->text;
 	int len = strlen(text) + BCTEXTLEN;
@@ -608,9 +717,9 @@ void AssetCopyWindow::create_objects()
 
 int AssetCopyWindow::resize_event(int w, int h)
 {
-	int fx = file_list->get_x(), fy = file_list->get_y(), pad = 5;
-	int text_w = w - fx - 10;
-	int text_h = h - fy - BC_OKButton::calculate_h() - pad;
+	int fx = file_list->get_x(), fy = file_list->get_y();
+	int text_w = w - fx - xS(10);
+	int text_h = h - fy - BC_OKButton::calculate_h() - yS(5);
 	int text_rows = BC_TextBox::pixels_to_rows(this, MEDIUMFONT, text_h);
 	file_list->reposition_window(fx, fy, text_w, text_rows);
 	return 0;
@@ -682,7 +791,8 @@ void AssetPasteDialog::handle_done_event(int result)
 	MWindow *mwindow = paste->mwindow;
 	mwindow->interrupt_indexes();
 	mwindow->gui->lock_window("AssetPasteDialog::handle_done_event");
-	result = mwindow->load_filenames(&path_list, LOADMODE_RESOURCESONLY, 0);
+	result = mwindow->load_filenames(&path_list,
+		LOADMODE_RESOURCESONLY, LOADMODE_EDL_CLIP, 0);
 	mwindow->gui->unlock_window();
 	path_list.remove_all_objects();
 	mwindow->save_backup();
@@ -701,12 +811,17 @@ void AssetPasteDialog::start(int x, int y)
 	BC_DialogThread::start();
 }
 
+#define APW_W xS(500)
+#define APW_H yS(200)
+
 AssetPasteWindow::AssetPasteWindow(AssetPasteDialog *paste_dialog)
  : BC_Window(_(PROGRAM_NAME ": Paste File List"),
-	paste_dialog->x - 500/2, paste_dialog->y - 200/2,
-	500, 200, 500, 200, 1, 0, 1)
+	paste_dialog->x - APW_W/2, paste_dialog->y - APW_H/2,
+	APW_W, APW_H, APW_W, APW_H, 1, 0, 1)
 {
 	this->paste_dialog = paste_dialog;
+// *** CONTEXT_HELP ***
+	context_help_set_keyword("Moving clips");
 }
 
 AssetPasteWindow::~AssetPasteWindow()
@@ -717,11 +832,13 @@ void AssetPasteWindow::create_objects()
 {
 	lock_window("AssetPasteWindow::create_objects()");
 	BC_Title *title;
-	int x = 10, y = 10, pad = 5;
+	int xs10 = xS(10);
+	int ys5 = yS(5), ys10 = yS(10);
+	int x = xs10, y = ys10;
 	add_subwindow(title = new BC_Title(x, y, _("Enter list of asset paths:")));
-	y += title->get_h() + pad;
-	int text_w = get_w() - x - 10;
-	int text_h = get_h() - y - BC_OKButton::calculate_h() - pad;
+	y += title->get_h() + ys5;
+	int text_w = get_w() - x - xs10;
+	int text_h = get_h() - y - BC_OKButton::calculate_h() - ys5;
 	int text_rows = BC_TextBox::pixels_to_rows(this, MEDIUMFONT, text_h);
 	file_list = new BC_ScrollTextBox(this, x, y, text_w, text_rows, (char*)0, 65536);
 	file_list->create_objects();
@@ -733,9 +850,9 @@ void AssetPasteWindow::create_objects()
 
 int AssetPasteWindow::resize_event(int w, int h)
 {
-	int fx = file_list->get_x(), fy = file_list->get_y(), pad = 5;
-	int text_w = w - fx - 10;
-	int text_h = h - fy - BC_OKButton::calculate_h() - pad;
+	int fx = file_list->get_x(), fy = file_list->get_y();
+	int text_w = w - fx - xS(10);
+	int text_h = h - fy - BC_OKButton::calculate_h() - yS(5);
 	int text_rows = BC_TextBox::pixels_to_rows(this, MEDIUMFONT, text_h);
 	file_list->reposition_window(fx, fy, text_w, text_rows);
 	return 0;
@@ -781,12 +898,13 @@ int SnapshotMenuItem::handle_event()
 	if( !edl->have_video() ) return 1;
 
 	Preferences *preferences = mwindow->preferences;
-	char filename[BCTEXTLEN];
+	char filename[BCTEXTLEN], snapshot_path[BCTEXTLEN];
 	static const char *exts[] = { "png", "jpg", "tif", "ppm" };
 	time_t tt;     time(&tt);
 	struct tm tm;  localtime_r(&tt,&tm);
+	File::getenv_path(snapshot_path, preferences->snapshot_path);
 	snprintf(filename,sizeof(filename),"%s/%s_%04d%02d%02d-%02d%02d%02d.%s",
-		preferences->snapshot_path, _("snap"),
+		snapshot_path, _("snap"),
 		1900+tm.tm_year,1+tm.tm_mon,tm.tm_mday,
 		tm.tm_hour,tm.tm_min,tm.tm_sec, exts[mode]);
 	char *asset_path = FileSystem::basepath(filename);
@@ -831,7 +949,7 @@ int SnapshotMenuItem::handle_event()
 			processors > 1 ? 2 : 1, 0);
 		VFrame ***frames = file.get_video_buffer();
 		VFrame *frame = frames[0][0];
-		TransportCommand command;
+		TransportCommand command(preferences);
 		//command.command = audio_tracks ? NORMAL_FWD : CURRENT_FRAME;
 		command.command = CURRENT_FRAME;
 		command.get_edl()->copy_all(edl);
@@ -839,8 +957,8 @@ int SnapshotMenuItem::handle_event()
 		command.realtime = 0;
 
 		RenderEngine render_engine(0, preferences, 0, 0);
-		CICache video_cache(preferences);
-		render_engine.set_vcache(&video_cache);
+		CICache *video_cache = new CICache(preferences);
+		render_engine.set_vcache(video_cache);
 		render_engine.arm_command(&command);
 
 		double position = edl->local_session->get_selectionstart(1);
@@ -850,6 +968,7 @@ int SnapshotMenuItem::handle_event()
 		if( !ret )
 			ret = file.write_video_buffer(1);
 		file.close_file();
+		video_cache->remove_user();
 	}
 	if( !ret ) {
 		asset->folder_no = AW_MEDIA_FOLDER;
@@ -907,111 +1026,34 @@ int GrabshotMenuItem::handle_event()
 }
 
 GrabshotThread::GrabshotThread(MWindow *mwindow)
- : Thread(1, 0, 0)
+ : BC_DragBox(mwindow->gui)
 {
 	this->mwindow = mwindow;
-	popup = 0;
-	done = -1;
 }
+
 GrabshotThread::~GrabshotThread()
 {
-	delete popup;
 }
 
 void GrabshotThread::start(GrabshotMenuItem *menu_item)
 {
-	popup = new GrabshotPopup(this, menu_item->mode);
-	popup->lock_window("GrabshotThread::start");
-	for( int i=0; i<4; ++i )
-		edge[i] = new BC_Popup(mwindow->gui, 0,0, 1,1, ORANGE, 1);
-	mwindow->gui->grab_buttons();
-	mwindow->gui->grab_cursor();
-	popup->grab(mwindow->gui);
-	popup->create_objects();
-	popup->show_window();
-	popup->unlock_window();
-	done = 0;
-	Thread::start();
+	mode = menu_item->mode;
+	start_drag();
 }
 
-void GrabshotThread::run()
+int GrabshotThread::handle_done_event(int x0, int y0, int x1, int y1)
 {
-	popup->lock_window("GrabshotThread::run 0");
-	while( !done ) {
-		popup->update();
-		popup->unlock_window();
-		enable_cancel();
-		Timer::delay(200);
-		disable_cancel();
-		popup->lock_window("GrabshotThread::run 1");
-	}
-	mwindow->gui->ungrab_cursor();
-	mwindow->gui->ungrab_buttons();
-	popup->ungrab(mwindow->gui);
-	for( int i=0; i<4; ++i ) delete edge[i];
-	popup->unlock_window();
-	delete popup;  popup = 0;
-}
-
-GrabshotPopup::GrabshotPopup(GrabshotThread *grab_thread, int mode)
- : BC_Popup(grab_thread->mwindow->gui, 0,0, 16,16, -1,1)
-{
-	this->grab_thread = grab_thread;
-	this->mode = mode;
-	dragging = -1;
-	grab_color = ORANGE;
-	x0 = y0 = x1 = y1 = -1;
-	lx0 = ly0 = lx1 = ly1 = -1;
-}
-GrabshotPopup::~GrabshotPopup()
-{
-}
-
-int GrabshotPopup::grab_event(XEvent *event)
-{
-	int cur_drag = dragging;
-	switch( event->type ) {
-	case ButtonPress:
-		if( cur_drag > 0 ) return 1;
-		x0 = event->xbutton.x_root;
-		y0 = event->xbutton.y_root;
-		if( !cur_drag ) {
-			draw_selection(-1);
-			if( event->xbutton.button == RIGHT_BUTTON ) break;
-			if( x0>=get_x() && x0<get_x()+get_w() &&
-			    y0>=get_y() && y0<get_y()+get_h() ) break;
-		}
-		x1 = x0;  y1 = y0;
-		draw_selection(1);
-		dragging = 1;
-		return 1;
-	case ButtonRelease:
-		dragging = 0;
-	case MotionNotify:
-		if( cur_drag > 0 ) {
-			x1 = event->xbutton.x_root;
-			y1 = event->xbutton.y_root;
-			draw_selection(0);
-		}
-		return 1;
-	default:
-		return 0;
-	}
-
-	int cx = lx0,     cy = ly0;
-	int cw = lx1-lx0, ch = ly1-ly0;
-	hide_window();
-	sync_display();
-	grab_thread->done = 1;
+	int cx = x0,    cy = y0;
+	int cw = x1-x0, ch = y1-y0;
 
-	MWindow *mwindow = grab_thread->mwindow;
 	Preferences *preferences = mwindow->preferences;
-	char filename[BCTEXTLEN];
+	char filename[BCTEXTLEN], snapshot_path[BCTEXTLEN];
 	static const char *exts[] = { "png", "jpg", "tif", "ppm" };
 	time_t tt;     time(&tt);
 	struct tm tm;  localtime_r(&tt,&tm);
+	File::getenv_path(snapshot_path, preferences->snapshot_path);
 	snprintf(filename,sizeof(filename),"%s/%s_%04d%02d%02d-%02d%02d%02d.%s",
-		preferences->snapshot_path, _("grab"),
+		snapshot_path, _("grab"),
 		1900+tm.tm_year,1+tm.tm_mon,tm.tm_mday,
 		tm.tm_hour,tm.tm_min,tm.tm_sec, exts[mode]);
 	char *asset_path = FileSystem::basepath(filename);
@@ -1037,12 +1079,13 @@ int GrabshotPopup::grab_event(XEvent *event)
 	}
 
 // no odd dimensions
-	int rw = get_root_w(0), rh = get_root_h(0);
+	int rw = mwindow->gui->get_root_w(0);
+	int rh = mwindow->gui->get_root_h(0);
 	if( cx < 0 ) { cw += cx;  cx = 0; }
 	if( cy < 0 ) { ch += cy;  cy = 0; }
 	if( cx+cw > rw ) cw = rw-cx;
 	if( cy+ch > rh ) ch = rh-cy;
-	if( !cw || !ch ) return 1;
+	if( !cw || !ch ) return 0;
 
 	VFrame vframe(cw,ch, BC_RGB888);
 	if( cx+cw < rw ) ++cw;
@@ -1085,37 +1128,3 @@ int GrabshotPopup::grab_event(XEvent *event)
 	return 1;
 }
 
-void GrabshotPopup::update()
-{
-	set_color(grab_color ^= GREEN);
-	draw_box(0,0, get_w(),get_h());
-	flash(1);
-}
-
-void GrabshotPopup::draw_selection(int show)
-{
-	if( show < 0 ) {
-		for( int i=0; i<4; ++i ) hide_window(0);
-		flush();
-		return;
-	}
-
-	int nx0 = x0 < x1 ? x0 : x1;
-	int nx1 = x0 < x1 ? x1 : x0;
-	int ny0 = y0 < y1 ? y0 : y1;
-	int ny1 = y0 < y1 ? y1 : y0;
-	lx0 = nx0;  lx1 = nx1;  ly0 = ny0;  ly1 = ny1;
-
-	--nx0;  --ny0;
-	BC_Popup **edge = grab_thread->edge;
-	edge[0]->reposition_window(nx0,ny0, nx1-nx0, 1);
-	edge[1]->reposition_window(nx1,ny0, 1, ny1-ny0);
-	edge[2]->reposition_window(nx0,ny1, nx1-nx0, 1);
-	edge[3]->reposition_window(nx0,ny0, 1, ny1-ny0);
-
-	if( show > 0 ) {
-		for( int i=0; i<4; ++i ) edge[i]->show_window(0);
-	}
-	flush();
-}
-