Merge branch 'devel/master' into tizen

Change-Id: Icd15959a66a4d9921d8606c2095b4243ac8516ea

diff --cc build/tizen/adaptor/Makefile.am
Simple merge

diff --cc dali/internal/window-system/tizen-wayland/event-handler-ecore-wl.cpp
index 89474e0,6cdb165..acfc8d8
--- 1/dali/internal/window-system/tizen-wayland/event-handler-ecore-wl.cpp
--- 2/dali/internal/window-system/tizen-wayland/event-handler-ecore-wl.cpp
+++ b/dali/internal/window-system/tizen-wayland/event-handler-ecore-wl.cpp
@@@ -93,150 -91,6 +91,83 @@@ const unsigned int PRIMARY_TOUCH_BUTTON
  
  const unsigned int BYTES_PER_CHARACTER_FOR_ATTRIBUTES = 3;
  
- /**
-  * EcoreInputModifierToEcoreIMFLock function converts from Ecore_Event_Modifier to Ecore_IMF_Keyboard_Locks enums.
-  * @param[in] modifier the Ecore_Event_Modifier input.
-  * @return the Ecore_IMF_Keyboard_Locks output.
-  */
- Ecore_IMF_Keyboard_Locks EcoreInputModifierToEcoreIMFLock( unsigned int modifier )
- {
-     unsigned int lock( ECORE_IMF_KEYBOARD_LOCK_NONE ); // If no other matches, returns NONE.
- 
-     if( modifier & ECORE_EVENT_LOCK_NUM )
-     {
-       lock |= ECORE_IMF_KEYBOARD_LOCK_NUM; // Num lock is active.
-     }
- 
-     if( modifier & ECORE_EVENT_LOCK_CAPS )
-     {
-       lock |= ECORE_IMF_KEYBOARD_LOCK_CAPS; // Caps lock is active.
-     }
- 
-     if( modifier & ECORE_EVENT_LOCK_SCROLL )
-     {
-       lock |= ECORE_IMF_KEYBOARD_LOCK_SCROLL; // Scroll lock is active.
-     }
- 
-     return static_cast<Ecore_IMF_Keyboard_Locks>( lock );
- }
- 
- /**
-  * Ecore_Event_Modifier enums in Ecore_Input.h do not match Ecore_IMF_Keyboard_Modifiers in Ecore_IMF.h.
-  * This function converts from Ecore_Event_Modifier to Ecore_IMF_Keyboard_Modifiers enums.
-  * @param[in] ecoreModifier the Ecore_Event_Modifier input.
-  * @return the Ecore_IMF_Keyboard_Modifiers output.
-  */
- Ecore_IMF_Keyboard_Modifiers EcoreInputModifierToEcoreIMFModifier(unsigned int ecoreModifier)
- {
-    unsigned int modifier( ECORE_IMF_KEYBOARD_MODIFIER_NONE );  // If no other matches returns NONE.
- 
- 
-    if ( ecoreModifier & ECORE_EVENT_MODIFIER_SHIFT )  // enums from ecore_input/Ecore_Input.h
-    {
-      modifier |= ECORE_IMF_KEYBOARD_MODIFIER_SHIFT;  // enums from ecore_imf/ecore_imf.h
-    }
- 
-    if ( ecoreModifier & ECORE_EVENT_MODIFIER_ALT )
-    {
-      modifier |= ECORE_IMF_KEYBOARD_MODIFIER_ALT;
-    }
- 
-    if ( ecoreModifier & ECORE_EVENT_MODIFIER_CTRL )
-    {
-      modifier |= ECORE_IMF_KEYBOARD_MODIFIER_CTRL;
-    }
- 
-    if ( ecoreModifier & ECORE_EVENT_MODIFIER_WIN )
-    {
-      modifier |= ECORE_IMF_KEYBOARD_MODIFIER_WIN;
-    }
- 
-    if ( ecoreModifier & ECORE_EVENT_MODIFIER_ALTGR )
-    {
-      modifier |= ECORE_IMF_KEYBOARD_MODIFIER_ALTGR;
-    }
- 
-    return static_cast<Ecore_IMF_Keyboard_Modifiers>( modifier );
- }
- 
- 
 +#ifdef DALI_ELDBUS_AVAILABLE
 +// DBus gesture string matching lists.
 +// TODO: This needs moving to its own module.
 +const char * ElDBusAccessibilityFingerCountStrings[] =
 +{
 +  "OneFinger",
 +  "TwoFingers",
 +  "ThreeFingers"
 +};
 +const unsigned int FingerCountStringsTotal = sizeof( ElDBusAccessibilityFingerCountStrings ) / sizeof( ElDBusAccessibilityFingerCountStrings[0] );
 +enum GestureType
 +{
 +  GESTURE_TYPE_NONE,
 +  GESTURE_TYPE_HOVER,
 +  GESTURE_TYPE_SINGLE_TAP,
 +  GESTURE_TYPE_DOUBLE_TAP,
 +  GESTURE_TYPE_TRIPLE_TAP
 +};
 +struct GestureTypeTable
 +{
 +  const char* name;
 +  const GestureType type;
 +};
 +GestureTypeTable ElDBusAccessibilityFullEventTypeStrings[] =
 +{
 +  { "Hover",     GESTURE_TYPE_HOVER      },
 +  { "SingleTap", GESTURE_TYPE_SINGLE_TAP },
 +  { "DoubleTap", GESTURE_TYPE_DOUBLE_TAP },
 +  { "TripleTap", GESTURE_TYPE_TRIPLE_TAP }
 +};
 +const unsigned int FullEventTypeStringsTotal = sizeof( ElDBusAccessibilityFullEventTypeStrings ) / sizeof( ElDBusAccessibilityFullEventTypeStrings[0] );
 +enum SubGestureType
 +{
 +  SUB_GESTURE_TYPE_NONE,
 +  SUB_GESTURE_TYPE_FLICK
 +};
 +struct SubGestureTypeTable
 +{
 +  const char* name;
 +  const SubGestureType type;
 +};
 +SubGestureTypeTable ElDBusAccessibilityDirectionalEventTypeStrings[] =
 +{
 +  { "Flick", SUB_GESTURE_TYPE_FLICK }
 +};
 +const unsigned int DirectionalEventTypeStringsTotal = sizeof( ElDBusAccessibilityDirectionalEventTypeStrings ) / sizeof( ElDBusAccessibilityDirectionalEventTypeStrings[0] );
 +enum GestureDirection
 +{
 +  GESTURE_DIRECTION_NONE,
 +  GESTURE_DIRECTION_UP,
 +  GESTURE_DIRECTION_DOWN,
 +  GESTURE_DIRECTION_LEFT,
 +  GESTURE_DIRECTION_RIGHT,
 +  GESTURE_DIRECTION_UP_RETURN,
 +  GESTURE_DIRECTION_DOWN_RETURN,
 +  GESTURE_DIRECTION_LEFT_RETURN,
 +  GESTURE_DIRECTION_RIGHT_RETURN
 +};
 +struct GestureDirectionTable
 +{
 +    const char* name;
 +    const GestureDirection direction;
 +};
 +GestureDirectionTable ElDBusAccessibilityDirectionStrings[] =
 +{
 +  { "Up",           GESTURE_DIRECTION_UP           },
 +  { "Down",         GESTURE_DIRECTION_DOWN         },
 +  { "Left",         GESTURE_DIRECTION_LEFT         },
 +  { "Right",        GESTURE_DIRECTION_RIGHT        },
 +  { "UpReturn",     GESTURE_DIRECTION_UP_RETURN    },
 +  { "DownReturn",   GESTURE_DIRECTION_DOWN_RETURN  },
 +  { "LeftReturn",   GESTURE_DIRECTION_LEFT_RETURN  },
 +  { "RightReturn",  GESTURE_DIRECTION_RIGHT_RETURN }
 +};
 +const unsigned int DirectionStringsTotal = sizeof( ElDBusAccessibilityDirectionStrings ) / sizeof( ElDBusAccessibilityDirectionStrings[0] );
 +#endif // DALI_ELDBUS_AVAILABLE
 +
  // Copied from x server
  static unsigned int GetCurrentMilliSeconds(void)
  {