X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=keymapparser.py;h=11c8530adb0da2b0c6ab0df583523854b9f26cae;hp=510a47a951c26e761861740d638c93a38a9e5de6;hb=1b2f75903244b6c03e1f123533d4385c0c271c78;hpb=1cdf6cb021fcaa6548b90ba7b6765cf1e8b8b37b

diff --git a/keymapparser.py b/keymapparser.py
index 510a47a..11c8530 100644
--- a/keymapparser.py
+++ b/keymapparser.py
@@ -9,12 +9,14 @@ def readKeymap():
 	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)
 	except:
-		raise "couldn't open keymap.xml!"
+		source = open(filename2)
+#		raise "couldn't open keymap.xml!"
 	
 	try:
 		dom = xml.dom.minidom.parse(source)
@@ -38,7 +40,7 @@ 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))
@@ -52,6 +54,13 @@ def readKeymap():
 				
 				if len(id) == 1:
 					keyid = ord(id) | 0x8000
+				elif id[0] == '\\':
+					if id[1] == 'x':
+						keyid = int(id[2:], 0x10) | 0x8000
+					elif id[1] == 'd':
+						keyid = int(id[2:]) | 0x8000
+					else:
+						raise "key id '" + str(id) + "' is neither hex nor dec"
 				else:
 					try:
 						keyid = KEYIDS[id]
@@ -59,7 +68,7 @@ def readKeymap():
 						raise "key id '" + str(id) + "' is illegal"
 
 				print context + "::" + mapto + " -> " + device + "." + hex(keyid)
-				p.bindKey(device, keyid, 7, context, mapto)
+				p.bindKey(device, keyid, flags, context, mapto)
 		
 		parseKeys("generic", cmap)