summaryrefslogtreecommitdiff
path: root/ism/modules
diff options
context:
space:
mode:
Diffstat (limited to 'ism/modules')
-rw-r--r--ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp15
-rw-r--r--ism/modules/panelagent/socketconfigserver/socket_config_server_panel_agent_module.cpp2
-rw-r--r--ism/modules/panelagent/wayland/isf_wsc_control_ui.cpp9
-rw-r--r--ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp28
4 files changed, 4 insertions, 50 deletions
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 53c8d25c..73c926c8 100644
--- a/ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp
+++ b/ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp
@@ -132,7 +132,6 @@ public:
}
bool initialize(InfoManager* info_manager, const String& display, bool resident) {
- LOGD ("");
m_info_manager = info_manager;
m_socket_address = scim_get_default_panel_socket_address(display);
@@ -154,7 +153,6 @@ public:
void stop(void) {
SCIM_DEBUG_MAIN(1) << "PanelAgent::stop ()\n";
- LOGD ("");
lock();
m_should_exit = true;
unlock();
@@ -1595,8 +1593,6 @@ private:
}
void set_autocapital_type(int client, uint32 context, String uuid, int mode) {
- LOGD ("client id:%d", client);
-
m_send_trans.clear();
m_send_trans.put_command(SCIM_TRANS_CMD_REPLY);
@@ -1610,8 +1606,6 @@ private:
}
void remote_update_preedit_string (int client, uint32 target_context, const WideString str, const WideString commit, const AttributeList &attrs, uint32 caret) {
- LOGD("client id:%d", client);
-
Socket client_socket(client);
lock();
m_send_trans.clear();
@@ -1627,8 +1621,6 @@ private:
}
void remote_send_key_event (int client, uint32 target_context, const KeyEvent &key) {
- LOGD("client id:%d", client);
-
Socket client_socket(client);
lock();
m_send_trans.clear ();
@@ -1641,8 +1633,6 @@ private:
}
void remote_forward_key_event (int client, uint32 target_context, const KeyEvent &key) {
- LOGD("client id:%d", client);
-
Socket client_socket(client);
lock();
m_send_trans.clear ();
@@ -2505,8 +2495,6 @@ private:
socket_transaction_start();
while (m_recv_trans.get_command(cmd)) {
- LOGD ("PanelAgent::cmd = %d", cmd);
-
if (cmd == SCIM_TRANS_CMD_PANEL_REGISTER_HELPER) {
HelperInfo info;
@@ -2528,8 +2516,6 @@ private:
socket_transaction_start();
while (m_recv_trans.get_command(cmd)) {
- LOGD ("PanelAgent::cmd = %d", cmd);
-
if (cmd == SCIM_TRANS_CMD_PANEL_REGISTER_ACTIVE_HELPER) {
HelperInfo info;
@@ -3216,7 +3202,6 @@ private:
} else if (client_info.type == REMOTEINPUT_ACT_CLIENT) {
socket_transaction_start();
while (m_recv_trans.get_command(cmd)) {
- LOGD ("PanelAgent::cmd = %d", cmd);
if (cmd == ISM_REMOTE_TRANS_CMD_SEND_INPUT_MESSAGE) {
char* buf = NULL;
size_t len;
diff --git a/ism/modules/panelagent/socketconfigserver/socket_config_server_panel_agent_module.cpp b/ism/modules/panelagent/socketconfigserver/socket_config_server_panel_agent_module.cpp
index 089c9b53..b8cb007c 100644
--- a/ism/modules/panelagent/socketconfigserver/socket_config_server_panel_agent_module.cpp
+++ b/ism/modules/panelagent/socketconfigserver/socket_config_server_panel_agent_module.cpp
@@ -279,8 +279,6 @@ private:
{
socket_transaction_start ();
while (m_recv_trans.get_command (cmd)) {
- LOGD ("PanelAgent::cmd = %d", cmd);
-
if (cmd == SCIM_TRANS_CMD_FLUSH_CONFIG) {
if (m_config_readonly) {
LOGW ("sorry config readonly");
diff --git a/ism/modules/panelagent/wayland/isf_wsc_control_ui.cpp b/ism/modules/panelagent/wayland/isf_wsc_control_ui.cpp
index 12f9c1c8..7c55a3b1 100644
--- a/ism/modules/panelagent/wayland/isf_wsc_control_ui.cpp
+++ b/ism/modules/panelagent/wayland/isf_wsc_control_ui.cpp
@@ -165,12 +165,9 @@ void isf_wsc_context_input_panel_show (WSCContextISF* wsc_ctx)
iseContext.bidi_direction = wsc_context_bidi_direction_get (wsc_ctx);
- LOGD ("ctx : %p, layout : %d, layout variation : %d", wsc_ctx, iseContext.layout, iseContext.layout_variation);
- LOGD ("language : %d, cursor position : %d, caps mode : %d", iseContext.language, iseContext.cursor_pos, iseContext.caps_mode);
- LOGD ("return_key_type : %d, return_key_disabled : %d, autocapital type : %d", iseContext.return_key_type, iseContext.return_key_disabled, iseContext.autocapital_type);
- LOGD ("password mode : %d, prediction_allow : %d", iseContext.password_mode, iseContext.prediction_allow);
- LOGD ("input hint : %#x", iseContext.input_hint);
- LOGD ("bidi direction : %d", iseContext.bidi_direction);
+ LOGD ("ctx : %p, layout : %d, layout variation : %d, language : %d, cursor position : %d", wsc_ctx, iseContext.layout, iseContext.layout_variation, iseContext.language, iseContext.cursor_pos);
+ LOGD ("caps mode : %d, return_key_type : %d, return_key_disabled : %d, autocapital type : %d", iseContext.caps_mode, iseContext.return_key_type, iseContext.return_key_disabled, iseContext.autocapital_type);
+ LOGD ("password mode : %d, prediction_allow : %d, input hint : %#x, bidi direction : %d", iseContext.password_mode, iseContext.prediction_allow, iseContext.input_hint, iseContext.bidi_direction);
int mime_type_size = strlen (mime_types);
if (mime_type_size > 0) {
diff --git a/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp b/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp
index 1b33eaaf..50cb648e 100644
--- a/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp
+++ b/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp
@@ -1331,8 +1331,6 @@ void
isf_wsc_context_focus_in (WSCContextISF *wsc_ctx)
{
WSCContextISF* context_scim = wsc_ctx;
- LOGD ("");
-
if (!context_scim)
return;
@@ -1383,7 +1381,7 @@ isf_wsc_context_focus_in (WSCContextISF *wsc_ctx)
if (context_scim->impl->imdata)
context_scim->impl->si->set_imdata ((const char*)context_scim->impl->imdata, context_scim->impl->imdata_size);
#endif
- LOGD ("set autocapital type : %d", context_scim->impl->autocapital_type);
+ LOGD ("set autocapital type : %d, ctx : %p", context_scim->impl->autocapital_type, wsc_ctx);
g_info_manager->set_autocapital_type ((int)context_scim->impl->autocapital_type);
} else {
g_info_manager->socket_turn_off ();
@@ -1399,15 +1397,12 @@ isf_wsc_context_focus_in (WSCContextISF *wsc_ctx)
context_scim->impl->block_input_resource = false;
context_scim->impl->input_resource = INPUT_RESOURCE_NONE;
}
-
- LOGD ("ctx : %p", wsc_ctx);
}
void
isf_wsc_context_focus_out (WSCContextISF *wsc_ctx)
{
WSCContextISF* context_scim = wsc_ctx;
- LOGD ("");
if (!context_scim) return;
@@ -1484,13 +1479,10 @@ void
isf_wsc_context_autocapital_type_set (WSCContextISF* wsc_ctx, Ecore_IMF_Autocapital_Type autocapital_type)
{
SCIM_DEBUG_FRONTEND (1) << __FUNCTION__ << " = " << autocapital_type << "...\n";
- LOGD ("autocapital_type: %d", autocapital_type);
WSCContextISF* context_scim = wsc_ctx;
if (context_scim && context_scim->impl && context_scim->impl->autocapital_type != autocapital_type) {
context_scim->impl->autocapital_type = autocapital_type;
- LOGD ("ctx : %p. set autocapital type : %d", wsc_ctx, autocapital_type);
-
if (context_scim == _focused_ic) {
LOGD ("ctx : %p. set autocapital type : %d", wsc_ctx, autocapital_type);
g_info_manager->set_autocapital_type ((int)autocapital_type);
@@ -1788,7 +1780,6 @@ isf_wsc_context_filter_key_event (WSCContextISF* wsc_ctx,
static void
wsc_commit_preedit (WSCContextISF* wsc_ctx)
{
- LOGD ("");
char* surrounding_text;
if (!wsc_ctx || !wsc_ctx->preedit_str ||
@@ -1843,8 +1834,6 @@ wsc_commit_preedit (WSCContextISF* wsc_ctx)
static void
wsc_send_preedit_style (WSCContextISF* wsc_ctx)
{
- LOGD ("");
-
if (!wsc_ctx) return;
if (wsc_ctx->impl && wsc_ctx->impl->is_on) {
String mbs = utf8_wcstombs (wsc_ctx->impl->preedit_string);
@@ -2261,8 +2250,6 @@ Ecore_IMF_Input_Hints wsc_context_input_hint_get (WSCContextISF *wsc_ctx)
Eina_Bool wsc_context_prediction_allow_get (WSCContextISF *wsc_ctx)
{
- LOGD ("");
-
if (!wsc_ctx)
return EINA_FALSE;
@@ -2289,8 +2276,6 @@ void wsc_context_delete_surrounding (WSCContextISF *wsc_ctx, int offset, int len
void wsc_context_set_selection (WSCContextISF *wsc_ctx, int start, int end)
{
- LOGD ("");
-
if (!wsc_ctx)
return;
@@ -2299,8 +2284,6 @@ void wsc_context_set_selection (WSCContextISF *wsc_ctx, int start, int end)
void wsc_context_commit_string (WSCContextISF *wsc_ctx, const char *str)
{
- LOGD ("");
-
if (!wsc_ctx)
return;
@@ -2315,7 +2298,6 @@ void wsc_context_commit_string (WSCContextISF *wsc_ctx, const char *str)
void wsc_context_commit_preedit_string (WSCContextISF *wsc_ctx)
{
- LOGD ("");
char* preedit_str = NULL;
int cursor_pos = 0;
@@ -2335,7 +2317,6 @@ void wsc_context_commit_preedit_string (WSCContextISF *wsc_ctx)
void wsc_context_send_preedit_string (WSCContextISF *wsc_ctx)
{
- LOGD ("");
char* preedit_str = NULL;
int cursor_pos = 0;
@@ -2355,8 +2336,6 @@ void wsc_context_send_preedit_string (WSCContextISF *wsc_ctx)
void wsc_context_send_key (WSCContextISF *wsc_ctx, uint32_t keysym, uint32_t modifiers, uint32_t time, bool press)
{
- LOGD ("");
-
if (!wsc_ctx || !wsc_ctx->im_ctx)
return;
@@ -2368,7 +2347,6 @@ static void
set_ic_capabilities (WSCContextISF *ic)
{
SCIM_DEBUG_FRONTEND (1) << __FUNCTION__ << "...\n";
- LOGD ("");
#if 0 //FIXME
if (ic && ic->impl) {
unsigned int cap = SCIM_CLIENT_CAP_ALL_CAPABILITIES;
@@ -2429,8 +2407,6 @@ static bool
filter_keys (const char *keyname, const char *config_path)
{
SCIM_DEBUG_FRONTEND (1) << __FUNCTION__ << "...\n";
- LOGD ("");
-
if (!keyname)
return false;
@@ -2450,7 +2426,6 @@ static void
panel_initialize (void)
{
SCIM_DEBUG_FRONTEND (1) << __FUNCTION__ << "...\n";
- LOGD ("");
String display_name;
{
const char *p = getenv ("DISPLAY");
@@ -3252,7 +3227,6 @@ public:
return ECORE_CALLBACK_RENEW;
WSCContextISF* wsc_ctx = (WSCContextISF*)data;
- LOGD("");
int fd = ecore_main_fd_handler_fd_get (fd_handler);
if (fd < 0)
return ECORE_CALLBACK_RENEW;