remove m_xclient_msg_handler

Change-Id: Ic1f28afc8859cc9fb7a02a8271afd777925de4ca

diff --git a/scl/gwes/efl/sclevents-efl.cpp b/scl/gwes/efl/sclevents-efl.cpp
index 436b222..9182e72 100644 (file)
--- a/scl/gwes/efl/sclevents-efl.cpp
+++ b/scl/gwes/efl/sclevents-efl.cpp
@@ -54,7 +54,7 @@ CSCLEventsImplEfl::CSCLEventsImplEfl()
     m_mouse_move_handler = ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE, mouse_move, NULL);
     m_mouse_up_handler = ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_UP, mouse_release, NULL);
 
-    m_xclient_msg_handler = ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE, client_message_cb, NULL);
+    //m_xclient_msg_handler = ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE, client_message_cb, NULL);
 }
 
 /**

diff --git a/scl/scleventhandler.cpp b/scl/scleventhandler.cpp
index 3c21623..5ab65af 100644 (file)
--- a/scl/scleventhandler.cpp
+++ b/scl/scleventhandler.cpp
@@ -93,15 +93,16 @@ static void handle_shift_state_on_button_click_event(SclUIEventDesc ui_event_des
 
     if (uiimpl && context) {
         sclboolean turn_shift_off = TRUE;
-        if (ui_event_desc.key_type == KEY_TYPE_CONTROL) {
-            if (ui_event_desc.key_event == MVK_Shift_L || ui_event_desc.key_event == MVK_Caps_Lock) {
-                turn_shift_off = FALSE;
-            }
-            if (ui_event_desc.key_type == KEY_TYPE_MODECHANGE) {
-                turn_shift_off = FALSE;
-            }
-            if (uiimpl->get_caps_mode()) {
-                turn_shift_off = FALSE;
+        if (uiimpl->get_caps_mode()) {
+            turn_shift_off = FALSE;
+        } else {
+            if (ui_event_desc.key_type == KEY_TYPE_CONTROL) {
+                if (ui_event_desc.key_event == MVK_Shift_L || ui_event_desc.key_event == MVK_Caps_Lock) {
+                    turn_shift_off = FALSE;
+                }
+                if (ui_event_desc.key_type == KEY_TYPE_MODECHANGE) {
+                    turn_shift_off = FALSE;
+                }
             }
         }
         /* If we are in ON_PRESSED or ON_KEY_ENTERED mode of shift multi touch state, do not turn it off now */

diff --git a/scl/scluiimpl.cpp b/scl/scluiimpl.cpp
index 437d9ac..a359433 100644 (file)
--- a/scl/scluiimpl.cpp
+++ b/scl/scluiimpl.cpp
@@ -399,6 +399,16 @@ CSCLUIImpl::set_shift_state(SCLShiftState state)
         CSCLUtils *utils = CSCLUtils::get_instance();
         CSCLContext *context = CSCLContext::get_instance();
         CSCLWindows *windows = CSCLWindows::get_instance();
+
+        /*inform the client that the shift state changed */
+        CSCLEventHandler *handler = CSCLEventHandler::get_instance();
+        if (handler) {
+            SCLEventReturnType ret = handler->on_event_notification(SCL_UINOTITYPE_SHIFT_STATE_CHANGE, state);
+            if (ret == SCL_EVENT_DONE) {
+                return;
+            }
+        }
+
         if (context && windows && utils) {
             SCLShiftState current_state = context->get_shift_state();
             context->set_shift_state(state);

diff --git a/scl/utils/linux/sclutils-linux.cpp b/scl/utils/linux/sclutils-linux.cpp
index b90cc64..9bf84c0 100644 (file)
--- a/scl/utils/linux/sclutils-linux.cpp
+++ b/scl/utils/linux/sclutils-linux.cpp
@@ -218,7 +218,7 @@ CSCLUtilsImplLinux::open_devices() {
         LOGD("FEEDBACK INITIALIZATION SUCCESSFUL : %d\n", r);
     }
 
-    r = tts_create(&tts);
+    /*r = tts_create(&tts);
     if (TTS_ERROR_NONE != r) {
         printf("tts_create FAILED : result(%d)", r);
     } else {
@@ -236,7 +236,7 @@ CSCLUtilsImplLinux::open_devices() {
     }
     if (TTS_ERROR_NONE != r) {
         LOGD("tts_prepare FAILED : ret(%d)\n", r);
-    }
+    }*/
 
     return TRUE;
 }
@@ -252,6 +252,7 @@ CSCLUtilsImplLinux::close_devices() {
     } else {
         LOGD("FEEDBACK DEINITIALIZATION SUCCESSFUL : %d\n", r);
     }
+    /*
     r = tts_unprepare(tts);
     if (TTS_ERROR_NONE != r) {
         printf("tts_unprepare FAILED : result(%d)", r);
@@ -260,7 +261,7 @@ CSCLUtilsImplLinux::close_devices() {
     r = tts_destroy(tts);
     if (TTS_ERROR_NONE != r) {
         printf("tts_destroy FAILED : result(%d)", r);
-    }
+    }*/
     return TRUE;
 }