brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meta_window_new: clean up error handling

Browse Source 
The return code of XGetWindowAttributes() indicates whether an error
was encountered or not. There is no need to specifically check the error
trap.

The trap around XAddToSaveSet() was superfluous. We have a global error
trap to ignore any errors here, and there is no need to XSync() as GDK
will later ignore the error asynchronously if one is raised.

Also move common error exit path to an error label.

https://bugzilla.gnome.org/show_bug.cgi?id=721345
This commit is contained in:
Daniel Drake 2014-01-06 13:09:44 -06:00
parent 39d26be941
commit af46ef3b96
1 changed files with 20 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/core/window.c
View File

@ -1440,28 +1440,12 @@ meta_window_new (MetaDisplay *display,
* creation, to reduce XSync() calls * creation, to reduce XSync() calls
*/ */
meta_error_trap_push_with_return (display); if (!XGetWindowAttributes (display->xdisplay, xwindow, &attrs))
{
if (XGetWindowAttributes (display->xdisplay, xwindow, &attrs)) meta_verbose ("Failed to get attributes for window 0x%lx\n",
{ xwindow);
if(meta_error_trap_pop_with_return (display) != Success) goto error;
{ }
meta_verbose ("Failed to get attributes for window 0x%lx\n",
xwindow);
meta_error_trap_pop (display);
meta_display_ungrab (display);
return NULL;
}
}
else
{
meta_error_trap_pop_with_return (display);
meta_verbose ("Failed to get attributes for window 0x%lx\n",
xwindow);
meta_error_trap_pop (display);
meta_display_ungrab (display);
return NULL;
}
for (tmp = display->screens; tmp != NULL; tmp = tmp->next) for (tmp = display->screens; tmp != NULL; tmp = tmp->next)
{ {
@ -1494,17 +1478,13 @@ meta_window_new (MetaDisplay *display,
) )
) { ) {
meta_verbose ("Not managing our own windows\n"); meta_verbose ("Not managing our own windows\n");
meta_error_trap_pop (display); goto error;
meta_display_ungrab (display);
return NULL;
} }
if (maybe_filter_xwindow (display, xwindow, must_be_viewable, &attrs)) if (maybe_filter_xwindow (display, xwindow, must_be_viewable, &attrs))
{ {
meta_verbose ("Not managing filtered window\n"); meta_verbose ("Not managing filtered window\n");
meta_error_trap_pop (display); goto error;
meta_display_ungrab (display);
return NULL;
} }
existing_wm_state = WithdrawnState; existing_wm_state = WithdrawnState;
@ -1521,9 +1501,7 @@ meta_window_new (MetaDisplay *display,
(state == IconicState || state == NormalState))) (state == IconicState || state == NormalState)))
{ {
meta_verbose ("Deciding not to manage unmapped or unviewable window 0x%lx\n", xwindow); meta_verbose ("Deciding not to manage unmapped or unviewable window 0x%lx\n", xwindow);
meta_error_trap_pop (display); goto error;
meta_display_ungrab (display);
return NULL;
} }
existing_wm_state = state; existing_wm_state = state;
@ -1536,15 +1514,13 @@ meta_window_new (MetaDisplay *display,
/* /*
* XAddToSaveSet can only be called on windows created by a different * XAddToSaveSet can only be called on windows created by a different
* client. with Mutter we want to be able to create manageable windows * client. with Mutter we want to be able to create manageable windows
* from within the process (such as a dummy desktop window), so we do not * from within the process (such as a dummy desktop window). As we do not
* want this call failing to prevent the window from being managed -- wrap * want this call failing to prevent the window from being managed, we
* it in its own error trap (we use the _with_return() version here to * call this before creating the return-checked error trap.
* ensure that XSync() is done on the pop, otherwise the error will not
* get caught).
*/ */
meta_error_trap_push_with_return (display);
XAddToSaveSet (display->xdisplay, xwindow); XAddToSaveSet (display->xdisplay, xwindow);
meta_error_trap_pop_with_return (display);
meta_error_trap_push_with_return (display);
event_mask = PropertyChangeMask | ColormapChangeMask; event_mask = PropertyChangeMask | ColormapChangeMask;
if (attrs.override_redirect) if (attrs.override_redirect)
@ -1591,9 +1567,7 @@ meta_window_new (MetaDisplay *display,
{ {
meta_verbose ("Window 0x%lx disappeared just as we tried to manage it\n", meta_verbose ("Window 0x%lx disappeared just as we tried to manage it\n",
xwindow); xwindow);
meta_error_trap_pop (display); goto error;
meta_display_ungrab (display);
return NULL;
} }
window = meta_window_new_shared (display, window = meta_window_new_shared (display,
@ -1617,6 +1591,11 @@ meta_window_new (MetaDisplay *display,
display_notify_window (display, window); display_notify_window (display, window);
return window; return window;
error:
meta_error_trap_pop (display);
meta_display_ungrab (display);
return NULL;
} }
/* This function should only be called from the end of meta_window_new_with_attrs () */ /* This function should only be called from the end of meta_window_new_with_attrs () */