storm/cthulhu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More web refactor. Tighten suspend terminal code.

Browse Source
This commit is contained in:
Storm Dragon
2026-07-21 13:28:26 -04:00
parent 5044455582
commit 1249aa791c
9 changed files with 1636 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_chromium_omnibox_regressions.py
+183
View File
@@ -8,6 +8,9 @@ from gi.repository import Atspi
from cthulhu import ax_object
from cthulhu import cthulhu_state
from cthulhu import focus_manager
from cthulhu.scripts import default
from cthulhu.scripts.toolkits.Chromium import script as chromium_script
from cthulhu.scripts.toolkits.Chromium import script_utilities as chromium_utilities
class ChromiumOmniboxRegressionTests(unittest.TestCase):
@@ -63,6 +66,186 @@ class ChromiumOmniboxRegressionTests(unittest.TestCase):
self.assertIs(manager.get_active_window(), activeWindow)
self.assertIs(cthulhu_state.activeWindow, activeWindow)
def test_detects_nameless_frame_with_listbox_as_autocomplete_popup(self):
utilities = chromium_utilities.Utilities.__new__(chromium_utilities.Utilities)
frame = object()
listbox = object()
with (
mock.patch.object(chromium_utilities.AXUtilities, "is_frame", return_value=True),
mock.patch.object(chromium_utilities.AXObject, "get_name", return_value=""),
mock.patch.object(chromium_utilities.AXObject, "get_child_count", return_value=1),
mock.patch.object(chromium_utilities.AXObject, "get_child", return_value=listbox),
mock.patch.object(chromium_utilities.AXUtilities, "is_list_box", return_value=True),
):
result = utilities.autocompletePopupForFrame(frame)
self.assertIs(result, listbox)
def test_does_not_treat_nested_listbox_as_autocomplete_popup(self):
utilities = chromium_utilities.Utilities.__new__(chromium_utilities.Utilities)
frame = object()
with (
mock.patch.object(chromium_utilities.AXUtilities, "is_frame", return_value=True),
mock.patch.object(chromium_utilities.AXObject, "get_name", return_value=""),
mock.patch.object(chromium_utilities.AXObject, "get_child_count", return_value=2),
):
result = utilities.autocompletePopupForFrame(frame)
self.assertIsNone(result)
@staticmethod
def _make_chromium_script():
testScript = chromium_script.Script.__new__(chromium_script.Script)
testScript.utilities = mock.Mock()
testScript.utilities.canBeActiveWindow.return_value = True
testScript.utilities.autocompletePopupForFrame.return_value = None
testScript.utilities.popupMenuForFrame.return_value = None
testScript._lastAutocompletePopupItem = None
testScript.presentObject = mock.Mock()
return testScript
def test_autocomplete_popup_activation_presents_item_without_frame_fallback(self):
testScript = self._make_chromium_script()
frame = object()
listbox = object()
item = object()
event = mock.Mock(source=frame)
testScript.utilities.autocompletePopupForFrame.return_value = listbox
testScript.utilities.selectedChildren.return_value = [item]
with (
mock.patch.object(chromium_script.AXUtilities, "get_focused_object", return_value=item),
mock.patch.object(chromium_script.cthulhu, "setActiveWindow") as setActiveWindow,
mock.patch.object(chromium_script.cthulhu, "setLocusOfFocus") as setLocusOfFocus,
mock.patch.object(default.Script, "onWindowActivated") as defaultHandler,
):
chromium_script.Script.onWindowActivated(testScript, event)
setActiveWindow.assert_not_called()
setLocusOfFocus.assert_not_called()
testScript.presentObject.assert_called_once_with(item, interrupt=True)
self.assertIs(testScript._lastAutocompletePopupItem, item)
defaultHandler.assert_not_called()
def test_autocomplete_popup_activation_uses_focused_item_when_none_selected(self):
testScript = self._make_chromium_script()
frame = object()
listbox = object()
item = object()
event = mock.Mock(source=frame)
testScript.utilities.autocompletePopupForFrame.return_value = listbox
testScript.utilities.selectedChildren.return_value = []
with mock.patch.object(
chromium_script.AXUtilities,
"get_focused_object",
return_value=item,
):
chromium_script.Script.onWindowActivated(testScript, event)
testScript.presentObject.assert_called_once_with(item, interrupt=True)
self.assertIs(testScript._lastAutocompletePopupItem, item)
def test_autocomplete_popup_selection_is_presented_without_changing_document_focus(self):
testScript = self._make_chromium_script()
comboBox = object()
listbox = object()
frame = object()
item = object()
event = mock.Mock(source=item, detail1=True)
cthulhu_state.locusOfFocus = comboBox
testScript.utilities.inDocumentContent.return_value = False
with (
mock.patch.object(chromium_script.web.Script, "onSelectedChanged", return_value=False),
mock.patch.object(
chromium_script.AXObject,
"find_ancestor_inclusive",
return_value=listbox,
),
mock.patch.object(chromium_script.AXObject, "get_parent", return_value=frame),
mock.patch.object(chromium_script.AXObject, "get_name", return_value=""),
mock.patch.object(chromium_script.AXUtilities, "is_frame", return_value=True),
):
chromium_script.Script.onSelectedChanged(testScript, event)
chromium_script.Script.onSelectedChanged(testScript, event)
self.assertIs(cthulhu_state.locusOfFocus, comboBox)
testScript.presentObject.assert_called_once_with(item, interrupt=True)
def test_main_window_deactivation_for_autocomplete_popup_preserves_state(self):
testScript = self._make_chromium_script()
mainFrame = object()
comboBox = object()
event = mock.Mock(source=mainFrame)
cthulhu_state.locusOfFocus = comboBox
testScript.utilities.lastKeyAndModifiers.return_value = ("Down", 8)
with (
mock.patch.object(chromium_script.AXUtilities, "is_combo_box", return_value=True),
mock.patch.object(
chromium_script.AXUtilities,
"supports_autocompletion",
return_value=True,
),
mock.patch.object(default.Script, "onWindowDeactivated") as defaultHandler,
):
chromium_script.Script.onWindowDeactivated(testScript, event)
defaultHandler.assert_not_called()
def test_unrelated_autocomplete_window_deactivation_reaches_default(self):
testScript = self._make_chromium_script()
mainFrame = object()
comboBox = object()
app = object()
event = mock.Mock(source=mainFrame)
cthulhu_state.locusOfFocus = comboBox
testScript.utilities.lastKeyAndModifiers.return_value = ("w", 4)
with (
mock.patch.object(chromium_script.AXUtilities, "is_combo_box", return_value=True),
mock.patch.object(
chromium_script.AXUtilities,
"supports_autocompletion",
return_value=True,
),
mock.patch.object(chromium_script.AXObject, "get_application", return_value=app),
mock.patch.object(chromium_script.AXObject, "iter_children", return_value=iter(())),
mock.patch.object(chromium_script.web.Script, "onWindowDeactivated", return_value=False),
mock.patch.object(default.Script, "onWindowDeactivated") as defaultHandler,
):
chromium_script.Script.onWindowDeactivated(testScript, event)
defaultHandler.assert_called_once_with(testScript, event)
def test_unmodified_arrow_deactivation_reaches_default(self):
testScript = self._make_chromium_script()
mainFrame = object()
comboBox = object()
app = object()
event = mock.Mock(source=mainFrame)
cthulhu_state.locusOfFocus = comboBox
testScript.utilities.lastKeyAndModifiers.return_value = ("Down", 0)
with (
mock.patch.object(chromium_script.AXUtilities, "is_combo_box", return_value=True),
mock.patch.object(
chromium_script.AXUtilities,
"supports_autocompletion",
return_value=True,
),
mock.patch.object(chromium_script.AXObject, "get_application", return_value=app),
mock.patch.object(chromium_script.AXObject, "iter_children", return_value=iter(())),
mock.patch.object(chromium_script.web.Script, "onWindowDeactivated", return_value=False),
mock.patch.object(default.Script, "onWindowDeactivated") as defaultHandler,
):
chromium_script.Script.onWindowDeactivated(testScript, event)
defaultHandler.assert_called_once_with(testScript, event)
if __name__ == "__main__":
unittest.main()
tests/test_input_event_manager_key_watcher_regressions.py
+20
View File
@@ -306,5 +306,25 @@ class InputEventManagerKeyWatcherTests(unittest.TestCase):
[(modified, None), (unrelated, None)],
)
def test_keybinding_grab_failure_rolls_back_partial_additions(self) -> None:
manager = input_event_manager.InputEventManager()
device = mock.Mock()
device.add_key_grab.side_effect = [101, RuntimeError("grab failed")]
manager._device = device
firstDefinition = types.SimpleNamespace(keycode=44, modifiers=0)
secondDefinition = types.SimpleNamespace(keycode=45, modifiers=0)
binding = mock.Mock()
binding.is_enabled.return_value = True
binding.is_bound.return_value = True
binding.has_grabs.return_value = False
binding.keycode = 44
binding.key_definitions.return_value = [firstDefinition, secondDefinition]
with self.assertRaisesRegex(RuntimeError, "grab failed"):
manager.add_grabs_for_keybinding(binding)
device.remove_key_grab.assert_called_once_with(101)
self.assertEqual(manager._grabbed_bindings, {})
if __name__ == "__main__":
unittest.main()
tests/test_input_event_manager_x11_focus_regressions.py
+108
View File
@@ -525,6 +525,114 @@ class InputEventManagerX11FocusRegressionTests(unittest.TestCase):
oldScript.removeKeyGrabs.assert_called_once_with()
oldScript.addKeyGrabs.assert_not_called()
def test_xterm_grabs_restore_on_x11_focus_change_without_keyboard_event(self):
manager = input_event_manager.InputEventManager()
activeScript = mock.Mock()
scriptManager = mock.Mock()
scriptManager.get_active_script.return_value = activeScript
screen = mock.Mock()
activeWindow = object()
screen.get_active_window.return_value = activeWindow
manager._scriptWithSuspendedGrabsForXterm = activeScript
with (
mock.patch.object(input_event_manager.script_manager, "get_manager", return_value=scriptManager),
mock.patch.object(manager, "_x11_window_xterm_match", return_value=False) as matcher,
mock.patch.object(input_event_manager.debug, "print_tokens"),
):
manager._on_active_x11_window_changed(screen, None)
matcher.assert_called_once_with(activeWindow)
activeScript.addKeyGrabs.assert_called_once_with()
self.assertIsNone(manager._scriptWithSuspendedGrabsForXterm)
def test_xterm_focus_check_failure_starts_recovery_timer(self):
manager = input_event_manager.InputEventManager()
manager._device = object()
manager._scriptWithSuspendedGrabsForXterm = object()
screen = mock.Mock()
screen.get_active_window.side_effect = RuntimeError("focus unavailable")
with (
mock.patch.object(input_event_manager.GLib, "timeout_add", return_value=23),
mock.patch.object(input_event_manager.debug, "print_message"),
):
manager._on_active_x11_window_changed(screen, None)
self.assertEqual(manager._xtermRecoverySourceId, 23)
def test_xterm_focus_monitor_is_connected_only_once(self):
manager = input_event_manager.InputEventManager()
screen = mock.Mock()
screen.connect.return_value = 17
manager._ensure_xterm_focus_monitor(screen)
manager._ensure_xterm_focus_monitor(screen)
screen.connect.assert_called_once_with(
"active-window-changed",
manager._on_active_x11_window_changed,
)
def test_xterm_suspension_starts_fallback_when_focus_monitor_is_unavailable(self):
manager = input_event_manager.InputEventManager()
manager._device = object()
activeScript = mock.Mock()
scriptManager = mock.Mock()
scriptManager.get_active_script.return_value = activeScript
with (
mock.patch.object(input_event_manager.script_manager, "get_manager", return_value=scriptManager),
mock.patch.object(input_event_manager.GLib, "timeout_add", return_value=23) as timeoutAdd,
mock.patch.object(input_event_manager.debug, "print_tokens"),
):
manager._suspend_key_grabs_for_xterm()
timeoutAdd.assert_called_once_with(100, manager._poll_xterm_grab_recovery)
self.assertEqual(manager._xtermRecoverySourceId, 23)
def test_xterm_grab_restore_failure_keeps_retry_state(self):
manager = input_event_manager.InputEventManager()
manager._device = object()
activeScript = mock.Mock()
activeScript.addKeyGrabs.side_effect = RuntimeError("grab failed")
scriptManager = mock.Mock()
scriptManager.get_active_script.return_value = activeScript
manager._scriptWithSuspendedGrabsForXterm = activeScript
with (
mock.patch.object(input_event_manager.script_manager, "get_manager", return_value=scriptManager),
mock.patch.object(input_event_manager.GLib, "timeout_add", return_value=23),
mock.patch.object(input_event_manager.debug, "print_message"),
mock.patch.object(input_event_manager.debug, "print_tokens"),
):
manager._restore_key_grabs_after_xterm()
self.assertIs(manager._scriptWithSuspendedGrabsForXterm, activeScript)
self.assertEqual(manager._xtermRecoverySourceId, 23)
activeScript.removeKeyGrabs.assert_called_once_with()
def test_stopping_key_watcher_disconnects_xterm_focus_monitor(self):
manager = input_event_manager.InputEventManager()
screen = mock.Mock()
manager._xtermFocusScreen = screen
manager._xtermFocusHandlerId = 17
manager._xtermRecoverySourceId = 23
manager._scriptWithSuspendedGrabsForXterm = object()
with (
mock.patch.object(input_event_manager.GLib, "source_remove") as sourceRemove,
mock.patch.object(input_event_manager.debug, "print_message"),
):
manager.stop_key_watcher()
screen.disconnect.assert_called_once_with(17)
sourceRemove.assert_called_once_with(23)
self.assertIsNone(manager._xtermFocusScreen)
self.assertEqual(manager._xtermFocusHandlerId, 0)
self.assertEqual(manager._xtermRecoverySourceId, 0)
self.assertIsNone(manager._scriptWithSuspendedGrabsForXterm)
def test_identifier_is_xterm_matches_exact_xterm_only(self):
self.assertTrue(input_event_manager.InputEventManager._identifier_is_xterm("xterm"))
self.assertTrue(input_event_manager.InputEventManager._identifier_is_xterm("/usr/bin/xterm"))
tests/test_web_input_regressions.py
+994
View File
File diff suppressed because it is too large Load Diff