pxcloud/spice-html5
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice-html5 synced 2025-12-25 20:31:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adjust the presentation of two byte scan codes.

Browse Source 
The previous implementation worked strictly due to a bug which would
luckily generate roughly the right scan codes, although we would send
more codes than required.

For example, the old implementation would send 0xdf48e0 for 'up key down'
and '0xdfc8e0' for 'up key up'.  The prepended 0xdf is incorrect; the
correct values should be 0x48e0 and 0xc8e0.  Essentially, it stored
the bytes in reverse order and had a bug while flipping them.

This code stores them in the order we transmit them which simplifies
the code.

Signed-off-by: Jeremy White <jwhite@codeweavers.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
This commit is contained in:
Jeremy White 2019-08-05 14:27:07 -05:00 committed by Frediano Ziglio
parent a14f8933a7
commit 61373be8ec
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/utils.js
View File

@ -223,21 +223,21 @@ common_scanmap[19] = 101;// Break, XSpice only
were grey on the original AT keyboard. These are
prefixed, as they were on the PS/2 controller, with an
0xE0 byte to indicate that they are extended */
common_scanmap[111] = 0xE035; // KP_Divide
common_scanmap[106] = 0xE037; // KP_Multiply
common_scanmap[36] = 0xE047; // Home
common_scanmap[38] = 0xE048; // Up
common_scanmap[33] = 0xE049; // PgUp
common_scanmap[37] = 0xE04B; // Left
common_scanmap[39] = 0xE04D; // Right
common_scanmap[35] = 0xE04F; // End
common_scanmap[40] = 0xE050; // Down
common_scanmap[34] = 0xE051; // PgDown
common_scanmap[45] = 0xE052; // Insert
common_scanmap[46] = 0xE053; // Delete
common_scanmap[91] = 0xE05B; //KeyNames.KEY_LMeta
common_scanmap[92] = 0xE05C; //KeyNames.KEY_RMeta
common_scanmap[93] = 0xE05D; //KeyNames.KEY_Menu
common_scanmap[111] = 0xE0 | (KeyNames.KEY_Slash << 8);// KP_Divide
common_scanmap[106] = 0xE0 | (KeyNames.KEY_KP_Multiply << 8); // KP_Multiply
common_scanmap[36] = 0xE0 | (KeyNames.KEY_KP_7 << 8); // Home
common_scanmap[38] = 0xE0 | (KeyNames.KEY_KP_8 << 8); // Up
common_scanmap[33] = 0xE0 | (KeyNames.KEY_KP_9 << 8); // PgUp
common_scanmap[37] = 0xE0 | (KeyNames.KEY_KP_4 << 8); // Left
common_scanmap[39] = 0xE0 | (KeyNames.KEY_KP_6 << 8); // Right
common_scanmap[35] = 0xE0 | (KeyNames.KEY_KP_1 << 8); // End
common_scanmap[40] = 0xE0 | (KeyNames.KEY_KP_2 << 8); // Down
common_scanmap[34] = 0xE0 | (KeyNames.KEY_KP_3 << 8); // PgDown
common_scanmap[45] = 0xE0 | (KeyNames.KEY_KP_0 << 8); // Insert
common_scanmap[46] = 0xE0 | (KeyNames.KEY_KP_Decimal << 8); // Delete
common_scanmap[91] = 0xE0 | (0x5B << 8); //KeyNames.KEY_LMeta
common_scanmap[92] = 0xE0 | (0x5C << 8); //KeyNames.KEY_RMeta
common_scanmap[93] = 0xE0 | (0x5D << 8); //KeyNames.KEY_Menu
/* Firefox/Mozilla codes */
var firefox_scanmap = [];
@ -273,11 +273,7 @@ function keycode_to_start_scan(code)
return 0;
}
if (scancode < 0x100) {
return scancode;
} else {
return 0xe0 | ((scancode - 0x100) << 8);
}
return scancode;
}
function keycode_to_end_scan(code)
@ -289,7 +285,7 @@ function keycode_to_end_scan(code)
if (scancode < 0x100) {
return scancode | 0x80;
} else {
return 0x80e0 | ((scancode - 0x100) << 8);
return scancode | 0x8000;
}
}