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

revert the patch from #128380--change _NET_ACTIVE_WINDOW behavior to what

Browse Source 
2005-07-23  Elijah Newren  <newren@gmail.com>

	* src/window.c: (meta_window_activate): revert the patch from
	#128380--change _NET_ACTIVE_WINDOW behavior to what it originally
	was.
This commit is contained in:
Elijah Newren 2005-07-24 01:13:41 +00:00 committed by Elijah Newren
parent 845a7fe554
commit 225407f3b3
2 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2005-07-23 Elijah Newren <newren@gmail.com>
* src/window.c: (meta_window_activate): revert the patch from
#128380--change _NET_ACTIVE_WINDOW behavior to what it originally
was.
2005-07-18 Matthias Clasen <mclasen@redhat.com> 2005-07-18 Matthias Clasen <mclasen@redhat.com>
* configure.in: Add checks for Xcursor, to make the changes * configure.in: Add checks for Xcursor, to make the changes

21
src/window.c
View File

@ -2262,31 +2262,22 @@ meta_window_activate (MetaWindow *window,
/* disable show desktop mode unless we're a desktop component */ /* disable show desktop mode unless we're a desktop component */
maybe_leave_show_desktop_mode (window); maybe_leave_show_desktop_mode (window);
/* Get window on current workspace */
if (!meta_window_located_on_workspace (window,
window->screen->active_workspace))
meta_window_change_workspace (window,
window->screen->active_workspace);
if (window->shaded) if (window->shaded)
meta_window_unshade (window); meta_window_unshade (window);
unminimize_window_and_all_transient_parents (window); unminimize_window_and_all_transient_parents (window);
/* Activate the window, moving to its workspace if necessary */
if (!meta_window_located_on_workspace (window,
window->screen->active_workspace))
{
meta_topic (META_DEBUG_FOCUS,
"Focusing and moving to workspace of window %s due to "
"activation\n",
window->desc);
meta_workspace_activate_with_focus (window->workspace,
window,
timestamp);
}
else
{
meta_window_raise (window); meta_window_raise (window);
meta_topic (META_DEBUG_FOCUS, meta_topic (META_DEBUG_FOCUS,
"Focusing window %s due to activation\n", "Focusing window %s due to activation\n",
window->desc); window->desc);
meta_window_focus (window, timestamp); meta_window_focus (window, timestamp);
}
} }
/* returns values suitable for meta_window_move /* returns values suitable for meta_window_move