igor's ru.po, update msg.txt, get_cursor_over_window tweaks

[goodguy/history.git] / cinelerra-5.1 / guicast / bcwindowbase.C

diff --git a/cinelerra-5.1/guicast/bcwindowbase.C b/cinelerra-5.1/guicast/bcwindowbase.C
index 2ab508f2438ed85a1b3dd327fec95a611a33b487..4b9f17d0cbb1edc9a21a803041331c65dc9b6cf8 100644 (file)
--- a/cinelerra-5.1/guicast/bcwindowbase.C
+++ b/cinelerra-5.1/guicast/bcwindowbase.C
@@ -3839,17 +3839,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);
-       if( ret && child_return == None && win != root_return ) ret = 0;
-       if( ret && child_return != None ) ret = match_window(child_return);
+               &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
+       if( !ret ) {
+               unsigned int nchildren_return = 0;
+               Window parent_return, *children_return = 0;
+               XQueryTree(top_level->display, child_return, &root_return,
+                       &parent_return, &children_return, &nchildren_return);
+               if( children_return ) {
+                       if( nchildren_return==1 && children_return[0]==top_level->win )
+                               ret = 1;
+                       XFree(children_return);
+               }
+       }
        return ret;
 }