X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcwindowbase.C;h=5d177c930d22693fe631a1a3727a6ee15bd1dcd0;hp=23e5bec4a7918345c1ca7bbb7384df62a4be56a1;hb=dcdf2f77cc47ca7c543f27ddb03c4814015d974b;hpb=3932d2c16e903573db3cacdb3102dea9639c6ca4

diff --git a/cinelerra-5.1/guicast/bcwindowbase.C b/cinelerra-5.1/guicast/bcwindowbase.C
index 23e5bec4..5d177c93 100644
--- a/cinelerra-5.1/guicast/bcwindowbase.C
+++ b/cinelerra-5.1/guicast/bcwindowbase.C
@@ -566,9 +566,8 @@ int BC_WindowBase::create_window(BC_WindowBase *parent_window, const char *title
 		mask = CWEventMask | CWBackPixel | CWColormap |
 			CWOverrideRedirect | CWSaveUnder | CWCursor;
 
-		attr.event_mask = DEFAULT_EVENT_MASKS |
-			KeyPressMask |
-			KeyReleaseMask;
+		attr.event_mask = DEFAULT_EVENT_MASKS | ExposureMask |
+			KeyPressMask | KeyReleaseMask;
 
 		if(this->bg_color == -1)
 			this->bg_color = resources.get_bg_color();
@@ -729,9 +728,8 @@ int BC_WindowBase::run_window()
 	init_lock->unlock();
 
 // Handle common events
-	while(!done)
-	{
-		dispatch_event(0);
+	while( !done ) {
+		dispatch_event();
 	}
 
 	unset_all_repeaters();
@@ -887,13 +885,14 @@ pthread_t locking_task = (pthread_t)-1L;
 int locking_event = -1;
 int locking_message = -1;
 
-int BC_WindowBase::dispatch_event(XEvent *event)
+int BC_WindowBase::dispatch_event()
 {
 	Window tempwin;
 	int result;
 	XClientMessageEvent *ptr;
 	int cancel_resize, cancel_translation;
 	volatile static int debug = 0;
+	XEvent *event;
 
 	key_pressed = 0;
 
@@ -1066,7 +1065,13 @@ if( debug && event->type != ClientMessage ) {
 
 	case Expose:
 		event_win = event->xany.window;
-		dispatch_expose_event();
+		result = 0;
+		for( int i=0; !result && i<popups.size(); ++i ) {  // popups take focus
+			if( popups[i]->win == event_win )
+				result = popups[i]->dispatch_expose_event();
+		}
+		if( !result )
+			result = dispatch_expose_event();
 		break;
 
 	case MotionNotify: