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

activating the current workspace should be a no-op. This prevents a race

Browse Source 
2004-08-07  Elijah Newren  <newren@math.utah.edu>

	* src/display.c (event_callback): activating the current workspace
	should be a no-op.  This prevents a race condition in focus window
	choice when activating a window via the taskbar.  Fix for #149589.
This commit is contained in:
Elijah Newren 2004-08-08 04:11:33 +00:00 committed by Elijah Newren
parent bd73853f72
commit 118a1fb76a
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,9 +1,15 @@
2004-08-07 Elijah Newren <newren@math.utah.edu> 2004-08-07 Elijah Newren <newren@math.utah.edu>
* window.c, window.h: Revert Rob's 2004-07-31 patch that ignored * src/display.c (event_callback): activating the current workspace
net_wm_user_time when unminimizing a window should be a no-op. This prevents a race condition in focus window
choice when activating a window via the taskbar. Fix for #149589.
* window.c (meta_window_activate): If a nonzero timestamp is 2004-08-07 Elijah Newren <newren@math.utah.edu>
* src/window.c, src/window.h: Revert Rob's 2004-07-31 patch that
ignored net_wm_user_time when unminimizing a window
* src/window.c (meta_window_activate): If a nonzero timestamp is
passed, update the window's net_wm_user_time accordingly. (see passed, update the window's net_wm_user_time accordingly. (see
comments 102-108 of bug 118372) comments 102-108 of bug 118372)

9
src/display.c
View File

@ -2057,8 +2057,13 @@ event_callback (XEvent *event,
if (workspace) if (workspace)
{ {
meta_workspace_activate (workspace); if (workspace != screen->active_workspace)
meta_workspace_focus_default_window (workspace, NULL); {
meta_workspace_activate (workspace);
meta_workspace_focus_default_window (workspace, NULL);
}
else
meta_verbose ("Workspace %d already active.\n", space);
} }
else else
meta_verbose ("Don't know about workspace %d\n", space); meta_verbose ("Don't know about workspace %d\n", space);