Changeset 2429

Timestamp:

10/12/08 08:55:18 (6 weeks ago)

Author:

pvagner

Message:

* some enhancements for keyboard support by Aleksey:
* While the keyboard help is turned on NVDA can speak all the keys including the key modifiers.
* Tweaked anouncing of the scripts description while the keyboard help is turned on.
* added ability to translate keynames.

Location:

trunk/source

Files:

• keyUtils.py (modified) (1 diff)
• keyboardHandler.py (modified) (5 diffs)
• winUser.py (modified) (2 diffs)

trunk/source/keyUtils.py

@@ -107 +107 @@
                 time.sleep(0.01)
                 wx.Yield()
+
+localizedKeyLabels={
+        'back': _("backspace"),
+        'capital': _("caps lock"),
+        'control': _("ctrl"),
+        'alt': _("alt"),
+        'shift': _("shift"),
+        'win': _("windows"),
+        'return': _("enter"),
+        'extendedreturn': _("numpad enter"),
+        'escape': _("escape"),
+        'space': _("space"),
+        'extendedprior': _("page up"),
+        'extendednext': _("page down"),
+        'extendedend': _("end"),
+        'extendedhome': _("home"),
+        'extendeddelete': _("delete"),
+        'extendedleft': _("left arrow"),
+        'extendedright': _("right arrow"),
+        'extendedup': _("up arrow"),
+        'extendeddown': _("down arrow"),
+        'extendedapps': _("applications"),
+        'extendednumlock': _("num lock"),
+        'extendedsnapshot': _("snapshot"),
+        'scroll': _("scrol lock"),
+        'left': _("numpad left"),
+        'right': _("numpad right"),
+        'up': _("numpad up"),
+        'down': _("numpad down"),
+        'prior': _("numpad page up"),
+        'next': _("numpad page down"),
+        'end': _("numpad end"),
+        'home': _("numpad home"),
+        'extendeddivide': _("numpad slash"),
+        'multiply': _("numpad star"),
+        'subtract': _("numpad minus"),
+        'add': _("numpad plus"),
+        'lcontrol': _("left control"),
+        'extendedrcontrol': _("right control"),
+        'extendedlwin': _("left windows"),
+        'lshift': _("left shift"),
+        'extendedrshift': _("right shift"),
+        'lmenu': _("left alt"),
+        'extendedrmenu': _("right alt"),
+        'extendedrwin': _("right windows")
+}

trunk/source/keyboardHandler.py

@@ -13 +13 @@
 import vkCodes
 import speech
-from keyUtils import key, keyName, sendKey
+from keyUtils import key, keyName, sendKey, localizedKeyLabels
 import scriptHandler
 import globalVars
@@ -78 +78 @@
 @ctypes.CFUNCTYPE(ctypes.c_int,ctypes.c_int,ctypes.c_int,ctypes.c_int,ctypes.c_int)
 def internal_keyDownEvent(vkCode,scanCode,extended,injected):
-        """Event called by pyHook when it receives a keyDown. It sees if there is a script tied to this key and if so executes it. It also handles the speaking of characters, words and command keys.
+        """Event called by keyHook when it receives a keyDown. It sees if there is a script tied to this key and if so executes it. It also handles the speaking of characters, words and command keys.
 """
         try:
@@ -112 +112 @@
                 if isNVDAModifierKey(vkCode,extended):
                         NVDAModifierKey=(vkCode,extended)
-                        return False
-                if vkCode in [winUser.VK_CONTROL,winUser.VK_LCONTROL,winUser.VK_RCONTROL,winUser.VK_SHIFT,winUser.VK_LSHIFT,winUser.VK_RSHIFT,winUser.VK_MENU,winUser.VK_LMENU,winUser.VK_RMENU,winUser.VK_LWIN,winUser.VK_RWIN]:
+                        if not globalVars.keyboardHelp:
+                                return False
+                if not globalVars.keyboardHelp and vkCode in [winUser.VK_CONTROL,winUser.VK_LCONTROL,winUser.VK_RCONTROL,winUser.VK_SHIFT,winUser.VK_LSHIFT,winUser.VK_RSHIFT,winUser.VK_MENU,winUser.VK_LMENU,winUser.VK_RMENU,winUser.VK_LWIN,winUser.VK_RWIN]:
                         return True
                 modifierList=[]
                 if NVDAModifierKey:
                         modifierList.append("nvda")
-                if winUser.getKeyState(winUser.VK_CONTROL)&32768:
+                if not vkCode in [winUser.VK_CONTROL,winUser.VK_LCONTROL,winUser.VK_RCONTROL] and winUser.getKeyState(winUser.VK_CONTROL)&32768:
                         modifierList.append("control")
-                if winUser.getKeyState(winUser.VK_SHIFT)&32768:
+                if not vkCode in [winUser.VK_SHIFT,winUser.VK_LSHIFT,winUser.VK_RSHIFT] and winUser.getKeyState(winUser.VK_SHIFT)&32768:
                         modifierList.append("shift")
-                if winUser.getKeyState(winUser.VK_MENU)&32768:
+                if not vkCode in [winUser.VK_MENU,winUser.VK_LMENU,winUser.VK_RMENU] and winUser.getKeyState(winUser.VK_MENU)&32768:
                         modifierList.append("alt")
-                if winUser.getKeyState(winUser.VK_LWIN)&32768:
+                if not vkCode in [winUser.VK_LWIN,winUser.VK_RWIN] and winUser.getKeyState(winUser.VK_LWIN)&32768:
                         modifierList.append("win")
-                if winUser.getKeyState(winUser.VK_RWIN)&32768:
+                if not vkCode in [winUser.VK_LWIN,winUser.VK_RWIN] and winUser.getKeyState(winUser.VK_RWIN)&32768:
                         modifierList.append("win")
                 if len(modifierList) > 0:
@@ -133 +134 @@
                         modifiers=None
                 mainKey=vkName
+                if not mainKey:
+                        mainKey=winUser.getKeyNameText(scanCode,extended)
                 if extended==1:
                         mainKey="extended%s"%mainKey
@@ -138 +141 @@
                 if log.isEnabledFor(log.IO): log.io("key press: %s"%keyName(keyPress))
                 if globalVars.keyboardHelp or (config.conf["keyboard"]["speakCommandKeys"] and not ( not keyPress[0] and config.conf["keyboard"]["speakTypedCharacters"])):
-                        labelList=[]
-                        if keyPress[0] is not None:
-                                labelList.extend(keyPress[0])
-                        ch=ctypes.windll.user32.MapVirtualKeyW(vkCode,winUser.MAPVK_VK_TO_CHAR)
-                        if ch>32:
-                                labelList.append(unichr(ch))
-                        else:
-                                labelList.append(keyPress[1])
+                        labelList = []
+                        if modifiers:
+                                for mod in modifiers: 
+                                        if localizedKeyLabels.has_key(mod): 
+                                                labelList.append(localizedKeyLabels[mod]) 
+                                        else: 
+                                                labelList.append(mod)
+                        if not isNVDAModifierKey(vkCode,extended):
+                                ch=ctypes.windll.user32.MapVirtualKeyW(vkCode,winUser.MAPVK_VK_TO_CHAR)
+                                if localizedKeyLabels.has_key(keyPress[1]):
+                                        labelList.append(localizedKeyLabels[keyPress[1]])
+                                elif ch>=32 and not mainKey.startswith('numpad') and not mainKey in ('extendeddivide', 'multiply', 'subtract', 'add', 'extendedreturn', 'decimal'):
+                                        labelList.append(unichr(ch))
+                                else:
+                                        labelList.append(keyPress[1])
                         queueHandler.queueFunction(queueHandler.eventQueue,speech.speakMessage,"+".join(labelList))
-                if (mainKey in ('extendeddivide', 'multiply', 'subtract', 'add', 'extendedreturn')) and (bool(winUser.getKeyState(winUser.VK_NUMLOCK)&1)):
+                if not globalVars.keyboardHelp and (mainKey in ('extendeddivide', 'multiply', 'subtract', 'add', 'extendedreturn')) and (bool(winUser.getKeyState(winUser.VK_NUMLOCK)&1)):
                         return True
                 script=scriptHandler.findScript(keyPress)
                 if script:
                         scriptName=scriptHandler.getScriptName(script)
-                        scriptLocation=scriptHandler.getScriptLocation(script)
-                        scriptDescription=scriptHandler.getScriptDescription(script)
                         if globalVars.keyboardHelp and scriptName!="keyboardHelp":
-                                queueHandler.queueFunction(queueHandler.eventQueue,speech.speakMessage,"%s"%scriptName.replace('_',' '))
-                                queueHandler.queueFunction(queueHandler.eventQueue,speech.speakMessage,_("Description: %s")%scriptDescription)
-                                queueHandler.queueFunction(queueHandler.eventQueue,speech.speakMessage,_("Location: %s")%scriptLocation)
+                                scriptDescription = scriptHandler.getScriptDescription(script)
+                                if scriptDescription: queueHandler.queueFunction(queueHandler.eventQueue,speech.speakMessage,_("Description: %s")%scriptDescription)
+                                queueHandler.queueFunction(queueHandler.eventQueue,speech.speakMessage,_("Location: %s")%scriptHandler.getScriptLocation(script))
                         else:
                                 scriptHandler.queueScript(script,keyPress)

trunk/source/winUser.py

@@ -74 +74 @@
 WM_GETTEXT=13
 WM_GETTEXTLENGTH=14
+WM_PAINT=0x000F
 #Clipboard formats
 CF_TEXT=1
@@ -377 +378 @@
 def getKeyboardLayout(idThread=0):
         return user32.GetKeyboardLayout(idThread)
+
+def updateWindow(hwnd):
+        return user32.UpdateWindow(hwnd)
+
+def invalidateRect(hwnd):
+        return user32.InvalidateRect(hwnd,None,False)
+
+def getKeyNameText(scanCode,extended):
+        buf=create_unicode_buffer(32)
+        user32.GetKeyNameTextW((scanCode<<16)|(extended<<24),buf,31)
+        return buf.value