[dali_1.2.35] Merge branch 'devel/master'

Change-Id: Iddd07a420df0595ce97196363d9990e65e6e2aa0

diff --git a/adaptors/base/interfaces/window-event-interface.h b/adaptors/base/interfaces/window-event-interface.h
index 92c9aa1..e8dc98d 100644 (file)
--- a/adaptors/base/interfaces/window-event-interface.h
+++ b/adaptors/base/interfaces/window-event-interface.h
@@ -21,6 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/events/key-event.h>
 #include <dali/public-api/events/wheel-event.h>
+#include <dali/integration-api/events/key-event-integ.h>
 #include <dali/integration-api/events/point.h>
 
 namespace Dali
@@ -52,7 +53,7 @@ public:
    * @brief Key Event callback
    * @param[in] keyEvent key event
    */
-  virtual void KeyEvent( Dali::KeyEvent& keyEvent ) = 0;
+  virtual void KeyEvent( Dali::Integration::KeyEvent& keyEvent ) = 0;
 
   /**
    * @brief Wheel Event callback

diff --git a/adaptors/common/events/event-handler.h b/adaptors/common/events/event-handler.h
index c7b7684..3b1caed 100644 (file)
--- a/adaptors/common/events/event-handler.h
+++ b/adaptors/common/events/event-handler.h
@@ -19,6 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
+#include <dali/integration-api/events/key-event-integ.h>
 #include <dali/integration-api/events/point.h>
 #include <dali/integration-api/events/touch-event-combiner.h>
 #include <style-monitor.h>
@@ -130,7 +131,7 @@ private:
    * Send key event to core.
    * @param[in]  keyEvent The KeyEvent to send.
    */
-  void SendEvent(KeyEvent& keyEvent);
+  void SendEvent(Integration::KeyEvent& keyEvent);
 
   /**
    * Send wheel event to core.

diff --git a/adaptors/ecore/wayland/event-handler-ecore-wl.cpp b/adaptors/ecore/wayland/event-handler-ecore-wl.cpp
index 8461a44..9989810 100644 (file)
--- a/adaptors/ecore/wayland/event-handler-ecore-wl.cpp
+++ b/adaptors/ecore/wayland/event-handler-ecore-wl.cpp
@@ -167,6 +167,20 @@ static unsigned int GetCurrentMilliSeconds(void)
 const char * DALI_VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_SIZE = "db/setting/accessibility/font_name";  // It will be update at vconf-key.h and replaced.
 #endif // DALI_PROFILE_UBUNTU
 
+/**
+ * Get the device name from the provided ecore key event
+ */
+void GetDeviceName(  Ecore_Event_Key* keyEvent, std::string& result )
+{
+  const char* ecoreDeviceName = ecore_device_name_get( keyEvent->dev );
+
+  if ( ecoreDeviceName )
+  {
+    result = ecoreDeviceName;
+  }
+}
+
+
 } // unnamed namespace
 
 // Impl to hide EFL implementation.
@@ -439,7 +453,12 @@ struct EventHandler::Impl
           keyString = keyEvent->string;
         }
 
-        KeyEvent keyEvent(keyName, keyString, keyCode, modifier, time, KeyEvent::Down);
+        std::string deviceName;
+        GetDeviceName( keyEvent, deviceName );
+
+        DALI_LOG_INFO( gImfLogging, Debug::Verbose, "EVENT EcoreEventKeyDown - >>EcoreEventKeyDown deviceName(%s)\n", deviceName.c_str() );
+
+        Integration::KeyEvent keyEvent(keyName, keyString, keyCode, modifier, time, Integration::KeyEvent::Down, deviceName );
         handler->SendEvent( keyEvent );
       }
     }
@@ -479,6 +498,11 @@ struct EventHandler::Impl
         ecoreKeyUpEvent.timestamp = keyEvent->timestamp;
         ecoreKeyUpEvent.modifiers = EcoreInputModifierToEcoreIMFModifier ( keyEvent->modifiers );
         ecoreKeyUpEvent.locks     = (Ecore_IMF_Keyboard_Locks) ECORE_IMF_KEYBOARD_LOCK_NONE;
+#ifdef ECORE_IMF_1_13
+        ecoreKeyUpEvent.dev_name  = "";
+        ecoreKeyUpEvent.dev_class = ECORE_IMF_DEVICE_CLASS_KEYBOARD;
+        ecoreKeyUpEvent.dev_subclass = ECORE_IMF_DEVICE_SUBCLASS_NONE;
+#endif // ECORE_IMF_1_13
 
         eventHandled = ecore_imf_context_filter_event( imfContext,
                                                        ECORE_IMF_EVENT_KEY_UP,
@@ -506,7 +530,10 @@ struct EventHandler::Impl
           keyString = keyEvent->string;
         }
 
-        KeyEvent keyEvent(keyName, keyString, keyCode, modifier, time, KeyEvent::Up);
+        std::string deviceName;
+        GetDeviceName( keyEvent, deviceName );
+
+        Integration::KeyEvent keyEvent(keyName, keyString, keyCode, modifier, time, Integration::KeyEvent::Up, deviceName );
         handler->SendEvent( keyEvent );
       }
     }
@@ -1184,21 +1211,19 @@ void EventHandler::SendEvent(Integration::Point& point, unsigned long timeStamp)
   }
 }
 
-void EventHandler::SendEvent(KeyEvent& keyEvent)
+void EventHandler::SendEvent(Integration::KeyEvent& keyEvent)
 {
   Dali::PhysicalKeyboard physicalKeyboard = PhysicalKeyboard::Get();
   if ( physicalKeyboard )
   {
-    if ( ! KeyLookup::IsDeviceButton( keyEvent.keyPressedName.c_str() ) )
+    if ( ! KeyLookup::IsDeviceButton( keyEvent.keyName.c_str() ) )
     {
       GetImplementation( physicalKeyboard ).KeyReceived( keyEvent.time > 1 );
     }
   }
 
-  // Create KeyEvent and send to Core.
-  Integration::KeyEvent event(keyEvent.keyPressedName, keyEvent.keyPressed, keyEvent.keyCode,
-  keyEvent.keyModifier, keyEvent.time, static_cast<Integration::KeyEvent::State>(keyEvent.state));
-  mCoreEventInterface.QueueCoreEvent( event );
+  // Create send KeyEvent to Core.
+  mCoreEventInterface.QueueCoreEvent( keyEvent );
   mCoreEventInterface.ProcessCoreEvents();
 }
 
@@ -1248,7 +1273,8 @@ void EventHandler::FeedWheelEvent( WheelEvent& wheelEvent )
 
 void EventHandler::FeedKeyEvent( KeyEvent& event )
 {
-  SendEvent( event );
+  Integration::KeyEvent convertedEvent( event );
+  SendEvent( convertedEvent );
 }
 
 void EventHandler::FeedEvent( Integration::Event& event )

diff --git a/adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp b/adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp
index 8879894..95de164 100644 (file)
--- a/adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp
+++ b/adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp
@@ -396,6 +396,7 @@ void ImfManager::Deactivate()
 
     Reset();
     ecore_imf_context_focus_out( mIMFContext );
+    ecore_imf_context_input_panel_hide( mIMFContext );
   }
 
   // Reset mIdleCallbackConnected

diff --git a/adaptors/public-api/dali-adaptor-version.cpp b/adaptors/public-api/dali-adaptor-version.cpp
index a807abe..a2712cb 100644 (file)
--- a/adaptors/public-api/dali-adaptor-version.cpp
+++ b/adaptors/public-api/dali-adaptor-version.cpp
@@ -28,7 +28,7 @@ namespace Dali
 
 const unsigned int ADAPTOR_MAJOR_VERSION = 1;
 const unsigned int ADAPTOR_MINOR_VERSION = 2;
-const unsigned int ADAPTOR_MICRO_VERSION = 34;
+const unsigned int ADAPTOR_MICRO_VERSION = 35;
 const char * const ADAPTOR_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED

diff --git a/adaptors/wayland/event-handler-wl.cpp b/adaptors/wayland/event-handler-wl.cpp
index b6a604e..4ea2f35 100644 (file)
--- a/adaptors/wayland/event-handler-wl.cpp
+++ b/adaptors/wayland/event-handler-wl.cpp
@@ -83,7 +83,7 @@ struct EventHandler::Impl : public WindowEventInterface
   {
     mHandler->SendEvent( point, timeStamp );
   }
-  virtual void KeyEvent( Dali::KeyEvent& keyEvent )
+  virtual void KeyEvent( Integration::KeyEvent& keyEvent )
   {
     mHandler->SendEvent( keyEvent );
   }
@@ -174,21 +174,19 @@ void EventHandler::SendEvent(Integration::Point& point, unsigned long timeStamp)
   }
 }
 
-void EventHandler::SendEvent(KeyEvent& keyEvent)
+void EventHandler::SendEvent(Integration::KeyEvent& keyEvent)
 {
   Dali::PhysicalKeyboard physicalKeyboard = PhysicalKeyboard::Get();
   if ( physicalKeyboard )
   {
-    if ( ! KeyLookup::IsDeviceButton( keyEvent.keyPressedName.c_str() ) )
+    if ( ! KeyLookup::IsDeviceButton( keyEvent.keyName.c_str() ) )
     {
       GetImplementation( physicalKeyboard ).KeyReceived( keyEvent.time > 1 );
     }
   }
 
-  // Create KeyEvent and send to Core.
-  Integration::KeyEvent event(keyEvent.keyPressedName, keyEvent.keyPressed, keyEvent.keyCode,
-  keyEvent.keyModifier, keyEvent.time, static_cast<Integration::KeyEvent::State>(keyEvent.state));
-  mCoreEventInterface.QueueCoreEvent( event );
+  // Create send KeyEvent to Core.
+  mCoreEventInterface.QueueCoreEvent( keyEvent );
   mCoreEventInterface.ProcessCoreEvents();
 }
 
@@ -240,7 +238,8 @@ void EventHandler::FeedWheelEvent( WheelEvent& wheelEvent )
 
 void EventHandler::FeedKeyEvent( KeyEvent& event )
 {
-  SendEvent( event );
+  Integration::KeyEvent convertedEvent( event );
+  SendEvent( convertedEvent );
 }
 
 void EventHandler::FeedEvent( Integration::Event& event )

diff --git a/adaptors/wayland/input-manager.cpp b/adaptors/wayland/input-manager.cpp
index 6f90b32..c276a41 100644 (file)
--- a/adaptors/wayland/input-manager.cpp
+++ b/adaptors/wayland/input-manager.cpp
@@ -18,6 +18,9 @@
 // CLASS HEADER
 #include "input-manager.h"
 
+// EXTERNAL INCLUDES
+#include <dali/integration-api/events/key-event-integ.h>
+
 // INTERNAL INCLUDES
 #include <input/input-listeners.h>
 #include <input/text/text-input-listeners.h>
@@ -191,7 +194,7 @@ void InputManager::KeyFocusLeave( Seat* seat, unsigned int serial, WlSurface* su
 
 void InputManager::KeyEvent( Seat* seat, unsigned int serial, unsigned int timestamp, unsigned int keycode, unsigned int state )
 {
-  Dali::KeyEvent keyEvent = seat->GetDALiKeyEvent( serial, timestamp, keycode, state );
+  Integration::KeyEvent keyEvent( seat->GetDALiKeyEvent( serial, timestamp, keycode, state ) );
 
   mWindowEventInterface->KeyEvent( keyEvent);
 

diff --git a/adaptors/wayland/input-manager.h b/adaptors/wayland/input-manager.h
index eb33fa4..0fc0b1f 100644 (file)
--- a/adaptors/wayland/input-manager.h
+++ b/adaptors/wayland/input-manager.h
@@ -20,7 +20,6 @@
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/common/dali-vector.h>
-#include <dali/public-api/events/key-event.h>
 
 // INTERNAL INCLUDES
 #include <base/interfaces/window-event-interface.h>

diff --git a/adaptors/wayland/input/text/text-input-manager.cpp b/adaptors/wayland/input/text/text-input-manager.cpp
index e6b31e9..7d1fb01 100644 (file)
--- a/adaptors/wayland/input/text/text-input-manager.cpp
+++ b/adaptors/wayland/input/text/text-input-manager.cpp
@@ -221,8 +221,8 @@ void TextInputManager::Keysym( Seat* seat,
 
   }
 
-
-  mWindowEventInterface->KeyEvent( keyEvent );
+  Integration::KeyEvent convertedEvent( keyEvent );
+  mWindowEventInterface->KeyEvent( convertedEvent );
 }
 
 void TextInputManager::Language( Seat* seat, uint32_t serial, const char *language )

diff --git a/adaptors/x11/ecore-x-event-handler.cpp b/adaptors/x11/ecore-x-event-handler.cpp
index 38c64ac..f16d5c1 100644 (file)
--- a/adaptors/x11/ecore-x-event-handler.cpp
+++ b/adaptors/x11/ecore-x-event-handler.cpp
@@ -84,7 +84,7 @@ namespace
 {
 
 const char * DETENT_DEVICE_NAME = "tizen_detent";
-
+const std::string DEFAULT_DEVICE_NAME = "";
 // DBUS accessibility
 #define A11Y_BUS "org.a11y.Bus"
 #define A11Y_INTERFACE "org.a11y.Bus"
@@ -707,7 +707,7 @@ struct EventHandler::Impl
           keyString = keyEvent->string;
         }
 
-        KeyEvent keyEvent(keyName, keyString, keyCode, modifier, time, KeyEvent::Down);
+        Integration::KeyEvent keyEvent(keyName, keyString, keyCode, modifier, time, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME );
         handler->SendEvent( keyEvent );
       }
     }
@@ -774,9 +774,9 @@ struct EventHandler::Impl
           keyString = keyEvent->string;
         }
 
-        KeyEvent keyEvent(keyName, keyString, keyCode, modifier, time, KeyEvent::Up);
-        handler->SendEvent( keyEvent );
+        Integration::KeyEvent keyEvent(keyName, keyString, keyCode, modifier, time, Integration::KeyEvent::Up, DEFAULT_DEVICE_NAME );
 
+        handler->SendEvent( keyEvent );
       }
     }
 
@@ -1763,21 +1763,19 @@ void EventHandler::SendEvent(Integration::Point& point, unsigned long timeStamp)
   }
 }
 
-void EventHandler::SendEvent(KeyEvent& keyEvent)
+void EventHandler::SendEvent(Integration::KeyEvent& keyEvent)
 {
   Dali::PhysicalKeyboard physicalKeyboard = PhysicalKeyboard::Get();
   if ( physicalKeyboard )
   {
-    if ( ! KeyLookup::IsDeviceButton( keyEvent.keyPressedName.c_str() ) )
+    if ( ! KeyLookup::IsDeviceButton( keyEvent.keyName.c_str() ) )
     {
       GetImplementation( physicalKeyboard ).KeyReceived( keyEvent.time > 1 );
     }
   }
 
-  // Create KeyEvent and send to Core.
-  Integration::KeyEvent event(keyEvent.keyPressedName, keyEvent.keyPressed, keyEvent.keyCode,
-  keyEvent.keyModifier, keyEvent.time, static_cast<Integration::KeyEvent::State>(keyEvent.state));
-  mCoreEventInterface.QueueCoreEvent( event );
+  // Send to KeyEvent Core.
+  mCoreEventInterface.QueueCoreEvent( keyEvent );
   mCoreEventInterface.ProcessCoreEvents();
 }
 
@@ -1830,7 +1828,8 @@ void EventHandler::FeedWheelEvent( WheelEvent& wheelEvent )
 
 void EventHandler::FeedKeyEvent( KeyEvent& event )
 {
-  SendEvent( event );
+  Integration::KeyEvent convertedEvent( event );
+  SendEvent( convertedEvent );
 }
 
 void EventHandler::FeedEvent( Integration::Event& event )

diff --git a/adaptors/x11/x-event-handler.cpp b/adaptors/x11/x-event-handler.cpp
index 0e73249..aa4a272 100644 (file)
--- a/adaptors/x11/x-event-handler.cpp
+++ b/adaptors/x11/x-event-handler.cpp
@@ -145,7 +145,7 @@ struct EventHandler::Impl : public WindowEventInterface
   {
     mHandler->SendEvent( point, timeStamp );
   }
-  virtual void KeyEvent( Dali::KeyEvent& keyEvent )
+  virtual void KeyEvent( Integration::KeyEvent& keyEvent )
   {
     mHandler->SendEvent( keyEvent );
   }
@@ -239,21 +239,19 @@ void EventHandler::SendEvent(Dali::Integration::Point& point, unsigned long time
   }
 }
 
-void EventHandler::SendEvent(KeyEvent& keyEvent)
+void EventHandler::SendEvent(Integration::KeyEvent& keyEvent)
 {
   Dali::PhysicalKeyboard physicalKeyboard = PhysicalKeyboard::Get();
   if ( physicalKeyboard )
   {
-    if ( ! KeyLookup::IsDeviceButton( keyEvent.keyPressedName.c_str() ) )
+    if ( ! KeyLookup::IsDeviceButton( keyEvent.keyName.c_str() ) )
     {
       GetImplementation( physicalKeyboard ).KeyReceived( keyEvent.time > 1 );
     }
   }
 
-  // Create KeyEvent and send to Core.
-  Integration::KeyEvent event(keyEvent.keyPressedName, keyEvent.keyPressed, keyEvent.keyCode,
-  keyEvent.keyModifier, keyEvent.time, static_cast<Integration::KeyEvent::State>(keyEvent.state));
-  mCoreEventInterface.QueueCoreEvent( event );
+  // Create send KeyEvent to Core.
+  mCoreEventInterface.QueueCoreEvent( keyEvent );
   mCoreEventInterface.ProcessCoreEvents();
 }
 
@@ -305,7 +303,8 @@ void EventHandler::FeedWheelEvent( WheelEvent& wheelEvent )
 
 void EventHandler::FeedKeyEvent( KeyEvent& event )
 {
-  SendEvent( event );
+  Integration::KeyEvent convertedEvent( event );
+  SendEvent( convertedEvent );
 }
 
 void EventHandler::FeedEvent( Integration::Event& event )

diff --git a/adaptors/x11/x-events/x-input2.cpp b/adaptors/x11/x-events/x-input2.cpp
index e634331..747b558 100644 (file)
--- a/adaptors/x11/x-events/x-input2.cpp
+++ b/adaptors/x11/x-events/x-input2.cpp
@@ -123,7 +123,9 @@ void XInput2::ProcessKeyEvent( XKeyEvent* xEvent )
   keyEvent.keyPressedName = keyname;
   keyEvent.time = xEvent->time;
 
-  mEventInterface->KeyEvent( keyEvent );
+  Integration::KeyEvent convertedEvent( keyEvent );
+
+  mEventInterface->KeyEvent( convertedEvent );
 }
 void XInput2::ProcessClientMessage( XEvent* event )
 {
@@ -163,7 +165,9 @@ void XInput2::ProcessClientMessage( XEvent* event )
     keyEvent.keyPressedName = keyname;
     keyEvent.time = event->xclient.data.l[0];
 
-    mEventInterface->KeyEvent( keyEvent );
+    Integration::KeyEvent convertedEvent( keyEvent );
+
+    mEventInterface->KeyEvent( convertedEvent );
   }
 }
 
@@ -222,7 +226,8 @@ void XInput2::ProcessGenericEvent( XGenericEventCookie* cookie )
     {
       KeyEvent keyEvent;
       CreateKeyEvent( deviceEvent, keyEvent );
-      mEventInterface->KeyEvent( keyEvent );
+      Integration::KeyEvent convertedEvent( keyEvent );
+      mEventInterface->KeyEvent( convertedEvent );
       break;
     }
     default:

diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am
index 47410c0..244146b 100644 (file)
--- a/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@ -83,16 +83,12 @@ adaptor_mobile_dir = ../../../adaptors/mobile
 include ../../../adaptors/mobile/file.list
 
 # WEARABLE
-if WEARABLE_PROFILE
 adaptor_wearable_dir = ../../../adaptors/wearable
 include ../../../adaptors/wearable/file.list
-endif
 
 # TV
-if TV_PROFILE
 adaptor_tv_dir = ../../../adaptors/tv
 include ../../../adaptors/tv/file.list
-endif
 
 # Public API
 adaptor_public_api_dir = ../../../adaptors/public-api
@@ -562,12 +558,10 @@ endif # NOT UBUNTU_PROFILE
 tizenadaptordaliheaderdir = $(devincludepath)/dali
 tizenadaptordaliheader_HEADERS = $(adaptor_dali_header_file)
 
-if WEARABLE_PROFILE
 tizenadaptorpublicapi_HEADERS += $(adaptor_dali_wearable_header_file)
 
 tizenwatchpublicapidir = $(tizenadaptorpublicapidir)/watch
 tizenwatchpublicapi_HEADERS = $(public_dali_watch_header_files)
-endif
 
 install-data-local:
        $(MKDIR_P) ${DESTDIR}/${daliUserFontCacheDir} ${DESTDIR}/${daliShaderbinCacheDir}

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index f1c8691..5871cb0 100644 (file)
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -14,7 +14,7 @@
 
 Name:       dali-adaptor
 Summary:    The DALi Tizen Adaptor
-Version:    1.2.34
+Version:    1.2.35
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-2-Clause and MIT