Incorrect VK constants generated for Japanese Solaris keyboard

Attach a Japanese keyboard to a Sparc station (the one I have right now needs to go back to Japan, but I ordered 2 for our use here), and run the attached KeyTest program. The following keys generate incorrect KeyEvent.keyCode values:

- Convert key (right of Space key): generates VK_KANJI, should generate VK_CONVERT.
- Nihongo On-Off key (right of Convert key): generates VK_CONVERT, should generate VK_KANJI.

The mapping table in canvas.c also has an extraneous entry XK_Henkan_Mode -> VK_MODECHANGE; this is bogus since XK_Henkan_Mode and XK_Henkan have the same value.