isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 08:00:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Also check for overlay_window.

Browse Source 
Tue Mar 28 09:57:26 2006  Søren Sandmann  <sandmann@redhat.com>

        * src/c-screen.c (meta_screen_info_add_window): Also check for overlay_window.

        * src/c-screen.c (meta_screen_info_redirect): Trap errors out of
        unredirect().
This commit is contained in:
Søren Sandmann 2006-03-28 14:58:14 +00:00 committed by Søren Sandmann Pedersen
parent 9b6aeeef12
commit ea1568c720
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Tue Mar 28 09:57:26 2006 Søren Sandmann <sandmann@redhat.com>
* src/c-screen.c (meta_screen_info_add_window): Also check for overlay_window.
* src/c-screen.c (meta_screen_info_redirect): Trap errors out of
unredirect().
2006-03-25 Thomas Thurman <thomas@thurman.org.uk> 2006-03-25 Thomas Thurman <thomas@thurman.org.uk>
* src/window.c, src/window.h (update_net_wm_state, * src/window.c, src/window.h (update_net_wm_state,

7
src/c-screen.c
View File

@ -283,8 +283,12 @@ meta_screen_info_redirect (MetaScreenInfo *info)
ws_window_set_input_shape (info->gl_window, region); ws_window_set_input_shape (info->gl_window, region);
g_object_unref (G_OBJECT (region)); g_object_unref (G_OBJECT (region));
ws_display_begin_error_trap (info->display);
ws_window_unredirect (info->gl_window); ws_window_unredirect (info->gl_window);
ws_display_end_error_trap (info->display);
claim_selection (info); claim_selection (info);
ws_window_map (info->gl_window); ws_window_map (info->gl_window);
@ -491,7 +495,8 @@ meta_screen_info_add_window (MetaScreenInfo *info,
if (ws_window_query_input_only (WS_WINDOW (drawable))) if (ws_window_query_input_only (WS_WINDOW (drawable)))
goto out; goto out;
if (WS_WINDOW (drawable) == info->gl_window) if (WS_WINDOW (drawable) == info->gl_window ||
WS_WINDOW (drawable) == info->screen->overlay_window)
{ {
g_print ("gl window\n"); g_print ("gl window\n");
goto out; goto out;