X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcwindowbase.C;h=583caac6d890e62de81dc16def9db3201a74e6a1;hp=1810abc3f6fd943076cbdb6ab20edc1a16a5ba83;hb=6c5258a9791775f706e55c280da75ed6f6ef1720;hpb=e8453fdab4d5ed7b384279a5b37c92010ac13295;ds=sidebyside

diff --git a/cinelerra-5.1/guicast/bcwindowbase.C b/cinelerra-5.1/guicast/bcwindowbase.C
index 1810abc3..583caac6 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();
@@ -959,42 +958,25 @@ if( debug && event->type != ClientMessage ) {
 	switch(event->type) {
 	case ClientMessage:
 // Clear the resize buffer
-		if(resize_events) dispatch_resize_event(last_resize_w, last_resize_h);
+		if( resize_events )
+			dispatch_resize_event(last_resize_w, last_resize_h);
 // Clear the motion buffer since this can clear the window
-		if(motion_events)
-		{
+		if( motion_events )
 			dispatch_motion_event();
-		}
 
 		ptr = (XClientMessageEvent*)event;
-
-
-		if(ptr->message_type == ProtoXAtom &&
-			(Atom)ptr->data.l[0] == DelWinXAtom)
-		{
+		if( ptr->message_type == ProtoXAtom &&
+		    (Atom)ptr->data.l[0] == DelWinXAtom ) {
 			close_event();
 		}
-		else
-		if(ptr->message_type == RepeaterXAtom)
-		{
+		else if( ptr->message_type == RepeaterXAtom ) {
 			dispatch_repeat_event(ptr->data.l[0]);
-// Make sure the repeater still exists.
-// 				for(int i = 0; i < repeaters.total; i++)
-// 				{
-// 					if(repeaters.values[i]->repeat_id == ptr->data.l[0])
-// 					{
-// 						dispatch_repeat_event_master(ptr->data.l[0]);
-// 						break;
-// 					}
-// 				}
 		}
-		else
-		if(ptr->message_type == SetDoneXAtom)
-		{
+		else if( ptr->message_type == SetDoneXAtom ) {
 			done = 1;
-			} else
-			{ // We currently use X marshalling for xatom events, we can switch to something else later
-				receive_custom_xatoms((xatom_event *)ptr);
+		}
+		else {
+			receive_custom_xatoms((xatom_event *)ptr);
 		}
 		break;
 
@@ -1083,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: