X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcwindowbase.C;h=5b1331061d321bfb3dec45a55a8bacef288ff9fd;hb=a94468d6de897136e77c70662177f4b8b4454b6b;hp=b429da4ca13f1d5b28d7c6a877b03dd5b9159c58;hpb=877bf33862808d3c3fbe11a31de0000feb915f21;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/guicast/bcwindowbase.C b/cinelerra-5.1/guicast/bcwindowbase.C
index b429da4c..5b133106 100644
--- a/cinelerra-5.1/guicast/bcwindowbase.C
+++ b/cinelerra-5.1/guicast/bcwindowbase.C
@@ -255,6 +255,7 @@ int BC_WindowBase::initialize()
 	keys_return[0] = 0;
 	is_deleting = 0;
 	window_lock = 0;
+	resend_event_window = 0;
 	x = 0;
 	y = 0;
 	w = 0;
@@ -1254,6 +1255,18 @@ locking_message = event->xclient.message_type;
 		case XK_KP_Insert:	key_pressed = KPINS;	break;
 		case XK_KP_Decimal:
 		case XK_KP_Delete:	key_pressed = KPDEL;	break;
+
+		case XK_F1:		key_pressed = KEY_F1;	break;
+		case XK_F2:		key_pressed = KEY_F2;	break;
+		case XK_F3:		key_pressed = KEY_F3;	break;
+		case XK_F4:		key_pressed = KEY_F4;	break;
+		case XK_F5:		key_pressed = KEY_F5;	break;
+		case XK_F6:		key_pressed = KEY_F6;	break;
+		case XK_F7:		key_pressed = KEY_F7;	break;
+		case XK_F8:		key_pressed = KEY_F8;	break;
+		case XK_F9:		key_pressed = KEY_F9;	break;
+		case XK_F10:		key_pressed = KEY_F10;	break;
+
 		case XK_Menu:		key_pressed = KPMENU;	break;  /* menu */
 // remote control
 // above	case XK_KP_Enter:	key_pressed = KPENTER;	break;  /* check */
@@ -1351,7 +1364,14 @@ locking_message = event->xclient.message_type;
 
 #ifndef SINGLE_THREAD
 	unlock_window();
-	if(event) delete event;
+	if(event) {
+		if( resend_event_window ) {
+			resend_event_window->put_event(event);
+			resend_event_window = 0;
+		}
+		else
+			delete event;
+	}
 #else
 //	if(done) completion_lock->unlock();
 #endif
@@ -3431,6 +3451,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 +3861,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()
@@ -4464,6 +4493,20 @@ void BC_WindowBase::dequeue_events(Window win)
 	event_lock->unlock();
 }
 
+int BC_WindowBase::resend_event(BC_WindowBase *window)
+{
+	if( resend_event_window ) return 1;
+	resend_event_window = window;
+	return 0;
+}
+
+#else
+
+int BC_WindowBase::resend_event(BC_WindowBase *window)
+{
+	return 1;
+}
+
 #endif // SINGLE_THREAD
 
 int BC_WindowBase::get_id()