X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3af66122574386a2856e83ba9c5d73d27a6f3710..669b3e40818106a277ccb8bc5ca07e9117f0e596:/keymapparser.py

diff --git a/keymapparser.py b/keymapparser.py
index 032805b3..23cd5a86 100644
--- a/keymapparser.py
+++ b/keymapparser.py
@@ -3,18 +3,25 @@ import enigma
 
 from keyids import KEYIDS;
 
+# these are only informational (for help)...
+from Tools.KeyBindings import addKeyBinding
+
 def readKeymap():
 
 	p = enigma.eActionMapPtr()
 	enigma.eActionMap.getInstance(p)
 	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)
@@ -38,11 +45,11 @@ def readKeymap():
 				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,8 +72,9 @@ 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)