fix rc-keyboard map.

[vuplus_dvbapp] / lib / python / Components / config.py

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index b913882..1eceea5 100755 (executable)
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -810,53 +810,54 @@ class ConfigFloat(ConfigSequence):
 #### vuplus
 #Normal, LShift(42), RAlt(100), LShift+RAlt(100+42)/LArt(56)
 vukeymap_us_de = {
-         "2":[u"1", u"!", None, None]
-       , "3":[u"2", u"@", None, None]
-       , "4":[u"3", u"#", None, '\xc2\xa3']
-       , "5":[u"4", u"$", '\xc3\xa7', None]
-       , "6":[u"5", u"%", '\xc3\xbc', '\xe2\x82\xac']
-       , "7":[u"6", u"^", '\xc3\xb6', None]
-       , "8":[u"7", u"&", '\xc3\xa4', None]
-       , "9":[u"8", u"*", '\xc3\xa0', None]
-       ,"10":[u"9", u"(", '\xc3\xa8', None]
-       ,"11":[u"0", u")", '\xc3\xa9', None]
-       ,"12":[u"-", u"_", None, None]
-       ,"13":[u"=", u"+", "~", None]
-       ,"16":[u"q", u"Q", None, None]
-       ,"17":[u"w", u"W", None, None]
-       ,"18":[u"e", u"E", '\xe2\x82\xac', None]
-       ,"19":[u"r", u"R", None, None]
-       ,"20":[u"t", u"T", None, None]
-       ,"21":[u"y", u"Y", None, None]
-       ,"22":[u"u", u"U", None, None]
-       ,"23":[u"i", u"I", None, None]
-       ,"24":[u"o", u"O", None, None]
-       ,"25":[u"p", u"P", None, None]
-       ,"26":[u"[", u"{", None, None]
-       ,"27":[u"]", u"}", None, None]
-       ,"30":[u"a", u"A", None, None]
-       ,"31":[u"s", u"S", '\xc3\x9f', None]
-       ,"32":[u"d", u"D", None, None]
-       ,"33":[u"f", u"F", None, None]
-       ,"34":[u"g", u"G", None, None]
-       ,"35":[u"h", u"H", None, None]
-       ,"36":[u"j", u"J", None, None]
-       ,"37":[u"k", u"K", None, None]
-       ,"38":[u"l", u"L", None, None]
-       ,"39":[u";", u":", None, None]
-       ,"40":[u"\'", u"\"", None, None]
-       ,"41":['\xc2\xa7', '\xc2\xb0', '\xc2\xac', None]
-       ,"43":[u"\\", u"|", None, None]
-       ,"44":[u"z", u"Z", None, u"<"]
-       ,"45":[u"x", u"X", None, u">"]
-       ,"46":[u"c", u"C", '\xc2\xa2', None]
-       ,"47":[u"v", u"V", None, None]
-       ,"48":[u"b", u"B", None, None]
-       ,"49":[u"n", u"N", None, None]
-       ,"50":[u"m", u"M", '\xc2\xb5', None]
-       ,"51":[u",", "<", None, None]
-       ,"52":[u".", ">", None, None]
-       ,"53":[u"/", u"?", None, None]
+         2:[u"1", u"!", None, None]
+       , 3:[u"2", u"@", None, None]
+       , 4:[u"3", u"#", None, '\xc2\xa3']
+       , 5:[u"4", u"$", '\xc3\xa7', None]
+       , 6:[u"5", u"%", '\xc3\xbc', '\xe2\x82\xac']
+       , 7:[u"6", u"^", '\xc3\xb6', None]
+       , 8:[u"7", u"&", '\xc3\xa4', None]
+       , 9:[u"8", u"*", '\xc3\xa0', None]
+       ,10:[u"9", u"(", '\xc3\xa8', None]
+       ,11:[u"0", u")", '\xc3\xa9', None]
+       ,12:[u"-", u"_", None, None]
+       ,13:[u"=", u"+", "~", None]
+       ,16:[u"q", u"Q", None, None]
+       ,17:[u"w", u"W", None, None]
+       ,18:[u"e", u"E", '\xe2\x82\xac', None]
+       ,19:[u"r", u"R", None, None]
+       ,20:[u"t", u"T", None, None]
+       ,21:[u"y", u"Y", None, None]
+       ,22:[u"u", u"U", None, None]
+       ,23:[u"i", u"I", None, None]
+       ,24:[u"o", u"O", None, None]
+       ,25:[u"p", u"P", None, None]
+       ,26:[u"[", u"{", None, None]
+       ,27:[u"]", u"}", None, None]
+       ,30:[u"a", u"A", None, None]
+       ,31:[u"s", u"S", '\xc3\x9f', None]
+       ,32:[u"d", u"D", None, None]
+       ,33:[u"f", u"F", None, None]
+       ,34:[u"g", u"G", None, None]
+       ,35:[u"h", u"H", None, None]
+       ,36:[u"j", u"J", None, None]
+       ,37:[u"k", u"K", None, None]
+       ,38:[u"l", u"L", None, None]
+       ,39:[u";", u":", None, None]
+       ,40:[u"\'", u"\"", None, None]
+       ,41:['\xc2\xa7', '\xc2\xb0', '\xc2\xac', None]
+       ,43:[u"\\", u"|", None, None]
+       ,44:[u"z", u"Z", None, u"<"]
+       ,45:[u"x", u"X", None, u">"]
+       ,46:[u"c", u"C", '\xc2\xa2', None]
+       ,47:[u"v", u"V", None, None]
+       ,48:[u"b", u"B", None, None]
+       ,49:[u"n", u"N", None, None]
+       ,50:[u"m", u"M", '\xc2\xb5', None]
+       ,51:[u",", "<", None, None]
+       ,52:[u".", ">", None, None]
+       ,53:[u"/", u"?", None, None]
+       ,57:[u" ", None, None, None]
 }
 vumapidx = 0
 vukeymap = vukeymap_us_de
@@ -868,7 +869,7 @@ def getCharValue(code):
        global vumapidx
        global vukeymap
        global rckeyboard_enable
-       #print "code : %d, mapidx : %d"%(code, vumapidx)
+       print "got ascii code : %d [%d]"%(code, vumapidx)
        if rckeyboard_enable:
                if code == 0:
                        vumapidx = 0
@@ -883,7 +884,7 @@ def getCharValue(code):
                        vumapidx += 2
                        return None
                try:
-                       return vukeymap[str(code)][vumapidx]
+                       return vukeymap[code][vumapidx]
                except:
                        return None
        else: