X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcwindowbase.C;h=f9eb98f20b18ee5d22609326afcc0382f7283125;hp=58055f78f98bbabffddfe7161c7db317f1bff7ee;hb=2540fb803c017aefc97be227d8f910507787f366;hpb=efc8fa7dc7ddcdeaa9398e09d81975a6ccf526fc

diff --git a/cinelerra-5.1/guicast/bcwindowbase.C b/cinelerra-5.1/guicast/bcwindowbase.C
index 58055f78..f9eb98f2 100644
--- a/cinelerra-5.1/guicast/bcwindowbase.C
+++ b/cinelerra-5.1/guicast/bcwindowbase.C
@@ -3431,6 +3431,8 @@ BC_WindowBase::get_xinerama_info(int screen)
 		return 0;
 	}
 	int top_x = get_x(), top_y = get_y();
+	if(  BC_DisplayInfo::left_border >= 0 ) top_x +=  BC_DisplayInfo::left_border;
+	if(  BC_DisplayInfo::top_border >= 0 ) top_y +=  BC_DisplayInfo::top_border;
 	for( int i=0; i<xinerama_screens; ++i ) {
 		int scr_y = top_y - xinerama_info[i].y_org;
 		if( scr_y < 0 || scr_y >= xinerama_info[i].height ) continue;
@@ -3839,21 +3841,28 @@ int BC_WindowBase::match_window(Window win)
 
 int BC_WindowBase::get_cursor_over_window()
 {
-	if(top_level != this) return top_level->get_cursor_over_window();
-
 	int abs_x, abs_y, win_x, win_y;
-	unsigned int temp_mask;
+	unsigned int mask_return;
 	Window root_return, child_return;
 
-	int ret = XQueryPointer(display, win,
+	int ret = XQueryPointer(top_level->display, top_level->rootwin,
 		&root_return, &child_return, &abs_x, &abs_y,
-		&win_x, &win_y, &temp_mask);
-//printf("BC_WindowBase::get_cursor_over_window %d %s 0x%x %d 0x%x\n",
-//  __LINE__, title, win, ret, child_return);
-
-	int result = !ret || child_return == None ? 0 :
-		match_window(child_return);
-	return result;
+		&win_x, &win_y, &mask_return);
+	if( ret && child_return == None ) ret = 0;
+	if( ret && win != child_return )
+		ret = top_level->match_window(child_return);
+// query pointer can return a window manager window with this top_level as a child
+//  for kde this can be two levels deep
+	unsigned int nchildren_return = 0;
+	Window parent_return, *children_return = 0;
+	Window top_win = top_level->win;
+	while( !ret && top_win != top_level->rootwin && top_win != root_return &&
+		XQueryTree(top_level->display, top_win, &root_return,
+			&parent_return, &children_return, &nchildren_return) ) {
+		if( children_return ) XFree(children_return);
+		if( (top_win=parent_return) == child_return ) ret = 1;
+	}
+	return ret;
 }
 
 int BC_WindowBase::cursor_above()
@@ -4256,6 +4265,7 @@ int BC_WindowBase::load_defaults(BC_Hash *defaults)
 	resources->filebox_columnwidth[1] = defaults->get("FILEBOX_WIDTH1", resources->filebox_columnwidth[1]);
 	resources->filebox_columnwidth[2] = defaults->get("FILEBOX_WIDTH2", resources->filebox_columnwidth[2]);
 	resources->filebox_columnwidth[3] = defaults->get("FILEBOX_WIDTH3", resources->filebox_columnwidth[3]);
+	resources->filebox_size_format = defaults->get("FILEBOX_SIZE_FORMAT", get_resources()->filebox_size_format);
 	defaults->get("FILEBOX_FILTER", resources->filebox_filter);
 	return 0;
 }
@@ -4283,6 +4293,7 @@ int BC_WindowBase::save_defaults(BC_Hash *defaults)
 	defaults->update("FILEBOX_WIDTH2", resources->filebox_columnwidth[2]);
 	defaults->update("FILEBOX_WIDTH3", resources->filebox_columnwidth[3]);
 	defaults->update("FILEBOX_FILTER", resources->filebox_filter);
+	defaults->update("FILEBOX_SIZE_FORMAT", get_resources()->filebox_size_format);
 	return 0;
 }