summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJihoon Kim <jihoon48.kim@samsung.com>2023-06-09 18:33:48 +0900
committerJihoon Kim <jihoon48.kim@samsung.com>2023-06-09 18:33:48 +0900
commit96c67113c828a56e2dda80225ac0d93d1fb8c3ca (patch)
tree47ded740db7b328ea2d597a2f8ff53236864518d /src
parent95d7ada0cc3eb788161d0cc745284a939c5655a5 (diff)
downloadise-default-96c67113c828a56e2dda80225ac0d93d1fb8c3ca.tar.gz
ise-default-96c67113c828a56e2dda80225ac0d93d1fb8c3ca.tar.bz2
ise-default-96c67113c828a56e2dda80225ac0d93d1fb8c3ca.zip
Remove clipboard feature
Change-Id: I84a445a9f5e953e7194780e3b1f8dfd90b91b51f Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>
Diffstat (limited to 'src')
-rw-r--r--src/clipboard.cpp103
-rw-r--r--src/include/clipboard.h35
-rw-r--r--src/ise.cpp36
3 files changed, 1 insertions, 173 deletions
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 <scltypes.h>
-#include <dlog.h>
-#include "clipboard.h"
-
-#undef LOG_TAG
-#define LOG_TAG "ISE_DEFAULT"
-
-using namespace scl;
-
-#ifdef HAVE_CBHM
-#include <cbhm.h>
-
-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_e>(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 <app_preference.h>
#include <ode/internal-encryption.h>
#include <notification.h>
-#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<sclchar*>("icon/54x54/icon_setting_press.png"),
const_cast<sclchar*>("icon/54x54/icon_setting_dim.png")};
ui->set_private_key("CM_KEY", const_cast<sclchar*>(" "), imagelabel, NULL, 0, const_cast<sclchar*>(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<sclchar*>("icon/54x54/icon_clipboard_nor.png"),
- const_cast<sclchar*>("icon/54x54/icon_clipboard_press.png"),
- const_cast<sclchar*>("icon/54x54/icon_clipboard_dim.png")};
- ui->set_private_key("CM_KEY", const_cast<sclchar*>(" "), imagelabel, NULL, 0, const_cast<sclchar*>(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<sclchar*>("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)