--- np2/x11/gtk2/gtk_keyboard.c	2004/07/14 16:01:40	1.1
+++ np2/x11/gtk2/gtk_keyboard.c	2011/01/15 18:55:47	1.4
@@ -10,8 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -39,7 +37,7 @@
 
 #define	NC	KEYBOARD_KC_NC
 
-static const BYTE xkeyconv_jis[256] = {
+static const UINT8 xkeyconv_jis[256] = {
 	/*	    ,    ,    ,    ,    ,    ,    ,    		; 0x00 */
 		  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC,
 	/*	    ,    ,    ,    ,    ,    ,    ,    		; 0x08 */
@@ -106,7 +104,7 @@ static const BYTE xkeyconv_jis[256] = {
 		  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC
 };
 
-static const BYTE xkeyconv_ascii[256] = {
+static const UINT8 xkeyconv_ascii[256] = {
 	/*	    ,    ,    ,    ,    ,    ,    ,    		; 0x00 */
 		  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC,
 	/*	    ,    ,    ,    ,    ,    ,    ,    		; 0x08 */
@@ -173,7 +171,7 @@ static const BYTE xkeyconv_ascii[256] = 
 		  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC,
 };
 
-static const BYTE xkeyconv_misc[256] = {
+static const UINT8 xkeyconv_misc[256] = {
 	/*	    ,    ,    ,    ,    ,    ,    ,  		; 0x00 */
 		  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC,
 	/*	  BS, TAB,  LF, CLR,    , RET,    ,   		; 0x08 */
@@ -194,7 +192,7 @@ static const BYTE xkeyconv_misc[256] = {
 		  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC,
 	/*	    ,    ,    ,    ,    ,    ,    ,   		; 0x48 */
 		  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC,
-	/*	HOME,  「ォ,  「ャ,  「ェ,  「ュ,RLDN,RLUP, END		; 0x50 */
+	/*	HOME,  竊  ↑,  →,  ↓,RLDN,RLUP, END		; 0x50 */
 		0x3e,0x3b,0x3a,0x3c,0x3d,0x37,0x36,0x3f,
 	/*	    ,    ,    ,    ,    ,    ,    ,   		; 0x58 */
 		  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC,
@@ -210,9 +208,9 @@ static const BYTE xkeyconv_misc[256] = {
 		0x34,  NC,  NC,  NC,  NC,  NC,  NC,  NC,
 	/*	    ,<TAB,    ,    ,    ,<ENT,    ,  		; 0x88 */
 		  NC,0x0f,  NC,  NC,  NC,0x1c,  NC,  NC,
-	/*	    ,    ,    ,    ,    ,<HOM,<「ォ>,<「ャ>		; 0x90 */
+	/*	    ,    ,    ,    ,    ,<HOM,<竊,<↑>		; 0x90 */
 		  NC,  NC,  NC,  NC,  NC,0x3e,0x3b,0x3a,
-	/*	<「ェ>,<「ュ>,<RDN,<RUP,<END,    ,<INS,<DEL		; 0x98 */
+	/*	<竊,<↓>,<RDN,<RUP,<END,    ,<INS,<DEL		; 0x98 */
 		0x3c,0x3d,0x37,0x36,0x3f,  NC,0x38,0x39,
 	/*	    ,    ,    ,    ,    ,    ,    ,    		; 0xa0 */
 		  NC,  NC,  NC,  NC,  NC,  NC,  NC,  NC,
@@ -240,8 +238,8 @@ static const BYTE xkeyconv_misc[256] = {
 		  NC,  NC,  NC,  NC,  NC,  NC,  NC,0x39
 };
 
-static const BYTE *xkeyconv = xkeyconv_jis;
-static BYTE shift_stat = 0x00;
+static const UINT8 *xkeyconv = xkeyconv_jis;
+static UINT8 shift_stat = 0x00;
 
 BOOL
 kbdmng_init(void)
@@ -256,10 +254,10 @@ kbdmng_init(void)
 	return SUCCESS;
 }
 
-static BYTE
-get_data(guint keysym, BYTE down)
+static UINT8
+get_data(guint keysym, UINT8 down)
 {
-	BYTE data;
+	UINT8 data;
 
 	if (keysym & ~0xff) {
 		if (keysym == GDK_VoidSymbol) {
@@ -290,14 +288,14 @@ get_data(guint keysym, BYTE down)
 void
 gtkkbd_keydown(guint keysym)
 {
-	BYTE data;
+	UINT8 data;
 
 	data = get_data(keysym, 0x80);
 	if (data != NC) {
 		if ((data & 0x80) == 0) {
 			keystat_senddata(data);
 		} else {
-			BYTE s = (shift_stat & 0x80) | 0x70;
+			UINT8 s = (shift_stat & 0x80) | 0x70;
 			keystat_senddata(s);
 			keystat_senddata(data & 0x7f);
 			keystat_senddata(s ^ 0x80);
@@ -308,7 +306,7 @@ gtkkbd_keydown(guint keysym)
 void
 gtkkbd_keyup(guint keysym)
 {
-	BYTE data;
+	UINT8 data;
 
 	data = get_data(keysym, 0x00);
 	if (data != NC) {