From: K.Ohta <whatisthis.sowhat@gmail.com>
Date: Sat, 14 Feb 2015 14:35:57 +0000 (+0900)
Subject: [UI][Keyboard] WIP.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b5d682ec9bfd35210ffe9f7e35a52e388ce4e2dd;p=csp-qt%2Fcommon_source_project-fm7.git

[UI][Keyboard] WIP.
---

diff --git a/source/src/qt/common/emu_input.cpp b/source/src/qt/common/emu_input.cpp
index 3e90a3e02..04213b001 100644
--- a/source/src/qt/common/emu_input.cpp
+++ b/source/src/qt/common/emu_input.cpp
@@ -851,7 +851,7 @@ void JoyThreadClass::doWork(void)
   while(SDL_PollEvent(&event) == 1) {
     EventSDL(&event);
   }
-  timer.setInterval(10);
+  timer.setInterval(5);
   return;
 }
 
@@ -869,9 +869,9 @@ void Ui_MainWindow::LaunchJoyThread(void)
     connect(&(hRunJoy->timer), SIGNAL(timeout()), hRunJoy, SLOT(doWork()));
     connect(this, SIGNAL(quit_joy_thread()), hRunJoy, SLOT(doExit()));
    
-    hRunJoy->timer.setInterval(10);
+    hRunJoy->timer.setInterval(5);
     hRunJoy->timer.setSingleShot(false);
-    hRunJoy->timer.start(10);
+    hRunJoy->timer.start(5);
    
 }
 void Ui_MainWindow::StopJoyThread(void) {
diff --git a/source/src/qt/gui/qt_input.cpp b/source/src/qt/gui/qt_input.cpp
index 5ded37897..ebaa6902f 100644
--- a/source/src/qt/gui/qt_input.cpp
+++ b/source/src/qt/gui/qt_input.cpp
@@ -246,8 +246,8 @@ struct NativeScanCode convTable_QTScan106[] = {
      {'O', 32},
      {'P', 33},
      {0xc0, 34}, // @
-     {VK_RETURN, 36}, // [
-     {0xdb, 35}, // Enter (Full key)
+     {VK_RETURN, 36}, // Enter (Full key)
+     {0xdb, 35}, // [
      // Line 3
      {0xf0, 66}, // CAPS Lock
      {'A', 38},