More web refactor. Tighten suspend terminal code.

This commit is contained in:
Storm Dragon committed 2026-07-21 13:28:26 -04:00
1 parent 5044455582
commit 1249aa791c
9 files changed
+1636 -64

No files matched your search

+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()