fix no more working infobar show when a service is selected in the

[enigma2.git] / keymapparser.py

diff --git a/keymapparser.py b/keymapparser.py
index 032805b34b595763f082137205ee58fa1d0b679c..f8aa07f49f4892f352eb7eb6f5c7f363e0ff242a 100644 (file)
--- a/keymapparser.py
+++ b/keymapparser.py
@@ -1,48 +1,52 @@
 import xml.dom.minidom
 import enigma
+from Tools.XMLTools import elementsWithTag
 
 from keyids import KEYIDS;
 
+# these are only informational (for help)...
+from Tools.KeyBindings import addKeyBinding
+
 def readKeymap():
 
-       p = enigma.eActionMapPtr()
-       enigma.eActionMap.getInstance(p)
+       p = enigma.eActionMap.getInstance()
        assert p
        
-       filename = "keymap.xml"
-       
+       filename1 = "data/keymap.xml"
+       filename2 = "/usr/share/enigma2/keymap.xml"
+               
        try:
-               source = open(filename)
+               source = open(filename1)
+               filename = filename1
        except:
-               raise "couldn't open keymap.xml!"
+               source = open(filename2)
+               filename = filename2
+#              raise "couldn't open keymap.xml!"
        
        try:
                dom = xml.dom.minidom.parse(source)
        except:
                raise "keymap not well-formed."
        
-       try:    
-               keymap = dom.getElementsByTagName("keymap")[0]
-       except:
-               raise "no keymap defined."
+       keymap = dom.childNodes[0]
        
-       maps = keymap.getElementsByTagName("map")
+       maps = elementsWithTag(keymap.childNodes, "map")
        
        for cmap in maps:
                context = str(cmap.getAttribute("context"))
                assert context != "", "map must have context"
        
                def parseKeys(device, keys):
-                       for x in keys.getElementsByTagName("key"):
+                       for x in elementsWithTag(keys.childNodes, "key"):
                                mapto = str(x.getAttribute("mapto"))
                                id = x.getAttribute("id")
                                flags = x.getAttribute("flags")
                                
-                               flag_ascii_to_id = lambda x: {'m':1,'r':2,'b':4}[x]
+                               flag_ascii_to_id = lambda x: {'m':1,'b':2,'r':4}[x]
                                
 #                              try:
                                flags = sum(map(flag_ascii_to_id, flags))
-                               print "-> " + str(flags)
+#                              print "-> " + str(flags)
 #                              except:
 #                                      raise str("%s: illegal flags '%s' specificed in context %s, id '%s'" % (filename, flags, context, id))
                                
@@ -65,11 +69,12 @@ def readKeymap():
                                        except:
                                                raise "key id '" + str(id) + "' is illegal"
 
-                               print context + "::" + mapto + " -> " + device + "." + hex(keyid)
-                               p.bindKey(device, keyid, 7, context, mapto)
+#                              print context + "::" + mapto + " -> " + device + "." + hex(keyid)
+                               p.bindKey(device, keyid, flags, context, mapto)
+                               addKeyBinding(keyid, context, mapto)
                
                parseKeys("generic", cmap)
                
-               for device in cmap.getElementsByTagName("device"):
+               for device in elementsWithTag(cmap.childNodes, "device"):
                        parseKeys(str(device.getAttribute("name")), device)