Incubates #6449.

nvaccess · Oct 13, 2016 · b38d31e · b38d31e
2 parents 1fb58cc + 2f3f4fc
commit b38d31e
Show file tree

Hide file tree

Showing 15 changed files with 804 additions and 369 deletions.
diff --git a/source/NVDAObjects/__init__.py b/source/NVDAObjects/__init__.py
@@ -24,6 +24,7 @@
 import treeInterceptorHandler
 import braille
 import globalPluginHandler
+import brailleInput
 
 class NVDAObjectTextInfo(textInfos.offsets.OffsetsTextInfo):
 	"""A default TextInfo which is used to enable text review of information about widgets that don't support text content.
@@ -891,6 +892,7 @@ def event_gainFocus(self):
 """
 		self.reportFocus()
 		braille.handler.handleGainFocus(self)
+		brailleInput.handler.handleGainFocus(self)
 
 	def event_foreground(self):
 		"""Called when the foreground window changes.

diff --git a/source/braille.py b/source/braille.py
diff --git a/source/brailleDisplayDrivers/brailleNote.py b/source/brailleDisplayDrivers/brailleNote.py
@@ -270,10 +270,10 @@ def display(self, cells):
 			"kb:end": ("br(braillenote):space+d4+d5",),
 			"kb:control+home": ("br(braillenote):space+d1+d2+d3",),
 			"kb:control+end": ("br(braillenote):space+d4+d5+d6",),
-			"kb:enter": ("br(braillenote):space+d8",),
+			"braille_enter": ("br(braillenote):space+d8",),
 			"kb:shift+tab": ("br(braillenote):space+d1+d2+d5+d6",),
 			"kb:tab": ("br(braillenote):space+d2+d3+d4+d5",),
-			"kb:backspace": ("br(braillenote):space+d7",),
+			"braille_eraseLastCell": ("br(braillenote):space+d7",),
 			"showGui": ("br(braillenote):space+d1+d3+d4+d5",),
 			"kb:windows": ("br(braillenote):space+d2+d4+d5+d6",),
 			"kb:alt": ("br(braillenote):space+d1+d3+d4",),

diff --git a/source/brailleDisplayDrivers/brailliantB.py b/source/brailleDisplayDrivers/brailliantB.py
@@ -254,7 +254,6 @@ def display(self, cells):
 			"kb:tab": ("br(brailliantB):space+dot4+dot6",),
 			"kb:alt": ("br(brailliantB):space+dot1+dot3+dot4",),
 			"kb:escape": ("br(brailliantB):space+dot1+dot5",),
-			"kb:enter": ("br(brailliantB):dot8",),
 			"kb:windows+d": ("br(brailliantB):c1+c4+c5",),
 			"kb:windows": ("br(brailliantB):space+dot3+dot4",),
 			"kb:alt+tab": ("br(brailliantB):space+dot2+dot3+dot4+dot5",),

diff --git a/source/brailleDisplayDrivers/freedomScientific.py b/source/brailleDisplayDrivers/freedomScientific.py
@@ -233,8 +233,6 @@ def script_toggleRightWizWheelAction(self,gesture):
 			"braille_scrollForward" : ("br(freedomScientific):rightAdvanceBar","br(freedomScientific):leftBumperBarDown","br(freedomScientific):rightBumperBarDown",),
 			"braille_previousLine" : ("br(freedomScientific):leftRockerBarUp", "br(freedomScientific):rightRockerBarUp",),
 			"braille_nextLine" : ("br(freedomScientific):leftRockerBarDown", "br(freedomScientific):rightRockerBarDown",),
-			"kb:backspace" : ("br(freedomScientific):dot7",),
-			"kb:enter" : ("br(freedomScientific):dot8",),
 			"kb:shift+tab": ("br(freedomScientific):dot1+dot2+brailleSpaceBar",),
 			"kb:tab" : ("br(freedomScientific):dot4+dot5+brailleSpaceBar",),
 			"kb:upArrow" : ("br(freedomScientific):dot1+brailleSpaceBar",),

diff --git a/source/brailleDisplayDrivers/hims/__init__.py b/source/brailleDisplayDrivers/hims/__init__.py
@@ -190,8 +190,6 @@ def display(self, cells):
 			"kb:shift+alt+downArrow": ("br(hims):dot5+dot6+dot7+advance1",),
 			"kb:alt+downArrow": ("br(hims):dot5+dot6+dot7",),
 			"kb:shift+downArrow": ("br(hims):space+rightSideScrollDown",),
-			"kb:backspace": ("br(hims):dot7",),
-			"kb:enter": ("br(hims):dot8",),
 			"kb:escape": ("br(hims):dot1+dot5+space",),
 			"kb:delete": ("br(hims):dot1+dot3+dot5+space",),
 			"kb:f1": ("br(hims):dot1+dot2+dot5+space",),

diff --git a/source/brailleDisplayDrivers/papenmeier.py b/source/brailleDisplayDrivers/papenmeier.py
@@ -498,8 +498,6 @@ def script_upperRouting(self, gesture):
 
 			"title": ("br(papenmeier):l1,up",),
 			"reportStatusLine": ("br(papenmeier):l2,dn",),
-			"kb:enter": ("br(papenmeier):d8",),
-			"kb:backspace": ("br(papenmeier):d7",),
 			"kb:alt": ("br(papenmeier):lt+d3",),
 			"kb:control": ("br(papenmeier):lt+d2",),
 			"kb:escape": ("br(papenmeier):space+d7",),