diff options
| author | Jihoon Kim <jihoon48.kim@samsung.com> | 2016-07-05 09:25:43 +0900 |
|---|---|---|
| committer | Jihoon Kim <jihoon48.kim@samsung.com> | 2016-07-04 18:39:59 -0700 |
| commit | 0ce8ed238ca7148d2c910de83c6a1674183ce991 (patch) | |
| tree | 8c47db215d28441e376e4746a5ee3647d7f92e7b | |
| parent | fe1cf7ff53825d0ecf07a184b43f710669855e40 (diff) | |
| download | isf-0ce8ed238ca7148d2c910de83c6a1674183ce991.tar.gz isf-0ce8ed238ca7148d2c910de83c6a1674183ce991.tar.bz2 isf-0ce8ed238ca7148d2c910de83c6a1674183ce991.zip | |
Avoid to change keyboard mode when pressing special H/W keys
Change-Id: I14f23f00d3b1372895de912a9f5e6116666d407c
| -rw-r--r-- | ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp b/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp index 2a7c13cd..a45c8791 100644 --- a/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp +++ b/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp @@ -1456,32 +1456,31 @@ isf_wsc_context_filter_key_event (WSCContextISF* wsc_ctx, } else { if (!ignore_key) { /* Hardware input detect code */ -#ifdef _TV if (get_keyboard_mode() == TOOLBAR_HELPER_MODE && timestamp > 1 && _support_hw_keyboard_mode && - strcmp(keyname, "Down") && - strcmp(keyname, "KP_Down") && - strcmp(keyname, "Up") && - strcmp(keyname, "KP_Up") && - strcmp(keyname, "Right") && - strcmp(keyname, "KP_Right") && - strcmp(keyname, "Left") && - strcmp(keyname, "KP_Left") && - strcmp(keyname, "Return") && - strcmp(keyname, "Pause") && - strcmp(keyname, "NoSymbol") && - strncmp(keyname, "XF86", 4) && - !is_number_key(keyname)) { + strncmp(keyname, "XF86", 4)) { +#ifdef _TV + if (strcmp(keyname, "Down") && + strcmp(keyname, "KP_Down") && + strcmp(keyname, "Up") && + strcmp(keyname, "KP_Up") && + strcmp(keyname, "Right") && + strcmp(keyname, "KP_Right") && + strcmp(keyname, "Left") && + strcmp(keyname, "KP_Left") && + strcmp(keyname, "Return") && + strcmp(keyname, "Pause") && + strcmp(keyname, "NoSymbol") && + !is_number_key(keyname)) { #else - if (get_keyboard_mode() == TOOLBAR_HELPER_MODE && timestamp > 1 - && _support_hw_keyboard_mode && key.code != 0x1008ff26 - && key.code != 0xFF69) { - /* XF86back, Cancel (Power + Volume down) key */ + if (key.code != 0x1008ff26 && key.code != 0xFF69) { + /* XF86back, Cancel (Power + Volume down) key */ #endif - isf_wsc_context_set_keyboard_mode (wsc_ctx, TOOLBAR_KEYBOARD_MODE); - ISF_SAVE_LOG ("Changed keyboard mode from S/W to H/W (code: %x, name: %s)\n", key.code, keyname); - LOGD ("Hardware keyboard mode, active helper option: %d\n", _active_helper_option); + isf_wsc_context_set_keyboard_mode (wsc_ctx, TOOLBAR_KEYBOARD_MODE); + ISF_SAVE_LOG ("Changed keyboard mode from S/W to H/W (code: %x, name: %s)\n", key.code, keyname); + LOGD ("Hardware keyboard mode, active helper option: %d\n", _active_helper_option); + } } } } |