X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcwindowbase.C;h=421a26fe7663e2470aba2f52d0265fb15c0560e4;hp=24dc5872e0e3ee426b504bffd009a9c305ede949;hb=17b4e5a06157865391c2d07b552b81d84665bcae;hpb=6853a2c0b04cc5ff4e87a2022c914227f925cb7f

diff --git a/cinelerra-5.1/guicast/bcwindowbase.C b/cinelerra-5.1/guicast/bcwindowbase.C
index 24dc5872..421a26fe 100644
--- a/cinelerra-5.1/guicast/bcwindowbase.C
+++ b/cinelerra-5.1/guicast/bcwindowbase.C
@@ -182,10 +182,12 @@ BC_WindowBase::~BC_WindowBase()
 		for( int i=sizeof(xfont)/sizeof(xfont[0]); --i>=0; )
 			XFreeFont(display, this->*xfont[i]);
 
-// past bug in X caused XRenderExtensionInfo to be damaged
-// if this is done here. left to be done in XCloseDisplay by Xlib.
-// works in more modern systems, and needed for leak testing.
-#if defined(HAVE_XFT) && defined(VALGRIND)
+#ifdef HAVE_XFT
+// prevents a bug when Xft closes with unrefd fonts
+		FcPattern *defaults = FcPatternCreate();
+		FcPatternAddInteger(defaults, "maxunreffonts", 0);
+		XftDefaultSet(display, defaults);
+
 		static void *BC_WindowBase::*xft_font[] = {
 			 &BC_WindowBase::smallfont_xft,
 			 &BC_WindowBase::mediumfont_xft,
@@ -390,12 +392,8 @@ int BC_WindowBase::create_window(BC_WindowBase *parent_window, const char *title
 #endif
 
 	id = get_resources()->get_id();
-	int need_lock = 0;
 	if(parent_window) top_level = parent_window->top_level;
-	if( top_level ) { // need this to avoid deadlock with Xlib's locks
-		need_lock = 1;
-		lock_window("BC_WindowBase::create_window");
-	}
+	if( top_level ) lock_window("BC_WindowBase::create_window");
 	get_resources()->create_window_lock->lock("BC_WindowBase::create_window");
 
 #ifdef HAVE_LIBXXF86VM
@@ -445,6 +443,7 @@ int BC_WindowBase::create_window(BC_WindowBase *parent_window, const char *title
 		if( shm_completion_event < 0 ) shm_completion_event =
 			ShmCompletion + XShmGetEventBase(display);
 #endif
+		lock_window("BC_WindowBase::create_window 1");
 
 		screen = DefaultScreen(display);
 		rootwin = RootWindow(display, screen);
@@ -638,7 +637,7 @@ int BC_WindowBase::create_window(BC_WindowBase *parent_window, const char *title
 		if(!hidden) show_window();
 	}
 	get_resources()->create_window_lock->unlock();
-	if(need_lock) unlock_window();
+	unlock_window();
 
 	return 0;
 }
@@ -998,7 +997,7 @@ locking_message = event->xclient.message_type;
 			done = 1;
 			} else
 			{ // We currently use X marshalling for xatom events, we can switch to something else later
-				recieve_custom_xatoms((xatom_event *)ptr);
+				receive_custom_xatoms((xatom_event *)ptr);
 		}
 		break;
 
@@ -1339,6 +1338,7 @@ locking_message = event->xclient.message_type;
 		break;
 
 	case LeaveNotify:
+		if( event->xcrossing.mode != NotifyNormal ) break;
 		if( cursor_entered && event->xcrossing.window == win ) {
 			cursor_entered = 0;
 		}
@@ -1347,6 +1347,7 @@ locking_message = event->xclient.message_type;
 		break;
 
 	case EnterNotify:
+		if( event->xcrossing.mode != NotifyNormal ) break;
 		if( !cursor_entered && event->xcrossing.window == win ) {
 			if( !event->xcrossing.focus && get_resources()->grab_input_focus ) {
 				XSetInputFocus(display, win, RevertToParent, CurrentTime);
@@ -1979,7 +1980,7 @@ int BC_WindowBase::arm_repeat(int64_t duration)
 }
 #endif
 
-int BC_WindowBase::recieve_custom_xatoms(xatom_event *event)
+int BC_WindowBase::receive_custom_xatoms(xatom_event *event)
 {
 	return 0;
 }