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

Avoid a race condition on the choice of window to focus after the

Browse Source 
2004-06-24  Elijah Newren  <newren@math.utah.edu>

	* src/window.c: Avoid a race condition on the choice of window to
	focus after the previously focused window gets closed or
	minimized.  Fixes #131582.
This commit is contained in:
Elijah Newren 2004-06-24 19:41:02 +00:00 committed by Elijah Newren
parent fe341bb927
commit 702a4c0da7
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2004-06-24 Elijah Newren <newren@math.utah.edu>
* src/window.c: Avoid a race condition on the choice of window to
focus after the previously focused window gets closed or
minimized. Fixes #131582.
2004-06-24 Elijah Newren <newren@math.utah.edu> 2004-06-24 Elijah Newren <newren@math.utah.edu>
* src/metacity.schemas.in: make naming for "move a window"/"move * src/metacity.schemas.in: make naming for "move a window"/"move

26
src/window.c
View File

@ -1080,6 +1080,12 @@ meta_window_free (MetaWindow *window)
meta_icon_cache_free (&window->icon_cache); meta_icon_cache_free (&window->icon_cache);
/* Avoid a race condition between the focusing of the mru window and the
* mouse entering the window beneath the one closed in sloppy/mouse focus
* modes.
*/
meta_display_increment_focus_sentinel (window->display);
g_free (window->sm_client_id); g_free (window->sm_client_id);
g_free (window->wm_client_machine); g_free (window->wm_client_machine);
g_free (window->startup_id); g_free (window->startup_id);
@ -1479,12 +1485,30 @@ idle_calc_showing (gpointer data)
/* for all displays used in the queue, set a sentinel property on /* for all displays used in the queue, set a sentinel property on
* the root window so that we can ignore EnterNotify events that * the root window so that we can ignore EnterNotify events that
* occur before the window maps occur. This avoids a race * occur before the window maps occur. This avoids a race
* condition. */ * condition.
*/
tmp = should_show; tmp = should_show;
while (tmp != NULL) while (tmp != NULL)
{ {
MetaWindow *window = tmp->data; MetaWindow *window = tmp->data;
if (g_slist_find (displays, window->display) == NULL)
{
displays = g_slist_prepend (displays, window->display);
meta_display_increment_focus_sentinel (window->display);
}
tmp = tmp->next;
}
/* There's also a potential race condition on window minimize.
* So we need to avoid that to, in the same manner. As with the
* case above, this race condition is only for sloppy/mouse focus.
*/
tmp = should_hide;
while (tmp != NULL)
{
MetaWindow *window = tmp->data;
if (g_slist_find (displays, window->display) == NULL) if (g_slist_find (displays, window->display) == NULL)
{ {
displays = g_slist_prepend (displays, window->display); displays = g_slist_prepend (displays, window->display);