--- qtopia-free-1.5.0-k1/inputmethods/keyboard/keyboard.cpp.org	Tue Oct  8 22:01:12 2002
+++ qtopia-free-1.5.0-k1/inputmethods/keyboard/keyboard.cpp	Tue Oct  8 22:01:14 2002
@@ -29,7 +29,7 @@
 #include <ctype.h>
 
 
-#define USE_SMALL_BACKSPACE
+// #define USE_SMALL_BACKSPACE
 
 Keyboard::Keyboard(QWidget* parent, const char* name, WFlags f) :
     QFrame(parent, name, f),  shift(FALSE), lock(FALSE), ctrl(FALSE),
@@ -130,21 +130,24 @@
 #ifdef USE_SMALL_BACKSPACE
     (const uchar *const)"\002\240\002`\0021\0022\0023\0024\0025\0026\0027\0028\0029\0020\002-\002=\002\200\002\223\002\215\002\216\002\217",
 #else
-    (const uchar *const)"\002\051\0021\0022\0023\0024\0025\0026\0027\0028\0029\0020\002-\002=\004\200\002\223\002\215\002\216\002\217",
+    (const uchar *const)"\002\240\0021\0022\0023\0024\0025\0026\0027\0028\0029\0020\002-\002=\004\200\002\223\002\215\002\216\002\217",
 #endif
     //~ + 123...+ BACKSPACE //+ INSERT + HOME + PGUP
 
     (const uchar *const)"\003\201\002q\002w\002e\002r\002t\002y\002u\002i\002o\002p\002[\002]\002\\\001\224\002\223\002\221\002\220\002\222",
     //TAB + qwerty..  + backslash //+ DEL + END + PGDN
 
-    (const uchar *const)"\004\202\002a\002s\002d\002f\002g\002h\002j\002k\002l\002;\002'\004\203",
-    //CAPS + asdf.. + RETURN 
+    (const uchar *const)"\004\205\002a\002s\002d\002f\002g\002h\002j\002k\002l\002;\002'\004\203",
+    //CTRL + asdf.. + RETURN 
 
     (const uchar *const)"\005\204\002z\002x\002c\002v\002b\002n\002m\002,\002.\002/\005\204\002\223\002\223\002\211",
     //SHIFT + zxcv... //+ UP
-
+#ifdef USE_SMALL_BACKSPACE
     (const uchar *const)"\003\205\003\206\022\207\003\206\003\205\002\223\002\212\002\213\002\214" 
-    //CTRL + ALT + SPACE //+ LEFT + DOWN + RIGHT
+#else
+    (const uchar *const)"\003\202\003\206\002`\015\207\003\243\003\206\003\205\002\223\002\212\002\213\002\214" 
+#endif
+    //CAPS + ALT + SPACE //+ LEFT + DOWN + RIGHT
     
 };
 
@@ -356,13 +359,13 @@
 ". c None",
 ".....................",
 ".....................",
-".....aaa..a..........",
-".a...a..a.a.a.aaa.aaa",
-"aaaa.aaa..aa..aa..a.a",
-".a...a..a.aaa..aa.a.a",
-".....aaaa.a.a.aaa.aa.",
-"..................a..",
-"....................."};
+"..........a..........",
+"........aa...........",
+"......aaa............",
+"....aaaaaaaaaaaaaaaaa",
+"......aaa............",
+"........aa...........",
+"..........a.........."};
 #endif
 /* XPM */
 static const char * const escape_xpm[]={
@@ -432,8 +435,16 @@
     {	Percent,		0,	"%",     NULL },
     {	Sqrt,			0,	"^1/2",	 NULL },
     {	Inverse,		0,	"1/x",	 NULL },
+    {	Escape,			27,	"ESC",	 escape_xpm },
 
-    {	Escape,			27,	"ESC",	 escape_xpm }
+    {	Qt::Key_F21,            0,      "ZEN",   NULL },
+    {	Qt::Key_F26,            0,      "KNA",   NULL },
+    {	Qt::Key_F25,            0,      "KNJ",   NULL },
+    {	Qt::Key_F27,            0,      "HKNA",  NULL },
+    {	Qt::Key_F28,            0,      "HHAN",  NULL },
+    {	Qt::Key_F29,            0,      "HEI",   NULL },
+    {	Qt::Key_F23,            0,      "ONK",   NULL },
+    {	Qt::Key_F24,            0,      "HEN",   NULL }
 };
 
 
@@ -698,7 +709,7 @@
 		  (alt ? Qt::AltButton : 0);
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
 	emit key( unicode, qkeycode, modifiers, true, false );
-	repeatTimer->start( 500 );
+	repeatTimer->start( 300 );
 #endif
 	need_repaint = shift || alt || ctrl;
 	shift = alt = ctrl = FALSE;
@@ -761,7 +772,7 @@
 
 void Keyboard::repeat()
 {
-    repeatTimer->start( 150 );
+    repeatTimer->start( 60 );
     emit key( unicode, qkeycode, modifiers, true, true );
 }
 
--- qtopia-free-1.5.0-k1/inputmethods/keyboard/keyboardimpl.cpp.org	Tue Oct  8 22:01:12 2002
+++ qtopia-free-1.5.0-k1/inputmethods/keyboard/keyboardimpl.cpp	Tue Oct  8 22:01:14 2002
@@ -100,8 +100,9 @@
 
 QString KeyboardImpl::name()
 {
-    return qApp->translate( "InputMethods", "Keyboard" );
+//    return qApp->translate( "InputMethods", "Keyboard" );
 //    return qApp->translate( "InputMethods", "Opti" );
+    return qApp->translate( "InputMethods", "USKeyboard" );
 }
 
 void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot )