Handle Japanese special keys.

Reported by: Hiroyuki YAMAMORI.
	Codes supplied by: Hiroyuki YAMAMORI.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-04-12 22:26:38 +02:00
parent 8573d302fc
commit bbdd6305db
5 changed files with 36 additions and 8 deletions

View file

@ -132,6 +132,9 @@ map_key_core (int code, int status, int *alt_gr_consumed)
{
*alt_gr_consumed = 0;
if (code >= GRUB_KEYBOARD_LAYOUTS_ARRAY_SIZE)
return 0;
if (status & GRUB_TERM_STATUS_RALT)
{
if (status & (GRUB_TERM_STATUS_LSHIFT | GRUB_TERM_STATUS_RSHIFT))
@ -242,7 +245,7 @@ grub_cmd_keymap (struct grub_command *cmd __attribute__ ((unused)),
goto fail;
}
if (grub_le_to_cpu32 (version) != GRUB_KEYBOARD_LAYOUTS_VERSION)
if (version != grub_cpu_to_le32_compile_time (GRUB_KEYBOARD_LAYOUTS_VERSION))
{
grub_error (GRUB_ERR_BAD_ARGUMENT, "invalid version");
goto fail;