X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmainsession.C;h=bab1e227ed8390d491c15bac1f5b0f347977615a;hp=59e2bff24cd4ba5b21e529573f5cbd72b55db127;hb=d60a59baa6cfe24c0fb153ed9e150a834ba29feb;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd

diff --git a/cinelerra-5.1/cinelerra/mainsession.C b/cinelerra-5.1/cinelerra/mainsession.C
index 59e2bff2..bab1e227 100644
--- a/cinelerra-5.1/cinelerra/mainsession.C
+++ b/cinelerra-5.1/cinelerra/mainsession.C
@@ -42,8 +42,6 @@ MainSession::MainSession(MWindow *mwindow)
 	track_highlighted = 0;
 	plugin_highlighted = 0;
 	pluginset_highlighted = 0;
-	vcanvas_highlighted = 0;
-	ccanvas_highlighted = 0;
 	edit_highlighted = 0;
 	current_operation = NO_OPERATION;
 	drag_pluginservers = new ArrayList<PluginServer*>;
@@ -62,6 +60,8 @@ MainSession::MainSession(MWindow *mwindow)
 	cwindow_fullscreen = 0;
 	rwindow_fullscreen = 0;
 	vwindow_fullscreen = 0;
+	zwindow_fullscreen = 0;
+	selected_zwindow = -1;
 	actual_frame_rate = 0;
 	window_config = 0;
 	a_x11_host[0] = 0;
@@ -84,6 +84,7 @@ MainSession::MainSession(MWindow *mwindow)
 	cwindow_x = cwindow_y = cwindow_w = cwindow_h = 0;
 	ctool_x = ctool_y = 0;
 	awindow_x = awindow_y = awindow_w = awindow_h = 0;
+	bwindow_w = bwindow_h = 0;
 	rmonitor_x = rmonitor_y = rmonitor_w = rmonitor_h = 0;
 	rwindow_x = rwindow_y = rwindow_w = rwindow_h = 0;
 	gwindow_x = gwindow_y = 0;
@@ -252,6 +253,9 @@ void MainSession::default_window_positions(int window_config)
 	awindow_w = root_x + root_w - awindow_x - border_left - border_right;
 	awindow_h = mwindow_h;
 
+	bwindow_w = 600;
+	bwindow_h = 360;
+
 	ewindow_w = 640;
 	ewindow_h = 240;
 
@@ -315,8 +319,8 @@ void MainSession::default_window_positions(int window_config)
 	swindow_w = 600;
 	swindow_h = 400;
 
-	batchrender_w = 540;
-	batchrender_h = 340;
+	batchrender_w = 750;
+	batchrender_h = 400;
 	batchrender_x = root_w / 2 - batchrender_w / 2;
 	batchrender_y = root_h / 2 - batchrender_h / 2;
 }
@@ -387,7 +391,11 @@ int MainSession::load_defaults(BC_Hash *defaults)
 //printf("MainSession::load_defaults 1\n");
 
 // Other windows
-	afolders_w = defaults->get("ABINS_W", 140);
+	afolders_w = defaults->get("ABINS_W", 200);
+
+	bwindow_w = defaults->get("BWINDOW_W", bwindow_w);
+	bwindow_h = defaults->get("BWINDOW_H", bwindow_h);
+
 	rwindow_x = defaults->get("RWINDOW_X", rwindow_x);
 	rwindow_y = defaults->get("RWINDOW_Y", rwindow_y);
 	rwindow_w = defaults->get("RWINDOW_W", rwindow_w);
@@ -479,6 +487,9 @@ int MainSession::save_defaults(BC_Hash *defaults)
 	defaults->update("AWINDOW_W", awindow_w);
 	defaults->update("AWINDOW_H", awindow_h);
 
+	defaults->update("BWINDOW_W", bwindow_w);
+	defaults->update("BWINDOW_H", bwindow_h);
+
 	defaults->update("EWINDOW_W", ewindow_w);
 	defaults->update("EWINDOW_H", ewindow_h);