mirror of
https://github.com/brl/mutter.git
synced 2024-11-24 00:50:42 -05:00
display: Use the grab pointer for delayed window raising
This commit is contained in:
parent
5ecbb3ec3b
commit
38df2715f2
@ -48,6 +48,7 @@
|
||||
#include "xprops.h"
|
||||
#include "workspace-private.h"
|
||||
#include "bell.h"
|
||||
#include "device-pointer.h"
|
||||
#include "device-keyboard.h"
|
||||
#include "device-private.h"
|
||||
#include "input-events.h"
|
||||
@ -1458,22 +1459,26 @@ window_raise_with_delay_callback (void *data)
|
||||
if (window == NULL)
|
||||
return FALSE;
|
||||
|
||||
if (window->cur_grab == NULL)
|
||||
return FALSE;
|
||||
|
||||
/* If we aren't already on top, check whether the pointer is inside
|
||||
* the window and raise the window if so.
|
||||
*/
|
||||
if (meta_stack_get_top (window->screen->stack) != window)
|
||||
{
|
||||
int x, y, root_x, root_y;
|
||||
Window root, child;
|
||||
unsigned int mask;
|
||||
int root_x, root_y;
|
||||
gboolean same_screen;
|
||||
gboolean point_in_window;
|
||||
MetaDevicePointer *pointer;
|
||||
|
||||
meta_error_trap_push (window->display);
|
||||
same_screen = XQueryPointer (window->display->xdisplay,
|
||||
pointer = META_DEVICE_POINTER (window->cur_grab->grab_pointer);
|
||||
same_screen = meta_device_pointer_query_position (pointer,
|
||||
window->xwindow,
|
||||
&root, &child,
|
||||
&root_x, &root_y, &x, &y, &mask);
|
||||
NULL, NULL,
|
||||
&root_x, &root_y,
|
||||
NULL, NULL, NULL);
|
||||
meta_error_trap_pop (window->display);
|
||||
|
||||
point_in_window =
|
||||
|
Loading…
Reference in New Issue
Block a user