From 21b355a01217e79f24ba31a463b9ef10c1c05440 Mon Sep 17 00:00:00 2001
From: Eduardo Bart <edub4rt@gmail.com>
Date: Mon, 31 Oct 2011 04:04:08 -0200
Subject: [PATCH] change console binding, now its Ctrl+F8, fix console focus
 issues

---
 modules/console/console.otui             | 1 +
 src/framework/platform/win32platform.cpp | 6 ------
 src/framework/ui/uiwidget.cpp            | 2 +-
 src/otclient/otclient.cpp                | 2 +-
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/modules/console/console.otui b/modules/console/console.otui
index e56667dd..66eb7597 100644
--- a/modules/console/console.otui
+++ b/modules/console/console.otui
@@ -11,6 +11,7 @@ RectPanel
   UIWidget
     id: consoleBuffer
     layout: verticalBox
+    focusable: false
     anchors.left: parent.left
     anchors.right: parent.right
     anchors.bottom: commandSymbolLabel.top
diff --git a/src/framework/platform/win32platform.cpp b/src/framework/platform/win32platform.cpp
index b57a82cd..766901c8 100644
--- a/src/framework/platform/win32platform.cpp
+++ b/src/framework/platform/win32platform.cpp
@@ -91,7 +91,6 @@ void Platform::init(PlatformListener* platformListener, const char *appName)
     win32.keyMap[VK_MENU] = Fw::KeyMenu;
 
     // ascii characters
-    /*
     win32.keyMap['!'] = Fw::KeyExclamation;
     win32.keyMap['"'] = Fw::KeyQuote;
     win32.keyMap['#'] = Fw::KeyNumberSign;
@@ -107,7 +106,6 @@ void Platform::init(PlatformListener* platformListener, const char *appName)
     win32.keyMap['-'] = Fw::KeyMinus;
     win32.keyMap['.'] = Fw::KeyPeriod;
     win32.keyMap['/'] = Fw::KeySlash;
-    */
 
     win32.keyMap['0'] = Fw::Key0;
     win32.keyMap['1'] = Fw::Key1;
@@ -120,7 +118,6 @@ void Platform::init(PlatformListener* platformListener, const char *appName)
     win32.keyMap['8'] = Fw::Key8;
     win32.keyMap['9'] = Fw::Key9;
 
-    /*
     win32.keyMap[':'] = Fw::KeyColon;
     win32.keyMap[';'] = Fw::KeySemicolon;
     win32.keyMap['<'] = Fw::KeyLess;
@@ -128,7 +125,6 @@ void Platform::init(PlatformListener* platformListener, const char *appName)
     win32.keyMap['>'] = Fw::KeyGreater;
     win32.keyMap['?'] = Fw::KeyQuestion;
     win32.keyMap['@'] = Fw::KeyAtSign;
-    */
 
     win32.keyMap['A'] = Fw::KeyA;
     win32.keyMap['B'] = Fw::KeyB;
@@ -157,7 +153,6 @@ void Platform::init(PlatformListener* platformListener, const char *appName)
     win32.keyMap['Y'] = Fw::KeyY;
     win32.keyMap['Z'] = Fw::KeyZ;
 
-    /*
     win32.keyMap['['] = Fw::KeyLeftBracket;
     win32.keyMap['\\'] = Fw::KeyBackslash;
     win32.keyMap[']'] = Fw::KeyRightBracket;
@@ -168,7 +163,6 @@ void Platform::init(PlatformListener* platformListener, const char *appName)
     win32.keyMap['|'] = Fw::KeyBar;
     win32.keyMap['}'] = Fw::KeyRightCurly;
     win32.keyMap['~'] = Fw::KeyTilde;
-    */
 
     // keypad
     win32.keyMap[VK_ADD] = Fw::KeyPlus;
diff --git a/src/framework/ui/uiwidget.cpp b/src/framework/ui/uiwidget.cpp
index 57095def..741e0465 100644
--- a/src/framework/ui/uiwidget.cpp
+++ b/src/framework/ui/uiwidget.cpp
@@ -828,7 +828,7 @@ void UIWidget::onGeometryUpdate(const Rect& oldRect, const Rect& newRect)
 
 void UIWidget::onFocusChange(bool focused, Fw::FocusReason reason)
 {
-    callLuaField("onHoverChange", focused, reason);
+    callLuaField("onFocusChange", focused, reason);
 }
 
 void UIWidget::onHoverChange(bool hovered)
diff --git a/src/otclient/otclient.cpp b/src/otclient/otclient.cpp
index 29d8061f..f10b6c4e 100644
--- a/src/otclient/otclient.cpp
+++ b/src/otclient/otclient.cpp
@@ -289,7 +289,7 @@ void OTClient::onPlatformEvent(const PlatformEvent& event)
 {
     bool fireUi = true;
 
-    if(event.type == EventKeyDown && event.ctrl && !event.alt && !event.shift && event.keycode == Fw::KeyApostrophe) {
+    if(event.type == EventKeyDown && event.ctrl && !event.alt && !event.shift && event.keycode == Fw::KeyF8) {
         // TODO: move this events to lua
         UIWidgetPtr console = g_ui.getRootWidget()->getChildById("consolePanel");
         if(!console->isExplicitlyVisible()) {