From: InHong Han Date: Thu, 25 Aug 2016 08:41:48 +0000 (+0900) Subject: Modify remote control commands X-Git-Tag: accepted/tizen/common/20160831.162305~10 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3734bf11c43295a8bbd72efdd41cb82948b00c8c;p=platform%2Fcore%2Fuifw%2Fisf.git Modify remote control commands Change-Id: I0be4c0749fac01e2796949e6f200532dc30bcc8a --- diff --git a/ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp b/ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp index 7e828f1..fab2a5d 100755 --- a/ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp +++ b/ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp @@ -1016,7 +1016,7 @@ private: m_send_trans.clear(); m_send_trans.put_command(SCIM_TRANS_CMD_REPLY); - m_send_trans.put_command(ISM_TRANS_CMD_RECV_REMOTE_FOCUS_IN); + m_send_trans.put_command(ISM_REMOTE_TRANS_CMD_RECV_FOCUS_IN); m_send_trans.write_to_socket(client_socket); } } @@ -1033,7 +1033,7 @@ private: m_send_trans.clear(); m_send_trans.put_command(SCIM_TRANS_CMD_REPLY); - m_send_trans.put_command(ISM_TRANS_CMD_RECV_REMOTE_FOCUS_OUT); + m_send_trans.put_command(ISM_REMOTE_TRANS_CMD_RECV_FOCUS_OUT); m_send_trans.write_to_socket(client_socket); } } @@ -1050,7 +1050,7 @@ private: m_send_trans.clear(); m_send_trans.put_command(SCIM_TRANS_CMD_REPLY); - m_send_trans.put_command(ISM_TRANS_CMD_RECV_REMOTE_ENTRY_METADATA); + m_send_trans.put_command(ISM_REMOTE_TRANS_CMD_RECV_ENTRY_METADATA); m_send_trans.put_data(hint); m_send_trans.put_data(layout); m_send_trans.put_data(variation); @@ -1071,7 +1071,7 @@ private: m_send_trans.clear(); m_send_trans.put_command(SCIM_TRANS_CMD_REPLY); - m_send_trans.put_command(ISM_TRANS_CMD_RECV_REMOTE_DEFAULT_TEXT); + m_send_trans.put_command(ISM_REMOTE_TRANS_CMD_RECV_DEFAULT_TEXT); m_send_trans.put_data(text); m_send_trans.put_data(cursor); m_send_trans.write_to_socket(client_socket); @@ -2985,7 +2985,7 @@ private: socket_transaction_start(); while (m_recv_trans.get_command(cmd)) { LOGD ("PanelAgent::cmd = %d\n", cmd); - if (cmd == ISM_TRANS_CMD_SEND_REMOTE_INPUT_MESSAGE) { + if (cmd == ISM_REMOTE_TRANS_CMD_SEND_INPUT_MESSAGE) { char* buf = NULL; size_t len; bool ret = false; @@ -3006,7 +3006,7 @@ private: if (NULL != buf) delete[] buf; - } else if (cmd == ISM_TRANS_CMD_CHECK_REMOTE_PRIVILEGE) { + } else if (cmd == ISM_REMOTE_TRANS_CMD_CHECK_PRIVILEGE) { bool ret = false; if (m_info_manager->check_privilege_by_sockfd(client_id, IMEMANAGER_PRIVILEGE)) @@ -3019,7 +3019,7 @@ private: trans.put_command(SCIM_TRANS_CMD_REPLY); trans.put_command(ret ? SCIM_TRANS_CMD_OK : SCIM_TRANS_CMD_FAIL); trans.write_to_socket(client_socket); - } else if (cmd == ISM_TRANS_CMD_DELETE_REMOTE_SURROUNDING_TEXT) { + } else if (cmd == ISM_REMOTE_TRANS_CMD_DELETE_SURROUNDING_TEXT) { uint32 offset; uint32 len; bool ret = false; diff --git a/ism/src/isf_remote_client.cpp b/ism/src/isf_remote_client.cpp index 027940a..aeb7e82 100644 --- a/ism/src/isf_remote_client.cpp +++ b/ism/src/isf_remote_client.cpp @@ -239,7 +239,7 @@ public: bool send_remote_input_message (const char* str) { int cmd; - m_trans.put_command (ISM_TRANS_CMD_SEND_REMOTE_INPUT_MESSAGE); + m_trans.put_command (ISM_REMOTE_TRANS_CMD_SEND_INPUT_MESSAGE); m_trans.put_data (str, strlen (str)+1); m_trans.write_to_socket (m_socket_remoteinput2panel); if (!m_trans.read_from_socket (m_socket_remoteinput2panel, m_socket_timeout)) { @@ -260,7 +260,7 @@ public: bool check_privilege (void) { int cmd; - m_trans.put_command (ISM_TRANS_CMD_CHECK_REMOTE_PRIVILEGE); + m_trans.put_command (ISM_REMOTE_TRANS_CMD_CHECK_PRIVILEGE); m_trans.write_to_socket (m_socket_remoteinput2panel); if (!m_trans.read_from_socket (m_socket_remoteinput2panel, m_socket_timeout)) { std::cerr << __func__ << " read_from_socket() may be timeout \n"; @@ -280,7 +280,7 @@ public: bool delete_surrounding_text(int offset, int len) { int cmd; - m_trans.put_command (ISM_TRANS_CMD_DELETE_REMOTE_SURROUNDING_TEXT); + m_trans.put_command (ISM_REMOTE_TRANS_CMD_DELETE_SURROUNDING_TEXT); m_trans.put_data (offset); m_trans.put_data (len); m_trans.write_to_socket (m_socket_remoteinput2panel); @@ -314,13 +314,13 @@ public: while (m_trans_recv.get_command (cmd)) { LOGD ("RemoteInput_Client::cmd = %d\n", cmd); switch (cmd) { - case ISM_TRANS_CMD_RECV_REMOTE_FOCUS_IN: + case ISM_REMOTE_TRANS_CMD_RECV_FOCUS_IN: type = REMOTE_CONTROL_CALLBACK_FOCUS_IN; break; - case ISM_TRANS_CMD_RECV_REMOTE_FOCUS_OUT: + case ISM_REMOTE_TRANS_CMD_RECV_FOCUS_OUT: type = REMOTE_CONTROL_CALLBACK_FOCUS_OUT; break; - case ISM_TRANS_CMD_RECV_REMOTE_ENTRY_METADATA: + case ISM_REMOTE_TRANS_CMD_RECV_ENTRY_METADATA: { type = REMOTE_CONTROL_CALLBACK_ENTRY_METADATA; @@ -331,7 +331,7 @@ public: LOGW ("wrong format of transaction\n"); break; } - case ISM_TRANS_CMD_RECV_REMOTE_DEFAULT_TEXT: + case ISM_REMOTE_TRANS_CMD_RECV_DEFAULT_TEXT: { type = REMOTE_CONTROL_CALLBACK_DEFAULT_TEXT; diff --git a/ism/src/scim_trans_commands.h b/ism/src/scim_trans_commands.h index d0a51bf..9193f5d 100644 --- a/ism/src/scim_trans_commands.h +++ b/ism/src/scim_trans_commands.h @@ -637,13 +637,13 @@ const int ISM_TRANS_CMD_SHOW_HELPER_ISE_LIST = 1021; const int ISM_TRANS_CMD_SHOW_HELPER_ISE_SELECTOR = 1022; const int ISM_TRANS_CMD_IS_HELPER_ISE_ENABLED = 1023; const int ISM_TRANS_CMD_GET_RECENT_ISE_GEOMETRY = 1024; -const int ISM_TRANS_CMD_SEND_REMOTE_INPUT_MESSAGE = 1025; -const int ISM_TRANS_CMD_RECV_REMOTE_FOCUS_IN = 1026; -const int ISM_TRANS_CMD_RECV_REMOTE_FOCUS_OUT = 1027; -const int ISM_TRANS_CMD_RECV_REMOTE_ENTRY_METADATA = 1028; -const int ISM_TRANS_CMD_RECV_REMOTE_DEFAULT_TEXT = 1029; -const int ISM_TRANS_CMD_CHECK_REMOTE_PRIVILEGE = 1030; -const int ISM_TRANS_CMD_DELETE_REMOTE_SURROUNDING_TEXT = 1031; +const int ISM_REMOTE_TRANS_CMD_SEND_INPUT_MESSAGE = 1025; +const int ISM_REMOTE_TRANS_CMD_RECV_FOCUS_IN = 1026; +const int ISM_REMOTE_TRANS_CMD_RECV_FOCUS_OUT = 1027; +const int ISM_REMOTE_TRANS_CMD_RECV_ENTRY_METADATA = 1028; +const int ISM_REMOTE_TRANS_CMD_RECV_DEFAULT_TEXT = 1029; +const int ISM_REMOTE_TRANS_CMD_CHECK_PRIVILEGE = 1030; +const int ISM_REMOTE_TRANS_CMD_DELETE_SURROUNDING_TEXT = 1031; /* IMControl to ISE */ const int ISM_TRANS_CMD_SET_ISE_MODE = 1108;