diff -ru uim-1.0.1.orig/emacs/key.c uim-1.0.1/emacs/key.c --- uim-1.0.1.orig/emacs/key.c 2005-12-07 21:39:21.000000000 +0900 +++ uim-1.0.1/emacs/key.c 2006-04-05 12:11:01.000000000 +0900 @@ -102,8 +102,12 @@ return UKey_Muhenkan; else if (strcmp("henkan", keyname) == 0) return UKey_Henkan_Mode; + else if (strcmp("kanji", keyname) == 0) + return UKey_Kanji; else if (strcmp("zenkaku-hankaku", keyname) == 0) return UKey_Zenkaku_Hankaku; + else if (strcmp("hiragana-katakana", keyname) == 0) + return UKey_Hiragana_Katakana; else if (strcmp("f1", keyname) == 0) return UKey_F1; else if (strcmp("f2", keyname) == 0) diff -ru uim-1.0.1.orig/fep/key.c uim-1.0.1/fep/key.c --- uim-1.0.1.orig/fep/key.c 2005-12-07 21:39:23.000000000 +0900 +++ uim-1.0.1/fep/key.c 2006-04-05 12:30:40.000000000 +0900 @@ -263,6 +263,12 @@ case UKey_Muhenkan: printf("Muhenkan"); break; + case UKey_Kanji: + printf("Kanji"); + break; + case UKey_Hiragana_Katakana: + printf("hiragana-katakana"); + break; case UKey_F1: printf("F1"); break; diff -ru uim-1.0.1.orig/gtk/gtk-im-uim.c uim-1.0.1/gtk/gtk-im-uim.c --- uim-1.0.1.orig/gtk/gtk-im-uim.c 2005-12-23 13:18:05.000000000 +0900 +++ uim-1.0.1/gtk/gtk-im-uim.c 2006-04-05 14:29:14.000000000 +0900 @@ -249,8 +249,9 @@ case GDK_Next: return UKey_Next; case GDK_Home: return UKey_Home; case GDK_End: return UKey_End; - case GDK_Kanji: + case GDK_Kanji: return UKey_Kanji; case GDK_Zenkaku_Hankaku: return UKey_Zenkaku_Hankaku; + case GDK_Hiragana_Katakana: return UKey_Hiragana_Katakana; case GDK_Multi_key: return UKey_Multi_key; case GDK_Mode_switch: return UKey_Mode_switch; case GDK_Henkan_Mode: return UKey_Henkan_Mode; diff -ru uim-1.0.1.orig/helper/pref-gtk-custom-widgets.c uim-1.0.1/helper/pref-gtk-custom-widgets.c --- uim-1.0.1.orig/helper/pref-gtk-custom-widgets.c 2005-12-09 19:34:05.000000000 +0900 +++ uim-1.0.1/helper/pref-gtk-custom-widgets.c 2006-04-05 12:33:17.000000000 +0900 @@ -1376,7 +1376,6 @@ case GDK_End: g_string_append(keystr, "end"); break; - case GDK_Kanji: case GDK_Zenkaku_Hankaku: g_string_append(keystr, "zenkaku-hankaku"); break; @@ -1392,6 +1391,12 @@ case GDK_Muhenkan: g_string_append(keystr, "Muhenkan"); break; + case GDK_Kanji: + g_string_append(keystr, "Kanji"); + break; + case GDK_Hiragana_Katakana: + g_string_append(keystr, "hiragana-katakana"); + break; case GDK_Shift_L: case GDK_Shift_R: g_string_append(keystr, "Shift_key"); diff -ru uim-1.0.1.orig/qt/immodule-quiminputcontext.cpp uim-1.0.1/qt/immodule-quiminputcontext.cpp --- uim-1.0.1.orig/qt/immodule-quiminputcontext.cpp 2005-12-07 21:39:19.000000000 +0900 +++ uim-1.0.1/qt/immodule-quiminputcontext.cpp 2006-04-05 12:34:25.000000000 +0900 @@ -205,6 +205,8 @@ #endif case Qt::Key_Henkan: key = UKey_Henkan_Mode; break; case Qt::Key_Muhenkan: key = UKey_Muhenkan; break; + case Qt::Key_Kanji: key = UKey_Kanji; break; + case Qt::Key_Hiragana_Katakana: key = UKey_Hiragana_Katakana; break; case Qt::Key_F1: key = UKey_F1; break; case Qt::Key_F2: key = UKey_F2; break; case Qt::Key_F3: key = UKey_F3; break; diff -ru uim-1.0.1.orig/qt/pref-customwidgets.cpp uim-1.0.1/qt/pref-customwidgets.cpp --- uim-1.0.1.orig/qt/pref-customwidgets.cpp 2005-12-16 17:09:47.000000000 +0900 +++ uim-1.0.1/qt/pref-customwidgets.cpp 2006-04-05 12:35:36.000000000 +0900 @@ -937,7 +937,6 @@ keystr += "end"; break; #ifdef QT_IMMODULE - case Qt::Key_Kanji: case Qt::Key_Zenkaku_Hankaku: keystr += "zenkaku-hankaku"; break; @@ -953,6 +952,12 @@ case Qt::Key_Muhenkan: keystr += "Muhenkan"; break; + case Qt::Key_Kanji: + keystr += "Kanji"; + break; + case Qt::Key_Hiragana_Katakana: + keystr += "hiragana-katakana"; + break; #endif /* Def: QT_IMMODULE */ case Qt::Key_Shift: keystr += "Shift_key"; diff -ru uim-1.0.1.orig/scm/m17nlib.scm uim-1.0.1/scm/m17nlib.scm --- uim-1.0.1.orig/scm/m17nlib.scm 2005-12-07 21:39:30.000000000 +0900 +++ uim-1.0.1/scm/m17nlib.scm 2006-04-05 12:36:44.000000000 +0900 @@ -216,6 +216,8 @@ (Mode_switch . "") (Henkan_Mode . "") (Muhenkan . "") + (Kanji . "") + (hiragana-katakana . "") (F1 . "F1") (F2 . "F2") (F3 . "F3") diff -ru uim-1.0.1.orig/scm/scim.scm uim-1.0.1/scm/scim.scm --- uim-1.0.1.orig/scm/scim.scm 2005-12-07 21:39:30.000000000 +0900 +++ uim-1.0.1/scm/scim.scm 2006-04-05 12:37:12.000000000 +0900 @@ -221,6 +221,8 @@ (Mode_switch . "") (Henkan_Mode . "") (Muhenkan . "") + (Kanji . "") + (hiragana-katakana . "") (F1 . "F1") (F2 . "F2") (F3 . "F3") diff -ru uim-1.0.1.orig/uim/uim-key.c uim-1.0.1/uim/uim-key.c --- uim-1.0.1.orig/uim/uim-key.c 2005-12-07 21:39:32.000000000 +0900 +++ uim-1.0.1/uim/uim-key.c 2006-04-05 10:48:42.000000000 +0900 @@ -65,6 +65,8 @@ {UKey_Mode_switch, "Mode_switch"}, {UKey_Henkan_Mode, "Henkan_Mode"}, {UKey_Muhenkan, "Muhenkan"}, + {UKey_Kanji, "Kanji"}, + {UKey_Hiragana_Katakana, "hiragana-katakana"}, {UKey_F1, "F1"}, {UKey_F2, "F2"}, {UKey_F3, "F3"}, diff -ru uim-1.0.1.orig/uim/uim.h uim-1.0.1/uim/uim.h --- uim-1.0.1.orig/uim/uim.h 2005-12-07 21:39:32.000000000 +0900 +++ uim-1.0.1/uim/uim.h 2006-04-05 12:47:54.000000000 +0900 @@ -86,6 +86,8 @@ UKey_Mode_switch, /* charcter set switch */ UKey_Henkan_Mode, /* start/stop conversion */ UKey_Muhenkan, /* cancel conversion */ + UKey_Kanji, /* kanji, kanji convert */ + UKey_Hiragana_Katakana, /* hiragana/katakana toggle */ UKey_F1, UKey_F2, UKey_F3, diff -ru uim-1.0.1.orig/xim/ximserver.cpp uim-1.0.1/xim/ximserver.cpp --- uim-1.0.1.orig/xim/ximserver.cpp 2005-12-13 22:31:28.000000000 +0900 +++ uim-1.0.1/xim/ximserver.cpp 2006-04-05 14:31:43.000000000 +0900 @@ -1001,7 +1001,6 @@ case XK_Next: mKey = UKey_Next; break; case XK_Home: mKey = UKey_Home; break; case XK_End: mKey = UKey_End; break; - case XK_Kanji: case XK_Zenkaku_Hankaku: mKey = UKey_Zenkaku_Hankaku; break; // Don't forward Multi_key to libuim. //case XK_Multi_key: mKey = UKey_Multi_key; break; @@ -1009,6 +1008,8 @@ case XK_Mode_switch: mKey = UKey_Mode_switch; break; case XK_Henkan_Mode: mKey = UKey_Henkan_Mode; break; case XK_Muhenkan: mKey = UKey_Muhenkan; break; + case XK_Kanji: mKey = UKey_Kanji; break; + case XK_Hiragana_Katakana: mKey = UKey_Hiragana_Katakana; break; case XK_Shift_L: mKey = UKey_Shift_key; break; case XK_Shift_R: mKey = UKey_Shift_key; break; case XK_Control_L: mKey = UKey_Control_key; break;