isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-09-19 14:05:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make the taskbar less flash happy and fix up some related stacking issues.

Browse Source 
2006-01-09  Elijah Newren  <newren@gmail.com>

	Make the taskbar less flash happy and fix up some related stacking
	issues.  #326035.

	* src/window.c (windows_overlap): new function,
	(meta_window_show): if a window is denied focus but doesn't
	overlap with the focus window there is no need to set the demands
	attention hint nor stack that window below the focus window,
	(meta_window_get_outer_rect): we're not modifying the window so
	declare it to be const
This commit is contained in:
Elijah Newren 2006-01-10 05:14:48 +00:00 committed by Elijah Newren
parent 8c5b6c875a
commit 0f8add8b37
3 changed files with 67 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2006-01-09 Elijah Newren <newren@gmail.com>
Make the taskbar less flash happy and fix up some related stacking
issues. #326035.
* src/window.c (windows_overlap): new function,
(meta_window_show): if a window is denied focus but doesn't
overlap with the focus window there is no need to set the demands
attention hint nor stack that window below the focus window,
(meta_window_get_outer_rect): we're not modifying the window so
declare it to be const
2006-01-09 Elijah Newren <newren@gmail.com>
Fix window outline for minimized windows when using alt-esc.

61
src/window.c
View File

@ -1724,6 +1724,15 @@ window_state_on_map (MetaWindow *window,
}
}
static gboolean
windows_overlap (const MetaWindow *w1, const MetaWindow *w2)
{
MetaRectangle w1rect, w2rect;
meta_window_get_outer_rect (w1, &w1rect);
meta_window_get_outer_rect (w2, &w2rect);
return meta_rectangle_overlap (&w1rect, &w2rect);
}
void
meta_window_show (MetaWindow *window)
{
@ -1731,14 +1740,18 @@ meta_window_show (MetaWindow *window)
gboolean did_show;
gboolean takes_focus_on_map;
gboolean place_on_top_on_map;
gboolean needs_stacking_adjustment;
MetaWindow *focus_window;
meta_topic (META_DEBUG_WINDOW_STATE,
"Showing window %s, shaded: %d iconic: %d placed: %d\n",
window->desc, window->shaded, window->iconic, window->placed);
focus_window = window->display->focus_window; /* May be NULL! */
did_show = FALSE;
did_placement = FALSE;
window_state_on_map (window, &takes_focus_on_map, &place_on_top_on_map);
needs_stacking_adjustment = FALSE;
meta_topic (META_DEBUG_WINDOW_STATE,
"Window %s %s focus on map, and %s place on top on map.\n",
@ -1747,12 +1760,11 @@ meta_window_show (MetaWindow *window)
place_on_top_on_map ? "does" : "does not");
if ( !takes_focus_on_map &&
window->display->focus_window != NULL &&
focus_window != NULL &&
!place_on_top_on_map &&
window->showing_for_first_time )
{
if (meta_window_is_ancestor_of_transient (window->display->focus_window,
window))
if (meta_window_is_ancestor_of_transient (focus_window, window))
{
/* This happens for error dialogs or alerts; these need to remain on
* top, but it would be confusing to have its ancestor remain
@ -1762,14 +1774,13 @@ meta_window_show (MetaWindow *window)
"The focus window %s is an ancestor of the newly mapped "
"window %s which isn't being focused. Unfocusing the "
"ancestor.\n",
window->display->focus_window->desc, window->desc);
focus_window->desc, window->desc);
meta_display_focus_the_no_focus_window (window->display, window->screen, meta_display_get_current_time_roundtrip (window->display));
}
else
{
meta_window_stack_just_below (window, window->display->focus_window);
ensure_mru_position_after (window, window->display->focus_window);
needs_stacking_adjustment = TRUE;
if (!window->placed)
window->denied_focus_and_not_transient = TRUE;
}
@ -1869,11 +1880,41 @@ meta_window_show (MetaWindow *window)
}
else
{
/* Only set the demands attention hint if the window doesn't
* take focus on map and it isn't placed on top on map.
/* This window isn't getting focus on map. We may need to do some
* special handing with it in regards to
* - the stacking of the window
* - the MRU position of the window
* - the demands attention setting of the window
*/
if (!place_on_top_on_map)
if (!place_on_top_on_map && needs_stacking_adjustment)
{
g_assert (focus_window != NULL);
gboolean overlap = windows_overlap (window, focus_window);
/* We want alt tab to go to the denied-focus window */
ensure_mru_position_after (window, focus_window);
/* We don't want the denied-focus window to obscure the focus
* window, and in click-to-focus-mode we want to maintain the
* invariant that MRU order == stacking order. The need for
* this if comes from the fact that in sloppy/mouse focus the
* focus window may not overlap other windows and also can be
* considered "below" them; this combination means that placing
* the denied-focus window "below" the focus window in the
* stack when it doesn't overlap it confusingly places that new
* window below a lot of other windows.
*/
if (overlap ||
meta_prefs_get_focus_mode () == META_FOCUS_MODE_CLICK)
meta_window_stack_just_below (window, focus_window);
/* If the window will be obscured by the focus window, then the
* user might not notice the window appearing so set the
* demands attention hint.
*/
if (overlap)
window->wm_state_demands_attention = TRUE;
}
/* Prevent EnterNotify events in sloppy/mouse focus from
* erroneously focusing the window that had been denied
@ -3317,7 +3358,7 @@ meta_window_get_geometry (MetaWindow *window,
}
void
meta_window_get_outer_rect (MetaWindow *window,
meta_window_get_outer_rect (const MetaWindow *window,
MetaRectangle *rect)
{
if (window->frame)

2
src/window.h
View File

@ -449,7 +449,7 @@ void meta_window_get_geometry (MetaWindow *window,
int *y,
int *width,
int *height);
void meta_window_get_outer_rect (MetaWindow *window,
void meta_window_get_outer_rect (const MetaWindow *window,
MetaRectangle *rect);
void meta_window_get_xor_rect (MetaWindow *window,
const MetaRectangle *grab_wireframe_rect,