Remove duplicate code

Change-Id: I035912fda79a4e4f2aea5326ac653b4175c595d5

diff --git a/src/websocket.cpp b/src/websocket.cpp
index f177fbf..d84a83f 100644 (file)
--- a/src/websocket.cpp
+++ b/src/websocket.cpp
@@ -554,14 +554,10 @@ std::string to_string(T i)
     return s;
 }
 
-void CWebHelperAgentWebSocket::on_init()
+static void send_ise_message(std::queue<ISE_MESSAGE> *message_queue, ISE_MESSAGE message)
 {
-    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);
+    message_queue->push(message);
     pthread_mutex_unlock(&g_ws_server_mutex);
 
     if (g_ws_server_context) {
@@ -571,21 +567,22 @@ void CWebHelperAgentWebSocket::on_init()
     }
 }
 
+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];
+
+    send_ise_message(&m_send_message_queue, message);
+}
+
 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");
-    }
+    send_ise_message(&m_send_message_queue, message);
 }
 
 void CWebHelperAgentWebSocket::on_focus_in(int ic)
@@ -595,15 +592,7 @@ void CWebHelperAgentWebSocket::on_focus_in(int ic)
     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");
-    }
+    send_ise_message(&m_send_message_queue, message);
 }
 
 void CWebHelperAgentWebSocket::on_focus_out(int ic)
@@ -613,15 +602,7 @@ void CWebHelperAgentWebSocket::on_focus_out(int ic)
     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");
-    }
+    send_ise_message(&m_send_message_queue, message);
 }
 
 void CWebHelperAgentWebSocket::on_show(int ic)
@@ -631,15 +612,7 @@ void CWebHelperAgentWebSocket::on_show(int ic)
     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");
-    }
+    send_ise_message(&m_send_message_queue, message);
 
     LOGD("put into send message buffer");
 }
@@ -651,15 +624,7 @@ void CWebHelperAgentWebSocket::on_hide(int ic)
     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");
-    }
+    send_ise_message(&m_send_message_queue, message);
 }
 
 void CWebHelperAgentWebSocket::on_set_rotation(int degree)
@@ -669,15 +634,7 @@ void CWebHelperAgentWebSocket::on_set_rotation(int degree)
     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");
-    }
+    send_ise_message(&m_send_message_queue, message);
 }
 
 void CWebHelperAgentWebSocket::on_update_cursor_position(int ic, int cursor_pos)
@@ -688,15 +645,7 @@ void CWebHelperAgentWebSocket::on_update_cursor_position(int ic, int cursor_pos)
     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");
-    }
+    send_ise_message(&m_send_message_queue, message);
 }
 
 void CWebHelperAgentWebSocket::on_update_surrounding_text(int ic, const char *text, int cursor)
@@ -707,15 +656,7 @@ void CWebHelperAgentWebSocket::on_update_surrounding_text(int ic, const char *te
     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");
-    }
+    send_ise_message(&m_send_message_queue, message);
 }
 
 void CWebHelperAgentWebSocket::on_update_selection(int ic, const char *text)
@@ -725,15 +666,7 @@ void CWebHelperAgentWebSocket::on_update_selection(int ic, const char *text)
     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");
-    }
+    send_ise_message(&m_send_message_queue, message);
 }
 
 void CWebHelperAgentWebSocket::on_set_language(unsigned int language)
@@ -751,15 +684,7 @@ void CWebHelperAgentWebSocket::on_set_language(unsigned int language)
     }
 
     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");
-        }
+        send_ise_message(&m_send_message_queue, message);
     }
 }
 
@@ -770,15 +695,7 @@ void CWebHelperAgentWebSocket::on_set_imdata(char *buf, unsigned int len)
     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");
-    }
+    send_ise_message(&m_send_message_queue, message);
 }
 
 void CWebHelperAgentWebSocket::on_get_imdata(char **buf, unsigned int *len)
@@ -787,15 +704,7 @@ void CWebHelperAgentWebSocket::on_get_imdata(char **buf, unsigned int *len)
     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");
-    }
+    send_ise_message(&m_send_message_queue, message);
 
     wait_for_reply_message();
 
@@ -835,15 +744,7 @@ void CWebHelperAgentWebSocket::on_set_return_key_type(unsigned int type)
     }
 
     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");
-        }
+        send_ise_message(&m_send_message_queue, message);
     }
 }
 
@@ -853,15 +754,7 @@ void CWebHelperAgentWebSocket::on_get_return_key_type(unsigned int *type)
     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");
-    }
+    send_ise_message(&m_send_message_queue, message);
 
     wait_for_reply_message();
 
@@ -896,15 +789,7 @@ void CWebHelperAgentWebSocket::on_set_return_key_disable(unsigned int disabled)
     }
 
     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");
-        }
+        send_ise_message(&m_send_message_queue, message);
     }
 }
 
@@ -914,15 +799,7 @@ void CWebHelperAgentWebSocket::on_get_return_key_disable(unsigned int *disabled)
     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");
-    }
+    send_ise_message(&m_send_message_queue, message);
 
     wait_for_reply_message();
 
@@ -957,15 +834,7 @@ void CWebHelperAgentWebSocket::on_set_layout(unsigned int layout)
     }
 
     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");
-        }
+        send_ise_message(&m_send_message_queue, message);
     }
 }
 
@@ -975,15 +844,7 @@ void CWebHelperAgentWebSocket::on_get_layout(unsigned int *layout)
     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");
-    }
+    send_ise_message(&m_send_message_queue, message);
 
     wait_for_reply_message();
 
@@ -1010,15 +871,7 @@ void CWebHelperAgentWebSocket::on_reset_input_context(int ic)
     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");
-    }
+    send_ise_message(&m_send_message_queue, message);
 }
 
 void CWebHelperAgentWebSocket::on_process_key_event(unsigned int code, unsigned int mask, unsigned int layout, unsigned int *ret)
@@ -1030,15 +883,7 @@ void CWebHelperAgentWebSocket::on_process_key_event(unsigned int code, unsigned
     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");
-    }
+    send_ise_message(&m_send_message_queue, message);
 
     wait_for_reply_message();