Merge branch 'testing' into wine-access

src/cthulhu/scripts/default.py

@@ -3441,6 +3441,20 @@ class Script(script.Script):
 
         return requested
 
+    def should_interrupt_for_mode_announcement(
+        self,
+        requested: bool,
+        already_handled: bool = False,
+    ) -> bool:
+        """Returns whether a mode announcement should interrupt prior output."""
+
+        if requested and already_handled:
+            msg = "DEFAULT: Mode announcement interruption already handled by input dispatch"
+            debug.printMessage(debug.LEVEL_INFO, msg, True)
+            return False
+
+        return requested
+
     def presentKeyboardEvent(self, event):
         """Convenience method to present the KeyboardEvent event. Returns True
         if we fully present the event; False otherwise."""

src/cthulhu/scripts/web/script.py

@@ -1523,7 +1523,11 @@ class Script(default.Script):
                 self.utilities.setCaretContext(AXObject.get_parent(parent), -1)
             if not self._loadingDocumentContent:
                 if inputEvent is not None:
-                    self.presentMessage(messages.MODE_BROWSE, interrupt=True)
+                    interrupt = self.should_interrupt_for_mode_announcement(
+                        True,
+                        already_handled=True,
+                    )
+                    self.presentMessage(messages.MODE_BROWSE, interrupt=interrupt)
                 else:
                     self.presentMessage(messages.MODE_BROWSE)
                 if not self._shouldSuppressBrowseModeSound(obj, inputEvent):
@@ -1536,7 +1540,11 @@ class Script(default.Script):
                 self.utilities.grabFocus(obj)
 
             if inputEvent is not None:
-                self.presentMessage(messages.MODE_FOCUS, interrupt=True)
+                interrupt = self.should_interrupt_for_mode_announcement(
+                    True,
+                    already_handled=True,
+                )
+                self.presentMessage(messages.MODE_FOCUS, interrupt=interrupt)
             else:
                 self.presentMessage(messages.MODE_FOCUS)
             sound_theme_manager.getManager().playFocusModeSound()

src/cthulhu/settings.py

@@ -493,7 +493,7 @@ structNavTriggersFocusMode = False
 caretNavTriggersFocusMode = False
 nativeNavTriggersFocusMode = True
 
-layoutMode = True
+layoutMode = False
 
 rewindAndFastForwardInSayAll = False
 structNavInSayAll = False