Replace method to send shift mode 40/216840/1
authorJihoon Kim <jihoon48.kim@samsung.com>
Thu, 24 Oct 2019 09:52:20 +0000 (18:52 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Mon, 4 Nov 2019 02:25:16 +0000 (11:25 +0900)
Change-Id: I632e7f11e328b177dd730cb48f1ccb66788386ef
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>
src/ise.cpp
src/sdk/sdk.cpp

index 5f52222..eb4e7b4 100644 (file)
@@ -324,13 +324,7 @@ static void set_caps_mode(sclboolean mode) {
             g_ui->set_shift_state(mode ? SCL_SHIFT_STATE_ON : SCL_SHIFT_STATE_OFF);
             g_ui->set_autocapital_shift_state(!mode);
 
-            if (g_config_values.prediction_on) {
-                if (mode) {
-                    ise_send_event(MVK_Shift_On, KEY_MASK_NULL);
-                } else {
-                    ise_send_event(MVK_Shift_Off, KEY_MASK_NULL);
-                }
-            }
+            ime_send_imengine_event(mode ? MVK_Shift_On : MVK_Shift_Off, 0);
         }
     }
 }
@@ -623,10 +617,10 @@ on_input_mode_changed(const sclchar *key_value, sclulong key_event, sclint key_t
             LANGUAGE_INFO *info = _language_manager.get_language_info(cur_lang);
             if (info) {
                 if (info->accepts_caps_mode) {
-                    ise_send_event(MVK_Shift_Enable, KEY_MASK_NULL);
+                    ime_send_imengine_event(MVK_Shift_Enable, 0);
                     set_caps_mode(g_keyboard_state.caps_mode);
                 } else {
-                    ise_send_event(MVK_Shift_Disable, KEY_MASK_NULL);
+                    ime_send_imengine_event(MVK_Shift_Disable, 0);
                     g_ui->set_shift_state(SCL_SHIFT_STATE_OFF);
                 }
             }
@@ -690,11 +684,11 @@ SCLEventReturnType CUIEventCallback::on_event_notification(SCLUINotiType noti_ty
                     if (info->accepts_caps_mode) {
                         LOGD("shift state: %d\n", desc->shift_state);
                         if (desc->shift_state == SCL_SHIFT_STATE_OFF) {
-                            ise_send_event(MVK_Shift_Off, KEY_MASK_NULL);
+                            ime_send_imengine_event(MVK_Shift_Off, 0);
                         } else if (desc->shift_state == SCL_SHIFT_STATE_ON) {
-                            ise_send_event(MVK_Shift_On, KEY_MASK_NULL);
+                            ime_send_imengine_event(MVK_Shift_On, 0);
                         } else if (desc->shift_state == SCL_SHIFT_STATE_LOCK) {
-                            ise_send_event(MVK_Shift_Lock, KEY_MASK_NULL);
+                            ime_send_imengine_event(MVK_Shift_Lock, 0);
                         }
                         ret = SCL_EVENT_PASS_ON;
                     }
@@ -1118,10 +1112,10 @@ SCLEventReturnType CUIEventCallback::on_event_key_clicked(SclUIEventDesc event_d
                 } else if (strncmp(event_desc.key_value, caps_lock, strlen(caps_lock)) == 0) {
                     if (g_ui->get_shift_state() != SCL_SHIFT_STATE_LOCK) {
                         g_ui->set_shift_state(SCL_SHIFT_STATE_LOCK);
-                        ise_send_event(MVK_Shift_Lock, KEY_MASK_NULL);
+                        ime_send_imengine_event(MVK_Shift_Lock, 0);
                     } else {
                         g_ui->set_shift_state(SCL_SHIFT_STATE_OFF);
-                        ise_send_event(MVK_Shift_Off, KEY_MASK_NULL);
+                        ime_send_imengine_event(MVK_Shift_Off, 0);
                     }
                     //g_need_send_shift_event = TRUE;
                 } else if (strncmp(event_desc.key_value, delete_all, strlen(delete_all)) == 0) {
index 6257b69..0a0a159 100644 (file)
@@ -407,11 +407,11 @@ sclboolean CSDKISE::on_language_selected(const sclchar *language, const sclchar
                         if (info->accepts_caps_mode) {
                             if (g_keyboard_state.caps_mode) {
                                 g_ui->set_shift_state(SCL_SHIFT_STATE_ON);
-                                ise_send_event(MVK_Shift_On, KEY_MASK_NULL);
+                                ime_send_imengine_event(MVK_Shift_On, 0);
                                 g_keyboard_state.caps_mode = TRUE;
                             } else {
                                 g_ui->set_shift_state(SCL_SHIFT_STATE_OFF);
-                                ise_send_event(MVK_Shift_Off, KEY_MASK_NULL);
+                                ime_send_imengine_event(MVK_Shift_Off, 0);
                                 g_keyboard_state.caps_mode = FALSE;
                             }
                         } else {