[[ Bug 12590 ]] Lock screen around menu update messages.

runrevmark · runrevmark · commit 4aa802b70f04 · 2014-06-10T16:02:42.000+01:00
diff --git a/docs/notes/bugfix-12590.md b/docs/notes/bugfix-12590.md
@@ -0,0 +1 @@
+# Screen updates occur during 'menu update' mouseDown message causing pauses when updating menus on first click.
diff --git a/engine/src/button.cpp b/engine/src/button.cpp
@@ -859,8 +859,11 @@ Boolean MCButton::mfocus(int2 x, int2 y)
 						menu->close();
 						menudepth--;
 						MCdispatcher->addmenu(bptr);
+                        // MW-2014-06-10: [[ Bug 12590 ]] Make sure we lock screen around the menu update message.
+                        MCRedrawLockScreen();
 						bptr->state |= CS_MFOCUSED;
 						bptr->message_with_args(MCM_mouse_down, menubutton);
+                        MCRedrawUnlockScreen();
 						bptr->findmenu();
 						bptr->openmenu(False);
 						return True;
diff --git a/engine/src/desktop-menu.cpp b/engine/src/desktop-menu.cpp
@@ -36,6 +36,7 @@
 #include "stack.h"
 #include "card.h"
 #include "graphics_util.h"
+#include "redraw.h"
 
 #include "platform.h"
 
@@ -892,9 +893,12 @@ void MCPlatformHandleMenuUpdate(MCPlatformMenuRef p_menu)
 	// from updates as we mustn't fiddle about with it too much in this case!
 	if (s_menubar_targets[t_parent_menu_index] -> Exists())
 	{
+        // MW-2014-06-10: [[ Bug 12590 ]] Make sure we lock screen around the menu update message.
+        MCRedrawLockScreen();
 		s_menubar_lock_count += 1;
 		s_menubar_targets[t_parent_menu_index] -> Get() -> message_with_args(MCM_mouse_down, "1");
 		s_menubar_lock_count -= 1;
+        MCRedrawUnlockScreen();
 	}
 	
 	// Now we've got the menu to update, process the new menu spec, but only if the
diff --git a/engine/src/desktop-stack.cpp b/engine/src/desktop-stack.cpp
@@ -289,14 +289,19 @@ void MCStack::updateignoremouseevents(void)
 	MCPlatformSetWindowBoolProperty(window, kMCPlatformWindowPropertyIgnoreMouseEvents, getextendedstate(ECS_IGNORE_MOUSE_EVENTS) == True);
 }
 
-
 // MW-2011-09-11: [[ Redraw ]] Force an immediate update of the window within the given
 //   region. The actual rendering is done by deferring to the 'redrawwindow' method.
 void MCStack::view_platform_updatewindow(MCRegionRef p_region)
 {
 	if (window == nil)
 		return;
-	
+    
+    if (!opened)
+        return;
+    
+    if (!isvisible())
+        return;
+    
 	MCPlatformInvalidateWindow(window, p_region);
 	MCPlatformUpdateWindow(window);
 }
diff --git a/engine/src/stacklst.cpp b/engine/src/stacklst.cpp
@@ -31,6 +31,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "stacklst.h"
 #include "sellst.h"
 #include "util.h"
+#include "redraw.h"
 
 #include "globals.h"
 
@@ -308,6 +309,9 @@ Boolean MCStacklist::doaccelerator(KeySym key)
 
 	if (t_menubar != NULL)
 	{
+        // MW-2014-06-10: [[ Bug 12590 ]] Make sure we lock screen around the menu update message.
+        MCRedrawLockScreen();
+        
 		// OK-2008-03-20 : Bug 6153. Don't send a mouse button number if the mouseDown is due to
 		// a menu accelerator.
 		// MW-2008-08-27: [[ Bug 6995 ]] Slowdown caused by repeated invocation of mouseDown even if
@@ -326,6 +330,7 @@ Boolean MCStacklist::doaccelerator(KeySym key)
 					{
 						MCmodifierstate &= t_mod_mask;
 						accelerators[i] . button -> activate(True, (uint2)key);
+                        MCRedrawUnlockScreen();
 						return True;
 					}
 				}
@@ -335,6 +340,8 @@ Boolean MCStacklist::doaccelerator(KeySym key)
 				break;
 			}
 		}
+        
+        MCRedrawUnlockScreen();
 	}
 
 	// IM-2008-09-05: Reorganize loop to be more efficient - only loop through stacks once we've

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Screen updates occur during 'menu update' mouseDown message causing pauses when updating menus on first click.`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ along with LiveCode. If not see <http://www.gnu.org/licenses/>. */`
`31`	`31`	`#include "stacklst.h"`
`32`	`32`	`#include "sellst.h"`
`33`	`33`	`#include "util.h"`
	`34`	`+#include "redraw.h"`
`34`	`35`
`35`	`36`	`#include "globals.h"`
`36`	`37`
`@@ -308,6 +309,9 @@ Boolean MCStacklist::doaccelerator(KeySym key)`
`308`	`309`
`309`	`310`	`if (t_menubar != NULL)`
`310`	`311`	`{`
	`312`	`+ // MW-2014-06-10: [[ Bug 12590 ]] Make sure we lock screen around the menu update message.`
	`313`	`+ MCRedrawLockScreen();`
	`314`	`+`
`311`	`315`	`// OK-2008-03-20 : Bug 6153. Don't send a mouse button number if the mouseDown is due to`
`312`	`316`	`// a menu accelerator.`
`313`	`317`	`// MW-2008-08-27: [[ Bug 6995 ]] Slowdown caused by repeated invocation of mouseDown even if`
`@@ -326,6 +330,7 @@ Boolean MCStacklist::doaccelerator(KeySym key)`
`326`	`330`	`{`
`327`	`331`	`MCmodifierstate &= t_mod_mask;`
`328`	`332`	`accelerators[i] . button -> activate(True, (uint2)key);`
	`333`	`+ MCRedrawUnlockScreen();`
`329`	`334`	`return True;`
`330`	`335`	`}`
`331`	`336`	`}`
`@@ -335,6 +340,8 @@ Boolean MCStacklist::doaccelerator(KeySym key)`
`335`	`340`	`break;`
`336`	`341`	`}`
`337`	`342`	`}`
	`343`	`+`
	`344`	`+ MCRedrawUnlockScreen();`
`338`	`345`	`}`
`339`	`346`
`340`	`347`	`// IM-2008-09-05: Reorganize loop to be more efficient - only loop through stacks once we've`