Skip to content

Address code review points from #4 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ragb merged 1 commit into from
Aug 24, 2026
Merged

Address code review points from #4 #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 9 additions & 13 deletions addon/globalPlugins/virtualRevision.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,7 @@ def obtainUWPWindowText():
if curObject.name is not None:
uwpTextList.append(curObject.name)
if _isTermControl(curObject):
info = curObject.makeTextInfo(textInfos.POSITION_FIRST)
info.expand(textInfos.UNIT_STORY)
info = curObject.makeTextInfo(textInfos.POSITION_ALL)
text = _cleanTerminalText(info.clipboardText)
uwpTextList.append(text)
if curObject.simpleFirstChild:
Expand All @@ -124,7 +123,10 @@ def obtainUWPWindowText():
parent = curObject.simpleParent
# As long as one is on current foreground object...
# Stay within the current top-level window.
if parent.simpleParent == desktop:
# Compare window handles rather than objects: an add-on that puts overlay classes on
# the desktop object makes the identity comparison fail.
grandParent = parent.simpleParent
if grandParent is not None and grandParent.windowHandle == desktop.windowHandle:
break
while parent and not parent.simpleNext:
parent = parent.simpleParent
Expand All @@ -134,8 +136,7 @@ def obtainUWPWindowText():
except AttributeError:
continue
if _isTermControl(foreground):
info = foreground.makeTextInfo(textInfos.POSITION_FIRST)
info.expand(textInfos.UNIT_STORY)
info = foreground.makeTextInfo(textInfos.POSITION_ALL)
text = _cleanTerminalText(info.clipboardText)
uwpTextList.append(text)
return uwpTextList
Expand Down Expand Up @@ -175,8 +176,7 @@ def script_virtualWindowReview(self, gesture):
# generic child walk is slower and can miss the active pane.
term = _findTermControl(obj)
if term is not None:
info = term.makeTextInfo(textInfos.POSITION_FIRST)
info.expand(textInfos.UNIT_STORY)
info = term.makeTextInfo(textInfos.POSITION_ALL)
text = _cleanTerminalText(info.clipboardText)
# Because it may take a while to iterate through elements, play abeep to alert users of this fact and the fact it's a UWP screen.
elif obj.windowClassName.startswith(("Windows.UI.Core", "Windows.UI.Input.InputSite")):
Expand All @@ -195,14 +195,10 @@ def script_virtualWindowReview(self, gesture):
root = ancestor
break
if root:
info = root.makeTextInfo(textInfos.POSITION_FIRST)
# sys.maxint is gone in Python 3 as integer bit width can grow arbitrarily.
# Use the static value (0x7fffffff or (2^31)-1) directly.
info.move(textInfos.UNIT_LINE, 0x7FFFFFFF, endPoint="end")
info = root.makeTextInfo(textInfos.POSITION_ALL)
text = info.clipboardText.replace("\0", " ")
if obj.windowClassName == "ConsoleWindowClass":
info = obj.makeTextInfo(textInfos.POSITION_FIRST)
info.expand(textInfos.UNIT_STORY)
info = obj.makeTextInfo(textInfos.POSITION_ALL)
text = info.clipboardText.rstrip()
if text:
name = api.getForegroundObject().name
Expand Down