From 6d5d7e205f2bda9cd10bee95aff93f1a9827a4e9 Mon Sep 17 00:00:00 2001 From: Ji-hoon Lee Date: Tue, 3 May 2016 17:23:25 +0900 Subject: [PATCH 01/16] Added websocket server for supporting legacy Web IMEs Change-Id: Iac56faf666ae861699c824fbb93cfff9855f84a9 --- CMakeLists.txt | 4 + packaging/libscl-core.spec | 1 + src/legacy_support/web_helper_agent.cpp | 194 ++++++ src/legacy_support/web_helper_agent.h | 128 ++++ src/legacy_support/websocket.cpp | 1029 +++++++++++++++++++++++++++++++ src/legacy_support/websocket.h | 263 ++++++++ src/sclcoreui-efl.cpp | 4 + src/sclcoreui-efl.h | 5 + src/sclcoreui.cpp | 8 +- 9 files changed, 1633 insertions(+), 3 deletions(-) create mode 100644 src/legacy_support/web_helper_agent.cpp create mode 100644 src/legacy_support/web_helper_agent.h create mode 100644 src/legacy_support/websocket.cpp create mode 100644 src/legacy_support/websocket.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 18d7cea..5d92453 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,8 @@ SET(SRCS src/sclconnection.cpp src/sclconnection-isf.cpp src/sclcore.cpp + src/legacy_support/websocket.cpp + src/legacy_support/web_helper_agent.cpp ) SET(PACKAGE ${PROJECT_NAME}) @@ -22,6 +24,7 @@ MESSAGE(STATUS "Build type: ${CMAKE_BUILD_TYPE}") INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/include + ${CMAKE_SOURCE_DIR}/src/legacy_support ) INCLUDE(FindPkgConfig) @@ -32,6 +35,7 @@ SET(PKGS_CHECK_MODULES isf vconf libscl-common + libwebsockets capi-appfw-application ) diff --git a/packaging/libscl-core.spec b/packaging/libscl-core.spec index 0f3a8c8..292705d 100644 --- a/packaging/libscl-core.spec +++ b/packaging/libscl-core.spec @@ -23,6 +23,7 @@ BuildRequires: pkgconfig(x11) %endif BuildRequires: pkgconfig(libscl-common) BuildRequires: pkgconfig(capi-appfw-application) +BuildRequires: pkgconfig(libwebsockets) %description diff --git a/src/legacy_support/web_helper_agent.cpp b/src/legacy_support/web_helper_agent.cpp new file mode 100644 index 0000000..cb81d35 --- /dev/null +++ b/src/legacy_support/web_helper_agent.cpp @@ -0,0 +1,194 @@ +/* + * Copyright (c) 2012 - 2016 Samsung Electronics Co., Ltd All Rights Reserved + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include + +#include "web_helper_agent.h" + +#include "websocket.h" +#include "sclcoreimpl.h" + +using namespace scl; + +typedef struct { + int major_version; + WEB_HELPER_AGENT_TYPE agent_type; +} WEB_HELPER_AGENT_TYPES_FOR_VERSIONS; + +static WEB_HELPER_AGENT_TYPES_FOR_VERSIONS web_helper_agent_types_for_versions[] = { + {1, WEB_HELPER_AGENT_WEBSOCKET}, /* Major version 1 indicates that it uses websocket for communication */ +}; + +static int WEB_HELPER_AGENT_TYPES_FOR_VERSIONS_NUM = \ + sizeof(web_helper_agent_types_for_versions) / sizeof(WEB_HELPER_AGENT_TYPES_FOR_VERSIONS); + +WEB_HELPER_AGENT_TYPE CWebHelperAgent::get_web_helper_agent_type_from_major_version(int version) +{ + for (int loop = 0;loop < WEB_HELPER_AGENT_TYPES_FOR_VERSIONS_NUM;loop++) { + if (web_helper_agent_types_for_versions[loop].major_version == version) { + return web_helper_agent_types_for_versions[loop].agent_type; + } + } + return WEB_HELPER_AGENT_UNKNOWN; +} + +CWebHelperAgent* CWebHelperAgent::create_web_helper_agent(WEB_HELPER_AGENT_TYPE type) +{ + CWebHelperAgent *ret = NULL; + if (type == WEB_HELPER_AGENT_WEBSOCKET) { + ret = new CWebHelperAgentWebSocket; + } + return ret; +} + +void CWebHelperAgent::destroy_web_helper_agent(CWebHelperAgent* agent) +{ + if (agent) delete agent; +} + +CWebHelperAgent::CWebHelperAgent() +{ +} + +CWebHelperAgent::~CWebHelperAgent() +{ + +} + +bool CWebHelperAgent::init() +{ + return true; +} + +bool CWebHelperAgent::exit() +{ + return true; +} + +void CWebHelperAgent::signal(int sig) +{ + +} + +void CWebHelperAgent::log(const char *str) +{ + CSCLCoreImpl *impl = CSCLCoreImpl::get_instance(); + if (impl) { + //impl->logise_log(str); + } +} + +void CWebHelperAgent::commit_string(const char *str) +{ + CSCLCoreImpl *impl = CSCLCoreImpl::get_instance(); + if (impl) { + impl->commit_string(-1, "", str); + } +} + +void CWebHelperAgent::update_preedit_string(const char *str) +{ + CSCLCoreImpl *impl = CSCLCoreImpl::get_instance(); + if (impl) { + impl->update_preedit_string(-1, "", str); + } +} + +void CWebHelperAgent::send_key_event(unsigned int key, unsigned int key_mask) +{ + CSCLCoreImpl *impl = CSCLCoreImpl::get_instance(); + if (impl) { + impl->send_key_event(-1, "", key, key_mask); + } +} + +void CWebHelperAgent::forward_key_event(unsigned int key) +{ + CSCLCoreImpl *impl = CSCLCoreImpl::get_instance(); + if (impl) { + impl->forward_key_event(-1, "", key, scim::SCIM_KEY_NullMask); + } +} + +void CWebHelperAgent::set_keyboard_sizes(int portrait_width, int portrait_height, int landscape_width, int landscape_height) +{ + CSCLCoreImpl *impl = CSCLCoreImpl::get_instance(); + if (impl) { + SclSize portrait, landscape; + portrait.width = portrait_width; + portrait.height = portrait_height; + landscape.width = landscape_width; + landscape.height = landscape_height; + impl->set_keyboard_size_hints(portrait, landscape); + } +} + +void CWebHelperAgent::set_selection(int start_index, int end_index) +{ + CSCLCoreImpl *impl = CSCLCoreImpl::get_instance(); + if (impl) { + impl->set_selection(start_index, end_index); + } +} + +void CWebHelperAgent::get_selection() +{ + CSCLCoreImpl *impl = CSCLCoreImpl::get_instance(); + if (impl) { + //impl->get_selection(-1, "", ); + } +} + +void CWebHelperAgent::get_surrounding_text(int maxlen_before, int maxlen_after) +{ + CSCLCoreImpl *impl = CSCLCoreImpl::get_instance(); + if (impl) { + impl->get_surrounding_text("", maxlen_before, maxlen_after); + } +} + +void CWebHelperAgent::delete_surrounding_text(int offset, int len) +{ + CSCLCoreImpl *impl = CSCLCoreImpl::get_instance(); + if (impl) { + impl->delete_surrounding_text(offset, len); + } +} + +std::string CMagicKeyManager::get_magic_key() +{ + static std::string current_magic_key; + + /* If we don't have magic key generated yet */ + if (current_magic_key.length() != MAGIC_KEY_LENGTH) { + char magic_key[MAGIC_KEY_LENGTH + 1]; + /* We are going to generate a magic key that contains ascii characters in the range of '0' to 'z' */ + const char magic_key_range_lower = '0'; + const char magic_key_range_upper = 'Z'; + + srand(time(NULL)); + for(int loop = 0;loop < MAGIC_KEY_LENGTH;loop++) { + magic_key[loop] = (rand() % (magic_key_range_upper - magic_key_range_lower)) + magic_key_range_lower; + } + magic_key[MAGIC_KEY_LENGTH] = '\0'; + + current_magic_key = magic_key; + } + + return current_magic_key; +} diff --git a/src/legacy_support/web_helper_agent.h b/src/legacy_support/web_helper_agent.h new file mode 100644 index 0000000..408c9d3 --- /dev/null +++ b/src/legacy_support/web_helper_agent.h @@ -0,0 +1,128 @@ +/* + * Copyright (c) 2012 - 2016 Samsung Electronics Co., Ltd All Rights Reserved + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#ifndef _WEB_HELPER_AGENT_H_ +#define _WEB_HELPER_AGENT_H_ + +#define MAGIC_KEY_LENGTH 32 +#define VERSION_DELIMITER '.' +#define VERSION_TOKEN_NUM 2 // We are expecting 2 version tokens : MAJOR and MINOR + +#include +#include +#include + +class CStringTokenizer +{ +public: + static std::vector &split(const std::string &s, char delim, std::vector &elems) { + unsigned int loop = 0; + unsigned int start = 0; + for (loop = 0;loop < s.length();loop++) { + if (s.at(loop) == delim) { + std::string item = s.substr(start, loop - start); + elems.push_back(item); + start = loop + 1; + } + } + std::string item = s.substr(start, loop - start); + elems.push_back(item); + return elems; + } + + static std::vector split(const std::string &s, char delim) { + std::vector elems; + split(s, delim, elems); + return elems; + } +}; + +typedef enum { + WEB_HELPER_AGENT_UNKNOWN, + WEB_HELPER_AGENT_WEBSOCKET, + WEB_HELPER_AGENT_DIRECT, +} WEB_HELPER_AGENT_TYPE; + +class CMagicKeyManager +{ +public: + static std::string get_magic_key(); +}; + +class CWebHelperAgent +{ +public: + CWebHelperAgent(); + virtual ~CWebHelperAgent(); + + virtual bool init(); + virtual bool exit(); + + virtual void signal(int sig); + + virtual void on_init() {} + virtual void on_exit() {} + + virtual void on_focus_in(int ic) {} + virtual void on_focus_out(int ic) {} + + virtual void on_show(int ic) {} + virtual void on_hide(int ic) {} + + virtual void on_set_rotation(int degree) {} + + virtual void on_update_cursor_position(int ic, int cursor_pos) {} + virtual void on_update_surrounding_text(int ic, const char *text, int cursor) {} + virtual void on_update_selection(int ic, const char *text) {} + + virtual void on_set_language(unsigned int language) {} + + virtual void on_set_imdata(char *buf, unsigned int len) {} + virtual void on_get_imdata(char **buf, unsigned int *len) {} + + virtual void on_set_return_key_type(unsigned int type) {} + virtual void on_get_return_key_type(unsigned int *type) {} + + virtual void on_set_return_key_disable(unsigned int disabled) {} + virtual void on_get_return_key_disable(unsigned int *disabled) {} + + virtual void on_set_layout(unsigned int layout) {} + virtual void on_get_layout(unsigned int *layout) {} + + virtual void on_reset_input_context(int ic) {} + + virtual void on_process_key_event(unsigned int code, unsigned int mask, unsigned int layout, unsigned int *ret) {} + + + virtual void log(const char *str); + virtual void commit_string(const char *str); + virtual void update_preedit_string(const char *str); + virtual void send_key_event(unsigned int key, unsigned int key_mask); + virtual void forward_key_event(unsigned int key); + virtual void set_keyboard_sizes(int portrait_width, int portrait_height, int landscape_width, int landscape_height); + virtual void set_selection(int start_index, int end_index); + virtual void get_selection(); + virtual void get_surrounding_text(int maxlen_before, int maxlen_after); + virtual void delete_surrounding_text(int offset, int len); + +public: + static WEB_HELPER_AGENT_TYPE get_web_helper_agent_type_from_major_version(int version); + static CWebHelperAgent* create_web_helper_agent(WEB_HELPER_AGENT_TYPE type); + static void destroy_web_helper_agent(CWebHelperAgent* agent); +}; + +#endif // _WEB_HELPER_AGENT_H_ \ No newline at end of file diff --git a/src/legacy_support/websocket.cpp b/src/legacy_support/websocket.cpp new file mode 100644 index 0000000..2725d79 --- /dev/null +++ b/src/legacy_support/websocket.cpp @@ -0,0 +1,1029 @@ +/* + * Copyright (c) 2012 - 2016 Samsung Electronics Co., Ltd All Rights Reserved + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "websocket.h" + +#include +#include + +#include + +pthread_t g_ws_server_thread = (pthread_t)NULL; +pthread_mutex_t g_ws_server_mutex = PTHREAD_MUTEX_INITIALIZER; + +pthread_cond_t g_ws_query_condition = PTHREAD_COND_INITIALIZER; +pthread_mutex_t g_ws_query_mutex = PTHREAD_MUTEX_INITIALIZER; + +bool g_ws_server_exit = false; +struct lws_context *g_ws_server_context = NULL; + +CWebHelperAgentWebSocket* CWebHelperAgentWebSocket::m_current_instance = NULL; + +int force_exit = 0; + +enum protocols { + /* always first */ + PROTOCOL_HTTP = 0, + + PROTOCOL_KEYBOARD, + + /* always last */ + MAX_PROTOCOL_COUNT +}; + +struct per_session_data__http { + int fd; +}; + +static int callback_http(struct lws *wsi, + enum lws_callback_reasons reason, + void *user, void *in, size_t len) +{ + return 0; +} + +struct per_session_data__keyboard { + int session_id; + int valid; +}; + +static int callback_keyboard(struct lws *wsi, + enum lws_callback_reasons reason, + void *user, void *in, size_t len); + +static struct lws_protocols protocols[] = { + { + "http-only", + callback_http, + sizeof(struct per_session_data__http), + 0, + }, + { + "keyboard-protocol", + callback_keyboard, + sizeof(struct per_session_data__keyboard), + 32, + }, + { NULL, NULL, 0, 0 } +}; + +static int callback_keyboard(struct lws *wsi, + enum lws_callback_reasons reason, + void *user, void *in, size_t len) +{ + static int last_session_id = 0; + const int bufsize = 512; + int n = 0; + unsigned char buf[LWS_SEND_BUFFER_PRE_PADDING + bufsize + + LWS_SEND_BUFFER_POST_PADDING]; + unsigned char *p = &buf[LWS_SEND_BUFFER_PRE_PADDING]; + struct per_session_data__keyboard *pss = (struct per_session_data__keyboard *)user; + CWebHelperAgentWebSocket *agent = CWebHelperAgentWebSocket::get_current_instance(); + + switch (reason) { + + case LWS_CALLBACK_ESTABLISHED: + pss->session_id = ++last_session_id; + LOGD("LWS_CALLBACK_ESTABLISHED : %p %d", g_ws_server_context, pss->session_id); + pss->valid = false; + if (g_ws_server_context) { + lws_callback_on_writable_all_protocol(g_ws_server_context, &protocols[PROTOCOL_KEYBOARD]); + } + break; + + case LWS_CALLBACK_CLOSED: + LOGD("LWS_CALLBACK_CLOSED : %d", pss->session_id); + break; + + case LWS_CALLBACK_SERVER_WRITEABLE: + if (agent) { + /* We allow data tranmission only if this client is guaranteed to be valid */ + if (pss->valid) { + pthread_mutex_lock(&g_ws_server_mutex); + std::queue& messages = agent->get_send_message_queue(); + while (messages.size() > 0) { + ISE_MESSAGE &message = messages.front(); + std::string str = CISEMessageSerializer::serialize(message); + LOGD("SEND_WEBSOCKET_MESSAGE : %s", str.c_str()); + n = snprintf((char *)p, bufsize, "%s", str.c_str()); + /* too small for partial */ + n = lws_write(wsi, p, n, LWS_WRITE_TEXT); + messages.pop(); + } + pthread_mutex_unlock(&g_ws_server_mutex); + + if (n < 0) { + lwsl_err("ERROR %d writing to di socket\n", n); + return -1; + } + } else { + LOGD("Rejecting data transmission since client is not valid"); + } + } + break; + + case LWS_CALLBACK_RECEIVE: + if (in) { + std::string str = (const char *)in; + ISE_MESSAGE message = CISEMessageSerializer::deserialize(str); + + if (message.command.compare(ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_LOGIN]) == 0) { + /* + if (message.values.at(0).compare(CMagicKeyManager::get_magic_key()) == 0) { + LOGD("LOGIN successful, validating client"); + pss->valid = true; + } else { + LOGD("LOGIN failed, invalidating client"); + pss->valid = false; + } + */ + pss->valid = true; + } + + if (pss->valid) { + pthread_mutex_lock(&g_ws_server_mutex); + std::queue& messages = agent->get_recv_message_queue(); + messages.push(message); + pthread_mutex_unlock(&g_ws_server_mutex); + + const char *recved_message = "recved"; + ecore_pipe_write(agent->get_recv_message_pipe(), recved_message, strlen(recved_message)); + + /* If we received reply message, let's send signal to wake up our main thread */ + if (message.type.compare(ISE_MESSAGE_TYPE_STRINGS[ISE_MESSAGE_TYPE_REPLY]) == 0) { + pthread_mutex_lock(&g_ws_query_mutex); + pthread_cond_signal(&g_ws_query_condition); + pthread_mutex_unlock(&g_ws_query_mutex); + } + } else { + LOGD("Ignoring data received since client is not valid"); + } + } + + break; + default: + break; + } + + return 0; +} + +void *process_ws_server(void *data) +{ + while (!force_exit && !g_ws_server_exit) { + struct timeval tv; + gettimeofday(&tv, NULL); + + if (g_ws_server_context) { + lws_service(g_ws_server_context, 50); + } else { + LOGD("WARNING : g_ws_server_context is NULL"); + } + } + return NULL; +} + +void log_func(int level, const char *line) +{ + if (line) { + LOGD("LEVEL : %d , %s", level, line); + } +} + +CWebHelperAgentWebSocket::CWebHelperAgentWebSocket() +{ + if (m_current_instance != NULL) { + LOGD("WARNING : m_current_instance is NOT NULL"); + } + m_current_instance = this; + m_recv_message_pipe = NULL; +} + +CWebHelperAgentWebSocket::~CWebHelperAgentWebSocket() +{ + if (m_current_instance == this) { + m_current_instance = NULL; + } + + if (m_recv_message_pipe) { + ecore_pipe_del(m_recv_message_pipe); + m_recv_message_pipe = NULL; + } +} + +static void recv_message_pipe_handler(void *data, void *buffer, unsigned int nbyte) +{ + CWebHelperAgentWebSocket *agent = CWebHelperAgentWebSocket::get_current_instance(); + if (agent) { + agent->process_recved_messages(); + } +} + +bool CWebHelperAgentWebSocket::init() +{ + bool ret = true; + + struct lws_context_creation_info info; + + memset(&info, 0, sizeof info); + info.port = 7681; + + int debug_level = LLL_DEBUG; + lws_set_log_level(debug_level, log_func); + + info.iface = NULL; + info.protocols = protocols; + info.extensions = NULL; + info.ssl_cert_filepath = NULL; + info.ssl_private_key_filepath = NULL; + info.gid = -1; + info.uid = -1; + info.options = 0; + + ecore_init(); + + /* The WebSocket server is running on a separate thread, and let the thread send a message + through this pipe to guarantee thread safety */ + m_recv_message_pipe = ecore_pipe_add(recv_message_pipe_handler, NULL); + + /* Let's retry creating server context for a certain number of times */ + const int max_retry_num = 10; + int retry_num = 0; + + do { + g_ws_server_context = lws_create_context(&info); + LOGD("libwebsocket context : %p", g_ws_server_context); + sleep(1); + } while (g_ws_server_context == NULL && retry_num++ < max_retry_num); + + pthread_mutex_init(&g_ws_server_mutex, NULL); + + pthread_mutex_init(&g_ws_query_mutex, NULL); + pthread_cond_init(&g_ws_query_condition, NULL); + + if (g_ws_server_context) { + if (pthread_create(&g_ws_server_thread, NULL, &process_ws_server, NULL) != 0) { + g_ws_server_thread = (pthread_t)NULL; + ret = false; + } + } else { + ret = false; + } + + on_init(); + + return ret; +} + +bool CWebHelperAgentWebSocket::exit() +{ + on_exit(); + + g_ws_server_exit = true; + + if (m_recv_message_pipe) { + ecore_pipe_del(m_recv_message_pipe); + m_recv_message_pipe = NULL; + } + + if (g_ws_server_thread) { + pthread_join(g_ws_server_thread, NULL); + } + + pthread_cond_destroy(&g_ws_query_condition); + pthread_mutex_destroy(&g_ws_query_mutex); + + pthread_mutex_destroy(&g_ws_server_mutex); + + if (g_ws_server_context) { + lws_context_destroy(g_ws_server_context); + g_ws_server_context = NULL; + } + + ecore_shutdown(); + + return true; +} + +void CWebHelperAgentWebSocket::signal(int sig) +{ + force_exit = 1; +} + +template +std::string to_string(T i) +{ + std::stringstream ss; + std::string s; + ss << i; + s = ss.str(); + + return s; +} + +void CWebHelperAgentWebSocket::on_init() +{ + ISE_MESSAGE message; + message.type = ISE_MESSAGE_TYPE_STRINGS[ISE_MESSAGE_TYPE_PLAIN]; + message.command = ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_INIT]; + + pthread_mutex_lock(&g_ws_server_mutex); + m_send_message_queue.push(message); + pthread_mutex_unlock(&g_ws_server_mutex); + + if (g_ws_server_context) { + lws_callback_on_writable_all_protocol(g_ws_server_context, &protocols[PROTOCOL_KEYBOARD]); + } else { + LOGD("WARNING : g_ws_server_context is NULL"); + } +} + +void CWebHelperAgentWebSocket::on_exit() +{ + ISE_MESSAGE message; + message.type = ISE_MESSAGE_TYPE_STRINGS[ISE_MESSAGE_TYPE_PLAIN]; + message.command = ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_EXIT]; + + pthread_mutex_lock(&g_ws_server_mutex); + m_send_message_queue.push(message); + pthread_mutex_unlock(&g_ws_server_mutex); + + if (g_ws_server_context) { + lws_callback_on_writable_all_protocol(g_ws_server_context, &protocols[PROTOCOL_KEYBOARD]); + } else { + LOGD("WARNING : g_ws_server_context is NULL"); + } +} + +void CWebHelperAgentWebSocket::on_focus_in(int ic) +{ + ISE_MESSAGE message; + message.type = ISE_MESSAGE_TYPE_STRINGS[ISE_MESSAGE_TYPE_PLAIN]; + message.command = ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_FOCUS_IN]; + message.values.push_back(to_string(ic)); + + pthread_mutex_lock(&g_ws_server_mutex); + m_send_message_queue.push(message); + pthread_mutex_unlock(&g_ws_server_mutex); + + if (g_ws_server_context) { + lws_callback_on_writable_all_protocol(g_ws_server_context, &protocols[PROTOCOL_KEYBOARD]); + } else { + LOGD("WARNING : g_ws_server_context is NULL"); + } +} + +void CWebHelperAgentWebSocket::on_focus_out(int ic) +{ + ISE_MESSAGE message; + message.type = ISE_MESSAGE_TYPE_STRINGS[ISE_MESSAGE_TYPE_PLAIN]; + message.command = ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_FOCUS_OUT]; + message.values.push_back(to_string(ic)); + + pthread_mutex_lock(&g_ws_server_mutex); + m_send_message_queue.push(message); + pthread_mutex_unlock(&g_ws_server_mutex); + + if (g_ws_server_context) { + lws_callback_on_writable_all_protocol(g_ws_server_context, &protocols[PROTOCOL_KEYBOARD]); + } else { + LOGD("WARNING : g_ws_server_context is NULL"); + } +} + +void CWebHelperAgentWebSocket::on_show(int ic) +{ + ISE_MESSAGE message; + message.type = ISE_MESSAGE_TYPE_STRINGS[ISE_MESSAGE_TYPE_PLAIN]; + message.command = ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_SHOW]; + message.values.push_back(to_string(ic)); + + pthread_mutex_lock(&g_ws_server_mutex); + m_send_message_queue.push(message); + pthread_mutex_unlock(&g_ws_server_mutex); + + if (g_ws_server_context) { + lws_callback_on_writable_all_protocol(g_ws_server_context, &protocols[PROTOCOL_KEYBOARD]); + } else { + LOGD("WARNING : g_ws_server_context is NULL"); + } + + LOGD("put into send message buffer"); +} + +void CWebHelperAgentWebSocket::on_hide(int ic) +{ + ISE_MESSAGE message; + message.type = ISE_MESSAGE_TYPE_STRINGS[ISE_MESSAGE_TYPE_PLAIN]; + message.command = ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_HIDE]; + message.values.push_back(to_string(ic)); + + pthread_mutex_lock(&g_ws_server_mutex); + m_send_message_queue.push(message); + pthread_mutex_unlock(&g_ws_server_mutex); + + if (g_ws_server_context) { + lws_callback_on_writable_all_protocol(g_ws_server_context, &protocols[PROTOCOL_KEYBOARD]); + } else { + LOGD("WARNING : g_ws_server_context is NULL"); + } +} + +void CWebHelperAgentWebSocket::on_set_rotation(int degree) +{ + ISE_MESSAGE message; + message.type = ISE_MESSAGE_TYPE_STRINGS[ISE_MESSAGE_TYPE_PLAIN]; + message.command = ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_SET_ROTATION]; + message.values.push_back(to_string(degree)); + + pthread_mutex_lock(&g_ws_server_mutex); + m_send_message_queue.push(message); + pthread_mutex_unlock(&g_ws_server_mutex); + + if (g_ws_server_context) { + lws_callback_on_writable_all_protocol(g_ws_server_context, &protocols[PROTOCOL_KEYBOARD]); + } else { + LOGD("WARNING : g_ws_server_context is NULL"); + } +} + +void CWebHelperAgentWebSocket::on_update_cursor_position(int ic, int cursor_pos) +{ + ISE_MESSAGE message; + message.type = ISE_MESSAGE_TYPE_STRINGS[ISE_MESSAGE_TYPE_PLAIN]; + message.command = ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_UPDATE_CURSOR_POSITION]; + message.values.push_back(to_string(ic)); + message.values.push_back(to_string(cursor_pos)); + + pthread_mutex_lock(&g_ws_server_mutex); + m_send_message_queue.push(message); + pthread_mutex_unlock(&g_ws_server_mutex); + + if (g_ws_server_context) { + lws_callback_on_writable_all_protocol(g_ws_server_context, &protocols[PROTOCOL_KEYBOARD]); + } else { + LOGD("WARNING : g_ws_server_context is NULL"); + } +} + +void CWebHelperAgentWebSocket::on_update_surrounding_text(int ic, const char *text, int cursor) +{ + ISE_MESSAGE message; + message.type = ISE_MESSAGE_TYPE_STRINGS[ISE_MESSAGE_TYPE_REPLY]; + message.command = ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_UPDATE_SURROUNDING_TEXT]; + message.values.push_back(to_string(cursor)); + message.values.push_back(text); + + pthread_mutex_lock(&g_ws_server_mutex); + m_send_message_queue.push(message); + pthread_mutex_unlock(&g_ws_server_mutex); + + if (g_ws_server_context) { + lws_callback_on_writable_all_protocol(g_ws_server_context, &protocols[PROTOCOL_KEYBOARD]); + } else { + LOGD("WARNING : g_ws_server_context is NULL"); + } +} + +void CWebHelperAgentWebSocket::on_update_selection(int ic, const char *text) +{ + ISE_MESSAGE message; + message.type = ISE_MESSAGE_TYPE_STRINGS[ISE_MESSAGE_TYPE_REPLY]; + message.command = ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_UPDATE_SELECTION]; + message.values.push_back(text); + + pthread_mutex_lock(&g_ws_server_mutex); + m_send_message_queue.push(message); + pthread_mutex_unlock(&g_ws_server_mutex); + + if (g_ws_server_context) { + lws_callback_on_writable_all_protocol(g_ws_server_context, &protocols[PROTOCOL_KEYBOARD]); + } else { + LOGD("WARNING : g_ws_server_context is NULL"); + } +} + +void CWebHelperAgentWebSocket::on_set_language(unsigned int language) +{ + ISE_MESSAGE message; + message.type = ISE_MESSAGE_TYPE_STRINGS[ISE_MESSAGE_TYPE_PLAIN]; + message.command = ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_SET_LANGUAGE]; + + bool found = false; + for (unsigned int loop = 0;loop < sizeof(ISE_LANGUAGE_TYPES) / sizeof(ISE_TYPE_VALUE_STRING);loop++) { + if (language == (unsigned int)ISE_LANGUAGE_TYPES[loop].type_value) { + message.values.push_back(ISE_LANGUAGE_TYPES[loop].type_string); + found = true; + } + } + + if (found) { + pthread_mutex_lock(&g_ws_server_mutex); + m_send_message_queue.push(message); + pthread_mutex_unlock(&g_ws_server_mutex); + + if (g_ws_server_context) { + lws_callback_on_writable_all_protocol(g_ws_server_context, &protocols[PROTOCOL_KEYBOARD]); + } else { + LOGD("WARNING : g_ws_server_context is NULL"); + } + } +} + +void CWebHelperAgentWebSocket::on_set_imdata(char *buf, unsigned int len) +{ + ISE_MESSAGE message; + message.type = ISE_MESSAGE_TYPE_STRINGS[ISE_MESSAGE_TYPE_PLAIN]; + message.command = ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_SET_IMDATA]; + message.values.push_back(buf); + + pthread_mutex_lock(&g_ws_server_mutex); + m_send_message_queue.push(message); + pthread_mutex_unlock(&g_ws_server_mutex); + + if (g_ws_server_context) { + lws_callback_on_writable_all_protocol(g_ws_server_context, &protocols[PROTOCOL_KEYBOARD]); + } else { + LOGD("WARNING : g_ws_server_context is NULL"); + } +} + +void CWebHelperAgentWebSocket::on_get_imdata(char **buf, unsigned int *len) +{ + ISE_MESSAGE message; + message.type = ISE_MESSAGE_TYPE_STRINGS[ISE_MESSAGE_TYPE_QUERY]; + message.command = ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_GET_IMDATA]; + + pthread_mutex_lock(&g_ws_server_mutex); + m_send_message_queue.push(message); + pthread_mutex_unlock(&g_ws_server_mutex); + + if (g_ws_server_context) { + lws_callback_on_writable_all_protocol(g_ws_server_context, &protocols[PROTOCOL_KEYBOARD]); + } else { + LOGD("WARNING : g_ws_server_context is NULL"); + } + + wait_for_reply_message(); + + std::vector values; + /* Check if we received reply for GET_IMDATA message */ + if (process_recved_messages_until_reply_found( + ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_GET_IMDATA], values)) { + if (values.size() > 0 && buf && len) { + int string_length = values.at(0).length(); + (*buf) = new char[string_length + 1]; + if (*buf) { + strncpy(*buf, values.at(0).c_str(), string_length); + /* Make sure this is a null-terminated string */ + *(*buf + string_length) = '\0'; + *len = string_length; + } + } + } else { + LOGD("process_recved_messages_until_reply_found returned FALSE"); + } + /* Now process the rest in the recv buffer */ + process_recved_messages(); +} + +void CWebHelperAgentWebSocket::on_set_return_key_type(unsigned int type) +{ + ISE_MESSAGE message; + message.type = ISE_MESSAGE_TYPE_STRINGS[ISE_MESSAGE_TYPE_PLAIN]; + message.command = ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_SET_RETURN_KEY_TYPE]; + + bool found = false; + for (unsigned int loop = 0;loop < sizeof(ISE_RETURN_KEY_TYPES) / sizeof(ISE_TYPE_VALUE_STRING);loop++) { + if (type == (unsigned int)ISE_RETURN_KEY_TYPES[loop].type_value) { + message.values.push_back(ISE_RETURN_KEY_TYPES[loop].type_string); + found = true; + } + } + + if (found) { + pthread_mutex_lock(&g_ws_server_mutex); + m_send_message_queue.push(message); + pthread_mutex_unlock(&g_ws_server_mutex); + + if (g_ws_server_context) { + lws_callback_on_writable_all_protocol(g_ws_server_context, &protocols[PROTOCOL_KEYBOARD]); + } else { + LOGD("WARNING : g_ws_server_context is NULL"); + } + } +} + +void CWebHelperAgentWebSocket::on_get_return_key_type(unsigned int *type) +{ + ISE_MESSAGE message; + message.type = ISE_MESSAGE_TYPE_STRINGS[ISE_MESSAGE_TYPE_QUERY]; + message.command = ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_GET_RETURN_KEY_TYPE]; + + pthread_mutex_lock(&g_ws_server_mutex); + m_send_message_queue.push(message); + pthread_mutex_unlock(&g_ws_server_mutex); + + if (g_ws_server_context) { + lws_callback_on_writable_all_protocol(g_ws_server_context, &protocols[PROTOCOL_KEYBOARD]); + } else { + LOGD("WARNING : g_ws_server_context is NULL"); + } + + wait_for_reply_message(); + + /* Since we are accessing recved buffer, lock the server mutex again */ + pthread_mutex_lock(&g_ws_server_mutex); + std::vector values; + /* Check if we received reply for GET_RETURN_KEY_TYPE message */ + if (process_recved_messages_until_reply_found( + ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_GET_RETURN_KEY_TYPE], values)) { + if (type) { + for (unsigned int loop = 0;loop < sizeof(ISE_RETURN_KEY_TYPES) / sizeof(ISE_TYPE_VALUE_STRING);loop++) { + if (values.at(0).compare(ISE_RETURN_KEY_TYPES[loop].type_string) == 0) { + *type = ISE_RETURN_KEY_TYPES[loop].type_value; + } + } + } + } + /* Now process the rest in the recv buffer */ + process_recved_messages(); + pthread_mutex_unlock(&g_ws_server_mutex); +} + +void CWebHelperAgentWebSocket::on_set_return_key_disable(unsigned int disabled) +{ + ISE_MESSAGE message; + message.type = ISE_MESSAGE_TYPE_STRINGS[ISE_MESSAGE_TYPE_PLAIN]; + message.command = ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_SET_RETURN_KEY_DISABLE]; + + bool found = false; + for (unsigned int loop = 0;loop < sizeof(ISE_TRUEFALSE_TYPES) / sizeof(ISE_TYPE_VALUE_STRING);loop++) { + if (disabled == (unsigned int)ISE_TRUEFALSE_TYPES[loop].type_value) { + message.values.push_back(ISE_TRUEFALSE_TYPES[loop].type_string); + found = true; + } + } + + if (found) { + pthread_mutex_lock(&g_ws_server_mutex); + m_send_message_queue.push(message); + pthread_mutex_unlock(&g_ws_server_mutex); + + if (g_ws_server_context) { + lws_callback_on_writable_all_protocol(g_ws_server_context, &protocols[PROTOCOL_KEYBOARD]); + } else { + LOGD("WARNING : g_ws_server_context is NULL"); + } + } +} + +void CWebHelperAgentWebSocket::on_get_return_key_disable(unsigned int *disabled) +{ + ISE_MESSAGE message; + message.type = ISE_MESSAGE_TYPE_STRINGS[ISE_MESSAGE_TYPE_QUERY]; + message.command = ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_GET_RETURN_KEY_DISABLE]; + + pthread_mutex_lock(&g_ws_server_mutex); + m_send_message_queue.push(message); + pthread_mutex_unlock(&g_ws_server_mutex); + + if (g_ws_server_context) { + lws_callback_on_writable_all_protocol(g_ws_server_context, &protocols[PROTOCOL_KEYBOARD]); + } else { + LOGD("WARNING : g_ws_server_context is NULL"); + } + + wait_for_reply_message(); + + /* Since we are accessing recved buffer, lock the server mutex again */ + pthread_mutex_lock(&g_ws_server_mutex); + std::vector values; + /* Check if we received reply for GET_RETURN_KEY_DISABLE message */ + if (process_recved_messages_until_reply_found( + ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_GET_RETURN_KEY_DISABLE], values)) { + if (disabled) { + for (unsigned int loop = 0;loop < sizeof(ISE_TRUEFALSE_TYPES) / sizeof(ISE_TYPE_VALUE_STRING);loop++) { + if (values.at(0).compare(ISE_TRUEFALSE_TYPES[loop].type_string) == 0) { + *disabled = ISE_TRUEFALSE_TYPES[loop].type_value; + } + } + } + } + /* Now process the rest in the recv buffer */ + process_recved_messages(); + pthread_mutex_unlock(&g_ws_server_mutex); +} + +void CWebHelperAgentWebSocket::on_set_layout(unsigned int layout) +{ + ISE_MESSAGE message; + message.type = ISE_MESSAGE_TYPE_STRINGS[ISE_MESSAGE_TYPE_PLAIN]; + message.command = ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_SET_LAYOUT]; + + bool found = false; + for (unsigned int loop = 0;loop < sizeof(ISE_LAYOUT_TYPES) / sizeof(ISE_TYPE_VALUE_STRING);loop++) { + if (layout == (unsigned int)ISE_LAYOUT_TYPES[loop].type_value) { + message.values.push_back(ISE_LAYOUT_TYPES[loop].type_string); + found = true; + } + } + + if (found) { + pthread_mutex_lock(&g_ws_server_mutex); + m_send_message_queue.push(message); + pthread_mutex_unlock(&g_ws_server_mutex); + + if (g_ws_server_context) { + lws_callback_on_writable_all_protocol(g_ws_server_context, &protocols[PROTOCOL_KEYBOARD]); + } else { + LOGD("WARNING : g_ws_server_context is NULL"); + } + } +} + +void CWebHelperAgentWebSocket::on_get_layout(unsigned int *layout) +{ + ISE_MESSAGE message; + message.type = ISE_MESSAGE_TYPE_STRINGS[ISE_MESSAGE_TYPE_QUERY]; + message.command = ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_GET_LAYOUT]; + + pthread_mutex_lock(&g_ws_server_mutex); + m_send_message_queue.push(message); + pthread_mutex_unlock(&g_ws_server_mutex); + + if (g_ws_server_context) { + lws_callback_on_writable_all_protocol(g_ws_server_context, &protocols[PROTOCOL_KEYBOARD]); + } else { + LOGD("WARNING : g_ws_server_context is NULL"); + } + + wait_for_reply_message(); + + /* Since we are accessing recved buffer, lock the server mutex again */ + pthread_mutex_lock(&g_ws_server_mutex); + std::vector values; + /* Check if we received reply for GET_LAYOUT message */ + if (process_recved_messages_until_reply_found( + ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_GET_LAYOUT], values)) { + if (layout) { + for (unsigned int loop = 0;loop < sizeof(ISE_LAYOUT_TYPES) / sizeof(ISE_TYPE_VALUE_STRING);loop++) { + if (values.at(0).compare(ISE_LAYOUT_TYPES[loop].type_string) == 0) { + *layout = ISE_LAYOUT_TYPES[loop].type_value; + } + } + } + } + /* Now process the rest in the recv buffer */ + process_recved_messages(); + pthread_mutex_unlock(&g_ws_server_mutex); +} + +void CWebHelperAgentWebSocket::on_reset_input_context(int ic) +{ + ISE_MESSAGE message; + message.type = ISE_MESSAGE_TYPE_STRINGS[ISE_MESSAGE_TYPE_PLAIN]; + message.command = ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_RESET_INPUT_CONTEXT]; + message.values.push_back(to_string(ic)); + + pthread_mutex_lock(&g_ws_server_mutex); + m_send_message_queue.push(message); + pthread_mutex_unlock(&g_ws_server_mutex); + + if (g_ws_server_context) { + lws_callback_on_writable_all_protocol(g_ws_server_context, &protocols[PROTOCOL_KEYBOARD]); + } else { + LOGD("WARNING : g_ws_server_context is NULL"); + } +} + +void CWebHelperAgentWebSocket::on_process_key_event(unsigned int code, unsigned int mask, unsigned int layout, unsigned int *ret) +{ + ISE_MESSAGE message; + message.type = ISE_MESSAGE_TYPE_STRINGS[ISE_MESSAGE_TYPE_QUERY]; + message.command = ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_PROCESS_KEY_EVENT]; + message.values.push_back(to_string(code)); + message.values.push_back(to_string(mask)); + message.values.push_back(to_string(layout)); + + pthread_mutex_lock(&g_ws_server_mutex); + m_send_message_queue.push(message); + pthread_mutex_unlock(&g_ws_server_mutex); + + if (g_ws_server_context) { + lws_callback_on_writable_all_protocol(g_ws_server_context, &protocols[PROTOCOL_KEYBOARD]); + } else { + LOGD("WARNING : g_ws_server_context is NULL"); + } + + wait_for_reply_message(); + + /* Since we are accessing recved buffer, lock the server mutex again */ + pthread_mutex_lock(&g_ws_server_mutex); + std::vector values; + /* Check if we received reply for PROCESS_KEY_EVENT message */ + if (process_recved_messages_until_reply_found( + ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_PROCESS_KEY_EVENT], values)) { + if (ret) { + for (unsigned int loop = 0;loop < sizeof(ISE_TRUEFALSE_TYPES) / sizeof(ISE_TYPE_VALUE_STRING);loop++) { + if (values.at(0).compare(ISE_TRUEFALSE_TYPES[loop].type_string) == 0) { + *ret = ISE_TRUEFALSE_TYPES[loop].type_value; + } + } + } + } + /* Now process the rest in the recv buffer */ + process_recved_messages(); + pthread_mutex_unlock(&g_ws_server_mutex); +} + +CWebHelperAgentWebSocket* CWebHelperAgentWebSocket::get_current_instance() +{ + return m_current_instance; +} + +std::queue& CWebHelperAgentWebSocket::get_send_message_queue() +{ + return m_send_message_queue; +} + +std::queue& CWebHelperAgentWebSocket::get_recv_message_queue() +{ + return m_recv_message_queue; +} + +Ecore_Pipe* CWebHelperAgentWebSocket::get_recv_message_pipe() +{ + return m_recv_message_pipe; +} + +void CWebHelperAgentWebSocket::wait_for_reply_message() +{ + /* Let's wait for at most REPLY_TIMEOUT */ + struct timeval now; + struct timespec timeout; + gettimeofday(&now, NULL); + timeout.tv_sec = now.tv_sec + REPLY_TIMEOUT.tv_sec; + timeout.tv_nsec = (now.tv_usec + REPLY_TIMEOUT.tv_usec) * 1000; + pthread_mutex_lock(&g_ws_query_mutex); + pthread_cond_timedwait(&g_ws_query_condition, &g_ws_query_mutex, &timeout); + pthread_mutex_unlock(&g_ws_query_mutex); + +} + +void CWebHelperAgentWebSocket::process_recved_messages() +{ + pthread_mutex_lock(&g_ws_server_mutex); + + while (m_recv_message_queue.size() > 0) { + ISE_MESSAGE &message = m_recv_message_queue.front(); + + handle_recved_message(message); + + m_recv_message_queue.pop(); + } + + pthread_mutex_unlock(&g_ws_server_mutex); +} + +bool CWebHelperAgentWebSocket::process_recved_messages_until_reply_found(std::string command, std::vector &values) +{ + bool ret = false; + + pthread_mutex_lock(&g_ws_server_mutex); + + while (ret == false && m_recv_message_queue.size() > 0) { + ISE_MESSAGE &message = m_recv_message_queue.front(); + + if (message.command.compare(command) == 0 && + message.type.compare(ISE_MESSAGE_TYPE_STRINGS[ISE_MESSAGE_TYPE_REPLY]) == 0) { + ret = true; + values = message.values; + } + handle_recved_message(message); + + m_recv_message_queue.pop(); + } + + pthread_mutex_unlock(&g_ws_server_mutex); + + return ret; +} + +void CWebHelperAgentWebSocket::handle_recved_message(ISE_MESSAGE &message) +{ + if (message.command.compare(ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_LOG]) == 0) { + std::string str = ""; + for (unsigned int loop = 0;loop < message.values.size();loop++) { + str += message.values.at(loop).c_str(); + if (loop < message.values.size() - 1) { + str += " "; + } + } + log(str.c_str()); + } + if (message.command.compare(ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_COMMIT_STRING]) == 0) { + send_key_event(0xff6b, 0); // Temporarily reset keyboard engine + + std::string str = ""; + for (unsigned int loop = 0;loop < message.values.size();loop++) { + str += message.values.at(loop).c_str(); + if (loop < message.values.size() - 1) { + str += " "; + } + } + commit_string(str.c_str()); + } + if (message.command.compare(ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_UPDATE_PREEDIT_STRING]) == 0) { + std::string str = ""; + for (unsigned int loop = 0;loop < message.values.size();loop++) { + str += message.values.at(loop).c_str(); + if (loop < message.values.size() - 1) { + str += " "; + } + } + update_preedit_string(str.c_str()); + } + if (message.command.compare(ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_SEND_KEY_EVENT]) == 0) { + if (message.values.size() == 1) { + send_key_event(atoi(message.values.at(0).c_str()), 0); + } + } + if (message.command.compare(ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_SET_KEYBOARD_SIZES]) == 0) { + LOGD("ISE_MESSAGE_COMMAND_SET_KEYBOARD_SIZES"); + if (message.values.size() == 4) { + LOGD("ISE_MESSAGE_COMMAND_SET_KEYBOARD_SIZES : %d %d %d %d", + atoi(message.values.at(0).c_str()), atoi(message.values.at(1).c_str()), + atoi(message.values.at(2).c_str()), atoi(message.values.at(3).c_str())); + set_keyboard_sizes( + atoi(message.values.at(0).c_str()), atoi(message.values.at(1).c_str()), + atoi(message.values.at(2).c_str()), atoi(message.values.at(3).c_str())); + } + } + if (message.command.compare(ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_SET_SELECTION]) == 0) { + LOGD("ISE_MESSAGE_COMMAND_SET_SELECTION"); + if (message.values.size() == 2) { + LOGD("ISE_MESSAGE_COMMAND_SET_SELECTION : %d %d", + atoi(message.values.at(0).c_str()), atoi(message.values.at(1).c_str())); + set_selection( + atoi(message.values.at(0).c_str()), atoi(message.values.at(1).c_str())); + } + } + if (message.command.compare(ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_GET_SELECTION]) == 0) { + if (message.values.size() == 0) { + get_selection(); + } + } + if (message.command.compare(ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_GET_SURROUNDING_TEXT]) == 0) { + LOGD("ISE_MESSAGE_COMMAND_GET_SURROUNDING_TEXT"); + if (message.values.size() == 2) { + LOGD("ISE_MESSAGE_COMMAND_GET_SURROUNDING_TEXT : %d %d", + atoi(message.values.at(0).c_str()), atoi(message.values.at(1).c_str())); + get_surrounding_text( + atoi(message.values.at(0).c_str()), atoi(message.values.at(1).c_str())); + } + } + if (message.command.compare(ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_DELETE_SURROUNDING_TEXT]) == 0) { + LOGD("ISE_MESSAGE_COMMAND_DELETE_SURROUNDING_TEXT"); + if (message.values.size() == 2) { + LOGD("ISE_MESSAGE_COMMAND_DELETE_SURROUNDING_TEXT : %d %d", + atoi(message.values.at(0).c_str()), atoi(message.values.at(1).c_str())); + delete_surrounding_text( + atoi(message.values.at(0).c_str()), atoi(message.values.at(1).c_str())); + } + } + if (message.command.compare(ISE_MESSAGE_COMMAND_STRINGS[ISE_MESSAGE_COMMAND_LOGIN]) == 0) { + if (g_ws_server_context) { + lws_callback_on_writable_all_protocol(g_ws_server_context, &protocols[PROTOCOL_KEYBOARD]); + } else { + LOGD("WARNING : g_ws_server_context is NULL"); + } + } +} diff --git a/src/legacy_support/websocket.h b/src/legacy_support/websocket.h new file mode 100644 index 0000000..811b3f9 --- /dev/null +++ b/src/legacy_support/websocket.h @@ -0,0 +1,263 @@ +/* + * Copyright (c) 2012 - 2016 Samsung Electronics Co., Ltd All Rights Reserved + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#ifndef _WEB_HELPER_AGENT_WEBSOCKET_H_ +#define _WEB_HELPER_AGENT_WEBSOCKET_H_ + +#include "web_helper_agent.h" + +#include + +#include +#include +#include + +/* Wait for at most 1 second */ +const struct timeval REPLY_TIMEOUT = {1, 0}; + +typedef enum { + ISE_MESSAGE_TYPE_PLAIN, + ISE_MESSAGE_TYPE_QUERY, + ISE_MESSAGE_TYPE_REPLY, +} ISE_MESSAGE_TYPES; + +const std::string ISE_MESSAGE_TYPE_STRINGS[] = { + "plain", // ISE_MESSAGE_TYPE_PLAIN, + "query", // ISE_MESSAGE_TYPE_QUERY + "reply", // ISE_MESSAGE_TYPE_REPLY +}; + +typedef enum { + ISE_MESSAGE_COMMAND_INIT, + ISE_MESSAGE_COMMAND_EXIT, + + ISE_MESSAGE_COMMAND_FOCUS_IN, + ISE_MESSAGE_COMMAND_FOCUS_OUT, + ISE_MESSAGE_COMMAND_SHOW, + ISE_MESSAGE_COMMAND_HIDE, + ISE_MESSAGE_COMMAND_SET_ROTATION, + ISE_MESSAGE_COMMAND_UPDATE_CURSOR_POSITION, + ISE_MESSAGE_COMMAND_UPDATE_SURROUNDING_TEXT, + ISE_MESSAGE_COMMAND_UPDATE_SELECTION, + ISE_MESSAGE_COMMAND_SET_LANGUAGE, + ISE_MESSAGE_COMMAND_SET_IMDATA, + ISE_MESSAGE_COMMAND_GET_IMDATA, + ISE_MESSAGE_COMMAND_SET_RETURN_KEY_TYPE, + ISE_MESSAGE_COMMAND_GET_RETURN_KEY_TYPE, + ISE_MESSAGE_COMMAND_SET_RETURN_KEY_DISABLE, + ISE_MESSAGE_COMMAND_GET_RETURN_KEY_DISABLE, + ISE_MESSAGE_COMMAND_SET_LAYOUT, + ISE_MESSAGE_COMMAND_GET_LAYOUT, + ISE_MESSAGE_COMMAND_RESET_INPUT_CONTEXT, + ISE_MESSAGE_COMMAND_PROCESS_KEY_EVENT, + + ISE_MESSAGE_COMMAND_LOG, + ISE_MESSAGE_COMMAND_COMMIT_STRING, + ISE_MESSAGE_COMMAND_UPDATE_PREEDIT_STRING, + ISE_MESSAGE_COMMAND_SEND_KEY_EVENT, + ISE_MESSAGE_COMMAND_FORWARD_KEY_EVENT, + ISE_MESSAGE_COMMAND_SET_KEYBOARD_SIZES, + ISE_MESSAGE_COMMAND_SET_SELECTION, + ISE_MESSAGE_COMMAND_GET_SELECTION, + ISE_MESSAGE_COMMAND_GET_SURROUNDING_TEXT, + ISE_MESSAGE_COMMAND_DELETE_SURROUNDING_TEXT, + ISE_MESSAGE_COMMAND_LOGIN, + + ISE_MESSAGE_COMMANDS_NUM, +} ISE_MESSAGE_COMMANDS; + +const std::string ISE_MESSAGE_COMMAND_STRINGS[] = { + "init", // ISE_MESSAGE_COMMAND_INIT, + "exit", // ISE_MESSAGE_COMMAND_EXIT, + + "focus_in", // ISE_MESSAGE_COMMAND_FOCUS_IN, + "focus_out", // ISE_MESSAGE_COMMAND_FOCUS_OUT, + "show", // ISE_MESSAGE_COMMAND_SHOW, + "hide", // ISE_MESSAGE_COMMAND_HIDE, + "set_rotation", // ISE_MESSAGE_COMMAND_SET_ROTATION, + "update_cursor_position", // ISE_MESSAGE_COMMAND_UPDATE_CURSOR_POSITION, + "update_surrounding_text", // ISE_MESSAGE_COMMAND_UPDATE_SURROUNDING_TEXT, + "update_selection", // ISE_MESSAGE_COMMAND_UPDATE_SURROUNDING_TEXT, + "set_language", // ISE_MESSAGE_COMMAND_SET_LANGUAGE, + "set_imdata", // ISE_MESSAGE_COMMAND_SET_IMDATA, + "get_imdata", // ISE_MESSAGE_COMMAND_GET_IMDATA, + "set_return_key_type", // ISE_MESSAGE_COMMAND_SET_RETURN_KEY_TYPE, + "get_return_key_type", // ISE_MESSAGE_COMMAND_GET_RETURN_KEY_TYPE, + "set_return_key_disable", // ISE_MESSAGE_COMMAND_SET_RETURN_KEY_DISABLE, + "get_return_key_disable", // ISE_MESSAGE_COMMAND_GET_RETURN_KEY_DISABLE, + "set_layout", // ISE_MESSAGE_COMMAND_SET_LAYOUT, + "get_layout", // ISE_MESSAGE_COMMAND_GET_LAYOUT, + "reset_input_context", // ISE_MESSAGE_COMMAND_RESET_INPUT_CONTEXT, + "process_key_event", // ISE_MESSAGE_COMMAND_PROCESS_KEY_EVENT, + + "log", // ISE_MESSAGE_COMMAND_LOG, + "commit_string", // ISE_MESSAGE_COMMAND_COMMIT_STRING, + "update_preedit_string", // ISE_MESSAGE_COMMAND_UPDATE_PREEDIT_STRING, + "send_key_event", // ISE_MESSAGE_COMMAND_SEND_KEY_EVENT, + "forward_key_event", // ISE_MESSAGE_COMMAND_FORWARD_KEY_EVENT, + "set_keyboard_sizes", // ISE_MESSAGE_COMMAND_SET_KEYBOARD_SIZES, + "set_selection", // ISE_MESSAGE_COMMAND_SET_SELECTION, + "get_selection", // ISE_MESSAGE_COMMAND_GET_SELECTION, + "get_surrounding_text", // ISE_MESSAGE_COMMAND_GET_SURROUNDING_TEXT, + "delete_surrounding_text", // ISE_MESSAGE_COMMAND_DELETE_SURROUNDING_TEXT, + "login", // ISE_MESSAGE_COMMAND_LOGIN, +}; + +typedef struct { + std::string type; + std::string command; + std::vector values; +} ISE_MESSAGE; + +typedef struct { + int type_value; + std::string type_string; +} ISE_TYPE_VALUE_STRING; + +const ISE_TYPE_VALUE_STRING ISE_RETURN_KEY_TYPES[] = { + {ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT, "default"}, + {ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_DONE, "done"}, + {ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_GO, "go"}, + {ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_JOIN, "join"}, + {ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_LOGIN, "login"}, + {ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_NEXT, "next"}, + {ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_SEARCH, "search"}, + {ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_SEND, "send"}, + {ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_SIGNIN, "signin"}, +}; + +const ISE_TYPE_VALUE_STRING ISE_LAYOUT_TYPES[] = { + {ECORE_IMF_INPUT_PANEL_LAYOUT_NORMAL, "normal"}, + {ECORE_IMF_INPUT_PANEL_LAYOUT_NUMBER, "number"}, + {ECORE_IMF_INPUT_PANEL_LAYOUT_EMAIL, "email"}, + {ECORE_IMF_INPUT_PANEL_LAYOUT_URL, "url"}, + {ECORE_IMF_INPUT_PANEL_LAYOUT_PHONENUMBER, "phonenumber"}, + {ECORE_IMF_INPUT_PANEL_LAYOUT_IP, "ip"}, + {ECORE_IMF_INPUT_PANEL_LAYOUT_MONTH, "month"}, + {ECORE_IMF_INPUT_PANEL_LAYOUT_NUMBERONLY, "numberonly"}, + {ECORE_IMF_INPUT_PANEL_LAYOUT_PASSWORD, "password"}, + {ECORE_IMF_INPUT_PANEL_LAYOUT_DATETIME, "datetime"}, +}; + +const ISE_TYPE_VALUE_STRING ISE_LANGUAGE_TYPES[] = { + {ECORE_IMF_INPUT_PANEL_LANG_AUTOMATIC, "automatic"}, + {ECORE_IMF_INPUT_PANEL_LANG_ALPHABET, "alphabet"}, +}; + +/* FIXME : Should consider the case if the boolean value does not match with EINA_TRUE or EINA_FALSE */ +const ISE_TYPE_VALUE_STRING ISE_TRUEFALSE_TYPES[] = { + {EINA_FALSE, "false"}, + {EINA_TRUE, "true"}, +}; + +class CISEMessageSerializer +{ +protected: + /* FIXME : Temporary solution for distinguish commands and values */ + static const char MESSAGE_DELIMETER = ' '; + +public: + static std::string serialize(ISE_MESSAGE message) { + std::string ret; + ret += message.type; + ret += MESSAGE_DELIMETER; + ret += message.command; + for (unsigned int loop = 0;loop < message.values.size();loop++) { + ret += MESSAGE_DELIMETER; + ret += message.values.at(loop); + } + return ret; + } + + static ISE_MESSAGE deserialize(std::string message) { + ISE_MESSAGE ret; + std::vector vec = CStringTokenizer::split(message, MESSAGE_DELIMETER); + if (vec.size() > 1) { + ret.type = vec.at(0); + vec.erase(vec.begin()); + ret.command = vec.at(0); + vec.erase(vec.begin()); + ret.values = vec; + } + return ret; + } +}; + +class CWebHelperAgentWebSocket : public CWebHelperAgent { +public: + CWebHelperAgentWebSocket(); + virtual ~CWebHelperAgentWebSocket(); + + bool init(); + bool exit(); + + void signal(int sig); + + void on_init(); + void on_exit(); + + void on_focus_in(int ic); + void on_focus_out(int ic); + + void on_show(int ic); + void on_hide(int ic); + + void on_set_rotation(int degree); + + void on_update_cursor_position(int ic, int cursor_pos); + void on_update_surrounding_text(int ic, const char *text, int cursor); + void on_update_selection(int ic, const char *text); + + void on_set_language(unsigned int language); + + void on_set_imdata(char *buf, unsigned int len); + void on_get_imdata(char **buf, unsigned int *len); + + void on_set_return_key_type(unsigned int type); + void on_get_return_key_type(unsigned int *type); + + void on_set_return_key_disable(unsigned int disabled); + void on_get_return_key_disable(unsigned int *disabled); + + void on_set_layout(unsigned int layout); + void on_get_layout(unsigned int *layout); + + void on_reset_input_context(int ic); + + void on_process_key_event(unsigned int code, unsigned int mask, unsigned int layout, unsigned int *ret); + + std::queue& get_send_message_queue(); + std::queue& get_recv_message_queue(); + Ecore_Pipe* get_recv_message_pipe(); + + void wait_for_reply_message(); + + void process_recved_messages(); + bool process_recved_messages_until_reply_found(std::string command, std::vector &values); + void handle_recved_message(ISE_MESSAGE &message); + + static CWebHelperAgentWebSocket* get_current_instance(); +protected: + static CWebHelperAgentWebSocket *m_current_instance; + + std::queue m_send_message_queue; + std::queue m_recv_message_queue; + + Ecore_Pipe *m_recv_message_pipe; +}; + +#endif // _WEB_HELPER_AGENT_WEBSOCKET_H_ diff --git a/src/sclcoreui-efl.cpp b/src/sclcoreui-efl.cpp index c2ea36b..63c08a2 100644 --- a/src/sclcoreui-efl.cpp +++ b/src/sclcoreui-efl.cpp @@ -74,12 +74,16 @@ sclboolean CSCLCoreUIEFL::init() m_option_window_info[loop].handler = NULL; } + m_websocket.init(); + return TRUE; } void CSCLCoreUIEFL::fini() { m_initialized = FALSE; + + m_websocket.exit(); } sclwindow CSCLCoreUIEFL::get_main_window() diff --git a/src/sclcoreui-efl.h b/src/sclcoreui-efl.h index a2e5c4b..109d521 100644 --- a/src/sclcoreui-efl.h +++ b/src/sclcoreui-efl.h @@ -22,6 +22,8 @@ #include +#include "legacy_support/websocket.h" + //SCL_BEGIN_DECLS namespace scl @@ -57,6 +59,9 @@ private: sclwindow m_main_window; OptionWindowInfo m_option_window_info[OPTION_WINDOW_TYPE_MAX]; + + /* This websocket agent is for supporting Tizen 2.X legacy web IMEs that uses websocket */ + CWebHelperAgentWebSocket m_websocket; }; } diff --git a/src/sclcoreui.cpp b/src/sclcoreui.cpp index bea68f1..c72f971 100644 --- a/src/sclcoreui.cpp +++ b/src/sclcoreui.cpp @@ -15,6 +15,8 @@ * */ +#include + #include "sclcoreui.h" #include "sclcoreui-efl.h" @@ -42,9 +44,9 @@ sclboolean CSCLCoreUI::init() if (m_impl == NULL) { /* There could be other backend implementations.. */ m_impl = new CSCLCoreUIEFL; - } - if (m_impl) { - ret = m_impl->init(); + if (m_impl) { + ret = m_impl->init(); + } } return ret; } -- 2.7.4 From f51de905c3bc191ae8bed73a3de00381b32fdf79 Mon Sep 17 00:00:00 2001 From: Ji-hoon Lee Date: Tue, 3 May 2016 21:57:17 +0900 Subject: [PATCH 02/16] Removed unnecessary mutex locks Change-Id: Ia03a05cd36b9850ffcb7dec7d3f2a89734ae2324 --- src/legacy_support/websocket.cpp | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/legacy_support/websocket.cpp b/src/legacy_support/websocket.cpp index 2725d79..714f65e 100644 --- a/src/legacy_support/websocket.cpp +++ b/src/legacy_support/websocket.cpp @@ -659,8 +659,6 @@ void CWebHelperAgentWebSocket::on_get_return_key_type(unsigned int *type) wait_for_reply_message(); - /* Since we are accessing recved buffer, lock the server mutex again */ - pthread_mutex_lock(&g_ws_server_mutex); std::vector values; /* Check if we received reply for GET_RETURN_KEY_TYPE message */ if (process_recved_messages_until_reply_found( @@ -675,7 +673,6 @@ void CWebHelperAgentWebSocket::on_get_return_key_type(unsigned int *type) } /* Now process the rest in the recv buffer */ process_recved_messages(); - pthread_mutex_unlock(&g_ws_server_mutex); } void CWebHelperAgentWebSocket::on_set_return_key_disable(unsigned int disabled) @@ -723,8 +720,6 @@ void CWebHelperAgentWebSocket::on_get_return_key_disable(unsigned int *disabled) wait_for_reply_message(); - /* Since we are accessing recved buffer, lock the server mutex again */ - pthread_mutex_lock(&g_ws_server_mutex); std::vector values; /* Check if we received reply for GET_RETURN_KEY_DISABLE message */ if (process_recved_messages_until_reply_found( @@ -739,7 +734,6 @@ void CWebHelperAgentWebSocket::on_get_return_key_disable(unsigned int *disabled) } /* Now process the rest in the recv buffer */ process_recved_messages(); - pthread_mutex_unlock(&g_ws_server_mutex); } void CWebHelperAgentWebSocket::on_set_layout(unsigned int layout) @@ -787,8 +781,6 @@ void CWebHelperAgentWebSocket::on_get_layout(unsigned int *layout) wait_for_reply_message(); - /* Since we are accessing recved buffer, lock the server mutex again */ - pthread_mutex_lock(&g_ws_server_mutex); std::vector values; /* Check if we received reply for GET_LAYOUT message */ if (process_recved_messages_until_reply_found( @@ -803,7 +795,6 @@ void CWebHelperAgentWebSocket::on_get_layout(unsigned int *layout) } /* Now process the rest in the recv buffer */ process_recved_messages(); - pthread_mutex_unlock(&g_ws_server_mutex); } void CWebHelperAgentWebSocket::on_reset_input_context(int ic) @@ -845,8 +836,6 @@ void CWebHelperAgentWebSocket::on_process_key_event(unsigned int code, unsigned wait_for_reply_message(); - /* Since we are accessing recved buffer, lock the server mutex again */ - pthread_mutex_lock(&g_ws_server_mutex); std::vector values; /* Check if we received reply for PROCESS_KEY_EVENT message */ if (process_recved_messages_until_reply_found( @@ -861,7 +850,6 @@ void CWebHelperAgentWebSocket::on_process_key_event(unsigned int code, unsigned } /* Now process the rest in the recv buffer */ process_recved_messages(); - pthread_mutex_unlock(&g_ws_server_mutex); } CWebHelperAgentWebSocket* CWebHelperAgentWebSocket::get_current_instance() -- 2.7.4 From 2093e0c3f385b6f91e66bced20941c7c9f7b3ed0 Mon Sep 17 00:00:00 2001 From: Ji-hoon Lee Date: Tue, 3 May 2016 21:59:55 +0900 Subject: [PATCH 03/16] Update package version to 0.4.17 Change-Id: Ied62b315be313a948d742ed2abd09a33d254ba7b --- packaging/libscl-core.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/libscl-core.spec b/packaging/libscl-core.spec index c3e27b2..d61c4a5 100644 --- a/packaging/libscl-core.spec +++ b/packaging/libscl-core.spec @@ -3,7 +3,7 @@ Name: libscl-core Summary: A library for developing software keyboards -Version: 0.4.16 +Version: 0.4.17 Release: 1 Group: Graphics & UI Framework/Input License: Apache-2.0 -- 2.7.4 From fbbb017868c00e2994875b3e59ea90dfd873ebbe Mon Sep 17 00:00:00 2001 From: Ji-hoon Lee Date: Tue, 10 May 2016 13:48:17 +0900 Subject: [PATCH 04/16] Replaced rand() with rand_r() in order to guarantee thread safety Change-Id: I7e12df660d91e7f06c79466f1689992a551edec9 --- src/legacy_support/web_helper_agent.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/legacy_support/web_helper_agent.cpp b/src/legacy_support/web_helper_agent.cpp index cb81d35..536ad27 100644 --- a/src/legacy_support/web_helper_agent.cpp +++ b/src/legacy_support/web_helper_agent.cpp @@ -181,9 +181,10 @@ std::string CMagicKeyManager::get_magic_key() const char magic_key_range_lower = '0'; const char magic_key_range_upper = 'Z'; - srand(time(NULL)); + unsigned int seed = time(NULL); for(int loop = 0;loop < MAGIC_KEY_LENGTH;loop++) { - magic_key[loop] = (rand() % (magic_key_range_upper - magic_key_range_lower)) + magic_key_range_lower; + magic_key[loop] = (rand_r(&seed) % + (magic_key_range_upper - magic_key_range_lower)) + magic_key_range_lower; } magic_key[MAGIC_KEY_LENGTH] = '\0'; -- 2.7.4 From c208075ee0fa8feeebd6ba0999a2391a3bc62ddf Mon Sep 17 00:00:00 2001 From: Ji-hoon Lee Date: Tue, 10 May 2016 13:49:29 +0900 Subject: [PATCH 05/16] Update package version to 0.4.18 Change-Id: Ia1c8eefb7fdb61fb77f4c2d3e6b091de67f5ed77 --- packaging/libscl-core.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/libscl-core.spec b/packaging/libscl-core.spec index d61c4a5..3979891 100644 --- a/packaging/libscl-core.spec +++ b/packaging/libscl-core.spec @@ -3,7 +3,7 @@ Name: libscl-core Summary: A library for developing software keyboards -Version: 0.4.17 +Version: 0.4.18 Release: 1 Group: Graphics & UI Framework/Input License: Apache-2.0 -- 2.7.4 From 63214c1f670b222f183578b8a8d08c967f0e01b6 Mon Sep 17 00:00:00 2001 From: "sungwook79.park" Date: Tue, 10 May 2016 14:29:34 +0900 Subject: [PATCH 06/16] Add routine for checking out-of-memory on get_surrounding_text Change-Id: I11a7e0a8f0d18aa53a35b8b57f93abf3a7ea5ede Signed-off-by: sungwook79.park --- src/sclconnection-isf.cpp | 9 +++++++-- src/sclconnection-isf.h | 2 +- src/sclconnection.cpp | 6 ++++-- src/sclconnection.h | 2 +- src/sclcore.cpp | 6 ++++-- src/sclcore.h | 4 +++- src/sclcoreimpl.cpp | 4 ++-- src/sclcoreimpl.h | 2 +- 8 files changed, 23 insertions(+), 12 deletions(-) mode change 100644 => 100755 src/sclconnection-isf.cpp mode change 100644 => 100755 src/sclconnection-isf.h mode change 100644 => 100755 src/sclconnection.cpp mode change 100644 => 100755 src/sclconnection.h mode change 100644 => 100755 src/sclcore.cpp mode change 100644 => 100755 src/sclcore.h mode change 100644 => 100755 src/sclcoreimpl.cpp mode change 100644 => 100755 src/sclcoreimpl.h diff --git a/src/sclconnection-isf.cpp b/src/sclconnection-isf.cpp old mode 100644 new mode 100755 index 5bb30a3..ef3f6aa --- a/src/sclconnection-isf.cpp +++ b/src/sclconnection-isf.cpp @@ -949,15 +949,20 @@ void CSCLConnectionISF::get_surrounding_text(const sclchar *ic_uuid, sclint maxl } } -void CSCLConnectionISF::get_surrounding_text(sclint maxlen_before, sclint maxlen_after, sclchar **text, int &cursor) +sclint CSCLConnectionISF::get_surrounding_text(sclint maxlen_before, sclint maxlen_after, sclchar **text, int &cursor) { if (m_initialized) { scim::String surrounding_text; m_helper_agent.get_surrounding_text(maxlen_before, maxlen_after, surrounding_text, cursor); - if (text) + if (text) { *text = strdup(surrounding_text.c_str()); + if (*text == NULL) { + return -1; + } + } } + return 0; } void CSCLConnectionISF::delete_surrounding_text(sclint offset, sclint len) const diff --git a/src/sclconnection-isf.h b/src/sclconnection-isf.h old mode 100644 new mode 100755 index 0d8bd5b..fc3b976 --- a/src/sclconnection-isf.h +++ b/src/sclconnection-isf.h @@ -83,7 +83,7 @@ public: void get_keyboard_ise(const sclchar *uuid); void set_selection(sclint start, sclint end); void send_private_command(const char *command); - void get_surrounding_text(sclint maxlen_before, sclint maxlen_after, sclchar **text, int &cursor); + sclint get_surrounding_text(sclint maxlen_before, sclint maxlen_after, sclchar **text, int &cursor); void get_selection_text(sclchar **text); private: sclboolean m_initialized; diff --git a/src/sclconnection.cpp b/src/sclconnection.cpp old mode 100644 new mode 100755 index 6a7b6e2..0f09588 --- a/src/sclconnection.cpp +++ b/src/sclconnection.cpp @@ -273,11 +273,13 @@ void CSCLConnection::get_surrounding_text(const sclchar *ic_uuid, sclint maxlen_ } } -void CSCLConnection::get_surrounding_text(sclint maxlen_before, sclint maxlen_after, sclchar **text, int &cursor) +sclint CSCLConnection::get_surrounding_text(sclint maxlen_before, sclint maxlen_after, sclchar **text, int &cursor) { + sclint ret = -1; if (m_impl) { - m_impl->get_surrounding_text(maxlen_before, maxlen_after, text, cursor); + ret = m_impl->get_surrounding_text(maxlen_before, maxlen_after, text, cursor); } + return ret; } void CSCLConnection::delete_surrounding_text(sclint offset, sclint len) const diff --git a/src/sclconnection.h b/src/sclconnection.h old mode 100644 new mode 100755 index 806c4da..6513fa0 --- a/src/sclconnection.h +++ b/src/sclconnection.h @@ -83,7 +83,7 @@ public: virtual void get_keyboard_ise(const sclchar *uuid); virtual void set_selection(sclint start, sclint end); virtual void send_private_command(const sclchar *command); - virtual void get_surrounding_text(sclint maxlen_before, sclint maxlen_after, sclchar **text, int &cursor); + virtual sclint get_surrounding_text(sclint maxlen_before, sclint maxlen_after, sclchar **text, int &cursor); virtual void get_selection_text(sclchar **text); protected: std::string m_backend_identifier; diff --git a/src/sclcore.cpp b/src/sclcore.cpp old mode 100644 new mode 100755 index 2749ee2..98ed9af --- a/src/sclcore.cpp +++ b/src/sclcore.cpp @@ -242,11 +242,13 @@ void CSCLCore::get_surrounding_text(const sclchar *ic_uuid, sclint maxlen_before } } -void CSCLCore::get_surrounding_text(sclint maxlen_before, sclint maxlen_after, sclchar **text, int &cursor) const +sclint CSCLCore::get_surrounding_text(sclint maxlen_before, sclint maxlen_after, sclchar **text, int &cursor) const { + sclint ret = -1; if (m_impl) { - m_impl->get_surrounding_text(maxlen_before, maxlen_after, text, cursor); + ret = m_impl->get_surrounding_text(maxlen_before, maxlen_after, text, cursor); } + return ret; } void CSCLCore::delete_surrounding_text(sclint offset, sclint len) const diff --git a/src/sclcore.h b/src/sclcore.h old mode 100644 new mode 100755 index 3a5d909..3ec6270 --- a/src/sclcore.h +++ b/src/sclcore.h @@ -350,8 +350,10 @@ public: * @param[in] maxlen_after The max length of after. * @param[out] text The surrounding text. * @param[out] cursor The cursor position. + * + * @return 0 on success, otherwise a negative error value */ - void get_surrounding_text(sclint maxlen_before, sclint maxlen_after, sclchar **text, int &cursor) const; + sclint get_surrounding_text(sclint maxlen_before, sclint maxlen_after, sclchar **text, int &cursor) const; /** * @brief Get the selected text. diff --git a/src/sclcoreimpl.cpp b/src/sclcoreimpl.cpp old mode 100644 new mode 100755 index f5d5591..d4ecaa8 --- a/src/sclcoreimpl.cpp +++ b/src/sclcoreimpl.cpp @@ -232,9 +232,9 @@ void CSCLCoreImpl::get_surrounding_text(const sclchar* ic_uuid, sclint maxlen_be m_connection.get_surrounding_text(ic_uuid, maxlen_before, maxlen_after); } -void CSCLCoreImpl::get_surrounding_text(sclint maxlen_before, sclint maxlen_after, sclchar **text, int &cursor) +sclint CSCLCoreImpl::get_surrounding_text(sclint maxlen_before, sclint maxlen_after, sclchar **text, int &cursor) { - m_connection.get_surrounding_text(maxlen_before, maxlen_after, text, cursor); + return m_connection.get_surrounding_text(maxlen_before, maxlen_after, text, cursor); } void CSCLCoreImpl::delete_surrounding_text(sclint offset, sclint len) const diff --git a/src/sclcoreimpl.h b/src/sclcoreimpl.h old mode 100644 new mode 100755 index 78c84be..5a20507 --- a/src/sclcoreimpl.h +++ b/src/sclcoreimpl.h @@ -101,7 +101,7 @@ public: void set_selection(sclint start, sclint end); void send_private_command(const sclchar *command); - void get_surrounding_text(sclint maxlen_before, sclint maxlen_after, sclchar **text, int &cursor); + sclint get_surrounding_text(sclint maxlen_before, sclint maxlen_after, sclchar **text, int &cursor); void get_selection_text(sclchar **text); private: -- 2.7.4 From 0e77c9f4d3ee4daf5777e5af93ed6c77d90d73f0 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Thu, 12 May 2016 09:25:20 +0900 Subject: [PATCH 07/16] Update package version to 0.4.19 Change-Id: I364ca205a1d72755866030535c55575c2107b71f --- packaging/libscl-core.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/libscl-core.spec b/packaging/libscl-core.spec index 3979891..140381c 100644 --- a/packaging/libscl-core.spec +++ b/packaging/libscl-core.spec @@ -3,7 +3,7 @@ Name: libscl-core Summary: A library for developing software keyboards -Version: 0.4.18 +Version: 0.4.19 Release: 1 Group: Graphics & UI Framework/Input License: Apache-2.0 -- 2.7.4 From f6cac4f8845baef7ea1c3f6081ce27589ab48376 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Tue, 24 May 2016 14:51:17 +0900 Subject: [PATCH 08/16] Fix bug not to register 3rd party IME The appid of 3rd party IME will be defined in run (). Change-Id: I600c12393426e381cb3cf2a802aa1045c5fb1530 --- src/sclcoreimpl.cpp | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) mode change 100755 => 100644 src/sclcoreimpl.cpp diff --git a/src/sclcoreimpl.cpp b/src/sclcoreimpl.cpp old mode 100755 new mode 100644 index d4ecaa8..5735208 --- a/src/sclcoreimpl.cpp +++ b/src/sclcoreimpl.cpp @@ -272,17 +272,23 @@ void CSCLCoreImpl::on_run(const sclchar *uuid, const sclchar *display) m_core_ui.init(); m_connection.init(); - if (m_uuid) { - free(m_uuid); - } + LOGD ("uuid : '%s', display : '%s'\n", uuid, display); - m_uuid = strdup(uuid); + if (uuid && strlen(uuid) > 0) { + if (m_uuid) { + free(m_uuid); + } - if (m_display) { - free(m_display); + m_uuid = strdup(uuid); } - m_display = strdup(display); + if (display) { + if (m_display) { + free(m_display); + } + + m_display = strdup(display); + } if (m_event_callback) { m_event_callback->on_run(0, NULL); @@ -356,4 +362,4 @@ void CSCLCoreImpl::send_private_command(const sclchar *command) void CSCLCoreImpl::get_selection_text(sclchar **text) { m_connection.get_selection_text(text); -} \ No newline at end of file +} -- 2.7.4 From c0c883747fcca9195aa1fc0589b178a5ab46dbe6 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Tue, 24 May 2016 16:26:04 +0900 Subject: [PATCH 09/16] Update package version to 0.4.20 Change-Id: Ia034e335c13d551bd5643fd04915d6b77a86e134 --- packaging/libscl-core.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/libscl-core.spec b/packaging/libscl-core.spec index 140381c..7e08ac5 100644 --- a/packaging/libscl-core.spec +++ b/packaging/libscl-core.spec @@ -3,7 +3,7 @@ Name: libscl-core Summary: A library for developing software keyboards -Version: 0.4.19 +Version: 0.4.20 Release: 1 Group: Graphics & UI Framework/Input License: Apache-2.0 -- 2.7.4 From 44c2de611f1801f514a38ce0b0d10cb4f9d5cad9 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Tue, 7 Jun 2016 19:21:04 +0900 Subject: [PATCH 10/16] Use the modified API to get selection synchronously Change-Id: Id9feedaaa13e02bef1f03255390a7b0d8d43125f --- src/sclconnection-isf.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sclconnection-isf.cpp b/src/sclconnection-isf.cpp index ef3f6aa..6b3e340 100755 --- a/src/sclconnection-isf.cpp +++ b/src/sclconnection-isf.cpp @@ -1028,7 +1028,7 @@ void CSCLConnectionISF::get_selection_text(sclchar **text) { if (m_initialized) { scim::String selection_text; - m_helper_agent.get_selection(selection_text); + m_helper_agent.get_selection_text(selection_text); if (text) *text = strdup(selection_text.c_str()); -- 2.7.4 From 5c757bb4a2be388fc87f0c06964fa9faef4d6a57 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Mon, 13 Jun 2016 13:40:00 +0900 Subject: [PATCH 11/16] Update package version to 0.4.21 Change-Id: I83ce9dad889044ae01ffd5d8b9122d1fa1398f70 --- packaging/libscl-core.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/libscl-core.spec b/packaging/libscl-core.spec index 7e08ac5..b530094 100644 --- a/packaging/libscl-core.spec +++ b/packaging/libscl-core.spec @@ -3,7 +3,7 @@ Name: libscl-core Summary: A library for developing software keyboards -Version: 0.4.20 +Version: 0.4.21 Release: 1 Group: Graphics & UI Framework/Input License: Apache-2.0 -- 2.7.4 From 8b288a392a6602103a5eb1c19d72a900b7f74a12 Mon Sep 17 00:00:00 2001 From: Ji-hoon Lee Date: Tue, 17 May 2016 17:22:08 +0900 Subject: [PATCH 12/16] Added interface for supporting unconventional input devices Change-Id: If6ed2985230ba257f460ac7cbfef7bb740d1097e --- src/sclconnection-isf.cpp | 14 ++++++++++++++ src/sclconnection-isf.h | 0 src/sclconnection.cpp | 0 src/sclconnection.h | 0 src/sclcore.cpp | 0 src/sclcore.h | 0 src/sclcorecallback.h | 26 ++++++++++++++++++++++++++ src/sclcoreimpl.h | 0 8 files changed, 40 insertions(+) mode change 100755 => 100644 src/sclconnection-isf.cpp mode change 100755 => 100644 src/sclconnection-isf.h mode change 100755 => 100644 src/sclconnection.cpp mode change 100755 => 100644 src/sclconnection.h mode change 100755 => 100644 src/sclcore.cpp mode change 100755 => 100644 src/sclcore.h mode change 100755 => 100644 src/sclcoreimpl.h diff --git a/src/sclconnection-isf.cpp b/src/sclconnection-isf.cpp old mode 100755 new mode 100644 index 6b3e340..54d0e5b --- a/src/sclconnection-isf.cpp +++ b/src/sclconnection-isf.cpp @@ -534,6 +534,19 @@ static void slot_candidate_hide(const scim::HelperAgent *agent, int ic, const sc } } +static void slot_process_input_device_event(const scim::HelperAgent *agent, scim::uint32 &type, char *data, size_t &len, scim::uint32 &ret) { + CSCLCoreImpl *impl = CSCLCoreImpl::get_instance(); + if (impl) { + ISCLCoreEventCallback *callback = impl->get_core_event_callback(); + if (callback) { + /* Input Device Event callback is available in versions after 1.1 */ + if (check_interface_version(callback, 1, 1)) { + callback->on_process_input_device_event(type, data, len, &ret); + } + } + } +} + /* Internal input handler function */ Eina_Bool input_handler(void *data, Ecore_Fd_Handler *fd_handler) { @@ -631,6 +644,7 @@ sclboolean CSCLConnectionISF::init() m_helper_agent.signal_connect_process_key_event(scim::slot(slot_process_key_event)); m_helper_agent.signal_connect_candidate_show(scim::slot(slot_candidate_show)); m_helper_agent.signal_connect_candidate_hide(scim::slot(slot_candidate_hide)); + m_helper_agent.signal_connect_process_input_device_event(scim::slot(slot_process_input_device_event)); m_initialized = TRUE; } diff --git a/src/sclconnection-isf.h b/src/sclconnection-isf.h old mode 100755 new mode 100644 diff --git a/src/sclconnection.cpp b/src/sclconnection.cpp old mode 100755 new mode 100644 diff --git a/src/sclconnection.h b/src/sclconnection.h old mode 100755 new mode 100644 diff --git a/src/sclcore.cpp b/src/sclcore.cpp old mode 100755 new mode 100644 diff --git a/src/sclcore.h b/src/sclcore.h old mode 100755 new mode 100644 diff --git a/src/sclcorecallback.h b/src/sclcorecallback.h index 5a4771a..5087bb5 100644 --- a/src/sclcorecallback.h +++ b/src/sclcorecallback.h @@ -85,8 +85,34 @@ struct ISCLCoreEventCallback { virtual void on_candidate_show(sclint ic, const sclchar *ic_uuid) {} virtual void on_candidate_hide(sclint ic, const sclchar *ic_uuid) {} + + /* Added in callback interface version 1.1 */ + virtual void on_process_input_device_event(sclu32 &type, sclchar *data, size_t &len, sclu32 *ret) {} + + ISCLCoreEventCallback() { + /* Current callback interface version is 1.1 */ + m_version_major = 1; + m_version_minor = 1; + } + sclint get_version_major() { return m_version_major; } + sclint get_version_minor() { return m_version_minor; } +private: + int m_version_major; + int m_version_minor; }; +inline sclboolean check_interface_version(ISCLCoreEventCallback *callback, int version_major, int version_minor) +{ + if (callback) { + if (callback->get_version_major() >= version_major) { + if (callback->get_version_minor() >= version_minor) { + return TRUE; + } + } + } + return FALSE; +} + } //SCL_END_DECLS diff --git a/src/sclcoreimpl.h b/src/sclcoreimpl.h old mode 100755 new mode 100644 -- 2.7.4 From faa07c402cca437bea247a5d9324c43eaf5015ff Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Thu, 16 Jun 2016 09:21:02 +0900 Subject: [PATCH 13/16] Update package version to 0.4.22 Change-Id: I1252830e4628c973f29190a045ee1c089a6d1635 --- packaging/libscl-core.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/libscl-core.spec b/packaging/libscl-core.spec index b530094..d030643 100644 --- a/packaging/libscl-core.spec +++ b/packaging/libscl-core.spec @@ -3,7 +3,7 @@ Name: libscl-core Summary: A library for developing software keyboards -Version: 0.4.21 +Version: 0.4.22 Release: 1 Group: Graphics & UI Framework/Input License: Apache-2.0 -- 2.7.4 From 39b45002bb2f0bfb24d52156c91fde6e20603946 Mon Sep 17 00:00:00 2001 From: Ji-hoon Lee Date: Wed, 25 May 2016 16:12:10 +0900 Subject: [PATCH 14/16] Modified to send set_ready request when we recved RENDER_PRE event Change-Id: I157f0d993afde7a8c8f8fd5adc46ed54abf8709d --- src/sclconnection-isf.cpp | 14 +++++++++ src/sclcoreui-efl.cpp | 75 ++++++++++++++++++++++++++++++++++++++++++++--- src/sclcoreui-efl.h | 2 ++ src/sclcoreui.cpp | 7 +++++ src/sclcoreui.h | 13 ++++++++ 5 files changed, 107 insertions(+), 4 deletions(-) diff --git a/src/sclconnection-isf.cpp b/src/sclconnection-isf.cpp index 54d0e5b..136fe6f 100644 --- a/src/sclconnection-isf.cpp +++ b/src/sclconnection-isf.cpp @@ -161,7 +161,14 @@ static void slot_ise_show(const scim::HelperAgent *agent, int ic, char *buf, siz } else { LOGD("\n-=-= WARNING - buf %p len %d size %d \n", buf, len, sizeof(ise_context)); } + CSCLCoreUI* ui = impl->get_core_ui(); + if (ui) { + ui->process_keyboard_ui_state_change(KEYBOARD_UI_STATE_WILL_SHOW); + } callback->on_ise_show(ic, impl->get_screen_rotation_degree(), ise_context); + if (ui) { + ui->process_keyboard_ui_state_change(KEYBOARD_UI_STATE_DID_SHOW); + } } } } @@ -171,7 +178,14 @@ static void slot_ise_hide(const scim::HelperAgent *agent, int ic, const scim::St if (impl) { ISCLCoreEventCallback *callback = impl->get_core_event_callback(); if (callback) { + CSCLCoreUI* ui = impl->get_core_ui(); + if (ui) { + ui->process_keyboard_ui_state_change(KEYBOARD_UI_STATE_WILL_HIDE); + } callback->on_ise_hide(ic, ic_uuid.c_str()); + if (ui) { + ui->process_keyboard_ui_state_change(KEYBOARD_UI_STATE_DID_HIDE); + } } } } diff --git a/src/sclcoreui-efl.cpp b/src/sclcoreui-efl.cpp index 1b582e4..310315d 100644 --- a/src/sclcoreui-efl.cpp +++ b/src/sclcoreui-efl.cpp @@ -43,9 +43,20 @@ struct WaylandKeyboard struct wl_surface *surface; struct wl_input_panel *ip; struct wl_output *output; + struct wl_input_panel_surface *ips; }; struct WaylandKeyboard wlkb = {0}; + +#define RENDER_PRE_TIMEOUT 1.0f +static Ecore_Timer *_render_pre_timer = NULL; +static void delete_render_pre_timer() +{ + if (_render_pre_timer) { + ecore_timer_del(_render_pre_timer); + _render_pre_timer = NULL; + } +} #endif using namespace scl; @@ -295,7 +306,6 @@ _wayland_setup(struct WaylandKeyboard *wlkb, Evas_Object *main_window) Eina_Inlist *globals; struct wl_registry *registry; Ecore_Wl_Global *global; - struct wl_input_panel_surface *ips; if (!(registry = ecore_wl_registry_get())) return false; @@ -342,13 +352,13 @@ _wayland_setup(struct WaylandKeyboard *wlkb, Evas_Object *main_window) return false; } - ips = wl_input_panel_get_input_panel_surface(wlkb->ip, wlkb->surface); - if (!ips) { + wlkb->ips = wl_input_panel_get_input_panel_surface(wlkb->ip, wlkb->surface); + if (!wlkb->ips) { LOGW("Couldn't get input panel surface\n"); return false; } - wl_input_panel_surface_set_toplevel(ips, wlkb->output, WL_INPUT_PANEL_SURFACE_POSITION_CENTER_BOTTOM); + wl_input_panel_surface_set_toplevel(wlkb->ips, wlkb->output, WL_INPUT_PANEL_SURFACE_POSITION_CENTER_BOTTOM); return true; } @@ -667,3 +677,60 @@ void CSCLCoreUIEFL::set_screen_rotation_degree(int degree) { m_rotation_degree = degree; } + +#ifdef WAYLAND +static void _render_pre_cb(void *data, Evas *e, void *event_info) +{ + LOGD("_render_pre_cb() called, now invoking wl_input_panel_surface_set_ready()"); + + wl_input_panel_surface_set_ready(wlkb.ips, 1); + + Evas_Object *main_window = NATIVE_WINDOW_CAST(data); + evas_event_callback_del_full(evas_object_evas_get(main_window), + EVAS_CALLBACK_RENDER_PRE, _render_pre_cb, main_window); + + delete_render_pre_timer(); +} + +static Eina_Bool _render_pre_timeout(void *data) +{ + LOGD("_render_pre_timer expired, forcing to call _render_pre_cb() callback"); + + _render_pre_cb(data, NULL, NULL); + + return ECORE_CALLBACK_CANCEL; +} +#endif + +void CSCLCoreUIEFL::process_keyboard_ui_state_change(KEYBOARD_UI_STATE state) +{ +#ifdef WAYLAND + static Evas_Object *force_update_helper_obj = NULL; + static int force_update_num = 0; + + if (state == KEYBOARD_UI_STATE_WILL_SHOW) { + evas_event_callback_add(evas_object_evas_get(NATIVE_WINDOW_CAST(m_main_window)), + EVAS_CALLBACK_RENDER_PRE, _render_pre_cb, (void*)m_main_window); + _render_pre_timer = ecore_timer_add (RENDER_PRE_TIMEOUT, _render_pre_timeout, (void*)m_main_window); + LOGD("Registered RENDER_PRE callback, _render_pre_cb() and a timer callback"); + } else if (state == KEYBOARD_UI_STATE_DID_SHOW) { + LOGD("Forcing keyboard window to render : %d", force_update_num); + + /* Since the ISE is waiting for RENDER_PRE event, we need to make sure the render event is + * occured on our ISE window. Since right now there is no proper way to trigger render event + * manually, we are creating a half transparent box above the keyboard window. Need to find + * more appropriate way to generate render event */ + if (force_update_helper_obj) evas_object_del(force_update_helper_obj); + force_update_helper_obj = elm_bg_add (NATIVE_WINDOW_CAST(m_main_window)); + evas_object_color_set(force_update_helper_obj, 255, 255, 255, 1); + evas_object_resize(force_update_helper_obj, 1, 1); + evas_object_move(force_update_helper_obj, force_update_num % 100, 0); + evas_object_layer_set(force_update_helper_obj, EVAS_LAYER_MAX); + evas_object_show (force_update_helper_obj); + force_update_num++; + } else if (state == KEYBOARD_UI_STATE_WILL_HIDE) { + if (force_update_helper_obj) evas_object_del(force_update_helper_obj); + force_update_helper_obj = NULL; + } +#endif +} diff --git a/src/sclcoreui-efl.h b/src/sclcoreui-efl.h index 148fad7..1a3435d 100644 --- a/src/sclcoreui-efl.h +++ b/src/sclcoreui-efl.h @@ -51,6 +51,8 @@ public: virtual void destroy_option_window(sclwindow window); void set_screen_rotation_degree(int degree); + + void process_keyboard_ui_state_change(KEYBOARD_UI_STATE state); private: sclboolean m_initialized; diff --git a/src/sclcoreui.cpp b/src/sclcoreui.cpp index c72f971..e7ea1f6 100644 --- a/src/sclcoreui.cpp +++ b/src/sclcoreui.cpp @@ -106,4 +106,11 @@ void CSCLCoreUI::destroy_option_window(sclwindow window) if (m_impl) { m_impl->destroy_option_window(window); } +} + +void CSCLCoreUI::process_keyboard_ui_state_change(KEYBOARD_UI_STATE state) +{ + if (m_impl) { + m_impl->process_keyboard_ui_state_change(state); + } } \ No newline at end of file diff --git a/src/sclcoreui.h b/src/sclcoreui.h index d836417..ad15281 100644 --- a/src/sclcoreui.h +++ b/src/sclcoreui.h @@ -27,6 +27,14 @@ namespace scl { +enum KEYBOARD_UI_STATE +{ + KEYBOARD_UI_STATE_DID_HIDE, + KEYBOARD_UI_STATE_WILL_HIDE, + KEYBOARD_UI_STATE_DID_SHOW, + KEYBOARD_UI_STATE_WILL_SHOW, +}; + /** * @brief The base class that provides features for a soft-keyboard * @@ -70,6 +78,11 @@ public: */ virtual void destroy_option_window(sclwindow window); + /** + * @brief This API requests each SCLCoreUI backends to process keyboard UI state change event + */ + virtual void process_keyboard_ui_state_change(KEYBOARD_UI_STATE state); + protected: std::string m_backend_identifier; -- 2.7.4 From ff3367ec7388305127ab773c342af69e727fb0be Mon Sep 17 00:00:00 2001 From: Ji-hoon Lee Date: Thu, 23 Jun 2016 11:46:11 +0900 Subject: [PATCH 15/16] Update package version to 0.4.23 Change-Id: Ib64a161371dfc906c38e7f77958a82334cf0bc90 --- packaging/libscl-core.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/libscl-core.spec b/packaging/libscl-core.spec index d030643..77d7c41 100644 --- a/packaging/libscl-core.spec +++ b/packaging/libscl-core.spec @@ -3,7 +3,7 @@ Name: libscl-core Summary: A library for developing software keyboards -Version: 0.4.22 +Version: 0.4.23 Release: 1 Group: Graphics & UI Framework/Input License: Apache-2.0 -- 2.7.4 From 838d6c7adc3f8a0ceb502d2960632e986da20d52 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Fri, 24 Jun 2016 11:48:04 +0900 Subject: [PATCH 16/16] Fix coding style Change-Id: I09b795fd932070090f12e7326bc9fcfcfd2a623b --- src/legacy_support/web_helper_agent.cpp | 7 ++----- src/legacy_support/websocket.cpp | 2 -- src/sclcoreimpl.cpp | 2 +- src/sclcoreui-efl.cpp | 23 +++++++++++------------ 4 files changed, 14 insertions(+), 20 deletions(-) diff --git a/src/legacy_support/web_helper_agent.cpp b/src/legacy_support/web_helper_agent.cpp index 536ad27..1d3cfc5 100644 --- a/src/legacy_support/web_helper_agent.cpp +++ b/src/legacy_support/web_helper_agent.cpp @@ -67,7 +67,6 @@ CWebHelperAgent::CWebHelperAgent() CWebHelperAgent::~CWebHelperAgent() { - } bool CWebHelperAgent::init() @@ -82,7 +81,6 @@ bool CWebHelperAgent::exit() void CWebHelperAgent::signal(int sig) { - } void CWebHelperAgent::log(const char *str) @@ -182,9 +180,8 @@ std::string CMagicKeyManager::get_magic_key() const char magic_key_range_upper = 'Z'; unsigned int seed = time(NULL); - for(int loop = 0;loop < MAGIC_KEY_LENGTH;loop++) { - magic_key[loop] = (rand_r(&seed) % - (magic_key_range_upper - magic_key_range_lower)) + magic_key_range_lower; + for (int loop = 0;loop < MAGIC_KEY_LENGTH;loop++) { + magic_key[loop] = (rand_r(&seed) % (magic_key_range_upper - magic_key_range_lower)) + magic_key_range_lower; } magic_key[MAGIC_KEY_LENGTH] = '\0'; diff --git a/src/legacy_support/websocket.cpp b/src/legacy_support/websocket.cpp index 714f65e..3814e5f 100644 --- a/src/legacy_support/websocket.cpp +++ b/src/legacy_support/websocket.cpp @@ -108,7 +108,6 @@ static int callback_keyboard(struct lws *wsi, CWebHelperAgentWebSocket *agent = CWebHelperAgentWebSocket::get_current_instance(); switch (reason) { - case LWS_CALLBACK_ESTABLISHED: pss->session_id = ++last_session_id; LOGD("LWS_CALLBACK_ESTABLISHED : %p %d", g_ws_server_context, pss->session_id); @@ -883,7 +882,6 @@ void CWebHelperAgentWebSocket::wait_for_reply_message() pthread_mutex_lock(&g_ws_query_mutex); pthread_cond_timedwait(&g_ws_query_condition, &g_ws_query_mutex, &timeout); pthread_mutex_unlock(&g_ws_query_mutex); - } void CWebHelperAgentWebSocket::process_recved_messages() diff --git a/src/sclcoreimpl.cpp b/src/sclcoreimpl.cpp index 5735208..268d2d4 100644 --- a/src/sclcoreimpl.cpp +++ b/src/sclcoreimpl.cpp @@ -272,7 +272,7 @@ void CSCLCoreImpl::on_run(const sclchar *uuid, const sclchar *display) m_core_ui.init(); m_connection.init(); - LOGD ("uuid : '%s', display : '%s'\n", uuid, display); + LOGD("uuid : '%s', display : '%s'\n", uuid, display); if (uuid && strlen(uuid) > 0) { if (m_uuid) { diff --git a/src/sclcoreui-efl.cpp b/src/sclcoreui-efl.cpp index 310315d..3e5b15b 100644 --- a/src/sclcoreui-efl.cpp +++ b/src/sclcoreui-efl.cpp @@ -100,9 +100,9 @@ sclwindow CSCLCoreUIEFL::get_main_window() { if (m_initialized) { return m_main_window; - } - else + } else { return NULL; + } } void CSCLCoreUIEFL::set_keyboard_size_hints(SclSize portrait, SclSize landscape) @@ -370,16 +370,15 @@ check_evas_engine(struct WaylandKeyboard *wlkb) const char *env = getenv("ECORE_EVAS_ENGINE"); if (!env) { - if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_WAYLAND_SHM)) + if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_WAYLAND_SHM)) { env = "wayland_shm"; - else if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_WAYLAND_EGL)) + } else if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_WAYLAND_EGL)) { env = "wayland_egl"; - else { + } else { LOGW("ERROR: Ecore_Evas does must be compiled with support for Wayland engines\n"); goto err; } - } - else if (strcmp(env, "wayland_shm") != 0 && strcmp(env, "wayland_egl") != 0) { + } else if (strcmp(env, "wayland_shm") != 0 && strcmp(env, "wayland_egl") != 0) { LOGW("ERROR: ECORE_EVAS_ENGINE must be set to either 'wayland_shm' or 'wayland_egl'\n"); goto err; } @@ -607,9 +606,9 @@ sclwindow CSCLCoreUIEFL::create_option_window(SCLOptionWindowType type) LOGW("on_create_option_window() is not available\n"); return SCLWINDOW_INVALID; } - } - else + } else { return SCLWINDOW_INVALID; + } } /* Just in case the previous option window for setting application exists */ @@ -711,7 +710,7 @@ void CSCLCoreUIEFL::process_keyboard_ui_state_change(KEYBOARD_UI_STATE state) if (state == KEYBOARD_UI_STATE_WILL_SHOW) { evas_event_callback_add(evas_object_evas_get(NATIVE_WINDOW_CAST(m_main_window)), EVAS_CALLBACK_RENDER_PRE, _render_pre_cb, (void*)m_main_window); - _render_pre_timer = ecore_timer_add (RENDER_PRE_TIMEOUT, _render_pre_timeout, (void*)m_main_window); + _render_pre_timer = ecore_timer_add(RENDER_PRE_TIMEOUT, _render_pre_timeout, (void*)m_main_window); LOGD("Registered RENDER_PRE callback, _render_pre_cb() and a timer callback"); } else if (state == KEYBOARD_UI_STATE_DID_SHOW) { LOGD("Forcing keyboard window to render : %d", force_update_num); @@ -721,12 +720,12 @@ void CSCLCoreUIEFL::process_keyboard_ui_state_change(KEYBOARD_UI_STATE state) * manually, we are creating a half transparent box above the keyboard window. Need to find * more appropriate way to generate render event */ if (force_update_helper_obj) evas_object_del(force_update_helper_obj); - force_update_helper_obj = elm_bg_add (NATIVE_WINDOW_CAST(m_main_window)); + force_update_helper_obj = elm_bg_add(NATIVE_WINDOW_CAST(m_main_window)); evas_object_color_set(force_update_helper_obj, 255, 255, 255, 1); evas_object_resize(force_update_helper_obj, 1, 1); evas_object_move(force_update_helper_obj, force_update_num % 100, 0); evas_object_layer_set(force_update_helper_obj, EVAS_LAYER_MAX); - evas_object_show (force_update_helper_obj); + evas_object_show(force_update_helper_obj); force_update_num++; } else if (state == KEYBOARD_UI_STATE_WILL_HIDE) { if (force_update_helper_obj) evas_object_del(force_update_helper_obj); -- 2.7.4