From 96c67113c828a56e2dda80225ac0d93d1fb8c3ca Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Fri, 9 Jun 2023 18:33:48 +0900 Subject: [PATCH] Remove clipboard feature Change-Id: I84a445a9f5e953e7194780e3b1f8dfd90b91b51f Signed-off-by: Jihoon Kim --- CMakeLists.txt | 6 -- data/layout/common/LYT_CM_POPUP.xml | 10 ---- data/layout/common/LYT_MM_POPUP_4.xml | 14 ----- data/layout/common/LYT_MM_POPUP_5.xml | 14 ----- data/layout/common/LYT_MM_POPUP_6.xml | 14 ----- data/layout/mobile/LYT_CM_POPUP.xml | 15 ++--- data/layout/mobile/LYT_MM_POPUP_4.xml | 14 ----- data/layout/mobile/LYT_MM_POPUP_5.xml | 14 ----- data/layout/mobile/LYT_MM_POPUP_6.xml | 14 ----- data/layout/wearable/LYT_MM_POPUP_4.xml | 14 ----- data/layout/wearable/LYT_MM_POPUP_5.xml | 14 ----- data/layout/wearable/LYT_MM_POPUP_6.xml | 14 ----- packaging/ise-default.spec | 3 - src/clipboard.cpp | 103 -------------------------------- src/include/clipboard.h | 35 ----------- src/ise.cpp | 36 +---------- 16 files changed, 6 insertions(+), 328 deletions(-) delete mode 100644 src/clipboard.cpp delete mode 100644 src/include/clipboard.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 124fdee..669441b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,6 @@ SET(ISE_SRCS src/ise_lang_table.cpp src/cji.cpp src/sdk.cpp - src/clipboard.cpp src/candidate-factory.cpp src/candidate.cpp src/candidate-efl.cpp @@ -108,11 +107,6 @@ SET(PKGS_CHECK_MODULES notification ) -IF (with_cbhm) - ADD_DEFINITIONS("-DHAVE_CBHM") - SET(PKGS_CHECK_MODULES ${PKGS_CHECK_MODULES} cbhm) -ENDIF(with_cbhm) - pkg_check_modules(ISE_PKGS REQUIRED ${PKGS_CHECK_MODULES}) FOREACH(flag ${ISE_PKGS_CFLAGS}) diff --git a/data/layout/common/LYT_CM_POPUP.xml b/data/layout/common/LYT_CM_POPUP.xml index 126adb6..2177770 100644 --- a/data/layout/common/LYT_CM_POPUP.xml +++ b/data/layout/common/LYT_CM_POPUP.xml @@ -133,16 +133,6 @@ nine patch/popup_line.9.png - - - CLIPBOARD - - - icon/bubble/icon_clipboard.png - icon/bubble/icon_clipboard_press.png - icon/bubble/icon_clipboard_dim.png - - nine patch/popup_line.9.png diff --git a/data/layout/common/LYT_MM_POPUP_4.xml b/data/layout/common/LYT_MM_POPUP_4.xml index daf69b3..c5f3c49 100644 --- a/data/layout/common/LYT_MM_POPUP_4.xml +++ b/data/layout/common/LYT_MM_POPUP_4.xml @@ -59,19 +59,5 @@ 0x1a - - - icon/bubble/icon_clipboard.png - icon/bubble/icon_clipboard_press.png - - - nine patch/btn_02.#.png - nine patch/btn_press.#.png - nine patch/btn_02.#.png - - - 0x1b - - diff --git a/data/layout/common/LYT_MM_POPUP_5.xml b/data/layout/common/LYT_MM_POPUP_5.xml index 8e56fe0..7c250c3 100644 --- a/data/layout/common/LYT_MM_POPUP_5.xml +++ b/data/layout/common/LYT_MM_POPUP_5.xml @@ -59,20 +59,6 @@ 0x1a - - - icon/bubble/icon_clipboard.png - icon/bubble/icon_clipboard_press.png - - - nine patch/btn_02.#.png - nine patch/btn_press.#.png - nine patch/btn_02.#.png - - - 0x1b - - icon/bubble/icon_camera.png diff --git a/data/layout/common/LYT_MM_POPUP_6.xml b/data/layout/common/LYT_MM_POPUP_6.xml index ad4312f..ce4e861 100644 --- a/data/layout/common/LYT_MM_POPUP_6.xml +++ b/data/layout/common/LYT_MM_POPUP_6.xml @@ -58,20 +58,6 @@ - icon/bubble/icon_clipboard.png - icon/bubble/icon_clipboard.png - - - B09_bg_Popup.png - nine patch/btn_press.#.png - nine patch/btn_press.#.png - - - 0x1b - - - - icon/bubble/icon_camera.png icon/bubble/icon_camera.png diff --git a/data/layout/mobile/LYT_CM_POPUP.xml b/data/layout/mobile/LYT_CM_POPUP.xml index 178d613..2d5604e 100644 --- a/data/layout/mobile/LYT_CM_POPUP.xml +++ b/data/layout/mobile/LYT_CM_POPUP.xml @@ -133,16 +133,6 @@ nine patch/popup_line.9.png - - - CLIPBOARD - - - icon/bubble/icon_clipboard.png - icon/bubble/icon_clipboard_press.png - icon/bubble/icon_clipboard_dim.png - - nine patch/popup_line.9.png @@ -188,5 +178,10 @@ icon/bubble/icon_translation_dim.png + + + nine patch/popup_line.9.png + + diff --git a/data/layout/mobile/LYT_MM_POPUP_4.xml b/data/layout/mobile/LYT_MM_POPUP_4.xml index daf69b3..c5f3c49 100644 --- a/data/layout/mobile/LYT_MM_POPUP_4.xml +++ b/data/layout/mobile/LYT_MM_POPUP_4.xml @@ -59,19 +59,5 @@ 0x1a - - - icon/bubble/icon_clipboard.png - icon/bubble/icon_clipboard_press.png - - - nine patch/btn_02.#.png - nine patch/btn_press.#.png - nine patch/btn_02.#.png - - - 0x1b - - diff --git a/data/layout/mobile/LYT_MM_POPUP_5.xml b/data/layout/mobile/LYT_MM_POPUP_5.xml index 8e56fe0..7c250c3 100644 --- a/data/layout/mobile/LYT_MM_POPUP_5.xml +++ b/data/layout/mobile/LYT_MM_POPUP_5.xml @@ -59,20 +59,6 @@ 0x1a - - - icon/bubble/icon_clipboard.png - icon/bubble/icon_clipboard_press.png - - - nine patch/btn_02.#.png - nine patch/btn_press.#.png - nine patch/btn_02.#.png - - - 0x1b - - icon/bubble/icon_camera.png diff --git a/data/layout/mobile/LYT_MM_POPUP_6.xml b/data/layout/mobile/LYT_MM_POPUP_6.xml index ad4312f..ce4e861 100644 --- a/data/layout/mobile/LYT_MM_POPUP_6.xml +++ b/data/layout/mobile/LYT_MM_POPUP_6.xml @@ -58,20 +58,6 @@ - icon/bubble/icon_clipboard.png - icon/bubble/icon_clipboard.png - - - B09_bg_Popup.png - nine patch/btn_press.#.png - nine patch/btn_press.#.png - - - 0x1b - - - - icon/bubble/icon_camera.png icon/bubble/icon_camera.png diff --git a/data/layout/wearable/LYT_MM_POPUP_4.xml b/data/layout/wearable/LYT_MM_POPUP_4.xml index c6845de..f7cc07e 100644 --- a/data/layout/wearable/LYT_MM_POPUP_4.xml +++ b/data/layout/wearable/LYT_MM_POPUP_4.xml @@ -49,19 +49,5 @@ 0x1a - - - B09_popup_icon_clipboard.png - B09_popup_icon_clipboard_press.png - - - B09_key_btn_02.png - B09_key_btn_press.png - B09_key_btn_02.png - - - 0x1b - - diff --git a/data/layout/wearable/LYT_MM_POPUP_5.xml b/data/layout/wearable/LYT_MM_POPUP_5.xml index cedc17a..325ebe0 100644 --- a/data/layout/wearable/LYT_MM_POPUP_5.xml +++ b/data/layout/wearable/LYT_MM_POPUP_5.xml @@ -49,20 +49,6 @@ 0x1a - - - B09_popup_icon_clipboard.png - B09_popup_icon_clipboard_press.png - - - B09_key_btn_02.png - B09_key_btn_press.png - B09_key_btn_02.png - - - 0x1b - - B09_popup_icon_ocr.png diff --git a/data/layout/wearable/LYT_MM_POPUP_6.xml b/data/layout/wearable/LYT_MM_POPUP_6.xml index 5243d4c..9db4736 100644 --- a/data/layout/wearable/LYT_MM_POPUP_6.xml +++ b/data/layout/wearable/LYT_MM_POPUP_6.xml @@ -48,20 +48,6 @@ - B09_popup_icon_clipboard.png - B09_popup_icon_clipboard.png - - - B09_bg_Popup.png - B09_key_btn_press.png - B09_key_btn_press.png - - - 0x1b - - - - B09_popup_icon_ocr.png B09_popup_icon_ocr.png diff --git a/packaging/ise-default.spec b/packaging/ise-default.spec index 5772153..79f4f1a 100644 --- a/packaging/ise-default.spec +++ b/packaging/ise-default.spec @@ -42,9 +42,6 @@ Requires: ise-engine-default # This is for old profile-based OBS project optimizations. # In 4.0 unified build env, this if statement is always true. -%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" -BuildRequires: pkgconfig(cbhm) -%endif Requires: %{name}-compat = %{version}-%{release} # This is for old profile-based OBS project optimizations. # In 4.0 unified build env, this if statement is always true. diff --git a/src/clipboard.cpp b/src/clipboard.cpp deleted file mode 100644 index 34186bd..0000000 --- a/src/clipboard.cpp +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Copyright (c) 2021 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 "clipboard.h" - -#undef LOG_TAG -#define LOG_TAG "ISE_DEFAULT" - -using namespace scl; - -#ifdef HAVE_CBHM -#include - -static cbhm_h cbhm_handle = NULL; -#endif - -static sclu32 cbhm_sel_type = 0; -static sclboolean g_set_mime_type = FALSE; - -void clipboard_init() -{ -#ifdef HAVE_CBHM - cbhm_open_service(&cbhm_handle); -#endif -} - -void clipboard_shutdown() -{ -#ifdef HAVE_CBHM - cbhm_close_service(cbhm_handle); - cbhm_handle = NULL; -#endif -} - -bool clipboard_show() -{ -#ifdef HAVE_CBHM - int ret; - - if (g_set_mime_type) - ret = cbhm_selection_type_set(cbhm_handle, static_cast(cbhm_sel_type)); - else - ret = cbhm_selection_type_set(cbhm_handle, CBHM_SEL_TYPE_TEXT); - - if (ret != CBHM_ERROR_NONE) - LOGW("Failed to set selection type in cbhm. error : %d\n", ret); - - ret = cbhm_show(cbhm_handle); - if (ret != CBHM_ERROR_NONE) { - LOGW("cbhm show error : %d\n", ret); - return false; - } - else { - LOGD("Show cbhm\n"); - return true; - } -#endif - - return false; -} - -void clipboard_set_mime_type(bool mime_type) -{ - g_set_mime_type = mime_type; -} - -void clipboard_init_sel_type() -{ - cbhm_sel_type = 0; -} - -void clipboard_add_sel_type(CLIPBOARD_SEL_TYPE sel_type) -{ -#ifdef HAVE_CBHM - switch(sel_type) - { - case CLIPBOARD_SEL_TEXT: - cbhm_sel_type |= CBHM_SEL_TYPE_TEXT; - break; - case CLIPBOARD_SEL_IMAGE: - cbhm_sel_type |= CBHM_SEL_TYPE_IMAGE; - break; - default: - break; - } -#endif -} \ No newline at end of file diff --git a/src/include/clipboard.h b/src/include/clipboard.h deleted file mode 100644 index 8fa9d94..0000000 --- a/src/include/clipboard.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2021 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 ISE_CLIPBOARD_H_ -#define ISE_CLIPBOARD_H_ - -typedef enum { - CLIPBOARD_SEL_NONE, - CLIPBOARD_SEL_TEXT, - CLIPBOARD_SEL_IMAGE -} CLIPBOARD_SEL_TYPE; - -void clipboard_init(); -void clipboard_shutdown(); -bool clipboard_show(); -void clipboard_set_mime_type(bool mime_type); - -void clipboard_init_sel_type(); -void clipboard_add_sel_type(CLIPBOARD_SEL_TYPE sel_type); - -#endif /* ISE_CLIPBOARD_H_ */ diff --git a/src/ise.cpp b/src/ise.cpp index 0e20846..e8eb514 100644 --- a/src/ise.cpp +++ b/src/ise.cpp @@ -32,7 +32,6 @@ #include #include #include -#include "clipboard.h" #include "autofill.h" #include "ise.h" #include "utils.h" @@ -212,7 +211,6 @@ static CandidateEventListener g_candidate_event_listener; #define MULTITAP_TIMEOUT 3.0 #define USER_KEYSTRING_OPTION "OPTION" #define USER_KEYSTRING_EMOTICON "EMOTICON_LAYOUT" -#define USER_KEYSTRING_CLIPBOARD "CLIPBOARD" #define USER_KEYSTRING_VOICE "STT_3X4" #define USER_KEYSTRING_FLOATING "FLOATING" #define USER_KEYSTRING_STICKER "STICKER_LAYOUT" @@ -221,7 +219,7 @@ static CandidateEventListener g_candidate_event_listener; #define USER_VOICE_LANGUAGE "LANGUAGE" static sclboolean _cm_popup_opened = FALSE; -static const char *_cm_key_list[CM_KEY_LIST_SIZE] = {USER_KEYSTRING_OPTION, USER_KEYSTRING_EMOTICON, USER_KEYSTRING_CLIPBOARD, +static const char *_cm_key_list[CM_KEY_LIST_SIZE] = {USER_KEYSTRING_OPTION, USER_KEYSTRING_EMOTICON, USER_KEYSTRING_VOICE, USER_KEYSTRING_FLOATING, USER_KEYSTRING_STICKER, USER_KEYSTRING_TRANSLATION}; static scluint _current_cm_key_id = 0; @@ -407,12 +405,6 @@ static void ise_set_cm_private_key(scluint cm_key_id) const_cast("icon/54x54/icon_setting_press.png"), const_cast("icon/54x54/icon_setting_dim.png")}; ui->set_private_key("CM_KEY", const_cast(" "), imagelabel, NULL, 0, const_cast(USER_KEYSTRING_OPTION), TRUE); - } else if (strcmp(_cm_key_list[cm_key_id], USER_KEYSTRING_CLIPBOARD) == 0) { - sclchar* imagelabel[SCL_BUTTON_STATE_MAX] = { - const_cast("icon/54x54/icon_clipboard_nor.png"), - const_cast("icon/54x54/icon_clipboard_press.png"), - const_cast("icon/54x54/icon_clipboard_dim.png")}; - ui->set_private_key("CM_KEY", const_cast(" "), imagelabel, NULL, 0, const_cast(USER_KEYSTRING_CLIPBOARD), TRUE); } else if (strcmp(_cm_key_list[cm_key_id], USER_KEYSTRING_VOICE) == 0) { sclchar* imagelabel[SCL_BUTTON_STATE_MAX] = { const_cast("icon/54x54/icon_mic_nor.png"), @@ -1108,10 +1100,6 @@ void CUIEventCallback::on_event_modechange_key(CSCLUI *ui, SclUIEventDesc event_ launch_option(); ret = SCL_EVENT_DONE; - } else if (strcmp(event_desc.key_value, USER_KEYSTRING_CLIPBOARD) == 0) { - clipboard_show(); - - ret = SCL_EVENT_DONE; } else if (strcmp(event_desc.key_value, USER_KEYSTRING_FLOATING) == 0) { CONFIG_VALUES *config_values = get_config_values(); @@ -1176,9 +1164,6 @@ void CUIEventCallback::process_user_key(CSCLUI *ui, SclUIEventDesc event_desc, K launch_option(); ret = SCL_EVENT_DONE; - } else if (strcmp(event_desc.key_value, USER_KEYSTRING_CLIPBOARD) == 0) { - clipboard_show(); - ret = SCL_EVENT_DONE; } else if (strcmp(event_desc.key_value, "Cancel") == 0) { ret = SCL_EVENT_DONE; const sclchar *input_mode = ui->get_input_mode(); @@ -1230,7 +1215,6 @@ void CUIEventCallback::process_user_key(CSCLUI *ui, SclUIEventDesc event_desc, K if (_cm_popup_opened) { if (strcmp(event_desc.key_value, USER_KEYSTRING_OPTION) == 0 || - strcmp(event_desc.key_value, USER_KEYSTRING_CLIPBOARD) == 0 || strcmp(event_desc.key_value, USER_KEYSTRING_STICKER) == 0 || strcmp(event_desc.key_value, USER_KEYSTRING_TRANSLATION) == 0) { scluint id = ise_get_cm_key_id(event_desc.key_value); @@ -2591,8 +2575,6 @@ static void ime_app_create_cb(void *user_data) if (elm_scale) elm_app_base_scale_set(atof(elm_scale)); - clipboard_init(); - if (nmt_check_agent_install()) nmt_init(); } @@ -2605,8 +2587,6 @@ static void ime_app_exit_cb(void *user_data) if (!engine_loader_dbus_shutdown()) LOGE("Failed to finalize dbus"); - clipboard_shutdown(); - nmt_shutdown(); } @@ -2714,8 +2694,6 @@ static void ime_app_hide_cb(int ic, void *user_data) LOGD("Enter\n"); ise_hide(); - clipboard_set_mime_type(false); - g_ic_smartreply = -1; } @@ -2790,7 +2768,6 @@ static void ime_app_focus_out_cb(int context_id, void *user_data) LOGD("Enter\n"); ise_focus_out(context_id); g_imdata_state = 0; - clipboard_set_mime_type(false); input_smartreply_deinit(); g_ic_smartreply = -1; @@ -3166,17 +3143,6 @@ static void ime_app_prediction_hint_set_cb(const char *prediction_hint, void *us static void ime_app_mime_type_set_request_cb(const char *mime_types, void *user_data) { LOGD("mime type : %s\n", mime_types); - - clipboard_set_mime_type(true); - clipboard_init_sel_type(); - - string str(mime_types), text_key = "text/", image_key = "image/"; - - if (str.find(text_key) != string::npos) - clipboard_add_sel_type(CLIPBOARD_SEL_TEXT); - - if (str.find(image_key) != string::npos) - clipboard_add_sel_type(CLIPBOARD_SEL_IMAGE); } static void ime_app_prediction_hint_data_set_cb(const char *key, const char *value, void *user_data) -- 2.7.4