Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix up keyboard grab handling

Browse Source
This commit is contained in:
Alexander Larsson
2008-12-04 12:44:09 +01:00
committed by Alexander Larsson
parent d47ee4d797
commit 2b9dc3338a
2 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
gdk/x11/gdkevents-x11.c
View File

@@ -867,6 +867,24 @@ set_user_time (GdkWindow *window,
gdk_event_get_time (event));
}
static gboolean
is_parent_of (GdkWindow *parent,
GdkWindow *child)
{
GdkWindow *w;
w = child;
while (w != NULL)
{
if (w == parent)
return TRUE;
w = gdk_window_get_parent (w);
}
return FALSE;
}
static gboolean
gdk_event_translate (GdkDisplay *display,
GdkEvent *event,
@@ -941,10 +959,20 @@ gdk_event_translate (GdkDisplay *display,
if (window != NULL)
{
/* Rewrite keyboard grabs to offscreen windows */
if ((xevent->type == KeyPress || xevent->type == KeyRelease) &&
window_private == display_x11->keyboard_xgrab_native_window)
/* Apply keyboard grabs to non-native windows */
if (/* Is key event */
(xevent->type == KeyPress || xevent->type == KeyRelease) &&
/* And we have a grab */
display_x11->keyboard_xgrab_window != NULL &&
(
/* The window is not a descendant of the grabbed window */
!is_parent_of (display_x11->keyboard_xgrab_window, window) ||
/* Or owner event is false */
!display_x11->keyboard_xgrab_owner_events
)
)
{
/* Report key event against grab window */
window_private = display_x11->keyboard_xgrab_window;
window = (GdkWindow *) window_private;
}

12
gdk/x11/gdkmain-x11.c
View File

@@ -206,6 +206,10 @@ gdk_pointer_grab (GdkWindow * window,
native = gdk_window_get_toplevel (window);
/* TODO: What do we do for offscreens and children? We need to proxy the grab somehow */
if (!GDK_IS_WINDOW_IMPL_X11 (GDK_WINDOW_OBJECT (native)->impl))
return GDK_GRAB_SUCCESS;
if (confine_to)
confine_to = _gdk_window_get_impl_window (confine_to);
@@ -310,13 +314,15 @@ gdk_keyboard_grab (GdkWindow * window,
GdkDisplayX11 *display_x11;
GdkWindow *native;
if (1) return 0; /* TODO: fix */
g_return_val_if_fail (window != NULL, 0);
g_return_val_if_fail (GDK_IS_WINDOW (window), 0);
native = _gdk_window_get_impl_window (window);
native = gdk_window_get_toplevel (window);
/* TODO: What do we do for offscreens and children? We need to proxy the grab somehow */
if (!GDK_IS_WINDOW_IMPL_X11 (GDK_WINDOW_OBJECT (native)->impl))
return GDK_GRAB_SUCCESS;
display_x11 = GDK_DISPLAY_X11 (GDK_WINDOW_DISPLAY (native));
serial = NextRequest (GDK_WINDOW_XDISPLAY (native));