From e13fa63dc0cc49dc75c9d6b5750c2e7327eaaad8 Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Tue, 27 Jan 2015 11:30:03 -0600 Subject: Move input handling into the main thread This also makes the hardwarekeyboard.cpp file that I created for the Asus Transformer tablets with a keyboard dock the default hardware keyboard handler. USB keyboards should work properly now if present for keyboard input. Change-Id: I724606e91ffe2a55265a9d1cb1ec714de244d38b --- gui/hardwarekeyboard.cpp | 414 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 383 insertions(+), 31 deletions(-) mode change 100644 => 100755 gui/hardwarekeyboard.cpp (limited to 'gui/hardwarekeyboard.cpp') diff --git a/gui/hardwarekeyboard.cpp b/gui/hardwarekeyboard.cpp old mode 100644 new mode 100755 index d8cdfd45a..1e3d7bc7a --- a/gui/hardwarekeyboard.cpp +++ b/gui/hardwarekeyboard.cpp @@ -1,5 +1,5 @@ // hardwarekeyboard.cpp - HardwareKeyboard object -// Shell file used for most devices. A custom hardwarekeyboard.cpp is needed for devices with a hardware keyboard. +// Custom hardware keyboard support for Asus Transformer devices #include #include @@ -19,65 +19,417 @@ #include extern "C" { -#include "../twcommon.h" +#include "../common.h" #include "../minuitwrp/minui.h" +#include "../recovery_ui.h" } #include "rapidxml.hpp" #include "objects.hpp" +#include "../data.hpp" +#include -HardwareKeyboard::HardwareKeyboard(void) -{ +HardwareKeyboard::HardwareKeyboard(void) { + // Do Nothing + DataManager::SetValue("Lshift_down", 0); + DataManager::SetValue("Rshift_down", 0); + DataManager::SetValue("last_key", 0); +} +HardwareKeyboard::~HardwareKeyboard() { + // Do Nothing } -HardwareKeyboard::~HardwareKeyboard() -{ +int HardwareKeyboard::KeyDown(int key_code) { -} + int keyboard = -1; + int shiftkey, Lshift_down, Rshift_down; + + DataManager::GetValue("Lshift_down", Lshift_down); + DataManager::GetValue("Rshift_down", Rshift_down); + if (Lshift_down || Rshift_down) + shiftkey = 1; + else + shiftkey = 0; -int HardwareKeyboard::KeyDown(int key_code) -{ - mPressedKeys.insert(key_code); - PageManager::NotifyKey(key_code, true); #ifdef _EVENT_LOGGING - LOGERR("HardwareKeyboard::KeyDown %i\n", key_code); + LOGE("HardwareKeyboard::KeyDown %i\n", key_code); +#endif + switch (key_code) { + case KEY_LEFTSHIFT: // Left Shift + DataManager::SetValue("Lshift_down", 1); + return 0; + break; + case KEY_RIGHTSHIFT: // Right Shift + DataManager::SetValue("Rshift_down", 1); + return 0; + break; + case KEY_A: + if (shiftkey) + keyboard = 'A'; + else + keyboard = 'a'; + break; + case KEY_B: + if (shiftkey) + keyboard = 'B'; + else + keyboard = 'b'; + break; + case KEY_C: + if (shiftkey) + keyboard = 'C'; + else + keyboard = 'c'; + break; + case KEY_D: + if (shiftkey) + keyboard = 'D'; + else + keyboard = 'd'; + break; + case KEY_E: + if (shiftkey) + keyboard = 'E'; + else + keyboard = 'e'; + break; + case KEY_F: + if (shiftkey) + keyboard = 'F'; + else + keyboard = 'f'; + break; + case KEY_G: + if (shiftkey) + keyboard = 'G'; + else + keyboard = 'g'; + break; + case KEY_H: + if (shiftkey) + keyboard = 'H'; + else + keyboard = 'h'; + break; + case KEY_I: + if (shiftkey) + keyboard = 'I'; + else + keyboard = 'i'; + break; + case KEY_J: + if (shiftkey) + keyboard = 'J'; + else + keyboard = 'j'; + break; + case KEY_K: + if (shiftkey) + keyboard = 'K'; + else + keyboard = 'k'; + break; + case KEY_L: + if (shiftkey) + keyboard = 'L'; + else + keyboard = 'l'; + break; + case KEY_M: + if (shiftkey) + keyboard = 'M'; + else + keyboard = 'm'; + break; + case KEY_N: + if (shiftkey) + keyboard = 'N'; + else + keyboard = 'n'; + break; + case KEY_O: + if (shiftkey) + keyboard = 'O'; + else + keyboard = 'o'; + break; + case KEY_P: + if (shiftkey) + keyboard = 'P'; + else + keyboard = 'p'; + break; + case KEY_Q: + if (shiftkey) + keyboard = 'Q'; + else + keyboard = 'q'; + break; + case KEY_R: + if (shiftkey) + keyboard = 'R'; + else + keyboard = 'r'; + break; + case KEY_S: + if (shiftkey) + keyboard = 'S'; + else + keyboard = 's'; + break; + case KEY_T: + if (shiftkey) + keyboard = 'T'; + else + keyboard = 't'; + break; + case KEY_U: + if (shiftkey) + keyboard = 'U'; + else + keyboard = 'u'; + break; + case KEY_V: + if (shiftkey) + keyboard = 'V'; + else + keyboard = 'v'; + break; + case KEY_W: + if (shiftkey) + keyboard = 'W'; + else + keyboard = 'w'; + break; + case KEY_X: + if (shiftkey) + keyboard = 'X'; + else + keyboard = 'x'; + break; + case KEY_Y: + if (shiftkey) + keyboard = 'Y'; + else + keyboard = 'y'; + break; + case KEY_Z: + if (shiftkey) + keyboard = 'Z'; + else + keyboard = 'z'; + break; + case KEY_0: + if (shiftkey) + keyboard = ')'; + else + keyboard = '0'; + break; + case KEY_1: + if (shiftkey) + keyboard = '!'; + else + keyboard = '1'; + break; + case KEY_2: + if (shiftkey) + keyboard = '@'; + else + keyboard = '2'; + break; + case KEY_3: + if (shiftkey) + keyboard = '#'; + else + keyboard = '3'; + break; + case KEY_4: + if (shiftkey) + keyboard = '$'; + else + keyboard = '4'; + break; + case KEY_5: + if (shiftkey) + keyboard = '%'; + else + keyboard = '5'; + break; + case KEY_6: + if (shiftkey) + keyboard = '^'; + else + keyboard = '6'; + break; + case KEY_7: + if (shiftkey) + keyboard = '&'; + else + keyboard = '7'; + break; + case KEY_8: + if (shiftkey) + keyboard = '*'; + else + keyboard = '8'; + break; + case KEY_9: + if (shiftkey) + keyboard = '('; + else + keyboard = '9'; + break; + case KEY_SPACE: + keyboard = ' '; + break; + case KEY_BACKSPACE: + keyboard = KEYBOARD_BACKSPACE; + break; + case KEY_ENTER: + keyboard = KEYBOARD_ACTION; + break; + case KEY_SLASH: + if (shiftkey) + keyboard = '?'; + else + keyboard = '/'; + break; + case KEY_DOT: + if (shiftkey) + keyboard = '>'; + else + keyboard = '.'; + break; + case KEY_COMMA: + if (shiftkey) + keyboard = '<'; + else + keyboard = ','; + break; + case KEY_MINUS: + if (shiftkey) + keyboard = '_'; + else + keyboard = '-'; + break; + case KEY_GRAVE: + if (shiftkey) + keyboard = '~'; + else + keyboard = '`'; + break; + case KEY_EQUAL: + if (shiftkey) + keyboard = '+'; + else + keyboard = '='; + break; + case KEY_LEFTBRACE: + if (shiftkey) + keyboard = '{'; + else + keyboard = '['; + break; + case KEY_RIGHTBRACE: + if (shiftkey) + keyboard = '}'; + else + keyboard = ']'; + break; + case KEY_BACKSLASH: + if (shiftkey) + keyboard = '|'; + else + keyboard = '\\'; + break; + case KEY_SEMICOLON: + if (shiftkey) + keyboard = ':'; + else + keyboard = ';'; + break; + case KEY_APOSTROPHE: + if (shiftkey) + keyboard = '\"'; + else + keyboard = '\''; + break; + case KEY_UP: // Up arrow + keyboard = KEYBOARD_ARROW_UP; + break; + case KEY_DOWN: // Down arrow + keyboard = KEYBOARD_ARROW_DOWN; + break; + case KEY_LEFT: // Left arrow + keyboard = KEYBOARD_ARROW_LEFT; + break; + case KEY_RIGHT: // Right arrow + keyboard = KEYBOARD_ARROW_RIGHT; + break; + case KEY_BACK: // back button on screen + mPressedKeys.insert(KEY_BACK); + PageManager::NotifyKey(KEY_BACK, true); + return 0; + break; + case KEY_HOMEPAGE: // keyboard home button + case KEY_HOME: // home button on screen + mPressedKeys.insert(KEY_HOME); + PageManager::NotifyKey(KEY_HOME, true); + return 0; + break; + case KEY_SLEEP: // keyboard lock button + case KEY_POWER: // tablet power button + mPressedKeys.insert(KEY_POWER); + PageManager::NotifyKey(KEY_POWER, true); + return 0; + break; +#ifdef _EVENT_LOGGING + default: + LOGE("Unmapped keycode: %i\n", key_code); + break; #endif - return 0; // 0 = no key repeat anything else turns on key repeat + } + if (keyboard != -1) { + DataManager::SetValue("last_key", keyboard); + mPressedKeys.insert(keyboard); + if (!PageManager::NotifyKeyboard(keyboard)) + return 1; // Return 1 to enable key repeat + } else { + DataManager::SetValue("last_key", 0); + } + return 0; } -int HardwareKeyboard::KeyUp(int key_code) -{ +int HardwareKeyboard::KeyUp(int key_code) { std::set::iterator itr = mPressedKeys.find(key_code); - if(itr != mPressedKeys.end()) - { + if (itr != mPressedKeys.end()) { mPressedKeys.erase(itr); PageManager::NotifyKey(key_code, false); } #ifdef _EVENT_LOGGING - LOGERR("HardwareKeyboard::KeyUp %i\n", key_code); + LOGE("HardwareKeyboard::KeyUp %i\n", key_code); #endif + if (key_code == KEY_LEFTSHIFT) { // Left Shift + DataManager::SetValue("Lshift_down", 0); + } else if (key_code == 31) { // Right Shift + DataManager::SetValue("Rshift_down", 0); + } return 0; } -int HardwareKeyboard::KeyRepeat(void) -{ - /* - * Uncomment when key repeats are sent somewhere. - * std::set::iterator itr = mPressedKeys.find(key_code); - * if(itr != mPressedKeys.end()) - * { - * Send repeats somewhere, don't remove itr from mPressedKeys - * } - */ +int HardwareKeyboard::KeyRepeat(void) { + int last_key; + DataManager::GetValue("last_key", last_key); #ifdef _EVENT_LOGGING - LOGERR("HardwareKeyboard::KeyRepeat\n"); + LOGE("HardwareKeyboard::KeyRepeat: %i\n", last_key); #endif + if (last_key) + PageManager::NotifyKeyboard(last_key); return 0; } -void HardwareKeyboard::ConsumeKeyRelease(int key) -{ +void HardwareKeyboard::ConsumeKeyRelease(int key) { mPressedKeys.erase(key); } -- cgit v1.2.3