Skip to content
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

UI Automation in Windows Console: add STABILIZE_DELAY and improve "speak typed words" #9651

Merged
merged 4 commits into from
Jun 3, 2019
Merged

UI Automation in Windows Console: add STABILIZE_DELAY and improve "speak typed words" #9651

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f9f0987
Add a 30 ms STABILIZE_DELAY to the UIA console (identical to that in …
codeofdusk May 28, 2019
54f4259
unset _isTyping on interrupt characters, and clear the typed words bu…
codeofdusk May 29, 2019
7a339a6
Cleanup.
codeofdusk May 31, 2019
8248159
Add \n
codeofdusk May 31, 2019
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
20 changes: 18 additions & 2 deletions source/NVDAObjects/UIA/winConsoleUIA.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
# See the file COPYING for more details.
# Copyright (C) 2019 Bill Dengler

import speech
import time
import textInfos
import UIAHandler
Expand Down Expand Up @@ -32,24 +33,39 @@ def __init__(self, obj, position, _rangeObj=None):


class winConsoleUIA(Terminal):
STABILIZE_DELAY = 0.03
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you elaborate on how you decided to go with 0.03

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Value taken from legacy console code.

_TextInfo = consoleUIATextInfo
_isTyping = False
_lastCharTime = 0
_TYPING_TIMEOUT = 1

def _reportNewText(self, line):
# Additional typed character filtering beyond that in LiveText
if self._isTyping and time.time() - self._lastCharTime <= self._TYPING_TIMEOUT:
if (
self._isTyping
and time.time() - self._lastCharTime <= self._TYPING_TIMEOUT
):
return
super(winConsoleUIA, self)._reportNewText(line)

def event_typedCharacter(self, ch):
if not ch.isspace():
self._isTyping = True
if ch in ('\n', '\r', '\t'):
# Clear the typed word buffer for tab and return.
# This will need to be changed once #8110 is merged.
speech.curWordChars = []
self._lastCharTime = time.time()
super(winConsoleUIA, self).event_typedCharacter(ch)

@script(gestures=["kb:enter", "kb:numpadEnter", "kb:tab"])
@script(gestures=[
"kb:enter",
"kb:numpadEnter",
"kb:tab",
"kb:control+c",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How could we make sure that this list of gestures is complete?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It probably isn't unfortunately.

"kb:control+d",
"kb:control+pause"
])
def script_clear_isTyping(self, gesture):
gesture.send()
self._isTyping = False
Expand Down