CLOUDSTACK-7904: EN-UK: CentOS 6.5 GUI: Key translation fails for some EN- UK keyboard keys.

This commit is contained in:
Sanjay Tripathi 2014-11-13 18:56:29 +05:30
parent 63ff683b89
commit 7f2219bcbb
2 changed files with 14 additions and 33 deletions

View File

@ -289,47 +289,26 @@ var keyboardTables = [
] ]
} }
}, {tindex: 2, keyboardType: KEYBOARD_TYPE_UK, mappingTable: }, {tindex: 2, keyboardType: KEYBOARD_TYPE_UK, mappingTable:
{X11: [ {X11: [],
//[223 = `¬¦]
{keycode: 223, entry : 0x60, browser: "IE"},
],
keyPress: [ keyPress: [
//[34 = "] //[34 = "]
{keycode: 34, entry: {keycode: 34, entry: 0x40, guestos: "windows"},
[{type : KEY_DOWN, code : 0x40, modifiers : 64, shift : true}]
},
//[35 = #] //[35 = #]
{keycode: 35, entry: {keycode: 35, entry: 0x5c, guestos: "windows"},
[{type : KEY_DOWN, code : 0x5c, modifiers : 0, shift : false}]
},
// [64 = @] // [64 = @]
{keycode: 64, entry: {keycode: 64, entry: 0x22, guestos: "windows"},
[{type : KEY_DOWN, code : 0x22, modifiers : 64, shift : true}]
},
// [92 = \] // [92 = \]
{keycode: 92, entry: {keycode: 92, entry: 0xa6, guestos: "windows"},
[{type : KEY_DOWN, code : 0xa6, modifiers : 0, shift : false}]
},
// [124 = |] // [124 = |]
{keycode: 124, entry: {keycode: 124, entry: 0xa6, guestos: "windows"},
[{type : KEY_DOWN, code : 0xa6, modifiers : 64, shift : true}]
},
// [126 = ~] // [126 = ~]
{keycode: 126, entry: {keycode: 126, entry: 0x7c, guestos: "windows"},
[{type : KEY_DOWN, code : 0x7c, modifiers : 64, shift : true}]
},
// [163 = £] // [163 = £]
{keycode: 163, entry: {keycode: 163, entry: 0x23, guestos: "windows"},
[{type : KEY_DOWN, code : 0x23, modifiers : 64, shift : true}]
},
// [172 = ¬] // [172 = ¬]
{keycode: 172, entry: {keycode: 172, entry: 0x7e, guestos: "windows"},
[{type : KEY_DOWN, code : 0x7e, modifiers : 64, shift : true}]
},
// [166 = ¦] // [166 = ¦]
{keycode: 166, entry: {keycode: 166, entry: [{type : KEY_DOWN, code : 0x60, modifiers : 896, shift : false}], guestos: "windows"}
[{type : KEY_DOWN, code : 0x60, modifiers : 896, shift : false}]
}
] ]
} }
}] }]

View File

@ -761,7 +761,9 @@ AjaxViewer.prototype = {
for (var j = 0; j < keyPressMaps.length; j++) { for (var j = 0; j < keyPressMaps.length; j++) {
var code = keyPressMaps[j].keycode; var code = keyPressMaps[j].keycode;
var mappedEntry = keyPressMaps[j].entry; var mappedEntry = keyPressMaps[j].entry;
this.keyboardMappers[keyboardType].jsKeyPressX11KeysymMap[code] = mappedEntry; if(keyPressMaps[j].guestos == undefined || keyPressMaps[j].guestos == this.guestos) {
this.keyboardMappers[keyboardType].jsKeyPressX11KeysymMap[code] = mappedEntry;
}
} }
} }
} }