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

Remove the hack from bug 128200; it isn't needed anymore with the fix from

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

	* src/display.c (meta_display_open):
	* src/display.h (struct _MetaDisplay):
	* src/window.c (meta_window_free, meta_window_client_message,
	meta_window_notify_focus):

	Remove the hack from bug 128200; it isn't needed anymore with the
	fix from bug #160470.
This commit is contained in:
Elijah Newren 2005-01-10 00:27:00 +00:00 committed by Elijah Newren
parent be29c69653
commit 7d747092a6
4 changed files with 11 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2005-01-09 Elijah Newren <newren@gmail.com>
* src/display.c (meta_display_open):
* src/display.h (struct _MetaDisplay):
* src/window.c (meta_window_free, meta_window_client_message,
meta_window_notify_focus):
Remove the hack from bug 128200; it isn't needed anymore with the
fix from bug #160470.
2005-01-09 Elijah Newren <newren@gmail.com> 2005-01-09 Elijah Newren <newren@gmail.com>
Don't focus the panel on click. Fixes #160470 (and 100470 and Don't focus the panel on click. Fixes #160470 (and 100470 and

1
src/display.c
View File

@ -330,7 +330,6 @@ meta_display_open (const char *name)
display->autoraise_timeout_id = 0; display->autoraise_timeout_id = 0;
display->autoraise_window = NULL; display->autoraise_window = NULL;
display->focus_window = NULL; display->focus_window = NULL;
display->previously_focused_window = NULL;
display->expected_focus_window = NULL; display->expected_focus_window = NULL;
#ifdef HAVE_XSYNC #ifdef HAVE_XSYNC

4
src/display.h
View File

@ -188,10 +188,6 @@ struct _MetaDisplay
*/ */
MetaWindow *focus_window; MetaWindow *focus_window;
/* Window that was the actual window from focus events before focus_window
*/
MetaWindow *previously_focused_window;
/* window we are expecting a FocusIn event for or the current focus /* window we are expecting a FocusIn event for or the current focus
* window if we are not expecting any FocusIn/FocusOut events; not * window if we are not expecting any FocusIn/FocusOut events; not
* perfect because applications can call XSetInputFocus directly. * perfect because applications can call XSetInputFocus directly.

26
src/window.c
View File

@ -950,8 +950,6 @@ meta_window_free (MetaWindow *window)
if (window->display->focus_window == window) if (window->display->focus_window == window)
window->display->focus_window = NULL; window->display->focus_window = NULL;
if (window->display->previously_focused_window == window)
window->display->previously_focused_window = NULL;
meta_window_unqueue_calc_showing (window); meta_window_unqueue_calc_showing (window);
meta_window_unqueue_move_resize (window); meta_window_unqueue_move_resize (window);
@ -3970,30 +3968,8 @@ meta_window_client_message (MetaWindow *window,
event->xclient.data.l[0]); event->xclient.data.l[0]);
if (event->xclient.data.l[0] == IconicState && if (event->xclient.data.l[0] == IconicState &&
window->has_minimize_func) window->has_minimize_func)
{
meta_window_minimize (window); meta_window_minimize (window);
/* If the window being minimized was the one with focus,
* then we should focus a new window. We often receive this
* wm_change_state message when a user has clicked on the
* tasklist on the panel; in those cases, the current
* focus_window is the panel, but the previous focus_window
* will have been this one. This is a special case where we
* need to manually handle focusing a new window because
* meta_window_minimize will get it wrong.
*/
if (window->display->focus_window &&
(window->display->focus_window->type == META_WINDOW_DOCK ||
window->display->focus_window->type == META_WINDOW_DESKTOP) &&
window->display->previously_focused_window == window)
{
meta_topic (META_DEBUG_FOCUS,
"Focusing default window because of minimization of former focus window %s, which was due to a wm_change_state client message\n",
window->desc);
meta_workspace_focus_default_window (window->screen->active_workspace, window, meta_display_get_current_time_roundtrip (window->display));
}
}
return TRUE; return TRUE;
} }
else if (event->xclient.message_type == else if (event->xclient.message_type ==
@ -4296,8 +4272,6 @@ meta_window_notify_focus (MetaWindow *window,
meta_topic (META_DEBUG_FOCUS, meta_topic (META_DEBUG_FOCUS,
"* Focus --> NULL (was %s)\n", window->desc); "* Focus --> NULL (was %s)\n", window->desc);
window->display->previously_focused_window =
window->display->focus_window;
window->display->focus_window = NULL; window->display->focus_window = NULL;
window->has_focus = FALSE; window->has_focus = FALSE;
if (window->frame) if (window->frame)