Removed EVAS, NativeBuffer & Livebox plugins 56/24956/2
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 24 Jul 2014 10:36:01 +0000 (11:36 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 24 Jul 2014 11:05:22 +0000 (12:05 +0100)
Change-Id: I689d076ca0f42049e854d8775f855f1a2c948640

29 files changed:
adaptors/mobile/application-file.list [deleted file]
adaptors/mobile/evas-plugin-impl.cpp [deleted file]
adaptors/mobile/evas-plugin-impl.h [deleted file]
adaptors/mobile/evas-plugin.cpp [deleted file]
adaptors/mobile/file.list
adaptors/mobile/mobile-native-buffer-render-surface.cpp [deleted file]
adaptors/mobile/mobile-native-buffer-render-surface.h [deleted file]
adaptors/mobile/mobile-render-surface-factory.cpp
adaptors/mobile/mobile-render-surface-factory.h
adaptors/mobile/native-buffer-plugin-impl.cpp [deleted file]
adaptors/mobile/native-buffer-plugin-impl.h [deleted file]
adaptors/mobile/native-buffer-plugin.cpp [deleted file]
adaptors/public-api/dali.h
adaptors/public-api/evas-plugin.h [deleted file]
adaptors/public-api/file.list
adaptors/public-api/native-buffer-plugin.h [deleted file]
build/tizen/Makefile.am
build/tizen/configure.ac
build/tizen/dali-adaptor/Makefile.am
build/tizen/dali-evas.pc.in [deleted file]
build/tizen/dali-evas/Makefile.am [deleted file]
build/tizen/dali-evas/linker-test.cpp [deleted file]
build/tizen/dali-livebox.pc.in [deleted file]
build/tizen/dali-livebox/Makefile.am [deleted file]
build/tizen/dali-livebox/linker-test.cpp [deleted file]
build/tizen/dali-native-buffer.pc.in [deleted file]
build/tizen/dali-native-buffer/Makefile.am [deleted file]
build/tizen/dali-native-buffer/linker-test.cpp [deleted file]
packaging/dali-adaptor-mobile.spec

diff --git a/adaptors/mobile/application-file.list b/adaptors/mobile/application-file.list
deleted file mode 100644 (file)
index abb44d9..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-# Application
-
-tizen_evas_plugin_internal_src_files = \
-  $(tizen_evas_plugin_internal_src_dir)/evas-plugin-impl.cpp
-
-tizen_native_buffer_plugin_internal_src_files = \
-  $(tizen_native_buffer_plugin_internal_src_dir)/native-buffer-plugin-impl.cpp
-
-# Public source files
-tizen_evas_plugin_public_api_src_files = \
-  $(tizen_evas_plugin_public_api_src_dir)/evas-plugin.cpp
-
-tizen_native_buffer_plugin_public_api_src_files = \
-  $(tizen_native_buffer_plugin_public_api_src_dir)/native-buffer-plugin.cpp
-
diff --git a/adaptors/mobile/evas-plugin-impl.cpp b/adaptors/mobile/evas-plugin-impl.cpp
deleted file mode 100644 (file)
index 9382dbd..0000000
+++ /dev/null
@@ -1,1565 +0,0 @@
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- * 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.
- *
- */
-
-// CLASS HEADER
-#include "evas-plugin-impl.h"
-
-// EXTERNAL HEADERS
-#include <dali/public-api/dali-core.h>
-#include <dali/integration-api/debug.h>
-
-#include <Ecore_IMF_Evas.h>
-
-// INTERNAL HEADERS
-#include <accessibility-manager.h>
-#include <clipboard-event-notifier.h>
-#include <imf-manager.h>
-
-#include <adaptor-impl.h>
-#include "mobile-render-surface-factory.h"
-#include <pixmap-render-surface.h>
-#include <trigger-event.h>
-
-namespace Dali
-{
-
-namespace SlpPlatform
-{
-class SlpPlatformAbstraction;
-}
-
-namespace Integration
-{
-class Core;
-}
-
-namespace Internal
-{
-
-namespace Adaptor
-{
-
-#if defined(DEBUG_ENABLED)
-Debug::Filter* gEvasPluginLogFilter = Debug::Filter::New(Debug::Verbose, true, "LOG_EVAS_PLUGIN");
-#endif
-
-const char * CLIPBOARD_ATOM                = "CBHM_MSG";
-const char * CLIPBOARD_SET_OWNER_MESSAGE   = "SET_OWNER";
-
-/**
- * Evas_Modifier enums in Ecore_Input.h do not match Ecore_Event_Modifier in Ecore_Input.h.
- * This function converts from Evas_Modifier to Ecore_Event_Modifier enums.
- * @param[in] evasModifier the Evas_Modifier input.
- * @return the Ecore_Event_Modifier output.
- */
-unsigned int EvasModifierToEcoreModifier(Evas_Modifier* evasModifier)
-{
-   Eina_Bool control, alt, shift, altGr, win;
-
-   control = evas_key_modifier_is_set(evasModifier, "Control");
-   alt = evas_key_modifier_is_set(evasModifier, "Alt");
-   shift = evas_key_modifier_is_set(evasModifier, "Shift");
-   altGr = evas_key_modifier_is_set(evasModifier, "AltGr");
-   win = evas_key_modifier_is_set(evasModifier, "Win");
-   win = evas_key_modifier_is_set(evasModifier, "Super");
-   win = evas_key_modifier_is_set(evasModifier, "Hyper");
-
-   unsigned int modifier( 0 );  // If no other matches returns NONE.
-
-   if ( shift )
-   {
-     modifier |= ECORE_EVENT_MODIFIER_SHIFT;  // enums from ecore_imf/ecore_imf.h
-   }
-
-   if ( alt )
-   {
-     modifier |= ECORE_EVENT_MODIFIER_ALT;
-   }
-
-   if ( control )
-   {
-     modifier |= ECORE_EVENT_MODIFIER_CTRL;
-   }
-
-   if ( win )
-   {
-     modifier |= ECORE_EVENT_MODIFIER_WIN;
-   }
-
-   if ( altGr )
-   {
-     modifier |= ECORE_EVENT_MODIFIER_ALTGR;
-   }
-
-   return modifier;
-}
-
-static void _evas_object_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
-{
-  EvasPlugin* ep = (EvasPlugin*)data;
-  if(ep)
-  {
-    Evas_Event_Mouse_Down* ev;
-    ev = (Evas_Event_Mouse_Down *)event_info;
-
-    Evas_Coord rel_x, rel_y;
-    Evas_Coord obj_x,  obj_y, obj_w, obj_h;
-    evas_object_geometry_get(obj, &obj_x,  &obj_y, &obj_w, &obj_h);
-
-    rel_x = ev->canvas.x - obj_x;
-    rel_y = ev->canvas.y - obj_y;
-
-    // create dali TouchEvent & SendEvent
-    TouchPoint point(0, TouchPoint::Down, rel_x, rel_y);
-    ep->OnTouchEvent(point, ev->timestamp);
-  }
-}
-
-static void _evas_object_mouse_move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
-{
-  EvasPlugin* ep = (EvasPlugin*)data;
-  if(ep)
-  {
-    Evas_Event_Mouse_Move *ev;
-    ev = (Evas_Event_Mouse_Move *)event_info;
-
-    Evas_Coord rel_x, rel_y;
-    Evas_Coord obj_x,  obj_y, obj_w, obj_h;
-    evas_object_geometry_get(obj, &obj_x,  &obj_y, &obj_w, &obj_h);
-
-    rel_x = ev->cur.canvas.x - obj_x;
-    rel_y = ev->cur.canvas.y - obj_y;
-
-    // create dali TouchEvent & SendEvent
-    TouchPoint point(0, TouchPoint::Motion, rel_x, rel_y);
-    ep->OnTouchEvent(point, ev->timestamp);
-  }
-}
-
-static void _evas_object_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
-{
-  EvasPlugin* ep = (EvasPlugin*)data;
-  if(ep)
-  {
-    Evas_Event_Mouse_Up *ev;
-    ev = (Evas_Event_Mouse_Up *)event_info;
-
-    Evas_Coord rel_x, rel_y;
-    Evas_Coord obj_x,  obj_y, obj_w, obj_h;
-    evas_object_geometry_get(obj, &obj_x,  &obj_y, &obj_w, &obj_h);
-
-    rel_x = ev->canvas.x - obj_x;
-    rel_y = ev->canvas.y - obj_y;
-
-    // create dali TouchEvent & SendEvent
-    TouchPoint point(0, TouchPoint::Up, rel_x, rel_y);
-    ep->OnTouchEvent(point, ev->timestamp);
-  }
-}
-
-static void _evas_object_mouse_wheel_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
-{
-  EvasPlugin* ep = (EvasPlugin*)data;
-  if(ep)
-  {
-    Evas_Event_Mouse_Wheel *ev = (Evas_Event_Mouse_Wheel*)event_info;
-    Evas_Coord rel_x, rel_y;
-    Evas_Coord obj_x,  obj_y, obj_w, obj_h;
-    evas_object_geometry_get(obj, &obj_x,  &obj_y, &obj_w, &obj_h);
-
-    rel_x = ev->canvas.x - obj_x;
-    rel_y = ev->canvas.y - obj_y;
-
-    MouseWheelEvent wheelEvent(ev->direction, -1 /*Need to check evas modifier*/, Vector2(rel_x, rel_y), ev->z, ev->timestamp);
-    ep->OnMouseWheelEvent(wheelEvent);
-  }
-}
-
-static void _evas_object_multi_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
-{
-  EvasPlugin* ep = (EvasPlugin*)data;
-  if(ep)
-  {
-    Evas_Event_Multi_Down *ev = (Evas_Event_Multi_Down*)event_info;
-
-    Evas_Coord rel_x, rel_y;
-    Evas_Coord obj_x,  obj_y, obj_w, obj_h;
-    evas_object_geometry_get(obj, &obj_x,  &obj_y, &obj_w, &obj_h);
-
-    rel_x = ev->canvas.x - obj_x;
-    rel_y = ev->canvas.y - obj_y;
-
-    // create dali TouchEvent & SendEvent
-    TouchPoint point(ev->device, TouchPoint::Down, rel_x, rel_y);
-    ep->OnTouchEvent(point, ev->timestamp);
-  }
-}
-
-static void _evas_object_multi_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
-{
-  EvasPlugin* ep = (EvasPlugin*)data;
-  if(ep)
-  {
-    Evas_Event_Multi_Up *ev = (Evas_Event_Multi_Up*)event_info;
-
-    Evas_Coord rel_x, rel_y;
-    Evas_Coord obj_x,  obj_y, obj_w, obj_h;
-    evas_object_geometry_get(obj, &obj_x,  &obj_y, &obj_w, &obj_h);
-
-    rel_x = ev->canvas.x - obj_x;
-    rel_y = ev->canvas.y - obj_y;
-
-    // create dali TouchEvent & SendEvent
-    TouchPoint point(ev->device, TouchPoint::Up, rel_x, rel_y);
-    ep->OnTouchEvent(point, ev->timestamp);
-  }
-}
-static void _evas_object_multi_move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
-{
-  EvasPlugin* ep = (EvasPlugin*)data;
-  if(ep)
-  {
-    Evas_Event_Multi_Move *ev = (Evas_Event_Multi_Move*)event_info;
-
-    Evas_Coord rel_x, rel_y;
-    Evas_Coord obj_x,  obj_y, obj_w, obj_h;
-    evas_object_geometry_get(obj, &obj_x,  &obj_y, &obj_w, &obj_h);
-
-    rel_x = ev->cur.canvas.x - obj_x;
-    rel_y = ev->cur.canvas.y - obj_y;
-
-    // create dali TouchEvent & SendEvent
-    TouchPoint point(ev->device, TouchPoint::Motion, rel_x, rel_y);
-    ep->OnTouchEvent(point, ev->timestamp);
-  }
-}
-
-static void _evas_object_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
-{
-  EvasPlugin* ep = (EvasPlugin*)data;
-
-  if(ep)
-  {
-    Evas_Event_Key_Down* keyEvent( (Evas_Event_Key_Down*)event_info );
-    bool eventHandled( false );
-
-    if(!keyEvent->keyname)
-    {
-      return;
-    }
-
-    Ecore_IMF_Context* imfContext = NULL;
-    if ( Dali::Adaptor::IsAvailable() )
-    {
-      Dali::ImfManager imfManager = Dali::ImfManager::Get();
-      if ( imfManager )
-      {
-        imfContext = reinterpret_cast<Ecore_IMF_Context*>( imfManager.GetContext() );
-      }
-    }
-
-    // XF86Stop and XF86Send must skip ecore_imf_context_filter_event.
-    if ( imfContext && strcmp( keyEvent->keyname, "XF86Send" ) && strcmp( keyEvent->keyname, "XF86Phone" ) && strcmp( keyEvent->keyname, "XF86Stop" ) )
-    {
-      Ecore_IMF_Event_Key_Down ecoreKeyDownEvent;
-      ecore_imf_evas_event_key_down_wrap(keyEvent, &ecoreKeyDownEvent);
-
-      eventHandled = ecore_imf_context_filter_event(imfContext,
-                                                      ECORE_IMF_EVENT_KEY_DOWN,
-                                                     (Ecore_IMF_Event *) &ecoreKeyDownEvent );
-
-      // If the event has not been handled by IMF then check if we should reset our IMF context
-      if( !eventHandled )
-      {
-        if ( !strcmp( keyEvent->keyname, "Escape"   ) ||
-             !strcmp( keyEvent->keyname, "Return"   ) ||
-             !strcmp( keyEvent->keyname, "KP_Enter" ) )
-        {
-          ecore_imf_context_reset( imfContext );
-       }
-      }
-    }
-
-    // If the event wasn't handled then we should send a key event.
-    if ( !eventHandled )
-    {
-      std::string keyName( keyEvent->keyname );
-      std::string keyString( "" );
-      int keyCode = ecore_x_keysym_keycode_get(keyEvent->keyname);
-      int modifier( EvasModifierToEcoreModifier ( keyEvent->modifiers ) );
-      unsigned long time( keyEvent->timestamp );
-
-      // Ensure key event string is not NULL as keys like SHIFT have a null string.
-      if ( keyEvent->string )
-      {
-        keyString = keyEvent->string;
-      }
-
-      KeyEvent daliKeyEvent(keyName, keyString, keyCode, modifier, time, KeyEvent::Down);
-      ep->OnKeyEvent( daliKeyEvent );
-    }
-  }
-}
-
-static void _evas_object_key_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
-{
-  EvasPlugin* ep = (EvasPlugin*)data;
-  if(ep)
-  {
-    // We're consuming key up event so we have to pass to IMF so that it can parse it as well.
-    Evas_Event_Key_Up* keyEvent( (Evas_Event_Key_Up*)event_info );
-    bool eventHandled( false );
-
-    Ecore_IMF_Context* imfContext = NULL;
-    if ( Dali::Adaptor::IsAvailable() )
-    {
-      Dali::ImfManager imfManager = Dali::ImfManager::Get();
-      if ( imfManager )
-      {
-        imfContext = reinterpret_cast<Ecore_IMF_Context*>( imfManager.GetContext() );
-      }
-    }
-
-    if ( imfContext && strcmp( keyEvent->keyname, "XF86Send" ) && strcmp( keyEvent->keyname, "XF86Phone" ) && strcmp( keyEvent->keyname, "XF86Stop" ))
-    {
-      Ecore_IMF_Event_Key_Up ecoreKeyUpEvent;
-      ecore_imf_evas_event_key_up_wrap(keyEvent, &ecoreKeyUpEvent);
-
-      eventHandled = ecore_imf_context_filter_event( imfContext,
-                                      ECORE_IMF_EVENT_KEY_UP,
-                                      (Ecore_IMF_Event *) &ecoreKeyUpEvent );
-    }
-
-    if ( !eventHandled )
-    {
-      std::string keyName( keyEvent->keyname );
-      std::string keyString( "" );
-      int keyCode = ecore_x_keysym_keycode_get(keyEvent->keyname);
-      int modifier( EvasModifierToEcoreModifier ( keyEvent->modifiers ) );
-      unsigned long time( keyEvent->timestamp );
-
-      // Ensure key event string is not NULL as keys like SHIFT have a null string.
-      if ( keyEvent->string )
-      {
-        keyString = keyEvent->string;
-      }
-
-      KeyEvent daliKeyEvent(keyName, keyString, keyCode, modifier, time, KeyEvent::Up);
-      ep->OnKeyEvent( daliKeyEvent );
-    }
-  }
-}
-
-static void _evas_object_focus_in_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
-{
-  EvasPlugin* ep = (EvasPlugin*)data;
-  if(ep != NULL && ep->GetEvasImageObject() == obj)
-  {
-    ep->OnEvasObjectFocusedIn();
-  }
-}
-
-static void _evas_object_focus_out_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
-{
-  EvasPlugin* ep = (EvasPlugin*)data;
-  if(ep != NULL && ep->GetEvasImageObject() == obj)
-  {
-    ep->OnEvasObjectFocusedOut();
-  }
-}
-
-static void _elm_focus_object_focus_in_cb(void *data, Evas_Object *obj, void *event_info)
-{
-  EvasPlugin* ep = (EvasPlugin*)data;
-  if(ep != NULL && ep->GetElmFocusObject() == obj)
-  {
-    Evas_Object* win = elm_object_top_widget_get(obj);
-    if(strcmp("elm_win", elm_object_widget_type_get(win)) == 0)
-    {
-      if(elm_win_focus_highlight_enabled_get(win) == EINA_TRUE)
-      {
-        // To allow that KeyboardFocusManager can handle the keyboard focus
-        KeyEvent fakeKeyEvent("", "", 0, 0, 100 /* fake timestamp */, KeyEvent::Down);
-        ep->OnKeyEvent( fakeKeyEvent );
-      }
-    }
-    else
-    {
-      DALI_LOG_ERROR("It is not elm win\n");
-    }
-
-    evas_object_focus_set(ep->GetEvasImageObject(), EINA_TRUE);
-  }
-}
-
-static void _elm_focus_object_focus_out_cb(void *data, Evas_Object *obj, void *event_info)
-{
-  EvasPlugin* ep = (EvasPlugin*)data;
-  if(ep != NULL && ep->GetElmFocusObject() == obj)
-  {
-    evas_object_focus_set(ep->GetEvasImageObject(), EINA_FALSE);
-  }
-}
-
-static void _canvas_focus_in_cb(void *data, Evas *e, void *event_info)
-{
-  EvasPlugin* ep = (EvasPlugin*)data;
-  if(ep != NULL && ep->GetEvasImageObject() == evas_focus_get(e))
-  {
-    ep->OnEvasObjectFocusedIn();
-  }
-}
-
-static void _canvas_focus_out_cb(void *data, Evas *e, void *event_info)
-{
-  EvasPlugin* ep = (EvasPlugin*)data;
-  if(ep != NULL && ep->GetEvasImageObject() == evas_focus_get(e))
-  {
-    ep->OnEvasObjectFocusedOut();
-  }
-}
-
-static void _evas_object_move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
-{
-  EvasPlugin* ep = (EvasPlugin*)data;
-  if(ep)
-  {
-    ep->Move();
-  }
-}
-
-static void _evas_object_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
-{
-  EvasPlugin* ep = (EvasPlugin*)data;
-  if(ep)
-  {
-    ep->Resize();
-  }
-}
-
-static void _evas_render_post_cb(void *data, Evas *e, void *event_info)
-{
-  EvasPlugin* ep = (EvasPlugin*)data;
-  if(ep)
-  {
-    // call RenderSync when the window surface(onscreen) was presented to LCD.
-    ep->RenderSync();
-
-    //After first render emit signal to notify
-    if(!ep->mFirstRenderCompleteNotified)
-    {
-      ep->OnFirstRenderCompleted();
-    }
-  }
-}
-
-/*
- * When the evas plugin is resumed,
- * need to forcely dirty set the evas object on idle time to show again the result of dali rendering.
- * One time should be enough.
- */
-static Eina_Bool _evas_object_dirty_set_idle_cb(void *data)
-{
-  EvasPlugin* ep = (EvasPlugin*)data;
-
-  if(ep)
-  {
-    Evas_Object* eo = ep->GetEvasImageObject();
-    if(eo)
-    {
-      /* dirty set to post the result of rendering via evas */
-      evas_object_image_pixels_dirty_set(eo, EINA_TRUE);
-    }
-
-    ep->ClearIdler(false); // clear idler handle without deleting handle. because handle will be deleted by ecore
-  }
-
-  // we need it once.
-  return ECORE_CALLBACK_CANCEL;
-}
-
-static Eina_Bool _elm_access_highlight_cb(void *data, Evas_Object *obj, Elm_Access_Action_Info *actionInfo)
-{
-  EvasPlugin* ep = (EvasPlugin*)data;
-  bool ret = false;
-
-  if(ep && actionInfo)
-  {
-    // action_by has NEXT or PREV
-    if (actionInfo->action_by == ELM_ACCESS_ACTION_HIGHLIGHT_NEXT)
-    {
-      ret = ep->OnAccessibilityActionEvent(ELM_ACCESS_ACTION_HIGHLIGHT_NEXT, actionInfo);
-      DALI_LOG_INFO(gEvasPluginLogFilter, Debug::General, "[%s:%d] Next returns %s\n", __FUNCTION__, __LINE__, ret?"TRUE":"FALSE");
-    }
-    else if (actionInfo->action_by == ELM_ACCESS_ACTION_HIGHLIGHT_PREV)
-    {
-      ret = ep->OnAccessibilityActionEvent(ELM_ACCESS_ACTION_HIGHLIGHT_PREV, actionInfo);
-      DALI_LOG_INFO(gEvasPluginLogFilter, Debug::General, "[%s:%d] Prev returns %s\n", __FUNCTION__, __LINE__, ret?"TRUE":"FALSE");
-    }
-    else
-    {
-      /*
-        * In case of access over, action_by has ELM_ACCESS_ACTION_HIGHLIGHT
-        * real operation will be done in _elm_access_over_cb
-        * so just return true in order to remove the entire focus indicator
-        */
-
-      /*
-        * Even if action_by has intialized value (-1), highlight action is valid
-        */
-      ret = true;
-    }
-  }
-  else
-  {
-    DALI_LOG_WARNING("[%s:%d] has no actionInfo\n", __FUNCTION__, __LINE__);
-  }
-
-  return ret;
-}
-
-static Eina_Bool _elm_access_read_cb(void *data, Evas_Object *obj, Elm_Access_Action_Info *actionInfo)
-{
-  EvasPlugin* ep = (EvasPlugin*)data;
-  bool ret = false;
-
-  if(ep)
-  {
-    PositionSize geometry = ep->GetEvasObjectGeometry();
-
-    if(actionInfo)
-    {
-      ret = ep->OnAccessibilityActionEvent(ELM_ACCESS_ACTION_READ, actionInfo, (actionInfo->x - geometry.x), (actionInfo->y - geometry.y));
-      DALI_LOG_INFO(gEvasPluginLogFilter, Debug::General, "[%s:%d] returns %s\n", __FUNCTION__, __LINE__, ret?"TRUE":"FALSE");
-    }
-    else
-    {
-      DALI_LOG_WARNING( "[%s:%d] has no actionInfo\n", __FUNCTION__, __LINE__);
-    }
-  }
-
-  return ret;
-}
-
-static Eina_Bool _elm_access_over_cb(void *data, Evas_Object *obj, Elm_Access_Action_Info *actionInfo)
-{
-  EvasPlugin* ep = (EvasPlugin*)data;
-  bool ret = false;
-
-  if(ep)
-  {
-    PositionSize geometry = ep->GetEvasObjectGeometry();
-
-    if(actionInfo)
-    {
-      ret = ep->OnAccessibilityActionEvent(ELM_ACCESS_ACTION_OVER, actionInfo, (actionInfo->x - geometry.x), (actionInfo->y - geometry.y));
-      DALI_LOG_INFO(gEvasPluginLogFilter, Debug::General, "[%s:%d] returns %s\n", __FUNCTION__, __LINE__, ret?"TRUE":"FALSE");
-    }
-    else
-    {
-      DALI_LOG_WARNING( "[%s:%d] has no actionInfo\n", __FUNCTION__, __LINE__);
-    }
-  }
-
-  return ret;
-}
-
-static Eina_Bool _elm_access_highlight_next_cb(void *data, Evas_Object *obj, Elm_Access_Action_Info *actionInfo)
-{
-  EvasPlugin* ep = (EvasPlugin*)data;
-  return ep->OnAccessibilityActionEvent(ELM_ACCESS_ACTION_HIGHLIGHT_NEXT, actionInfo);
-}
-
-static Eina_Bool _elm_access_highlight_prev_cb(void *data, Evas_Object *obj, Elm_Access_Action_Info *actionInfo)
-{
-  EvasPlugin* ep = (EvasPlugin*)data;
-  return ep->OnAccessibilityActionEvent(ELM_ACCESS_ACTION_HIGHLIGHT_PREV, actionInfo);
-}
-
-static Eina_Bool _elm_access_activate_cb(void *data, Evas_Object *obj, Elm_Access_Action_Info *actionInfo)
-{
-  EvasPlugin* ep = (EvasPlugin*)data;
-  return ep->OnAccessibilityActionEvent(ELM_ACCESS_ACTION_ACTIVATE, actionInfo);
-}
-
-static Eina_Bool _elm_access_unhighlight_cb(void *data, Evas_Object *obj, Elm_Access_Action_Info *actionInfo)
-{
-  EvasPlugin* ep = (EvasPlugin*)data;
-  return ep->OnAccessibilityActionEvent(ELM_ACCESS_ACTION_UNHIGHLIGHT, actionInfo);
-}
-
-static Eina_Bool _elm_access_back_cb(void *data, Evas_Object *obj, Elm_Access_Action_Info *actionInfo)
-{
-  EvasPlugin* ep = (EvasPlugin*)data;
-  return ep->OnAccessibilityActionEvent(ELM_ACCESS_ACTION_BACK, actionInfo);
-}
-
-static Eina_Bool _elm_access_value_up_cb(void *data, Evas_Object *obj, Elm_Access_Action_Info *actionInfo)
-{
-  EvasPlugin* ep = (EvasPlugin*)data;
-  return ep->OnAccessibilityActionEvent(ELM_ACCESS_ACTION_UP, actionInfo);
-}
-
-static Eina_Bool _elm_access_value_down_cb(void *data, Evas_Object *obj, Elm_Access_Action_Info *actionInfo)
-{
-  EvasPlugin* ep = (EvasPlugin*)data;
-  return ep->OnAccessibilityActionEvent(ELM_ACCESS_ACTION_DOWN, actionInfo);
-}
-
-static Eina_Bool _elm_access_scroll_cb(void *data, Evas_Object *obj, Elm_Access_Action_Info *actionInfo)
-{
-  EvasPlugin* ep = (EvasPlugin*)data;
-  bool ret = false;
-
-  if(actionInfo && ep)
-  {
-    Evas_Coord rel_x, rel_y;
-    Evas_Coord obj_x,  obj_y, obj_w, obj_h;
-    Evas_Object* eo = ep->GetEvasImageObject();
-
-    if(eo)
-    {
-      evas_object_geometry_get(eo, &obj_x,  &obj_y, &obj_w, &obj_h);
-
-      rel_x = actionInfo->x - obj_x;
-      rel_y = actionInfo->y - obj_y;
-
-      ret = ep->OnAccessibilityActionEvent(ELM_ACCESS_ACTION_SCROLL, actionInfo, rel_x, rel_y);
-    }
-  }
-  else
-  {
-    DALI_LOG_WARNING("[%s:%d] has no actionInfo\n", __FUNCTION__, __LINE__);
-  }
-
-  return ret;
-}
-
-static Eina_Bool _elm_access_mouse_cb(void *data, Evas_Object *obj, Elm_Access_Action_Info *actionInfo)
-{
-  EvasPlugin* ep = (EvasPlugin*)data;
-  bool ret = false;
-
-  if(actionInfo && ep)
-  {
-    Evas_Coord rel_x, rel_y;
-    Evas_Coord obj_x,  obj_y, obj_w, obj_h;
-    Evas_Object* eo = ep->GetEvasImageObject();
-
-    if(eo)
-    {
-      evas_object_geometry_get(eo, &obj_x,  &obj_y, &obj_w, &obj_h);
-
-      rel_x = actionInfo->x - obj_x;
-      rel_y = actionInfo->y - obj_y;
-
-      ret = ep->OnAccessibilityActionEvent(ELM_ACCESS_ACTION_MOUSE, actionInfo, rel_x, rel_y);
-    }
-  }
-  else
-  {
-    DALI_LOG_WARNING("[%s:%d] has no actionInfo\n", __FUNCTION__, __LINE__);
-  }
-
-  return ret;
-}
-
-static Eina_Bool _ecore_x_event_selection_clear(void *data, int type, void *event)
-{
-  EvasPlugin* ep = (EvasPlugin*)data;
-
-  if( ep )
-  {
-    ep->OnEcoreEventSelectionCleared(data, type, event);
-  }
-
-  return ECORE_CALLBACK_PASS_ON;
-}
-
-static Eina_Bool _ecore_x_event_selection_notify(void *data, int type, void *event)
-{
-  EvasPlugin* ep = (EvasPlugin*)data;
-
-  if( ep )
-  {
-    ep->OnEcoreEventSelectionNotified(data, type, event);
-  }
-
-  return ECORE_CALLBACK_PASS_ON;
-}
-static Eina_Bool _ecore_x_event_client_message(void* data, int type, void* event)
-{
-  EvasPlugin* ep = (EvasPlugin*)data;
-
-  if( ep )
-  {
-    ep->OnEcoreEventClientMessaged(data, type, event);
-  }
-
-  return ECORE_CALLBACK_PASS_ON;
-}
-
-// Copied from x server
-static unsigned int GetCurrentMilliSeconds(void)
-{
-  struct timeval tv;
-
-  struct timespec tp;
-  static clockid_t clockid;
-
-  if (!clockid)
-  {
-#ifdef CLOCK_MONOTONIC_COARSE
-    if (clock_getres(CLOCK_MONOTONIC_COARSE, &tp) == 0 &&
-      (tp.tv_nsec / 1000) <= 1000 && clock_gettime(CLOCK_MONOTONIC_COARSE, &tp) == 0)
-    {
-      clockid = CLOCK_MONOTONIC_COARSE;
-    }
-    else
-#endif
-    if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0)
-    {
-      clockid = CLOCK_MONOTONIC;
-    }
-    else
-    {
-      clockid = ~0L;
-    }
-  }
-  if (clockid != ~0L && clock_gettime(clockid, &tp) == 0)
-  {
-    return (tp.tv_sec * 1000) + (tp.tv_nsec / 1000000L);
-  }
-
-  gettimeofday(&tv, NULL);
-  return (tv.tv_sec * 1000) + (tv.tv_usec / 1000);
-}
-
-EvasPlugin::EvasPlugin(Dali::EvasPlugin& evasPlugin, Evas_Object* parent, bool isTransparent, unsigned int initialWidth, unsigned int initialHeight)
-: mEvasImageObject(NULL),
-  mElmAccessObject(NULL),
-  mElmFocusObject(NULL),
-  mSurface(NULL),
-  mFirstRenderCompleteNotified(false),
-  mEvasPlugin(evasPlugin),
-  mAdaptor(NULL),
-  mEvas(NULL),
-  mEvasImageObjectGeometry(0, 0, initialWidth, initialHeight),
-  mInitialized(false),
-  mIsTransparent(isTransparent),
-  mHasFocus(false),
-  mRenderNotification(NULL),
-  mEvasDirtyIdler(NULL)
-{
-  DALI_ASSERT_ALWAYS( parent && "No parent object for plugin" );
-  mEvas = AnyCast<Evas*>(evas_object_evas_get(parent));
-
-  /* create evas object image */
-  CreateEvasImageObject(mEvas, initialWidth, initialHeight, isTransparent);
-
-  /* create elm access object */
-  CreateElmAccessObject(parent);
-
-  /* create elm focus object */
-  CreateElmFocusObject(parent);
-
-  /* create adaptor */
-  CreateAdaptor(initialWidth, initialHeight);
-
-  /* render post callback */
-  evas_event_callback_add(mEvas, EVAS_CALLBACK_RENDER_POST, _evas_render_post_cb, this);
-
-  mRenderNotification = new TriggerEvent( boost::bind(&EvasPlugin::Render, this ) );
-
-  mSurface->SetRenderNotification( mRenderNotification );
-
-  mState = Ready;
-}
-
-EvasPlugin::~EvasPlugin()
-{
-  mConnectionTracker.DisconnectAll();
-
-  if (mAdaptor)
-  {
-    Stop();
-
-    // delete idler
-    ClearIdler();
-
-    // no more notifications
-    delete mRenderNotification;
-
-    // delete evas canvas callback for render sync
-    evas_event_callback_del(mEvas, EVAS_CALLBACK_RENDER_POST, _evas_render_post_cb);
-
-    delete mAdaptor;
-    mAdaptor = NULL;
-
-    // delete elm focus object
-    DeleteElmFocusObject();
-
-    // delete elm access object
-    DeleteElmAccessObject();
-
-    // delete evas object image
-    DeleteEvasImageObject();
-
-    if (mSurface)
-    {
-      delete mSurface;
-      mSurface = NULL;
-    }
-  }
-}
-
-void EvasPlugin::CreateEvasImageObject(Evas* evas, unsigned int initialWidth, unsigned int initialHeight, bool isTransparent)
-{
-  /* create evas object */
-
-  mEvasImageObject = evas_object_image_filled_add(mEvas);
-  evas_object_name_set(mEvasImageObject, "dali-evasplugin");
-  evas_object_image_content_hint_set(mEvasImageObject, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
-  evas_object_size_hint_align_set(mEvasImageObject, EVAS_HINT_FILL, EVAS_HINT_FILL);
-  evas_object_size_hint_weight_set(mEvasImageObject, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-
-  if(isTransparent)
-  {
-    evas_object_image_alpha_set(mEvasImageObject, EINA_TRUE);
-  }
-
-  evas_object_move(mEvasImageObject, 0, 0);
-  evas_object_image_size_set(mEvasImageObject, initialWidth, initialHeight);
-  evas_object_resize(mEvasImageObject, initialWidth, initialHeight);
-
-  /* event callback */
-  evas_object_event_callback_add(mEvasImageObject, EVAS_CALLBACK_MOUSE_DOWN, _evas_object_mouse_down_cb, this);
-  evas_object_event_callback_add(mEvasImageObject, EVAS_CALLBACK_MOUSE_UP, _evas_object_mouse_up_cb, this);
-  evas_object_event_callback_add(mEvasImageObject, EVAS_CALLBACK_MOUSE_MOVE, _evas_object_mouse_move_cb, this);
-  evas_object_event_callback_add(mEvasImageObject, EVAS_CALLBACK_MOUSE_WHEEL, _evas_object_mouse_wheel_cb, this);
-
-  evas_object_event_callback_add(mEvasImageObject, EVAS_CALLBACK_MULTI_DOWN, _evas_object_multi_down_cb, this);
-  evas_object_event_callback_add(mEvasImageObject, EVAS_CALLBACK_MULTI_UP, _evas_object_multi_up_cb, this);
-  evas_object_event_callback_add(mEvasImageObject, EVAS_CALLBACK_MULTI_MOVE, _evas_object_multi_move_cb, this);
-
-  evas_object_event_callback_add(mEvasImageObject, EVAS_CALLBACK_KEY_DOWN, _evas_object_key_down_cb, this);
-  evas_object_event_callback_add(mEvasImageObject, EVAS_CALLBACK_KEY_UP, _evas_object_key_up_cb, this);
-
-  /* move callback */
-  evas_object_event_callback_add(mEvasImageObject, EVAS_CALLBACK_MOVE, _evas_object_move_cb, this);
-
-  /* resize callback */
-  evas_object_event_callback_add(mEvasImageObject, EVAS_CALLBACK_RESIZE, _evas_object_resize_cb, this);
-
-  /* focus callback */
-  evas_event_callback_add(mEvas, EVAS_CALLBACK_CANVAS_FOCUS_IN, _canvas_focus_in_cb, this);
-  evas_event_callback_add(mEvas, EVAS_CALLBACK_CANVAS_FOCUS_OUT, _canvas_focus_out_cb, this);
-
-  evas_object_event_callback_add(mEvasImageObject, EVAS_CALLBACK_FOCUS_IN, _evas_object_focus_in_cb, this);
-  evas_object_event_callback_add(mEvasImageObject, EVAS_CALLBACK_FOCUS_OUT, _evas_object_focus_out_cb, this);
-
-  evas_object_show(mEvasImageObject);
-}
-
-void EvasPlugin::DeleteEvasImageObject()
-{
-  if(mEvasImageObject)
-  {
-    /* event callback */
-    evas_object_event_callback_del(mEvasImageObject, EVAS_CALLBACK_MOUSE_DOWN, _evas_object_mouse_down_cb);
-    evas_object_event_callback_del(mEvasImageObject, EVAS_CALLBACK_MOUSE_UP, _evas_object_mouse_up_cb);
-    evas_object_event_callback_del(mEvasImageObject, EVAS_CALLBACK_MOUSE_MOVE, _evas_object_mouse_move_cb);
-
-    evas_object_event_callback_del(mEvasImageObject, EVAS_CALLBACK_MULTI_DOWN, _evas_object_multi_down_cb);
-    evas_object_event_callback_del(mEvasImageObject, EVAS_CALLBACK_MULTI_UP, _evas_object_multi_up_cb);
-    evas_object_event_callback_del(mEvasImageObject, EVAS_CALLBACK_MULTI_MOVE, _evas_object_multi_move_cb);
-
-    evas_object_event_callback_del(mEvasImageObject, EVAS_CALLBACK_KEY_DOWN, _evas_object_key_down_cb);
-    evas_object_event_callback_del(mEvasImageObject, EVAS_CALLBACK_KEY_UP, _evas_object_key_up_cb);
-
-    /* move callback */
-    evas_object_event_callback_del(mEvasImageObject, EVAS_CALLBACK_MOVE, _evas_object_move_cb);
-
-    /* resize callback */
-    evas_object_event_callback_del(mEvasImageObject, EVAS_CALLBACK_RESIZE, _evas_object_resize_cb);
-
-    /* focus callback */
-    evas_event_callback_del(mEvas, EVAS_CALLBACK_CANVAS_FOCUS_IN, _canvas_focus_in_cb);
-    evas_event_callback_del(mEvas, EVAS_CALLBACK_CANVAS_FOCUS_OUT, _canvas_focus_out_cb);
-
-    evas_object_event_callback_del(mEvasImageObject, EVAS_CALLBACK_FOCUS_IN, _evas_object_focus_in_cb);
-    evas_object_event_callback_del(mEvasImageObject, EVAS_CALLBACK_FOCUS_OUT, _evas_object_focus_out_cb);
-
-    // evas object callbacks are deleted with the object
-    evas_object_del(mEvasImageObject);
-    mEvasImageObject = NULL;
-  }
-}
-
-void EvasPlugin::CreateElmAccessObject(Evas_Object* parent)
-{
-  // elm access register with image object
-  mElmAccessObject = elm_access_object_register(mEvasImageObject, parent);
-
-  // elm access action callbacks
-  elm_access_action_cb_set(mElmAccessObject, ELM_ACCESS_ACTION_HIGHLIGHT, _elm_access_highlight_cb, this);
-  elm_access_action_cb_set(mElmAccessObject, ELM_ACCESS_ACTION_UNHIGHLIGHT, _elm_access_unhighlight_cb, this);
-  elm_access_action_cb_set(mElmAccessObject, ELM_ACCESS_ACTION_HIGHLIGHT_NEXT, _elm_access_highlight_next_cb, this);
-  elm_access_action_cb_set(mElmAccessObject, ELM_ACCESS_ACTION_HIGHLIGHT_PREV, _elm_access_highlight_prev_cb, this);
-  elm_access_action_cb_set(mElmAccessObject, ELM_ACCESS_ACTION_ACTIVATE, _elm_access_activate_cb, this);
-  elm_access_action_cb_set(mElmAccessObject, ELM_ACCESS_ACTION_UP, _elm_access_value_up_cb, this);
-  elm_access_action_cb_set(mElmAccessObject, ELM_ACCESS_ACTION_DOWN, _elm_access_value_down_cb, this);
-  elm_access_action_cb_set(mElmAccessObject, ELM_ACCESS_ACTION_SCROLL, _elm_access_scroll_cb, this);
-  elm_access_action_cb_set(mElmAccessObject, ELM_ACCESS_ACTION_MOUSE, _elm_access_mouse_cb, this);
-  elm_access_action_cb_set(mElmAccessObject, ELM_ACCESS_ACTION_BACK, _elm_access_back_cb, this);
-  elm_access_action_cb_set(mElmAccessObject, ELM_ACCESS_ACTION_READ, _elm_access_read_cb, this);
-  elm_access_action_cb_set(mElmAccessObject, ELM_ACCESS_ACTION_OVER, _elm_access_over_cb, this);
-
-  /**
-   * Dali doesn't set the order of elm focus chain.
-   * Application should append mElmAccessObject to layout's custom focus chain
-   *
-   * e.g) elm_object_focus_custom_chain_append(parent, mElmAccessObject, NULL);
-   */
-}
-
-void EvasPlugin::DeleteElmAccessObject()
-{
-  if(mElmAccessObject)
-  {
-    // elm access action callbacks and elm_access_object will be deleted in unregister
-    elm_access_object_unregister(mEvasImageObject);
-    mElmAccessObject = NULL;
-  }
-}
-
-void EvasPlugin::CreateElmFocusObject(Evas_Object* parent)
-{
-  // create a button and set style as "focus", if does not want to show the focus, then "transparent"
-  mElmFocusObject = elm_button_add(parent);
-  // don't need to show the focus boundary here
-  elm_object_style_set(mElmFocusObject, "transparent");
-
-  // set the evas image object to focus object, but event should not be propagated
-  elm_object_part_content_set(mElmFocusObject, "elm.swallow.content", mEvasImageObject);
-  evas_object_propagate_events_set(mEvasImageObject, EINA_FALSE);
-
-  // set the evas object you want to make focusable as the content of the swallow part
-  evas_object_size_hint_weight_set(mElmFocusObject, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-  evas_object_size_hint_align_set(mElmFocusObject, EVAS_HINT_FILL, EVAS_HINT_FILL);
-
-  evas_object_smart_callback_add(mElmFocusObject, "focused", _elm_focus_object_focus_in_cb, this);
-  evas_object_smart_callback_add(mElmFocusObject, "unfocused", _elm_focus_object_focus_out_cb, this);
-
-  evas_object_show(mElmFocusObject);
-}
-
-void EvasPlugin::DeleteElmFocusObject()
-{
-  if(mElmFocusObject)
-  {
-    evas_object_smart_callback_del(mElmFocusObject, "focused", _elm_focus_object_focus_in_cb);
-    evas_object_smart_callback_del(mElmFocusObject, "unfocused", _elm_focus_object_focus_out_cb);
-
-    evas_object_del(mElmFocusObject);
-    mElmFocusObject = NULL;
-  }
-}
-
-void EvasPlugin::CreateAdaptor(unsigned int initialWidth, unsigned int initialHeight)
-{
-  mSurface = CreateSurface(initialWidth, initialHeight);
-
-  mAdaptor = Internal::Adaptor::Adaptor::New( mSurface, DeviceLayout::DEFAULT_BASE_LAYOUT );
-
-  Any surface = mSurface->GetSurface();
-
-  Ecore_X_Pixmap pixmap = AnyCast<Ecore_X_Pixmap>(surface);
-
-  /* set native pixmap surface */
-  Evas_Native_Surface ns;
-  ns.type = EVAS_NATIVE_SURFACE_X11;
-  ns.version = EVAS_NATIVE_SURFACE_VERSION;
-  ns.data.x11.pixmap = pixmap;
-  ns.data.x11.visual = NULL;
-
-  evas_object_image_native_surface_set(mEvasImageObject, &ns);
-}
-
-ECore::RenderSurface* EvasPlugin::CreateSurface( int width, int height )
-{
-  PositionSize pixmapSize( 0, 0, width, height );
-  Any surface;
-  Any display;
-  // if we already have surface, reuse its display
-  if( mSurface )
-  {
-    display = mSurface->GetMainDisplay();
-  }
-
-  // create a X11 pixmap
-  ECore::RenderSurface* daliSurface = ECore::CreatePixmapSurface( pixmapSize, surface, display, "no name", mIsTransparent );
-
-  daliSurface->SetRenderNotification( mRenderNotification );
-
-  return daliSurface;
-}
-
-void EvasPlugin::ResizeSurface()
-{
-  // remember old surface
-  Dali::RenderSurface* oldSurface = mSurface;
-  mSurface = CreateSurface( mEvasImageObjectGeometry.width, mEvasImageObjectGeometry.height );
-
-  // ask the replace the surface inside dali
-  Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).ReplaceSurface( *mSurface ); // this method is synchronous => guarantee until rendering next frame
-
-  // update the pixmap for evas
-  {
-    Any surface = mSurface->GetSurface();
-    Ecore_X_Pixmap pixmap = AnyCast<Ecore_X_Pixmap>( surface );
-
-    Evas_Native_Surface ns;
-    ns.type = EVAS_NATIVE_SURFACE_X11;
-    ns.version = EVAS_NATIVE_SURFACE_VERSION;
-    ns.data.x11.pixmap = pixmap;
-    ns.data.x11.visual = NULL;
-
-    evas_object_image_native_surface_set(mEvasImageObject, &ns);
-
-    // its now safe to delete the old surface
-    delete oldSurface;
-  }
-
-  OnResize();
-}
-
-void EvasPlugin::ConnectEcoreEvent()
-{
-  // Get Ecore_Evas using Evas.
-  Ecore_Evas* ecoreEvas = ecore_evas_ecore_evas_get( mEvas );
-
-  if( ecoreEvas )  // Check invalid or valid.
-  {
-    // Get window from Ecore_Evas.
-    Ecore_X_Window window = ecore_evas_gl_x11_window_get( ecoreEvas );
-
-    // Set the application window at ime context.
-    Dali::ImfManager imfManager = Dali::ImfManager::Get();
-    Ecore_IMF_Context* imfContext = reinterpret_cast<Ecore_IMF_Context*>( imfManager.GetContext() );
-    ecore_imf_context_client_window_set( imfContext, reinterpret_cast<void*>( window ) );
-
-    if( window )  // Check invalid or valid.
-    {
-      // Connect clipboard events.
-      mEcoreEventHandler.push_back( ecore_event_handler_add(ECORE_X_EVENT_SELECTION_CLEAR, _ecore_x_event_selection_clear, this) );
-      mEcoreEventHandler.push_back( ecore_event_handler_add(ECORE_X_EVENT_SELECTION_NOTIFY, _ecore_x_event_selection_notify, this) );
-
-      // Register Client message events - accessibility etc.
-      mEcoreEventHandler.push_back( ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE, _ecore_x_event_client_message, this) );
-    }
-  }
-}
-
-void EvasPlugin::DisconnectEcoreEvent()
-{
-  for( std::vector<Ecore_Event_Handler*>::iterator iter = mEcoreEventHandler.begin(), endIter = mEcoreEventHandler.end(); iter != endIter; ++iter )
-  {
-    ecore_event_handler_del( *iter );
-  }
-
-  mEcoreEventHandler.clear();
-}
-
-void EvasPlugin::Run()
-{
-  if(mState == Ready)
-  {
-    // Run the adaptor
-    mAdaptor->Start();
-    mState = Running;
-
-    OnInit();
-  }
-}
-
-void EvasPlugin::Pause()
-{
-  if(mState == Running)
-  {
-    mAdaptor->Pause();
-    mState = Suspended;
-
-    mPauseSignalV2.Emit( mEvasPlugin );
-  }
-}
-
-void EvasPlugin::Resume()
-{
-  if(mState == Suspended)
-  {
-    mAdaptor->Resume();
-    mState = Running;
-
-    mResumeSignalV2.Emit( mEvasPlugin );
-  }
-
-  // forcely dirty_set the evas_object on idle time
-  ClearIdler();
-  mEvasDirtyIdler = ecore_idler_add(_evas_object_dirty_set_idle_cb, this);
-}
-
-void EvasPlugin::ClearIdler(bool deleteHandle)
-{
-  if(mEvasDirtyIdler)
-  {
-    if(deleteHandle)
-    {
-      ecore_idler_del(mEvasDirtyIdler);
-    }
-    mEvasDirtyIdler = NULL;
-  }
-}
-
-void EvasPlugin::Stop()
-{
-  if(mState != Stopped)
-  {
-    // Stop the adaptor
-    mAdaptor->Stop();
-    mState = Stopped;
-
-    mTerminateSignalV2.Emit( mEvasPlugin );
-  }
-}
-Evas_Object* EvasPlugin::GetEvasImageObject()
-{
-  return mEvasImageObject;
-}
-
-Evas_Object* EvasPlugin::GetElmAccessObject()
-{
-  return mElmAccessObject;
-}
-
-Evas_Object* EvasPlugin::GetElmFocusObject()
-{
-  return mElmFocusObject;
-}
-
-void EvasPlugin::OnInit()
-{
-  mInitialized = true;
-
-  mInitSignalV2.Emit( mEvasPlugin );
-}
-
-void EvasPlugin::OnFirstRenderCompleted()
-{
-  mFirstRenderCompletedSignalV2.Emit( mEvasPlugin );
-
-  mFirstRenderCompleteNotified = true;
-}
-
-void EvasPlugin::Move()
-{
-  Evas_Coord x, y, w, h;
-  evas_object_geometry_get(mEvasImageObject, &x, &y, &w, &h);
-
-  // update geometry
-  mEvasImageObjectGeometry.x = x;
-  mEvasImageObjectGeometry.y = y;
-  mEvasImageObjectGeometry.width = w;
-  mEvasImageObjectGeometry.height = h;
-
-  DALI_LOG_INFO( gEvasPluginLogFilter, Debug::General, "EvasPlugin::Move : %d, %d, %d x %d\n", x, y, w, h );
-}
-
-void EvasPlugin::Resize()
-{
-  Evas_Coord x, y, w, h;
-  evas_object_geometry_get(mEvasImageObject, &x, &y, &w, &h);
-
-  // skip meaningless resize signal
-  if(w <= 1 || h <= 1)
-  {
-    return;
-  }
-
-  if(mEvasImageObjectGeometry.width == w && mEvasImageObjectGeometry.height == h)
-  {
-    return;
-  }
-
-  DALI_LOG_INFO( gEvasPluginLogFilter, Debug::General, "old size (%d x %d), new size (%d x %d)\n", mEvasImageObjectGeometry.width, mEvasImageObjectGeometry.height, w, h );
-
-  // update geometry
-  mEvasImageObjectGeometry.x = x;
-  mEvasImageObjectGeometry.y = y;
-  mEvasImageObjectGeometry.width = w;
-  mEvasImageObjectGeometry.height = h;
-
-  ResizeSurface();
-}
-
-void EvasPlugin::OnResize()
-{
-  if(mInitialized)
-  {
-    // emit resized signal to application
-    mResizeSignalV2.Emit( mEvasPlugin );
-  }
-}
-
-void EvasPlugin::Render()
-{
-  // dirty set while adaptor is running
-  if( EvasPlugin::Running == mState )
-  {
-    /* dirty set to post the result of rendering via evas */
-    evas_object_image_pixels_dirty_set( mEvasImageObject, EINA_TRUE );
-  }
-}
-
-void EvasPlugin::OnTouchEvent(TouchPoint& point, int timeStamp)
-{
-  if ( mAdaptor )
-  {
-    if(timeStamp < 1)
-    {
-      timeStamp = GetCurrentMilliSeconds();
-    }
-
-    Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).FeedTouchPoint( point, timeStamp );
-  }
-}
-
-void EvasPlugin::OnKeyEvent(KeyEvent& keyEvent)
-{
-  // Create KeyEvent and send to Core.
-  if ( mAdaptor )
-  {
-    Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).FeedKeyEvent( keyEvent );
-  }
-}
-
-void EvasPlugin::OnMouseWheelEvent(MouseWheelEvent& wheelEvent)
-{
-  if ( mAdaptor )
-  {
-    Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).FeedWheelEvent( wheelEvent );
-  }
-}
-
-void EvasPlugin::OnImfActivated(Dali::ImfManager& imfManager)
-{
-  // When imf is activated, set focus to own evas-object to get key events
-  evas_object_focus_set(mEvasImageObject, EINA_TRUE);
-}
-
-void EvasPlugin::RenderSync()
-{
-  if( NULL != mAdaptor )
-  {
-    Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).RenderSync();
-  }
-}
-
-bool EvasPlugin::OnAccessibilityActionEvent(Elm_Access_Action_Type actionType, Elm_Access_Action_Info* actionInfo, int x, int y)
-{
-  bool ret = false;
-
-  if( NULL == mAdaptor || NULL == actionInfo )
-  {
-    return ret;
-  }
-
-  Dali::AccessibilityManager accessibilityManager = Dali::AccessibilityManager::Get();
-  if( accessibilityManager )
-  {
-    int touchType = actionInfo->mouse_type;
-    int touchX = x >= 0 ? x : actionInfo->x;
-    int touchY = y >= 0 ? y : actionInfo->y;
-
-    switch(actionType)
-    {
-      case ELM_ACCESS_ACTION_HIGHLIGHT:
-      case ELM_ACCESS_ACTION_READ:
-      {
-        ret = accessibilityManager.HandleActionReadEvent((unsigned int)x, (unsigned int)y, true);
-      }
-      break;
-
-      case ELM_ACCESS_ACTION_OVER:
-      {
-        ret = accessibilityManager.HandleActionReadEvent((unsigned int)x, (unsigned int)y, false);
-      }
-      break;
-
-      case ELM_ACCESS_ACTION_HIGHLIGHT_PREV:
-      {
-        // if actionInfo->highlight_end is true, need to handle end_of_list sound feedback
-        ret = accessibilityManager.HandleActionPreviousEvent(actionInfo->highlight_end);
-        if(!ret)
-        {
-          // when focus moving was failed, clear the focus
-          accessibilityManager.HandleActionClearFocusEvent();
-        }
-      }
-      break;
-
-      case ELM_ACCESS_ACTION_HIGHLIGHT_NEXT:
-      {
-        // if actionInfo->highlight_end is true, need to handle end_of_list sound feedback
-        ret = accessibilityManager.HandleActionNextEvent(actionInfo->highlight_end);
-        if(!ret)
-        {
-          // when focus moving was failed, clear the focus
-          accessibilityManager.HandleActionClearFocusEvent();
-        }
-      }
-      break;
-
-      case ELM_ACCESS_ACTION_ACTIVATE:
-      {
-        ret = accessibilityManager.HandleActionActivateEvent();
-      }
-      break;
-
-      case ELM_ACCESS_ACTION_UNHIGHLIGHT:
-      {
-        ret = accessibilityManager.HandleActionClearFocusEvent();
-      }
-      break;
-
-      case ELM_ACCESS_ACTION_SCROLL:
-      {
-        TouchPoint::State state(TouchPoint::Down);
-
-        if (touchType == 0)
-        {
-          state = TouchPoint::Down; // mouse down
-        }
-        else if (touchType == 1)
-        {
-          state = TouchPoint::Motion; // mouse move
-        }
-        else if (touchType == 2)
-        {
-          state = TouchPoint::Up; // mouse up
-        }
-        else
-        {
-          state = TouchPoint::Interrupted; // error
-        }
-
-        // Send touch event to accessibility manager.
-        TouchPoint point( 0, state, (float)touchX, (float)touchY );
-        ret = accessibilityManager.HandleActionScrollEvent(point, GetCurrentMilliSeconds());
-      }
-      break;
-
-      case ELM_ACCESS_ACTION_UP:
-      {
-        ret = accessibilityManager.HandleActionUpEvent();
-      }
-      break;
-
-      case ELM_ACCESS_ACTION_DOWN:
-      {
-        ret = accessibilityManager.HandleActionDownEvent();
-      }
-      break;
-
-      case ELM_ACCESS_ACTION_MOUSE:
-      {
-        // generate normal mouse event
-        TouchPoint::State state(TouchPoint::Down);
-
-        if (touchType == 0)
-        {
-          state = TouchPoint::Down; // mouse down
-        }
-        else if (touchType == 1)
-        {
-          state = TouchPoint::Motion; // mouse move
-        }
-        else if (touchType == 2)
-        {
-          state = TouchPoint::Up; // mouse up
-        }
-        else
-        {
-          state = TouchPoint::Interrupted; // error
-        }
-
-        // Send touch event to accessibility manager.
-        TouchPoint point( 0, state, (float)touchX, (float)touchY );
-        ret = accessibilityManager.HandleActionTouchEvent(point, GetCurrentMilliSeconds());
-      }
-      break;
-
-      case ELM_ACCESS_ACTION_BACK:
-      default:
-      {
-        DALI_LOG_WARNING("[%s:%d]\n", __FUNCTION__, __LINE__);
-      }
-
-      break;
-    }
-  }
-  else
-  {
-    DALI_LOG_WARNING("[%s:%d]\n", __FUNCTION__, __LINE__);
-  }
-
-  DALI_LOG_INFO(gEvasPluginLogFilter, Debug::General, "[%s:%d] [action : %d] focus manager returns %s\n", __FUNCTION__, __LINE__, (int)(actionType), ret?"TRUE":"FALSE");
-
-  return ret;
-
-}
-
-void EvasPlugin::OnEvasObjectFocusedIn()
-{
-  if(mHasFocus)
-  {
-    return;
-  }
-  mHasFocus = true;
-
-  // If the evas object gains focus and we hide the keyboard then show it again.
-  if( Dali::Adaptor::IsAvailable() )
-  {
-    ConnectEcoreEvent();
-
-    Dali::ImfManager imfManager( Dali::ImfManager::Get() );
-    if( imfManager && imfManager.RestoreAfterFocusLost() )
-    {
-      imfManager.Activate();
-    }
-
-    // No need to connect callbacks as KeyboardStatusChanged will be called.
-
-    // emit focused signal to application
-    mFocusedSignalV2.Emit( mEvasPlugin );
-  }
-}
-
-void EvasPlugin::OnEvasObjectFocusedOut()
-{
-  if(!mHasFocus)
-  {
-    return;
-  }
-  mHasFocus = false;
-
-  // If the evas object loses focus then hide the keyboard.
-  if ( Dali::Adaptor::IsAvailable() )
-  {
-    Dali::ImfManager imfManager( Dali::ImfManager::Get() );
-    if( imfManager && imfManager.RestoreAfterFocusLost() )
-    {
-      imfManager.Deactivate();
-    }
-
-    // Clipboard don't support that whether clipboard is shown or not. Hide clipboard.
-    Dali::Clipboard clipboard = Dali::Clipboard::Get();
-    clipboard.HideClipboard();
-
-    DisconnectEcoreEvent();
-
-    // emit unfocused signal to application
-    mUnFocusedSignalV2.Emit( mEvasPlugin );
-  }
-}
-
-void EvasPlugin::OnEcoreEventSelectionCleared( void* data, int type, void* event )
-{
-  Ecore_X_Event_Selection_Clear* selectionClearEvent( (Ecore_X_Event_Selection_Clear*) event );
-
-  if( selectionClearEvent->selection == ECORE_X_SELECTION_SECONDARY )
-  {
-    // Request to get the content from Ecore.
-    ecore_x_selection_secondary_request(selectionClearEvent->win, ECORE_X_SELECTION_TARGET_TEXT);
-  }
-}
-
-void EvasPlugin::OnEcoreEventSelectionNotified(void* data, int type, void* event)
-{
-  Ecore_X_Event_Selection_Notify* selectionNotifyEvent( (Ecore_X_Event_Selection_Notify*) event );
-
-  if( selectionNotifyEvent->selection == ECORE_X_SELECTION_SECONDARY )
-  {
-    // We have got the selected content, inform the clipboard event listener (if we have one).
-    Dali::ClipboardEventNotifier clipboardEventNotifier = Dali::ClipboardEventNotifier::Get();
-    Ecore_X_Selection_Data* selectionData( (Ecore_X_Selection_Data*) selectionNotifyEvent->data );
-
-    if ( clipboardEventNotifier )
-    {
-      std::string content( (char*) selectionData->data, selectionData->length );
-
-      if( !content.empty() )
-      {
-        clipboardEventNotifier.SetContent( content );
-        clipboardEventNotifier.EmitContentSelectedSignal();
-      }
-    }
-
-    // Claim the ownership of the SECONDARY selection.
-    ecore_x_selection_secondary_set(selectionNotifyEvent->win, "", 1);
-  }
-}
-
-void EvasPlugin::OnEcoreEventClientMessaged(void* data, int type, void* event)
-{
-  Ecore_X_Event_Client_Message* clientMessageEvent( (Ecore_X_Event_Client_Message*)event );
-
-  if(clientMessageEvent->message_type == ecore_x_atom_get(CLIPBOARD_ATOM))
-  {
-    std::string message(clientMessageEvent->data.b);
-    if( message == CLIPBOARD_SET_OWNER_MESSAGE)
-    {
-      // Claim the ownership of the SECONDARY selection.
-      ecore_x_selection_secondary_set(clientMessageEvent->win, "", 1);
-
-      // Show the clipboard window
-      Dali::Clipboard clipboard = Dali::Clipboard::Get();
-      clipboard.ShowClipboard();
-    }
-  }
-}
-
-void EvasPlugin::SignalConnected( SlotObserver* slotObserver, CallbackBase* callback )
-{
-  mConnectionTracker.SignalConnected( slotObserver, callback );
-}
-
-void EvasPlugin::SignalDisconnected( SlotObserver* signal, CallbackBase* callback )
-{
-  mConnectionTracker.SignalDisconnected( signal, callback );
-}
-
-std::size_t EvasPlugin::GetConnectionCount() const
-{
-  return mConnectionTracker.GetConnectionCount();
-}
-
-} // namespace Adaptor
-
-} // namespace Internal
-
-} // namespace Dali
diff --git a/adaptors/mobile/evas-plugin-impl.h b/adaptors/mobile/evas-plugin-impl.h
deleted file mode 100644 (file)
index edcf997..0000000
+++ /dev/null
@@ -1,425 +0,0 @@
-#ifndef __DALI_INTERNAL_EVAS_PLUGIN_H__
-#define __DALI_INTERNAL_EVAS_PLUGIN_H__
-
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- * 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.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <boost/bind.hpp>
-#include <boost/function.hpp>
-#include <boost/thread.hpp>
-#include <cstdlib>
-#include <X11/Xatom.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
-#include <Elementary.h>
-#include <Evas.h>
-#include <Ecore.h>
-#include <Ecore_X.h>
-#include <Ecore_Input.h>
-
-#include <dali/public-api/math/rect.h>
-#include <dali/public-api/math/vector2.h>
-#include <dali/integration-api/events/touch-event-integ.h>
-#include <dali/integration-api/events/key-event-integ.h>
-
-// INTERNAL INCLUDES
-#include <imf-manager.h>
-#include <evas-plugin.h>
-
-#include <virtual-keyboard-impl.h>
-#include <clipboard-impl.h>
-
-namespace Dali
-{
-
-class Adaptor;
-
-namespace Internal
-{
-
-namespace Adaptor
-{
-class TriggerEvent;
-
-typedef Dali::Rect<int> PositionSize;
-
-namespace ECore
-{
-class RenderSurface;
-}
-
-/**
- * Implementation of the EvasPlugin class.
- */
-class EvasPlugin : public ConnectionTrackerInterface
-{
-public:
-
-  typedef Dali::EvasPlugin::EvasPluginSignalV2 EvasPluginSignalV2;
-
-  /**
-   * Constructor
-   * @param[in] evasPlugin The public instance of the EvasPlugin
-   * @param[in] parent A pointer of the parent object
-   * @param[in] isTransparent Whether the object is transparent or not
-   * @param[in] initialWidth width for canvas
-   * @param[in] initialHeight height for canvas
-   */
-  EvasPlugin(Dali::EvasPlugin& evasPlugin, Evas_Object* parent, bool isTransparent, unsigned int initialWidth, unsigned int initialHeight);
-
-  /**
-   * Destructor
-   */
-  virtual ~EvasPlugin();
-
-public:
-
-  /**
-   * @copydoc Dali::EvasPlugin::Start()
-   */
-  virtual void Run();
-
-  /**
-   * @copydoc Dali::EvasPlugin::Pause()
-   */
-  virtual void Pause();
-
-  /**
-   * @copydoc Dali::EvasPlugin::Resume()
-   */
-  virtual void Resume();
-
-  /**
-   * @copydoc Dali::EvasPlugin::Stop()
-   */
-  virtual void Stop();
-
-  /**
-   * @copydoc Dali::EvasPlugin::GetEvasImageObject()
-   */
-  Evas_Object* GetEvasImageObject();
-
-  /**
-   * @copydoc Dali::EvasPlugin::GetElmAccessObject()
-   */
-  Evas_Object* GetElmAccessObject();
-
-  /**
-   * @copydoc Dali::EvasPlugin::GetElmFocusObject()
-   */
-  Evas_Object* GetElmFocusObject();
-
-  /**
-   * @copydoc Dali::EvasPlugin::GetAdaptor()
-   */
-  Dali::Adaptor* GetAdaptor() { return mAdaptor;}
-
-public:
-
-  /**
-   * Called when the adaptor is initialised.
-   */
-  void OnInit();
-
-  /**
-   * Called to notify that Dali has started rendering and atleast one frame has been rendered
-   */
-  void OnFirstRenderCompleted();
-
-  /**
-   * Resize the surface, Called when evas_object_image resized
-   */
-  void Resize();
-
-  /**
-   * Move the surface, Called when evas_object_image moved
-   */
-  void Move();
-
-  /**
-   * Called when the rendering surface is resized
-   */
-  void OnResize();
-
-  /**
-   * Render the pixmap
-   */
-  void Render();
-
-  /**
-   * Called when the event dispatched in evas object area.
-   * @param[in] point touch point structure
-   * @param[in] timeStamp event timestamp, if it is less than 1, this function will generate current time stamp
-   */
-  void OnTouchEvent(TouchPoint& point, int timeStamp);
-
-  /**
-   * Called when the mouse wheel event dispatched  in evas object area.
-   * @param[in]  wheelEvent  The mouse wheel event
-   */
-  void OnMouseWheelEvent( MouseWheelEvent& wheelEvent );
-
-  /**
-   * Called when the key event dispatched in evas object area.
-   * @param[in]  keyEvent  The key event.
-   */
-  void OnKeyEvent(KeyEvent& keyEvent);
-
-  /**
-   * Called when the accessibility action event dispatched from elm_access.
-   * @param[in] actionType elm accessibility action type structure
-   * @param[in] x x position for action, it could be unnecessary
-   * @param[in] y y position for action, it could be unnecessary
-   * @param[in] type mouse event type, it could be unnecessary
-   * @return True if the event was handled
-   */
-  bool OnAccessibilityActionEvent(Elm_Access_Action_Type actionType, Elm_Access_Action_Info* actionInfo, int x = -1, int y = -1);
-
-  /**
-   * Called when evqas object gain focus.
-   */
-  void OnEvasObjectFocusedIn();
-
-  /**
-   * Called when evas object lost focus
-   */
-  void OnEvasObjectFocusedOut();
-
-  /**
-   * Called when the source window notifies us the content in clipboard is selected.
-   * @param[in] data A data pointer.
-   * @param[in] type A type of event.
-   * @param[in] event A event information pointer.
-   */
-  void OnEcoreEventSelectionCleared(void* data, int type, void* event);
-
-  /**
-   * Called when the source window sends us about the selected content.
-   * For example, when dragged items are dragged INTO our window or when items are selected in the clipboard.
-   * @param[in] data A data pointer.
-   * @param[in] type A type of event.
-   * @param[in] event A event information pointer.
-   */
-  void OnEcoreEventSelectionNotified(void* data, int type, void* event);
-
-  /**
-   * Called when the client messages (i.e. the accessibility events) are received.
-   * @param[in] data A data pointer.
-   * @param[in] type A type of event.
-   * @param[in] event A event information pointer.
-   */
-  void OnEcoreEventClientMessaged(void* data, int type, void* event);
-
-  /**
-   * Called when the result of rendering was posted to on-screen.
-   * Adaptor (i.e. render thread) can be waiting this sync to render next frame.
-   */
-  void RenderSync();
-
-  /**
-   * It returns geometry information of evas-object
-   * @return geometry information of evas-object
-   */
-  PositionSize GetEvasObjectGeometry() const { return mEvasImageObjectGeometry; }
-
-  /**
-   * Clear ecore idler handler
-   * @param[in] deleteHandle false if it does not need to delete the idler handle
-   *            (e.g. when idler callback returns ECORE_CALLBACK_CANCEL, handler will be deleted automatically)
-   */
-  void ClearIdler(bool deleteHandle = true);
-
-  /**
-   * @copydoc ConnectionTrackerInterface::SignalConnected
-   */
-  virtual void SignalConnected( SlotObserver* slotObserver, CallbackBase* callback );
-
-  /**
-   * @copydoc ConnectionTrackerInterface::SignalDisconnected
-   */
-  virtual void SignalDisconnected( SlotObserver* slotObserver, CallbackBase* callback );
-
-  /**
-   * @copydoc ConnectionTrackerInterface::GetConnectionCount
-   */
-  virtual std::size_t GetConnectionCount() const;
-
-public:  // Signals
-
-  /**
-   * @copydoc Dali::EvasPlugin::InitSignal()
-   */
-  EvasPluginSignalV2& InitSignal() { return mInitSignalV2; }
-
-  /**
-   * @copydoc Dali::EvasPlugin::FirstRenderCompletedSignal()
-   */
-  EvasPluginSignalV2& FirstRenderCompletedSignal() { return mFirstRenderCompletedSignalV2; }
-
-  /**
-   * @copydoc Dali::EvasPlugin::TerminateSignal()
-   */
-  EvasPluginSignalV2& TerminateSignal() { return mTerminateSignalV2; }
-
-  /**
-   * @copydoc Dali::EvasPlugin::PauseSignal()
-   */
-  EvasPluginSignalV2& PauseSignal() { return mPauseSignalV2; }
-
-  /**
-   * @copydoc Dali::EvasPlugin::ResumeSignal()
-   */
-  EvasPluginSignalV2& ResumeSignal() { return mResumeSignalV2; }
-
-  /**
-   * @copydoc Dali::EvasPlugin::ResizeSignal()
-   */
-  EvasPluginSignalV2& ResizeSignal() { return mResizeSignalV2; }
-
-  /**
-   * @copydoc Dali::EvasPlugin::FocusedSignal()
-   */
-  EvasPluginSignalV2& FocusedSignal() { return mFocusedSignalV2; }
-
-  /**
-   * @copydoc Dali::EvasPlugin::UnFocusedSignal()
-   */
-  EvasPluginSignalV2& UnFocusedSignal() { return mUnFocusedSignalV2; }
-
-private:
-
-  // Undefined
-  EvasPlugin(const EvasPlugin&);
-  EvasPlugin& operator=(EvasPlugin&);
-
-private:
-
-  /**
-   * Create / Delete the evas image object
-   */
-  void CreateEvasImageObject(Evas* evas, unsigned int initialWidth, unsigned int initialHeight, bool isTransparent);
-  void DeleteEvasImageObject();
-
-  /**
-   * Create / Delete the elm access object
-   */
-  void CreateElmAccessObject(Evas_Object* parent);
-  void DeleteElmAccessObject();
-
-  /**
-   * Create / Delete the elm focus object
-   */
-  void CreateElmFocusObject(Evas_Object* parent);
-  void DeleteElmFocusObject();
-
-  /**
-   * Creates the adaptor
-   */
-  void CreateAdaptor(unsigned int initialWidth, unsigned int initialHeight);
-
-  /**
-   * Creates the render surface
-   * @param width of the surface
-   * @param height of the surface
-   * @return the new surface
-   */
-  ECore::RenderSurface* CreateSurface( int width, int height );
-
-  /**
-   * Resize the surface
-   * To resize, create new surface with evas object's size and replace with it.
-   */
-  void ResizeSurface();
-
-  /**
-   * Connect ecore event if the evas plugin has Ecore_X_Window.
-   */
-  void ConnectEcoreEvent();
-
-  /**
-   * Disconnect all connected event.
-   */
-  void DisconnectEcoreEvent();
-
-  /**
-   * For ImfActivated signal
-   * When the imf is activated, it will handle the focus
-   * @param[in] imfManager imfManager instance
-   */
-  void OnImfActivated(Dali::ImfManager& imfManager);
-
-public:
-  enum State
-  {
-    Ready,
-    Running,
-    Suspended,
-    Stopped,
-  };
-
-  State                                       mState;
-
-public:
-  /* for rendering control : these public members will be used in static function */
-  Evas_Object*                                mEvasImageObject;
-  Evas_Object*                                mElmAccessObject;
-  Evas_Object*                                mElmFocusObject;
-  ECore::RenderSurface*                       mSurface;
-  bool                                        mFirstRenderCompleteNotified;
-
-private:
-
-  EvasPluginSignalV2      mInitSignalV2;
-  EvasPluginSignalV2      mFirstRenderCompletedSignalV2;
-  EvasPluginSignalV2      mTerminateSignalV2;
-  EvasPluginSignalV2      mPauseSignalV2;
-  EvasPluginSignalV2      mResumeSignalV2;
-  EvasPluginSignalV2      mResizeSignalV2;
-  EvasPluginSignalV2      mFocusedSignalV2;
-  EvasPluginSignalV2      mUnFocusedSignalV2;
-
-  Dali::EvasPlugin&                           mEvasPlugin;
-
-  Dali::Adaptor*                              mAdaptor;
-
-  Evas*                                       mEvas;
-  PositionSize                                mEvasImageObjectGeometry;
-
-  bool                                        mInitialized;
-  bool                                        mIsTransparent;
-  bool                                        mHasFocus;
-  TriggerEvent*                               mRenderNotification; ///< Render Notification trigger
-
-  Ecore_Idler *                               mEvasDirtyIdler; ///< Ecore idler for updating image object when it resumed
-
-  std::vector<Ecore_Event_Handler*>           mEcoreEventHandler; ///< Vector of Ecore_Event_Handler
-
-  Dali::ConnectionTracker                     mConnectionTracker; ///< Used to implement ConnectionTrackerInterface
-
-public:
-  inline static EvasPlugin& GetImplementation(Dali::EvasPlugin& evasPlugin) { return *evasPlugin.mImpl; }
-};
-
-} // namespace Adaptor
-
-} // namespace Internal
-
-} // namespace Dali
-
-#endif // __DALI_INTERNAL_EVAS_PLUGIN_H__
diff --git a/adaptors/mobile/evas-plugin.cpp b/adaptors/mobile/evas-plugin.cpp
deleted file mode 100644 (file)
index 4fbc61b..0000000
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- * 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.
- *
- */
-
-// CLASS HEADER
-#include <public-api/evas-plugin.h>
-
-// EXTERNAL INCLUDES
-
-// INTERNAL INCLUDES
-#include <dali/integration-api/debug.h>
-
-#include <mobile/evas-plugin-impl.h>
-
-namespace Dali
-{
-
-EvasPlugin::EvasPlugin(Evas_Object* parent, bool isTransparent, unsigned int initialWidth, unsigned int initialHeight)
-{
-  mImpl = new Internal::Adaptor::EvasPlugin(*this, parent, isTransparent, initialWidth, initialHeight);
-}
-
-EvasPlugin::~EvasPlugin()
-{
-  delete mImpl;
-}
-
-void EvasPlugin::Run()
-{
-  mImpl->Run();
-}
-
-void EvasPlugin::Pause()
-{
-  mImpl->Pause();
-}
-
-void EvasPlugin::Resume()
-{
-  mImpl->Resume();
-}
-
-void EvasPlugin::Stop()
-{
-  mImpl->Stop();
-}
-
-Evas_Object* EvasPlugin::GetEvasImageObject()
-{
-  return mImpl->GetEvasImageObject();
-}
-
-Evas_Object*  EvasPlugin::GetElmAccessObject()
-{
-  return mImpl->GetElmAccessObject();
-}
-
-Evas_Object*  EvasPlugin::GetElmFocusObject()
-{
-  return mImpl->GetElmFocusObject();
-}
-
-Dali::Adaptor* EvasPlugin::GetAdaptor()
-{
-  return mImpl->GetAdaptor();
-}
-
-EvasPlugin::EvasPluginSignalV2& EvasPlugin::InitSignal()
-{
-  return mImpl->InitSignal();
-}
-
-EvasPlugin::EvasPluginSignalV2& EvasPlugin::FirstRenderCompletedSignal()
-{
-  return mImpl->FirstRenderCompletedSignal();
-}
-
-EvasPlugin::EvasPluginSignalV2& EvasPlugin::TerminateSignal()
-{
-  return mImpl->TerminateSignal();
-}
-
-EvasPlugin::EvasPluginSignalV2& EvasPlugin::PauseSignal()
-{
-  return mImpl->PauseSignal();
-}
-
-EvasPlugin::EvasPluginSignalV2& EvasPlugin::ResumeSignal()
-{
-  return mImpl->ResumeSignal();
-}
-
-EvasPlugin::EvasPluginSignalV2& EvasPlugin::ResizeSignal()
-{
-  return mImpl->ResizeSignal();
-}
-
-EvasPlugin::EvasPluginSignalV2& EvasPlugin::FocusedSignal()
-{
-  return mImpl->FocusedSignal();
-}
-
-EvasPlugin::EvasPluginSignalV2& EvasPlugin::UnFocusedSignal()
-{
-  return mImpl->UnFocusedSignal();
-}
-
-/**
- * @copydoc ConnectionTrackerInterface::SignalConnected
- */
-void EvasPlugin::SignalConnected( SlotObserver* slotObserver, CallbackBase* callback )
-{
-  mImpl->SignalConnected(slotObserver, callback );
-}
-
-/**
- * @copydoc ConnectionTrackerInterface::SignalDisconnected
- */
-void EvasPlugin::SignalDisconnected( SlotObserver* slotObserver, CallbackBase* callback )
-{
-  mImpl->SignalDisconnected(slotObserver, callback );
-}
-
-/**
- * @copydoc ConnectionTrackerInterface::GetConnectionCount
- */
-std::size_t EvasPlugin::GetConnectionCount() const
-{
-  return mImpl->GetConnectionCount( );
-}
-
-} // namespace Dali
index d147f5f..b74e139 100644 (file)
@@ -1,6 +1,5 @@
 # mobile profile internal files
 adaptor_common_internal_src_files += \
   $(adaptor_common_dir)/../mobile/mobile-render-surface-factory.cpp \
-  $(adaptor_common_dir)/../mobile/mobile-native-buffer-render-surface.cpp \
   $(adaptor_common_dir)/../mobile/mobile-system-settings.cpp \
   $(adaptor_common_dir)/../mobile/mobile-color-controller-impl.cpp
\ No newline at end of file
diff --git a/adaptors/mobile/mobile-native-buffer-render-surface.cpp b/adaptors/mobile/mobile-native-buffer-render-surface.cpp
deleted file mode 100644 (file)
index b2cc5a7..0000000
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- * 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.
- *
- */
-
-// CLASS HEADER
-#include "mobile-native-buffer-render-surface.h"
-
-// EXTERNAL INCLUDES
-#include <dali/integration-api/debug.h>
-#include <dali/integration-api/gl-abstraction.h>
-#include <native-buffer-pool.h>
-
-// INTERANL INCLUDES
-#include <gl/egl-implementation.h>
-#include <trigger-event.h>
-
-namespace Dali
-{
-
-namespace Internal
-{
-
-namespace Adaptor
-{
-
-#if defined(DEBUG_ENABLED)
-extern Debug::Filter* gRenderSurfaceLogFilter;
-#endif
-
-namespace ECore
-{
-
-NativeBufferRenderSurface::NativeBufferRenderSurface( native_buffer_provider* provider,
-                                                      native_buffer_pool* pool,
-                                                      unsigned int maxBufferCount,
-                                                      Dali::PositionSize positionSize,
-                                                      Any surface,
-                                                      Any display,
-                                                      const std::string& name,
-                                                      bool isTransparent )
-: RenderSurface( Dali::RenderSurface::NATIVE_BUFFER, positionSize, surface, display, "native_buffer", isTransparent ),
-  mProvider( provider ),
-  mPool( pool ),
-  mMaxBufferCount( maxBufferCount ),
-  mIsAcquired( false )
-{
-  DALI_ASSERT_ALWAYS(maxBufferCount > 0);
-  Init( surface );
-}
-
-NativeBufferRenderSurface::~NativeBufferRenderSurface()
-{
-  DALI_LOG_WARNING("%d native buffer will be destroyed\n", mBuffers.size());
-
-  // destroy buffers
-  NativeBufferContainer::iterator bufferIter;
-  for (bufferIter = mBuffers.begin(); bufferIter != mBuffers.end(); ++bufferIter)
-  {
-    native_buffer_destroy((*bufferIter));
-  }
-  mBuffers.clear();
-}
-
-Ecore_X_Drawable NativeBufferRenderSurface::GetDrawable()
-{
-  return (Ecore_X_Drawable)0;
-}
-
-Dali::RenderSurface::SurfaceType NativeBufferRenderSurface::GetType()
-{
-  DALI_LOG_TRACE_METHOD( gRenderSurfaceLogFilter );
-  return Dali::RenderSurface::NATIVE_BUFFER;
-}
-
-Any NativeBufferRenderSurface::GetSurface()
-{
-  DALI_LOG_TRACE_METHOD( gRenderSurfaceLogFilter );
-  return Any();
-}
-
-void NativeBufferRenderSurface::InitializeEgl( EglInterface& egl )
-{
-  DALI_LOG_TRACE_METHOD( gRenderSurfaceLogFilter );
-
-  EglImplementation& eglImpl = static_cast<EglImplementation&>( egl );
-  eglImpl.InitializeGles( reinterpret_cast< EGLNativeDisplayType >( mMainDisplay ), false /* external surface */);
-
-  eglImpl.ChooseConfig(false, mColorDepth);
-}
-
-native_buffer* NativeBufferRenderSurface::CreateNativeBuffer()
-{
-  native_buffer* buffer;
-
-  buffer = native_buffer_create(mProvider, mPosition.width, mPosition.height,
-    mColorDepth == COLOR_DEPTH_32? mPosition.width * 4 : mPosition.width * 3, /* stride will be deprecated */
-    mColorDepth == COLOR_DEPTH_32? NATIVE_BUFFER_FORMAT_BGRA_8888 : NATIVE_BUFFER_FORMAT_RGB_888,
-    NATIVE_BUFFER_USAGE_3D_RENDER);
-
-  if(buffer)
-  {
-    // insert buffer to list
-    mBuffers.push_back(buffer);
-  }
-
-  return buffer;
-}
-
-void NativeBufferRenderSurface::CreateEglSurface( EglInterface& egl )
-{
-  DALI_LOG_TRACE_METHOD( gRenderSurfaceLogFilter );
-
-  EglImplementation& eglImpl = static_cast<EglImplementation&>( egl );
-
-  // create one buffer
-  native_buffer_pool_add_buffer(mPool, CreateNativeBuffer());
-
-  DALI_ASSERT_ALWAYS( native_buffer_pool_acquire_surface( mPool, eglImpl.GetDisplay(), eglImpl.GetContext() ) == STATUS_SUCCESS );
-  mIsAcquired = true;
-}
-
-void NativeBufferRenderSurface::DestroyEglSurface( EglInterface& egl )
-{
-  DALI_LOG_TRACE_METHOD( gRenderSurfaceLogFilter );
-
-  // Remove buffers from pool
-  native_buffer_pool_reset(mPool);
-}
-
-bool NativeBufferRenderSurface::ReplaceEGLSurface( EglInterface& egl )
-{
-  DALI_LOG_TRACE_METHOD( gRenderSurfaceLogFilter );
-
-  return false;
-}
-
-bool NativeBufferRenderSurface::PreRender( EglInterface& egl, Integration::GlAbstraction& glAbstraction )
-{
-  EglImplementation& eglImpl = static_cast<EglImplementation&>( egl );
-
-  if(mIsAcquired)
-  {
-    mIsAcquired = false;
-    return true;
-  }
-
-  // Attempt to acquire a surface for rendering
-  while( !mIsStopped && native_buffer_pool_get_input_buffer_count(mPool) < 1 )
-  {
-    if(mBuffers.size() <= mMaxBufferCount)
-    {
-      // create one buffer
-      native_buffer_pool_add_buffer(mPool, CreateNativeBuffer());
-    }
-    else
-    {
-      usleep( 5 * 1000 );  // polling per 5 msec
-    }
-  }
-
-  if( !mIsStopped && native_buffer_pool_acquire_surface( mPool, eglImpl.GetDisplay(), eglImpl.GetContext() ) != STATUS_SUCCESS )
-  {
-    DALI_LOG_ERROR("Failed to acquire native buffer surface (# queue : %d)\n", native_buffer_pool_get_input_buffer_count(mPool));
-  }
-
-  return !mIsStopped; // fail if it is stopped
-}
-
-void NativeBufferRenderSurface::PostRender( EglInterface& egl, Integration::GlAbstraction& glAbstraction, unsigned int timeDelta, SyncMode syncMode )
-{
-  glAbstraction.Flush();
-
-  // release the surface to allow consumer usage
-  if(native_buffer_pool_release_surface( mPool ) != STATUS_SUCCESS)
-  {
-    DALI_LOG_ERROR("Failed to release native buffer surface (# queue : %d)\n", native_buffer_pool_get_input_buffer_count(mPool));
-  }
-
-  // create damage for client applications which wish to know the update timing
-  if( mRenderNotification )
-  {
-    // use notification trigger
-    // Tell the event-thread to render the pixmap
-    mRenderNotification->Trigger();
-  }
-
-  // Do render synchronisation
-  DoRenderSync( timeDelta, syncMode );
-}
-
-void NativeBufferRenderSurface::CreateXRenderable()
-{
-  DALI_LOG_TRACE_METHOD( gRenderSurfaceLogFilter );
-
-  // nothing to do
-}
-
-void NativeBufferRenderSurface::UseExistingRenderable( unsigned int surfaceId )
-{
-  DALI_LOG_TRACE_METHOD( gRenderSurfaceLogFilter );
-
-  // nothing to do
-}
-
-} // namespace ECore
-
-} // namespace Adaptor
-
-} // namespace Internal
-
-} // namespace Dali
diff --git a/adaptors/mobile/mobile-native-buffer-render-surface.h b/adaptors/mobile/mobile-native-buffer-render-surface.h
deleted file mode 100644 (file)
index ee8860b..0000000
+++ /dev/null
@@ -1,142 +0,0 @@
-#ifndef __DALI_INTERNAL_NATIVE_BUFFER_RENDER_SURFACE_H__
-#define __DALI_INTERNAL_NATIVE_BUFFER_RENDER_SURFACE_H__
-
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- * 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.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <native-buffer-pool.h>
-#include <dali/public-api/common/vector-wrapper.h>
-
-// INTERNAL INCLUDES
-#include <ecore-x-render-surface.h>
-
-using namespace std;
-
-namespace Dali
-{
-
-namespace Internal
-{
-
-namespace Adaptor
-{
-
-namespace ECore
-{
-
-/**
- * NativeBuffer API compatible implementation of RenderSurface.
- */
-class NativeBufferRenderSurface : public RenderSurface
-{
-public:
-
-  /**
-   * Constructor
-   */
-  NativeBufferRenderSurface( native_buffer_provider* provider,
-                             native_buffer_pool* pool,
-                             unsigned int maxBufferCount,
-                             Dali::PositionSize positionSize,
-                             Any surface,
-                             Any display,
-                             const std::string& name,
-                             bool isTransparent );
-
-  /**
-   * Destructor
-   */
-  virtual ~NativeBufferRenderSurface();
-
-public: // API
-
-  /**
-   * @copydoc Dali::Internal::Adaptor::ECore::RenderSurface::GetDrawable()
-   */
-  virtual Ecore_X_Drawable GetDrawable();
-
-public: // from Dali::RenderSurface
-
-  /**
-   * @copydoc Dali::RenderSurface::GetType()
-   */
-  virtual Dali::RenderSurface::SurfaceType GetType();
-
-  /**
-   * @copydoc Dali::RenderSurface::GetSurface()
-   */
-  virtual Any GetSurface();
-
-public: // from Internal::Adaptor::RenderSurface
-
-  /// @copydoc Dali::Internal::Adaptor::RenderSurface::InitializeEgl
-  virtual void InitializeEgl( EglInterface& egl );
-
-  /// @copydoc Dali::Internal::Adaptor::RenderSurface::CreateEglSurface
-  virtual void CreateEglSurface( EglInterface& egl );
-
-  /// @copydoc Dali::Internal::Adaptor::RenderSurface::DestroyEglSurface
-  virtual void DestroyEglSurface( EglInterface& egl );
-
-  /// @copydoc Dali::Internal::Adaptor::RenderSurface::ReplaceEGLSurface
-  virtual bool ReplaceEGLSurface( EglInterface& egl );
-
-  /// @copydoc Dali::RenderSurface::PreRender
-  virtual bool PreRender( EglInterface& egl, Integration::GlAbstraction& glAbstraction );
-
-  /// @copydoc Dali::RenderSurface::PostRender
-  virtual void PostRender( EglInterface& egl, Integration::GlAbstraction& glAbstraction, unsigned int timeDelta, SyncMode syncMode );
-
-protected:
-
-  /**
-   * Create XWindow
-   */
-  virtual void CreateXRenderable();
-
-  /**
-   * @copydoc Dali::Internal::Adaptor::ECore::RenderSurface::UseExistingRenderable
-   */
-  virtual void UseExistingRenderable( unsigned int surfaceId );
-
-private:
-  /**
-   * Create native buffer
-   */
-  native_buffer* CreateNativeBuffer();
-
-private: // Data
-  native_buffer_provider*              mProvider;
-  native_buffer_pool*                  mPool;
-
-  typedef std::vector<native_buffer*>  NativeBufferContainer;
-  NativeBufferContainer                mBuffers;
-
-  unsigned int                         mMaxBufferCount;
-  bool                                 mIsAcquired;
-}; // class NativeBufferRenderSurface
-
-} // namespace ECore
-
-} // namespace Adaptor
-
-} // namespace internal
-
-} // namespace Dali
-
-#endif // __DALI_INTERNAL_NATIVE_BUFFER_RENDER_SURFACE_H__
index 898cf16..f5f2ed6 100644 (file)
@@ -16,7 +16,6 @@
  */
 
 #include <pixmap-render-surface.h>
-#include "mobile-native-buffer-render-surface.h"
 
 namespace Dali
 {
@@ -40,20 +39,6 @@ DALI_EXPORT_API RenderSurface* CreatePixmapSurface(
   return new PixmapRenderSurface( positionSize, surface, display, name, isTransparent );
 }
 
-DALI_EXPORT_API RenderSurface* CreateNativeBufferSurface(
-  native_buffer_provider* provider,
-  native_buffer_pool*     pool,
-  unsigned int            maxBufferCount,
-  PositionSize            positionSize,
-  Any                     surface,
-  Any                     display,
-  const std::string&      name,
-  bool                    isTransparent )
-{
-  return new NativeBufferRenderSurface( provider, pool, maxBufferCount, positionSize,
-                                        surface, display, name, isTransparent);
-}
-
 } // namespace ECoreX
 
 } // namespace Adaptor
index 82ca2b9..187099c 100644 (file)
@@ -59,29 +59,6 @@ DALI_IMPORT_API RenderSurface* CreatePixmapSurface(
   const std::string& name,
   bool               isTransparent );
 
-/**
- * Surface factory function for Native buffer
- * A native buffer surface is created.
- * @param [in] provider The provider
- * @param [in] pool The native buffer pool
- * @param [in] maxBufferCount The maximum number of buffers to create
- * @param [in] type the type of surface to create
- * @param [in] positionSize the position and size of the surface to create
- * @param [in] display X Pixmap to use, or null for default.
- * @param [in] display X Display to use, or null for default.
- * @param [in] name Name of surface passed in
- * @param [in] isTransparent Whether the surface has an alpha channel
- */
-DALI_IMPORT_API RenderSurface* CreateNativeBufferSurface(
-  native_buffer_provider* provider,
-  native_buffer_pool*     pool,
-  unsigned int            maxBufferCount,
-  PositionSize            positionSize,
-  Any              surface,
-  Any              display,
-  const std::string&      name,
-  bool                    isTransparent );
-
 } // namespace ECoreX
 
 } // namespace Adaptor
diff --git a/adaptors/mobile/native-buffer-plugin-impl.cpp b/adaptors/mobile/native-buffer-plugin-impl.cpp
deleted file mode 100644 (file)
index 547860a..0000000
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- * 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.
- *
- */
-
-// CLASS HEADER
-#include "native-buffer-plugin-impl.h"
-
-// EXTERNAL HEADERS
-#include <Ecore_X.h>
-
-#include <dali/public-api/dali-core.h>
-#include <dali/integration-api/debug.h>
-
-// INTERNAL HEADERS
-#include <accessibility-manager-impl.h>
-#include <adaptor-impl.h>
-#include "mobile-render-surface-factory.h"
-#include <ecore-x-render-surface.h>
-#include <trigger-event.h>
-
-namespace Dali
-{
-
-namespace SlpPlatform
-{
-
-class SlpPlatformAbstraction;
-
-} // namespace SlpPlatform
-
-namespace Integration
-{
-
-class Core;
-
-} // namespace Integration
-
-namespace Internal
-{
-
-namespace Adaptor
-{
-
-namespace
-{
-
-#if defined(DEBUG_ENABLED)
-Integration::Log::Filter* gLogFilter  = Integration::Log::Filter::New(Debug::Verbose, true, "LOG_NATIVE_BUFFER_PLUGIN");
-#endif
-
-} // namespace
-
-NativeBufferPlugin::NativeBufferPlugin(Dali::NativeBufferPlugin& nbPlugin, unsigned int initialWidth, unsigned int initialHeight, bool isTransparent, unsigned int maxBufferCount, Dali::RenderSurface::RenderMode mode, const DeviceLayout& baseLayout )
-: mNativeBufferPlugin( nbPlugin ),
-  mAdaptor( NULL ),
-  mSurface( NULL ),
-  mRenderNotification( NULL ),
-  mState( Stopped ),
-  mInitialized( false ),
-  mFirstRenderCompleteNotified( false )
-{
-  // create provider
-  mProvider = native_buffer_provider_create(NATIVE_BUFFER_PROVIDER_CORE);
-
-  //create pool
-  mPool = native_buffer_pool_create( mProvider );
-
-  // create surface
-  mSurface = CreateSurface( initialWidth, initialHeight, isTransparent, maxBufferCount );
-
-  // create adaptor
-  CreateAdaptor( *mSurface, baseLayout );
-
-  // render notification
-  mRenderNotification = new TriggerEvent( boost::bind(&NativeBufferPlugin::OnRender, this ) );
-  mSurface->SetRenderNotification( mRenderNotification );
-  mSurface->SetRenderMode(mode);
-
-  mState = Ready;
-}
-
-NativeBufferPlugin::~NativeBufferPlugin()
-{
-  if( mAdaptor )
-  {
-    Stop();
-
-    // no more notifications
-    delete mRenderNotification;
-
-    delete mAdaptor;
-    delete mSurface;
-
-    native_buffer_pool_destroy(mPool);
-    native_buffer_provider_destroy(mProvider);
-  }
-}
-
-void NativeBufferPlugin::CreateAdaptor( ECore::RenderSurface &surface, const DeviceLayout& baseLayout )
-{
-  DALI_LOG_TRACE_METHOD( gLogFilter );
-
-  mAdaptor = Internal::Adaptor::Adaptor::New( &surface, baseLayout );
-}
-
-ECore::RenderSurface* NativeBufferPlugin::CreateSurface( int width, int height, bool isTransparent, unsigned int maxBufferCount )
-{
-  DALI_LOG_TRACE_METHOD( gLogFilter );
-
-  PositionSize positionSize( 0, 0, width, height );
-  Any surface;
-  Any display;
-
-  // if we already have surface, reuse its display
-  if( mSurface )
-  {
-    display = mSurface->GetMainDisplay();
-  }
-
-  ECore::RenderSurface* nbSurface = ECore::CreateNativeBufferSurface( mProvider, mPool, maxBufferCount, positionSize, surface, display, "no name", isTransparent );
-
-  return nbSurface;
-}
-
-void NativeBufferPlugin::ChangeSurfaceSize(unsigned int width, unsigned int height)
-{
-  // TODO: not yet implemented
-  DALI_LOG_WARNING("Not yet implemented!\n");
-}
-
-Vector2 NativeBufferPlugin::GetBufferCount()
-{
-  Vector2 retVal;
-  retVal.x = native_buffer_pool_get_input_buffer_count(mPool);
-  retVal.y = native_buffer_pool_get_output_buffer_count(mPool);
-
-  return retVal;
-}
-
-void NativeBufferPlugin::Run()
-{
-  DALI_LOG_TRACE_METHOD( gLogFilter );
-
-  if(mState == Ready)
-  {
-    // Run the adaptor
-    mAdaptor->Start();
-    mState = Running;
-
-    OnInit();
-  }
-}
-
-void NativeBufferPlugin::Pause()
-{
-  DALI_LOG_TRACE_METHOD( gLogFilter );
-
-  if(mState == Running)
-  {
-    mAdaptor->Pause();
-    mState = Suspended;
-
-    mPauseSignalV2.Emit( mNativeBufferPlugin );
-  }
-}
-
-void NativeBufferPlugin::Resume()
-{
-  DALI_LOG_TRACE_METHOD( gLogFilter );
-
-  if(mState == Suspended)
-  {
-    mAdaptor->Resume();
-    mState = Running;
-
-    mResumeSignalV2.Emit( mNativeBufferPlugin );
-  }
-}
-
-void NativeBufferPlugin::Stop()
-{
-  DALI_LOG_TRACE_METHOD( gLogFilter );
-
-  if(mState != Stopped)
-  {
-    // Stop the adaptor
-    mAdaptor->Stop();
-    mState = Stopped;
-
-    mTerminateSignalV2.Emit( mNativeBufferPlugin );
-  }
-}
-
-void NativeBufferPlugin::OnInit()
-{
-  DALI_LOG_TRACE_METHOD( gLogFilter );
-
-  mInitialized = true;
-  mInitSignalV2.Emit( mNativeBufferPlugin );
-}
-
-/*
-  * app can poll the get buffer after first rendered signal
-  * Otherwise, app can get render signal whenever it rendered
-  */
-void NativeBufferPlugin::OnFirstRenderCompleted()
-{
-  DALI_LOG_TRACE_METHOD( gLogFilter );
-
-  mFirstRenderCompletedSignalV2.Emit( mNativeBufferPlugin );
-  mFirstRenderCompleteNotified = true;
-}
-
-/*
-  * app can poll the get buffer after first rendered signal
-  * Otherwise, app can get render signal whenever it rendered
-  */
-void NativeBufferPlugin::OnRender()
-{
-  // dirty set while adaptor is running
-  if( Running == mState )
-  {
-    mRenderSignalV2.Emit( mNativeBufferPlugin );
-  }
-}
-
-// TODO: need it?
-void NativeBufferPlugin::RenderSync()
-{
-  if( NULL != mAdaptor )
-  {
-    Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).RenderSync();
-  }
-}
-
-native_buffer* NativeBufferPlugin::GetNativeBufferFromOutput()
-{
-  return native_buffer_pool_get_buffer(mPool);
-}
-
-bool NativeBufferPlugin::AddNativeBufferToInput(native_buffer* nativeBuffer)
-{
-  status_t result = native_buffer_pool_add_buffer(mPool, nativeBuffer);
-
-  if(result != STATUS_SUCCESS)
-  {
-    DALI_LOG_WARNING("native_buffer_pool_add_buffer returns %d\n", result);
-    return false;
-  }
-
-  return true;
-}
-
-
-} // namespace Adaptor
-
-} // namespace Internal
-
-} // namespace Dali
diff --git a/adaptors/mobile/native-buffer-plugin-impl.h b/adaptors/mobile/native-buffer-plugin-impl.h
deleted file mode 100644 (file)
index b3501c2..0000000
+++ /dev/null
@@ -1,279 +0,0 @@
-#ifndef __DALI_INTERNAL_NATIVE_BUFFER_PLUGIN_IMPL_H__
-#define __DALI_INTERNAL_NATIVE_BUFFER_PLUGIN_IMPL_H__
-
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- * 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.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <native-buffer-pool.h>
-#include <boost/bind.hpp>
-
-#include <dali/public-api/math/rect.h>
-#include <dali/public-api/math/vector2.h>
-#include <dali/integration-api/events/touch-event-integ.h>
-
-// INTERNAL INCLUDES
-
-#include <native-buffer-plugin.h>
-
-namespace Dali
-{
-
-class Adaptor;
-
-namespace Internal
-{
-
-namespace Adaptor
-{
-
-class TriggerEvent;
-
-typedef Dali::Rect<int> PositionSize;
-
-namespace ECore
-{
-
-class RenderSurface;
-
-}
-
-/**
- * Implementation of the NativeBufferPlugin class.
- */
-class NativeBufferPlugin
-{
-public:
-
-  typedef Dali::NativeBufferPlugin::NativeBufferPluginSignalV2 NativeBufferPluginSignalV2;
-
-  /**
-   * Constructor
-   * @param[in] nbPlugin      The public instance of the NativeBufferPlugin
-   * @param[in] nbPool        A pointer to a native_buffer_pool object
-   * @param[in] initialWidth  The initial width of the plugin and DALis stage
-   * @param[in] initialWidth  The initial height of the plugin and DALis stage
-   * @param[in] mode          The rendering mode to decide frame rate
-   */
-  NativeBufferPlugin( Dali::NativeBufferPlugin& nbPlugin,
-                      unsigned int initialWidth,
-                      unsigned int initialHeight,
-                      bool isTransparent,
-                      unsigned int maxBufferCount,
-                      RenderSurface::RenderMode mode,
-                      const DeviceLayout& baseLayout);
-
-  /**
-   * Destructor
-   */
-  virtual ~NativeBufferPlugin();
-
-public:
-
-  /**
-   * @copydoc Dali::NativeBufferPlugin::Run()
-   */
-  virtual void Run();
-
-  /**
-   * @copydoc Dali::NativeBufferPlugin::Pause()
-   */
-  virtual void Pause();
-
-  /**
-   * @copydoc Dali::NativeBufferPlugin::Resume()
-   */
-  virtual void Resume();
-
-  /**
-   * @copydoc Dali::NativeBufferPlugin::Stop()
-   */
-  virtual void Stop();
-
-  /**
-   * @copydoc Dali::NativeBufferPlugin::GetNativeBufferFromOutput()
-   */
-   native_buffer* GetNativeBufferFromOutput();
-
-  /**
-   * @copydoc Dali::NativeBufferPlugin::AddNativeBufferToInput()
-   */
-   bool AddNativeBufferToInput(native_buffer* nativeBuffer);
-
-  /**
-   * @copydoc Dali::NativeBufferPlugin::ChangeSurfaceSize()
-   */
-   void ChangeSurfaceSize(unsigned int width, unsigned int height);
-
-  /**
-   * @copydoc Dali::NativeBufferPlugin::GetBufferCount()
-   */
-   Vector2 GetBufferCount();
-
-  /**
-   * @copydoc Dali::NativeBufferPlugin::GetAdaptor()
-   */
-  Dali::Adaptor* GetAdaptor()
-  {
-    return mAdaptor;
-  }
-
-public:
-
-  /**
-   * Called when the adaptor is initialised.
-   */
-  void OnInit();
-
-  /**
-   * Called when the result of rendering was posted to on-screen.
-   * Adaptor (i.e. render thread) can be waiting this sync to render next frame.
-   */
-  void RenderSync();
-
-  /**
-   * Called to notify that Dali has started rendering and atleast one frame has been rendered
-   */
-  void OnFirstRenderCompleted();
-
-  /**
-   * Called to notify that Dali has rendered one frame
-   */
-  void OnRender();
-
-public:  // Signals
-
-  /**
-   * @copydoc Dali::NativeBufferPlugin::InitSignal()
-   */
-  NativeBufferPluginSignalV2& InitSignal()
-  {
-    return mInitSignalV2;
-  }
-
-  /**
-   * @copydoc Dali::NativeBufferPlugin::TerminateSignal()
-   */
-  NativeBufferPluginSignalV2& TerminateSignal()
-  {
-    return mTerminateSignalV2;
-  }
-
-  /**
-   * @copydoc Dali::NativeBufferPlugin::PauseSignal()
-   */
-  NativeBufferPluginSignalV2& PauseSignal()
-  {
-    return mPauseSignalV2;
-  }
-
-  /**
-   * @copydoc Dali::NativeBufferPlugin::ResumeSignal()
-   */
-  NativeBufferPluginSignalV2& ResumeSignal()
-  {
-    return mResumeSignalV2;
-  }
-
-  /**
-   * @copydoc Dali::NativeBufferPlugin::FirstRenderCompletedSignal()
-   */
-  NativeBufferPluginSignalV2& FirstRenderCompletedSignal()
-  {
-    return mFirstRenderCompletedSignalV2;
-  }
-
-  /**
-   * @copydoc Dali::NativeBufferPlugin::RenderSignal()
-   */
-  NativeBufferPluginSignalV2& RenderSignal()
-  {
-    return mRenderSignalV2;
-  }
-
-private:
-
-  // Undefined copy constructor
-  NativeBufferPlugin(const NativeBufferPlugin&);
-
-  // Undefined assignment operator
-  NativeBufferPlugin& operator=(NativeBufferPlugin&);
-
-private:
-
-  /**
-   * Create the adaptor
-   */
-  void CreateAdaptor( ECore::RenderSurface &surface, const DeviceLayout& baseLayout );
-
-  /**
-   * Creates a render surface
-   * @param[in] width  Width of the surface
-   * @param[in] height Height of the surface
-   * @param[in] isTransparent Whether the surface is transparent
-   * @return A pointer to the new surface
-   */
-  ECore::RenderSurface* CreateSurface( int width, int height, bool isTransparent, unsigned int maxBufferCount );
-
-public:
-
-  enum State
-  {
-    Ready,
-    Running,
-    Suspended,
-    Stopped,
-  };
-
-
-private:
-
-  // Signals
-  NativeBufferPluginSignalV2 mInitSignalV2;
-  NativeBufferPluginSignalV2 mTerminateSignalV2;
-  NativeBufferPluginSignalV2 mPauseSignalV2;
-  NativeBufferPluginSignalV2 mResumeSignalV2;
-  NativeBufferPluginSignalV2 mResetSignalV2;
-  NativeBufferPluginSignalV2 mFirstRenderCompletedSignalV2;
-  NativeBufferPluginSignalV2 mRenderSignalV2;
-
-  Dali::NativeBufferPlugin& mNativeBufferPlugin;
-  native_buffer_provider* mProvider;
-  native_buffer_pool*       mPool;
-  Dali::Adaptor*            mAdaptor;
-  ECore::RenderSurface*     mSurface;
-  TriggerEvent*             mRenderNotification; ///< Render Notification trigger
-  State                     mState;
-  bool                      mInitialized;
-  bool                      mFirstRenderCompleteNotified;
-
-public:
-
-  inline static NativeBufferPlugin& GetImplementation(Dali::NativeBufferPlugin& nbPlugin)
-  {
-    return *nbPlugin.mImpl;
-  }
-
-}; // class NativeBufferPlugin
-
-} // namespace Adaptor
-
-} // namespace Internal
-
-} // namespace Dali
-
-#endif // __DALI_INTERNAL_NATIVE_BUFFER_PLUGIN_IMPL_H__
diff --git a/adaptors/mobile/native-buffer-plugin.cpp b/adaptors/mobile/native-buffer-plugin.cpp
deleted file mode 100644 (file)
index ba61bc5..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- * 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.
- *
- */
-
-// CLASS HEADER
-#include <public-api/native-buffer-plugin.h>
-
-// EXTERNAL INCLUDES
-
-// INTERNAL INCLUDES
-#include <mobile/native-buffer-plugin-impl.h>
-
-namespace Dali
-{
-
-NativeBufferPlugin::NativeBufferPlugin( unsigned int initialWidth, unsigned int initialHeight, bool isTransparent, unsigned int maxBufferCount, RenderSurface::RenderMode mode, const DeviceLayout& baseLayout )
-{
-  mImpl = new Internal::Adaptor::NativeBufferPlugin( *this, initialWidth, initialHeight, isTransparent, maxBufferCount, mode, baseLayout );
-}
-
-NativeBufferPlugin::~NativeBufferPlugin()
-{
-  delete mImpl;
-}
-
-void NativeBufferPlugin::Run()
-{
-  mImpl->Run();
-}
-
-void NativeBufferPlugin::Pause()
-{
-  mImpl->Pause();
-}
-
-void NativeBufferPlugin::Resume()
-{
-  mImpl->Resume();
-}
-
-void NativeBufferPlugin::Stop()
-{
-  mImpl->Stop();
-}
-
-Dali::Adaptor* NativeBufferPlugin::GetAdaptor()
-{
-  return mImpl->GetAdaptor();
-}
-
-native_buffer* NativeBufferPlugin::GetNativeBufferFromOutput()
-{
-  return mImpl->GetNativeBufferFromOutput();
-}
-
-bool NativeBufferPlugin::AddNativeBufferToInput(native_buffer* nativeBuffer)
-{
-  return mImpl->AddNativeBufferToInput(nativeBuffer);
-}
-
-void NativeBufferPlugin::ChangeSurfaceSize(unsigned int width, unsigned int height)
-{
-  mImpl->ChangeSurfaceSize(width, height);
-}
-
-Vector2 NativeBufferPlugin::GetBufferCount()
-{
-  return mImpl->GetBufferCount();
-}
-
-NativeBufferPlugin::NativeBufferPluginSignalV2& NativeBufferPlugin::InitSignal()
-{
-  return mImpl->InitSignal();
-}
-
-NativeBufferPlugin::NativeBufferPluginSignalV2& NativeBufferPlugin::TerminateSignal()
-{
-  return mImpl->TerminateSignal();
-}
-
-NativeBufferPlugin::NativeBufferPluginSignalV2& NativeBufferPlugin::PauseSignal()
-{
-  return mImpl->PauseSignal();
-}
-
-NativeBufferPlugin::NativeBufferPluginSignalV2& NativeBufferPlugin::ResumeSignal()
-{
-  return mImpl->ResumeSignal();
-}
-
-NativeBufferPlugin::NativeBufferPluginSignalV2& NativeBufferPlugin::FirstRenderCompletedSignal()
-{
-  return mImpl->FirstRenderCompletedSignal();
-}
-
-NativeBufferPlugin::NativeBufferPluginSignalV2& NativeBufferPlugin::RenderSignal()
-{
-  return mImpl->RenderSignal();
-}
-
-} // namespace Dali
index b02ca11..8608147 100644 (file)
 
 // These defines come from running pkg-config --cflags with the correct package config file
 
-#if defined(DALI_LIVEBOX_PLUGIN)
-#include <dali/public-api/livebox-plugin.h>
-#endif
-
-#if defined(DALI_EVAS_PLUGIN)
-#include <dali/public-api/evas-plugin.h>
-#endif
-
-#if defined(DALI_NATIVE_BUFFER_PLUGIN)
-#include <dali/public-api/native-buffer-plugin.h>
-#endif
-
 #if defined(DALI_APPLICATION)
 #include <dali/public-api/application.h>
 #endif
diff --git a/adaptors/public-api/evas-plugin.h b/adaptors/public-api/evas-plugin.h
deleted file mode 100644 (file)
index 0c9a417..0000000
+++ /dev/null
@@ -1,276 +0,0 @@
-#ifndef __DALI_EVAS_PLUGIN_H__
-#define __DALI_EVAS_PLUGIN_H__
-
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- * 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.
- *
- */
-
-/**
- * @addtogroup CAPI_DALI_ADAPTOR_MODULE
- * @{
- */
-
-// EXTERNAL INCLUDES
-#include <boost/function.hpp>
-
-#include <dali/public-api/signals/dali-signal-v2.h>
-
-// Declare this forward declaration ourselves to remove unnecessary dependencies in
-// public headers.
-extern "C"
-{
-  struct _Evas_Object;
-  typedef struct _Evas_Object Evas_Object; ///< Forward declaration of Evas_Object
-}
-
-
-namespace Dali DALI_IMPORT_API
-{
-class Adaptor;
-
-namespace Internal DALI_INTERNAL
-{
-namespace Adaptor
-{
-class EvasPlugin;
-}
-}
-
-/**
- * @brief Application class used by EFL applications that wish to use Dali.
- *
- * An EvasPlugin class object should be created by EFL application
- * that wishes to use Dali.  It provides a means for initialising the
- * resources required by the Dali::Core.
- *
- * The EvasPlugin class emits several signals which the user can
- * connect to.  The user should not create any Dali objects in the main
- * function and instead should connect to the Init signal of the
- * EvasPlugin and create the Dali objects in the connected callback.
- *
- * SLP and EFL applications should follow the example below:
- *
- * @code
- * void Created(EvasPlugin& evasPlugin)
- * {
- *   // Create Dali components...
- *   // Can instantiate here, if required
- * }
- *
- * void Resized(EvasPlugin& evasPlugin)
- * {
- *   // Set size properties of Dali components
- *   // Set screen layout
- * }
- *
- * int main (int argc, char **argv)
- * {
- *   elm_init(&argc, &argv);
- *
- *   Evas* e;
- *   Evas_Object* win, eo;
- *   win = elm_win_add(...);
- *   Dali::EvasPlugin evasPlugin = Dali::EvasPlugin(win);
- *   evasPlugin.InitSignal().Connect(&Created);
- *   evasPlugin.ResizeSignal().Connect(&Resized);
- *
- *   eo = evasPlugin.GetEvasImageObject();
- *   evas_object_show(eo);
- *
- *   // add eo to layout such as elm_box
- *
- *   elm_run();
- * }
- * @endcode
- *
- * If required, you can also connect class member functions to a signal:
- *
- * @code
- * MyEvasPlugin mep;
- * mep.ResumeSignal().Connect(&app, &MyEvasPlugin::Resume);
- * @endcode
- */
-class EvasPlugin : public ConnectionTrackerInterface
-{
-public:
-
-  typedef SignalV2< void (EvasPlugin&) > EvasPluginSignalV2; ///< Generic evas plugin signal type
-
-public:
-
-  /**
-   * @brief This is the constructor for SLP EFL applications
-   * @param[in]  parent  A parent of new evas object
-   * @param[in]  isTransparent Whether the object is transparent or not
-   * @param[in]  initialWidth The initial width of Dali view port
-   * @param[in]  initialHeight The initial height of Dali view port
-   */
-  EvasPlugin(Evas_Object* parent, bool isTransparent = false, unsigned int initialWidth = 1, unsigned int initialHeight = 1);
-
-  /**
-   * @brief Virtual destructor.
-   */
-  virtual ~EvasPlugin();
-
-public:
-
-  /**
-   * @brief Run Evas Plugin.
-   */
-  void Run();
-
-  /**
-   * @brief Pause Evas Plugin.
-   */
-  void Pause();
-
-  /**
-   * @brief Resume Evas Plugin.
-   */
-  void Resume();
-
-  /**
-   * @brief Stop Evas Plugin.
-   */
-  void Stop();
-
-  /**
-   * @brief This returns Evas_Object* which is created internally.
-   * @return Evas_Object* evas image object which is drawen by dali.
-   */
-  Evas_Object* GetEvasImageObject();
-
-  /**
-   * @brief This returns Evas_Object* which is created internally.
-   *
-   * Application should append this access object to custom focus chain for accessibility
-   *
-   * e.g. elm_object_focus_custom_chain_append(layout, dali_access_object, NULL);
-   *
-   * @return Evas_Object* elm access object which dali image object is registered.
-   */
-  Evas_Object* GetElmAccessObject();
-
-  /**
-   * @brief This returns Evas_Object* which is created internally.
-   *
-   * If application want to handle the keyboard focus among the efl and dali view part,
-   * application should set this object to efl layout instead of the evas image object from GetEvasImageObject()
-   * @return Evas_Object* evas object which can handle the focus internally. It is contained the image object.
-   */
-  Evas_Object* GetElmFocusObject();
-
-  /**
-   * @brief This returns the internal Adaptor instance.
-   *
-   * @return Adaptor* adaptor instance.
-   */
-   Dali::Adaptor* GetAdaptor();
-
-public:  // Signals
-
-  /**
-   * @brief Signal to notify the client when the application is ready to be initialized.
-   * @return The signal
-   */
-  EvasPluginSignalV2& InitSignal();
-
-  /**
-   * @brief Signal to notify client when Dali has rendered at least one frame.
-   *
-   * The user should connect to this signal to be notified when Dali has started rendering
-   * and atleast one frame has been rendered.
-   * @return The signal
-   */
-  EvasPluginSignalV2& FirstRenderCompletedSignal();
-
-  /**
-   * @brief Signal to notify the user when the application is about to be terminated.
-   *
-   * @return The signal
-   */
-  EvasPluginSignalV2& TerminateSignal();
-
-  /**
-   * @brief Signal to notify the client when the adaptor is about to be paused.
-   *
-   * The user should connect to this signal if they need to perform any special
-   * activities when the application is about to be paused.
-   * @return The signal
-   */
-  EvasPluginSignalV2& PauseSignal();
-
-  /**
-   * @brief Signal to notify the client when the adpator has resumed.
-   *
-   * The user should connect to this signal if they need to perform any special
-   * activities when the application has resumed.
-   * @return The signal
-   */
-  EvasPluginSignalV2& ResumeSignal();
-
-  /**
-   * @brief Signal to notify the client when the evas object is resized.
-   * @return The signal
-   */
-  EvasPluginSignalV2& ResizeSignal();
-
-  /**
-   * @brief Signal to notify the client when the evas object get the keyboard focus.
-   * @return The signal
-   */
-  EvasPluginSignalV2& FocusedSignal();
-
-  /**
-   * @brief Signal to notify the client when the evas object lost the keyboard focus.
-   * @return The signal
-   */
-  EvasPluginSignalV2& UnFocusedSignal();
-
-protected:
-  /**
-   * @copydoc ConnectionTrackerInterface::SignalConnected
-   */
-  virtual void SignalConnected( SlotObserver* slotObserver, CallbackBase* callback );
-
-  /**
-   * @copydoc ConnectionTrackerInterface::SignalDisconnected
-   */
-  virtual void SignalDisconnected( SlotObserver* slotObserver, CallbackBase* callback );
-
-  /**
-   * @copydoc ConnectionTrackerInterface::GetConnectionCount
-   */
-  virtual std::size_t GetConnectionCount() const;
-
-private:
-
-  // Undefined
-  EvasPlugin(const EvasPlugin&);
-  EvasPlugin& operator=(EvasPlugin&);
-
-private:
-
-  Internal::Adaptor::EvasPlugin *mImpl; ///< Pointer to Implementation
-  friend class Internal::Adaptor::EvasPlugin;
-};
-
-} // namespace Dali
-
-/**
- * @}
- */
-#endif // __DALI_EVAS_PLUGIN_H__
index 0cd7474..729a2e1 100644 (file)
@@ -1,12 +1,3 @@
-evas_plugin_public_api_header_files = \
-  $(adaptor_public_api_dir)/evas-plugin.h
-
-native_buffer_plugin_public_api_header_files = \
-  $(adaptor_public_api_dir)/native-buffer-plugin.h
-
-livebox_plugin_public_api_header_files = \
-  $(adaptor_public_api_dir)/livebox-plugin.h
-
 public_api_header_files = \
   $(adaptor_public_api_dir)/accessibility-manager.h \
   $(adaptor_public_api_dir)/adaptor.h \
diff --git a/adaptors/public-api/native-buffer-plugin.h b/adaptors/public-api/native-buffer-plugin.h
deleted file mode 100644 (file)
index 67aee02..0000000
+++ /dev/null
@@ -1,255 +0,0 @@
-#ifndef __DALI_NATIVE_BUFFER_PLUGIN_H__
-#define __DALI_NATIVE_BUFFER_PLUGIN_H__
-
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- * 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.
- *
- */
-
-/**
- * @addtogroup CAPI_DALI_ADAPTOR_MODULE
- * @{
- */
-
-// EXTERNAL INCLUDES
-#include <native-buffer-pool.h>
-#include <boost/function.hpp>
-
-#include <dali/public-api/signals/dali-signal-v2.h>
-#include <dali/public-api/math/vector2.h>
-#include "render-surface.h"
-#include "device-layout.h"
-
-namespace Dali DALI_IMPORT_API
-{
-
-class Adaptor;
-
-namespace Internal DALI_INTERNAL
-{
-
-namespace Adaptor
-{
-
-class NativeBufferPlugin;
-
-} // namespace Adaptor
-
-} // namespace Internal
-
-/**
- * @brief Used by Tizen applications that wish to capture Dali output in a buffer.
- *
- * A NativeBufferPlugin class object should be created by Tizen application
- * that wish to use Dali, capturing it's output using the Native Buffer Provider API.
- * It provides a means for initialising the resources required by the Dali::Core.
- *
- * The NativeBufferPlugin class emits several signals which the user may
- * connect to.  The user should not create any Dali objects in the main()
- * function and instead should connect to the InitSignal of the
- * NativeBufferPlugin and create DALi objects in the signal handler.
- *
- * Tizen applications should follow the example below:
- *
- * @code
- * void OnConsumeTimerCallback()
- * {
- *   native_buffer* buffer = nbPlugin.GetNativeBufferFromOutput();
- *   if(buffer != NULL)
- *   {
- *     // Consume the buffer
- *   }
- *   // return back the buffer to plugin
- *   AddNativeBufferToInput(buffer);
- * }
- *
- * void Created(NativeBufferPlugin& nbPlugin)
- * {
- *   // Create Dali components...
- *   // Can instantiate here, if required
- *   mTimer = Dali::Timer::New(1000/30); // 30fps
- *   mTimer.TickSignal().Connect(this, &OnConsumeTimerCallback);
- *   mTimer.Start();
- * }
- *
- * void Resized(NativeBufferPlugin& nbPlugin)
- * {
- *   // Set size properties of Dali components
- *   // Set screen layout
- * }
- *
- * int main (int argc, char **argv)
- * {
- *   Dali::NativeBufferPlugin nbPlugin( 640, 480, false, 2, RENDER_30FPS );
- *   nbPlugin.InitSignal().Connect(&Created);
- *   nbPlugin.ResizeSignal().Connect(&Resized);
- *   nbPlugin.Run();
- * }
- * @endcode
- */
-class NativeBufferPlugin
-{
-public:
-
-  typedef SignalV2< void (NativeBufferPlugin&) > NativeBufferPluginSignalV2; ///< Generic native buffer signal type
-
-public:
-
-  /**
-   * @brief This is the constructor for Tizen applications.
-   * @param[in] initialWidth   The initial width of Dali view port
-   * @param[in] initialHeight  The initial height of Dali view port
-   * @param[in] isTransparent Whether the surface will be transparent or not
-   * @param[in] maxBufferCount The maximum number of buffers to render
-   * @param[in] mode The rendering mode to decide frame rate
-   * @param[in] baseLayout  The base layout that the application has been written for
-   */
-  NativeBufferPlugin( unsigned int initialWidth, unsigned int initialHeight, bool isTransparent = false, unsigned int maxBufferCount = 2, RenderSurface::RenderMode mode = RenderSurface::RENDER_60FPS, const DeviceLayout& baseLayout = DeviceLayout::DEFAULT_BASE_LAYOUT);
-
-  /**
-   * @brief Virtual destructor.
-   */
-  virtual ~NativeBufferPlugin();
-
-public:
-
-  /**
-   * @brief Run the NativeBufferPlugin.
-   */
-  void Run();
-
-  /**
-   * @brief Pause the NativeBufferPlugin.
-   */
-  void Pause();
-
-  /**
-   * @brief Resume the NativeBufferPlugin.
-   */
-  void Resume();
-
-  /**
-   * @brief Stop the NativeBufferPlugin.
-   */
-  void Stop();
-
-  /**
-   * @brief Get the internal Adaptor instance.
-   * @return A pointer to the internal adaptor instance.
-   */
-   Dali::Adaptor* GetAdaptor();
-
-   /**
-    * @brief Get the native buffer object which contain rendered result.
-    *
-    * Application should return back the buffer object to plugin by using AddNativeBufferToInput().
-    * @return A pointer to the native buffer object.
-    * @note do not destroy the native-buffer returned from this plugin.
-    */
-   native_buffer* GetNativeBufferFromOutput();
-
-   /**
-    * @brief Add the native buffer object which was consumed in application.
-    *
-    * The added buffer will be re-used with render target
-    * @param nativeBuffer A pointer to the native buffer object.
-    * @return True if the operation is successful
-    * @pre the nativeBuffer should be got by GetNativeBufferFromOutput()
-    */
-    bool AddNativeBufferToInput(native_buffer* nativeBuffer);
-
-    /**
-     * @brief Get number of native buffers in pool.
-     * @return vector2 which has input buffer count and output buffer count
-     */
-    Vector2 GetBufferCount();
-
-    /**
-     * @brief Change surface size.
-     *
-     * NOT YET SUPPORTED
-     * @param width The width of target size
-     * @param height The height of target size
-     */
-    void ChangeSurfaceSize(unsigned int width, unsigned int height);
-
-public:  // Signals
-
-  /**
-   * @brief Signal to notify the client when the application is ready to be initialized.
-   * @return The signal
-   */
-  NativeBufferPluginSignalV2& InitSignal();
-
-  /**
-   * @brief Signal to notify the user when the application is about to be terminated.
-   * @return The signal
-   */
-  NativeBufferPluginSignalV2& TerminateSignal();
-
-  /**
-   * @brief Signal to notify the client when the adaptor is about to be paused.
-   *
-   * The user should connect to this signal if they need to perform any special
-   * activities when the application is about to be paused.
-   * @return The signal
-   */
-  NativeBufferPluginSignalV2& PauseSignal();
-
-  /**
-   * @brief Signal to notify the client when the adpator has resumed.
-   *
-   * The user should connect to this signal if they need to perform any special
-   * activities when the application has resumed.
-   * @return The signal
-   */
-  NativeBufferPluginSignalV2& ResumeSignal();
-
-  /**
-   * @brief Signal to notify the client when Dali has rendered at least one frame.
-   *
-   * The user should connect to this signal to be notified when Dali has started rendering
-   * and atleast one frame has been rendered.
-   * @return The signal
-   */
-  NativeBufferPluginSignalV2& FirstRenderCompletedSignal();
-
-  /**
-   * @brief Signal to notify the client when Dali has rendered one frame
-   * @return The signal
-   */
-  NativeBufferPluginSignalV2& RenderSignal();
-
-private:
-
-  // Undefined copy constructor
-  NativeBufferPlugin(const NativeBufferPlugin&);
-
-  // Undefined assignment operator
-  NativeBufferPlugin& operator=(NativeBufferPlugin&);
-
-private:
-
-  Internal::Adaptor::NativeBufferPlugin *mImpl; ///< Pointer to implementation
-  friend class Internal::Adaptor::NativeBufferPlugin;
-
-}; // class NativeBufferPlugin
-
-} // namespace Dali
-
-/**
- * @}
- */
-#endif // __DALI_NATIVE_BUFFER_PLUGIN_H__
index 92e52eb..bde36fe 100644 (file)
@@ -22,19 +22,10 @@ SUBDIRS += plugins
 endif
 endif
 
-if MOBILE_PROFILE
-SUBDIRS += dali-evas dali-native-buffer
-endif
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = dali.pc \
                  dali-application.pc
 
-if MOBILE_PROFILE
-pkgconfig_DATA += dali-evas.pc \
-                  dali-native-buffer.pc
-endif
-
 MAINTAINERCLEANFILES = \
     aclocal.m4 \
     autom4te.cache \
index d3d1842..4279fb4 100644 (file)
@@ -140,9 +140,6 @@ if test "x$enable_profile" = "xMOBILE"; then
 PKG_CHECK_MODULES(OPENGLES20, opengl-es-20)
 PKG_CHECK_MODULES(ASSIMP, assimp)
 PKG_CHECK_MODULES(DEVICED, deviced)
-PKG_CHECK_MODULES(EVAS, evas)
-PKG_CHECK_MODULES(NATIVE_BUFFER, native-buffer)
-PKG_CHECK_MODULES(NATIVE_BUFFER_POOL, native-buffer-pool)
 fi
 
 if test "x$enable_profile" = "xLITE"; then
@@ -231,10 +228,6 @@ AC_CONFIG_FILES([
 
 if test "x$enable_profile" != "xLITE"; then
 AC_CONFIG_FILES([
- dali-evas/Makefile
- dali-evas.pc
- dali-native-buffer/Makefile
- dali-native-buffer.pc
  plugins/Makefile
 ])
 fi
index 73cfa18..d3c6253 100644 (file)
@@ -32,23 +32,10 @@ adaptor_x11_dir = ../../../adaptors/x11
 include ../../../adaptors/x11/file.list
 endif
 
-if MOBILE_PROFILE
-tizen_evas_plugin_internal_src_dir = ../../../adaptors/mobile
-tizen_native_buffer_plugin_internal_src_dir = ../../../adaptors/mobile
-tizen_evas_plugin_public_api_src_dir = ../../../adaptors/mobile
-tizen_native_buffer_plugin_public_api_src_dir = ../../../adaptors/mobile
-include ../../../adaptors/mobile/application-file.list
-endif
-
 lib_LTLIBRARIES = libdali-adaptor.la
 
 libdali_adaptor_la_SOURCES = $(adaptor_application_src_files)
 
-if MOBILE_PROFILE
-libdali_adaptor_la_SOURCES += $(tizen_evas_plugin_public_api_src_files) \
-                              $(tizen_native_buffer_plugin_public_api_src_files)
-endif
-
 libdali_adaptor_la_SOURCES += $(adaptor_application_internal_src_files)
 
 if WAYLAND
@@ -57,11 +44,6 @@ else
 libdali_adaptor_la_SOURCES += $(adaptor_x11_application_src_files)
 endif
 
-if MOBILE_PROFILE
-libdali_adaptor_la_SOURCES += $(tizen_evas_plugin_internal_src_files) \
-                              $(tizen_native_buffer_plugin_internal_src_files)
-endif
-
 libdali_adaptor_la_DEPENDENCIES =
 
 # List include directories with more platform-specific (slp) before portable
@@ -113,26 +95,10 @@ libdali_adaptor_la_CXXFLAGS = \
                       $(XML_CFLAGS) \
                       $(VCONF_CFLAGS) \
                       $(EXIF_CFLAGS) \
-                      $(TTS_CFLAGS) \
-                      $(LIVEBOX_CLIENT_CFLAGS) \
-                      $(LIVEBOX_SERVICE_CFLAGS)
+                      $(TTS_CFLAGS)
 
 libdali_adaptor_la_LIBADD = \
-                      $(CAPI_APPFW_APPLICATION_LIBS) \
-                      $(LIVEBOX_CLIENT_LIBS) \
-                      $(LIVEBOX_SERVICE_LIBS)
-
-if MOBILE_PROFILE
-libdali_adaptor_la_CXXFLAGS += \
-                      $(NATIVE_BUFFER_CFLAGS) \
-                      $(NATIVE_BUFFER_POOL_CFLAGS)
-
-libdali_adaptor_la_LIBADD += \
-                      $(NATIVE_BUFFER_LIBS) \
-                      $(NATIVE_BUFFER_POOL_LIBS)
-endif
-
-
+                      $(CAPI_APPFW_APPLICATION_LIBS)
 
 install-data-local:
        $(MKDIR_P) ${DESTDIR}/${daliUserFontCacheDir}
diff --git a/build/tizen/dali-evas.pc.in b/build/tizen/dali-evas.pc.in
deleted file mode 100644 (file)
index 54424c8..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-apiversion=@DALI_ADAPTOR_VERSION@
-libdir=${exec_prefix}/lib
-includedir=@devincludepath@
-
-Name: Samsung OpenGLES Toolkit Adaptor
-Description: 3D Canvas Toolkit using OpenGLES (with EvasPlugin adaptor)
-Version: ${apiversion}
-Requires: dali-core
-Libs: -L${libdir} -ldali-evas-plugin -ldali-adaptor-common
-Cflags: -I${includedir}/dali -DDALI_EVAS_PLUGIN
diff --git a/build/tizen/dali-evas/Makefile.am b/build/tizen/dali-evas/Makefile.am
deleted file mode 100644 (file)
index 4f88c7f..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-#
-# Copyright (c) 2014 Samsung Electronics Co., Ltd.
-#
-# 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.
-#
-
-# Build the Dali Adaptor + Evas Plugin library
-
-tizen_evas_plugin_internal_src_dir = ../../../adaptors/mobile
-tizen_evas_plugin_public_api_src_dir = ../../../adaptors/mobile
-include ../../../adaptors/mobile/application-file.list
-
-# Public API
-adaptor_public_api_dir = ../../../adaptors/public-api
-include ../../../adaptors/public-api/file.list
-
-lib_LTLIBRARIES = libdali-evas-plugin.la
-
-libdali_evas_plugin_la_SOURCES = \
-                     $(tizen_evas_plugin_public_api_src_files) \
-                     $(tizen_evas_plugin_internal_src_files)
-
-libdali_evas_plugin_la_DEPENDENCIES =
-
-libdali_evas_plugin_includes = \
-                      -I../../.. \
-                      -I../../../platform-abstractions/ \
-                      -I../../../platform-abstractions/slp \
-                      -I../../../platform-abstractions/slp/resource-loader \
-                      -I../../../platform-abstractions/portable \
-                      -I../../../adaptors/public-api \
-                      -I../../../adaptors/common \
-                      -I../../../adaptors/ 
-
-if WAYLAND
-libdali_evas_plugin_includes += \
-                      -I../../../adaptors/wayland
-else
-libdali_evas_plugin_includes += \
-                      -I../../../adaptors/x11
-endif
-
-daliDefaultFontCacheDir = ${dataReadOnlyDir}/glyphcache/
-daliUserFontCacheDir = ${dataReadWriteDir}/glyphcache/
-daliDefaultThemeDir  = ${dataReadWriteDir}/theme/
-
-libdali_evas_plugin_la_CXXFLAGS = \
-                      -DDALI_DATA_RW_DIR="\"${daliReadWriteDir}\"" \
-                      -DDALI_DATA_RO_DIR="\"${daliReadOnlyDir}\"" \
-                      -DDALI_DEFAULT_FONT_CACHE_DIR="\"${daliDefaultFontCacheDir}\"" \
-                      -DDALI_USER_FONT_CACHE_DIR="\"${daliUserFontCacheDir}\"" \
-                      -DDALI_DEFAULT_THEME_DIR="\"${daliDefaultThemeDir}\"" \
-                      -DFONT_PRELOADED_PATH="\"${fontPreloadedPath}\"" \
-                      -DFONT_DOWNLOADED_PATH="\"${fontDownloadedPath}\"" \
-                      -DFONT_CONFIGURATION_FILE_PATH="\"${fontConfigurationFilePath}\"" \
-                      -DNON_POWER_OF_TWO_TEXTURES \
-                      -DDALI_COMPILATION -DDALI_ADAPTOR_COMPILATION \
-                      -Werror -Wall \
-                      $(libdali_evas_plugin_includes) \
-                      $(DALI_ADAPTOR_CFLAGS) \
-                      $(DALICORE_CFLAGS) \
-                      $(OPENGLES20_CFLAGS) \
-                      $(X11_CFLAGS) \
-                      $(FREETYPE_CFLAGS) \
-                      $(FONTCONFIG_CFLAGS) \
-                      $(PNG_CFLAGS) \
-                      $(ASSIMP_CFLAGS) \
-                      $(CAPI_APPFW_APPLICATION_CFLAGS) \
-                      $(ELEMENTARY_CFLAGS) \
-                      $(EVAS_CFLAGS) \
-                      $(ECORE_CFLAGS) \
-                      $(DLOG_CFLAGS) \
-                      $(XML_CFLAGS) \
-                      $(VCONF_CFLAGS) \
-                      $(EXIF_CFLAGS) \
-                      $(MMFSOUND_CFLAGS) \
-                      $(DEVICED_CFLAGS) \
-                      $(TTS_CFLAGS)
-
-libdali_evas_plugin_la_LIBADD = \
-                      $(ELEMENTARY_LIBS) \
-                      $(EVAS_LIBS)
-
-tizenadaptordaliheaderdir = $(devincludepath)/dali/public-api/
-tizenadaptordaliheader_HEADERS = $(tizen_evas_plugin_public_api_header_files) \
-                                 $(evas_plugin_public_api_header_files)
-
-# linking test
-
-noinst_PROGRAMS = linker.test
-
-linker_test_SOURCES = linker-test.cpp
-
-linker_test_CXXFLAGS = \
-  -I../../../adaptors/common \
-  -I../../../adaptors/public-api \
-  $(DALI_ADAPTOR_CFLAGS) \
-  $(DALICORE_CFLAGS) \
-  $(DALIX11_CFLAGS) \
-  $(ELEMENTARY_CFLAGS) \
-  $(EVAS_CFLAGS) \
-  $(ECORE_CFLAGS) \
-  -Werror -Wall
-
-linker_test_DEPENDENCIES = libdali-evas-plugin.la
-linker_test_LDADD = \
-  $(DALICORE_LIBS) \
-  libdali-evas-plugin.la \
-  ../common/libdali-adaptor-common.la \
-  -L${prefix}/lib
diff --git a/build/tizen/dali-evas/linker-test.cpp b/build/tizen/dali-evas/linker-test.cpp
deleted file mode 100644 (file)
index 03dde2f..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- * 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 <dali/public-api/dali-core.h>
-
-#include <evas-plugin.h>
-#include <adaptor.h>
-#include <render-surface.h>
-#include <orientation.h>
-#include <timer.h>
-
-using namespace Dali;
-
-/*****************************************************************************
- * Test to see if the dali-adaptor is linking correctly.
- */
-
-class LinkerApp : public ConnectionTracker
-{
-public:
-  LinkerApp(EvasPlugin &app)
-  {
-    app.InitSignal().Connect(this, &LinkerApp::Create);
-  }
-
-public:
-
-  void Create(EvasPlugin& app)
-  {
-  }
-};
-
-/*****************************************************************************/
-
-int
-main(int argc, char **argv)
-{
-  Evas_Object* nullPtr= NULL;
-
-  EvasPlugin *evasPlugin = new EvasPlugin(nullPtr);
-
-  LinkerApp linkerApp (*evasPlugin);
-
-  evasPlugin->Run();
-
-  delete evasPlugin;
-  return 0;
-}
diff --git a/build/tizen/dali-livebox.pc.in b/build/tizen/dali-livebox.pc.in
deleted file mode 100644 (file)
index 1a09498..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-apiversion=@DALI_ADAPTOR_VERSION@
-libdir=${exec_prefix}/lib
-includedir=@devincludepath@
-
-Name: Samsung OpenGLES Toolkit Adaptor
-Description: 3D Canvas Toolkit using OpenGLES (with the Livebox adaptor)
-Version: ${apiversion}
-Requires: dali-core
-Libs: -L${libdir} -ldali-livebox-plugin -ldali-adaptor-common
-Cflags: -I${includedir}/dali -DDALI_LIVEBOX_PLUGIN
diff --git a/build/tizen/dali-livebox/Makefile.am b/build/tizen/dali-livebox/Makefile.am
deleted file mode 100644 (file)
index 8a97506..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-#
-# Copyright (c) 2014 Samsung Electronics Co., Ltd.
-#
-# 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.
-#
-
-# Build the Dali Adaptor + Livebox Plugin library
-
-tizen_application_internal_src_dir = ../../../adaptors/tizen/internal
-include ../../../adaptors/tizen/internal/application-file.list
-
-tizen_livebox_plugin_public_api_src_dir = ../../../adaptors/tizen/public-api
-include ../../../adaptors/tizen/public-api/adaptor-framework/application-file.list
-
-capi_public_api_src_dir = ../../../capi/dali/public-api
-include ../../../capi/dali/public-api/file.list
-
-lib_LTLIBRARIES = libdali-livebox-plugin.la
-
-libdali_livebox_plugin_la_SOURCES = \
-                     $(tizen_livebox_plugin_public_api_src_files) \
-                     $(tizen_livebox_plugin_internal_src_files)
-
-libdali_livebox_plugin_la_DEPENDENCIES =
-
-libdali_livebox_plugin_includes = \
-                      -I../../.. \
-                      -I../../../platform-abstractions/ \
-                      -I../../../platform-abstractions/slp \
-                      -I../../../platform-abstractions/slp/resource-loader \
-                      -I../../../platform-abstractions/portable \
-                      -I../../../adaptors/ \
-                      -I../../../adaptors/tizen \
-                      -I../../../adaptors/tizen\common
-
-daliDefaultFontCacheDir = ${dataReadOnlyDir}/glyphcache/
-daliUserFontCacheDir = ${dataReadWriteDir}/glyphcache/
-daliDefaultThemeDir  = ${dataReadWriteDir}/theme/
-
-libdali_livebox_plugin_la_CXXFLAGS = \
-                      -DDALI_DATA_RW_DIR="\"${daliReadWriteDir}\"" \
-                      -DDALI_DATA_RO_DIR="\"${daliReadOnlyDir}\"" \
-                      -DDALI_DEFAULT_FONT_CACHE_DIR="\"${daliDefaultFontCacheDir}\"" \
-                      -DDALI_USER_FONT_CACHE_DIR="\"${daliUserFontCacheDir}\"" \
-                      -DDALI_DEFAULT_THEME_DIR="\"${daliDefaultThemeDir}\"" \
-                      -DFONT_PRELOADED_PATH="\"${fontPreloadedPath}\"" \
-                      -DFONT_DOWNLOADED_PATH="\"${fontDownloadedPath}\"" \
-                      -DFONT_CONFIGURATION_FILE_PATH="\"${fontConfigurationFilePath}\"" \
-                      -DNON_POWER_OF_TWO_TEXTURES \
-                      -DDALI_COMPILATION -DDALI_ADAPTOR_COMPILATION \
-                      -Werror -Wall \
-                      $(libdali_livebox_plugin_includes) \
-                      $(DALI_ADAPTOR_CFLAGS) \
-                      $(DALICORE_CFLAGS) \
-                      $(OPENGLES20_CFLAGS) \
-                      $(X11_CFLAGS) \
-                      $(FREETYPE_CFLAGS) \
-                      $(FONTCONFIG_CFLAGS) \
-                      $(PNG_CFLAGS) \
-                      $(ASSIMP_CFLAGS) \
-                      $(CAPI_APPFW_APPLICATION_CFLAGS) \
-                      $(ELEMENTARY_CFLAGS) \
-                      $(ECORE_CFLAGS) \
-                      $(DLOG_CFLAGS) \
-                      $(XML_CFLAGS) \
-                      $(VCONF_CFLAGS) \
-                      $(EXIF_CFLAGS) \
-                      $(MMFSOUND_CFLAGS) \
-                      $(DEVICED_CFLAGS) \
-                      $(TTS_CFLAGS) \
-                      $(LIVEBOX_CLIENT_CFLAGS) \
-                      $(LIVEBOX_SERVICE_CFLAGS)
-
-
-libdali_livebox_plugin_la_LIBADD = \
-                      $(CAPI_APPFW_APPLICATION_LIBS) \
-                      $(LIVEBOX_CLIENT_LIBS) \
-                      $(LIVEBOX_SERVICE_LIBS)
-
-tizenadaptorpublicapidir = $(devincludepath)/dali/public-api/adaptor-framework
-tizenadaptorpublicapi_HEADERS = $(tizen_livebox_plugin_public_api_header_files)
-
-# linking test
-
-noinst_PROGRAMS = linker.test
-
-linker_test_SOURCES = linker-test.cpp
-
-linker_test_CXXFLAGS = \
-  -I../../../adaptors/tizen \
-  $(DALI_ADAPTOR_CFLAGS) \
-  $(DALICORE_CFLAGS) \
-  $(DALIX11_CFLAGS) \
-  $(LIVEBOX_CLIENT_CFLAGS) \
-  $(LIVEBOX_SERVICE_CFLAGS) \
-  -Werror -Wall
-
-linker_test_DEPENDENCIES = libdali-livebox-plugin.la
-linker_test_LDADD = \
-  $(DALICORE_LIBS) \
-  libdali-livebox-plugin.la \
-  ../common/libdali-adaptor-common.la \
-  -L${prefix}/lib
diff --git a/build/tizen/dali-livebox/linker-test.cpp b/build/tizen/dali-livebox/linker-test.cpp
deleted file mode 100644 (file)
index 4cdcb52..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- * 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 <dali/public-api/dali-core.h>
-
-#include <public-api/adaptor-framework/livebox-plugin.h>
-#include <dali/public-api/adaptor-framework/common/adaptor.h>
-#include <dali/public-api/adaptor-framework/common/render-surface.h>
-#include <dali/public-api/adaptor-framework/common/orientation.h>
-#include <dali/public-api/adaptor-framework/common/timer.h>
-
-using namespace Dali;
-
-/*****************************************************************************
- * Test to see if the dali-adaptor is linking correctly.
- */
-
-class LinkerApp : public ConnectionTracker
-{
-public:
-  LinkerApp(LiveboxPlugin &app)
-  {
-    app.InitializedSignal().Connect(this, &LinkerApp::Create);
-  }
-
-public:
-
-  void Create(LiveboxPlugin& app)
-  {
-  }
-};
-
-/*****************************************************************************/
-
-int
-main(int argc, char **argv)
-{
-  LiveboxPlugin *liveboxPlugin = new LiveboxPlugin(&argc, &argv);
-  LinkerApp linkerApp (*liveboxPlugin);
-
-  liveboxPlugin->Run();
-
-  return 0;
-}
diff --git a/build/tizen/dali-native-buffer.pc.in b/build/tizen/dali-native-buffer.pc.in
deleted file mode 100644 (file)
index 07ad8b5..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-apiversion=@DALI_ADAPTOR_VERSION@
-libdir=${exec_prefix}/lib
-includedir=@devincludepath@
-
-Name: Samsung OpenGLES Toolkit Adaptor
-Description: 3D Canvas Toolkit using OpenGLES (with the Native Buffer adaptor)
-Version: ${apiversion}
-Requires: dali-core,native-buffer,native-buffer-pool
-Libs: -L${libdir} -ldali-native-buffer-plugin -ldali-adaptor-common
-Cflags: -I${includedir}/dali -DDALI_NATIVE_BUFFER_PLUGIN
diff --git a/build/tizen/dali-native-buffer/Makefile.am b/build/tizen/dali-native-buffer/Makefile.am
deleted file mode 100644 (file)
index dfd2aed..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-#
-# Copyright (c) 2014 Samsung Electronics Co., Ltd.
-#
-# 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.
-#
-
-# Build the Dali Adaptor + Native Buffer Plugin library
-
-tizen_native_buffer_plugin_internal_src_dir = ../../../adaptors/mobile
-tizen_native_buffer_plugin_public_api_src_dir = ../../../adaptors/mobile
-include ../../../adaptors/mobile/application-file.list
-
-# Public API
-adaptor_public_api_dir = ../../../adaptors/public-api
-include ../../../adaptors/public-api/file.list
-
-lib_LTLIBRARIES = libdali-native-buffer-plugin.la
-
-libdali_native_buffer_plugin_la_SOURCES = \
-                     $(tizen_native_buffer_plugin_public_api_src_files) \
-                     $(tizen_native_buffer_plugin_internal_src_files)
-
-libdali_native_buffer_plugin_la_DEPENDENCIES =
-
-libdali_native_buffer_plugin_includes = \
-                      -I../../.. \
-                      -I../../../platform-abstractions/ \
-                      -I../../../platform-abstractions/slp \
-                      -I../../../platform-abstractions/slp/resource-loader \
-                      -I../../../platform-abstractions/portable \
-                      -I../../../adaptors/public-api \
-                      -I../../../adaptors/common \
-                      -I../../../adaptors/ 
-
-if WAYLAND
-libdali_native_buffer_plugin_includes += \
-                      -I../../../adaptors/wayland
-else
-libdali_native_buffer_plugin_includes += \
-                      -I../../../adaptors/x11
-endif
-
-daliDefaultFontCacheDir = ${dataReadOnlyDir}/glyphcache/
-daliUserFontCacheDir = ${dataReadWriteDir}/glyphcache/
-daliDefaultThemeDir  = ${dataReadWriteDir}/theme/
-
-libdali_native_buffer_plugin_la_CXXFLAGS = \
-                      -DDALI_DATA_RW_DIR="\"${daliReadWriteDir}\"" \
-                      -DDALI_DATA_RO_DIR="\"${daliReadOnlyDir}\"" \
-                      -DDALI_DEFAULT_FONT_CACHE_DIR="\"${daliDefaultFontCacheDir}\"" \
-                      -DDALI_USER_FONT_CACHE_DIR="\"${daliUserFontCacheDir}\"" \
-                      -DDALI_DEFAULT_THEME_DIR="\"${daliDefaultThemeDir}\"" \
-                      -DFONT_PRELOADED_PATH="\"${fontPreloadedPath}\"" \
-                      -DFONT_DOWNLOADED_PATH="\"${fontDownloadedPath}\"" \
-                      -DFONT_CONFIGURATION_FILE_PATH="\"${fontConfigurationFilePath}\"" \
-                      -DNON_POWER_OF_TWO_TEXTURES \
-                      -DDALI_COMPILATION -DDALI_ADAPTOR_COMPILATION \
-                      -Werror -Wall \
-                      $(libdali_native_buffer_plugin_includes) \
-                      $(DALI_ADAPTOR_CFLAGS) \
-                      $(DALICORE_CFLAGS) \
-                      $(OPENGLES20_CFLAGS) \
-                      $(X11_CFLAGS) \
-                      $(FREETYPE_CFLAGS) \
-                      $(FONTCONFIG_CFLAGS) \
-                      $(PNG_CFLAGS) \
-                      $(ASSIMP_CFLAGS) \
-                      $(CAPI_APPFW_APPLICATION_CFLAGS) \
-                      $(ELEMENTARY_CFLAGS) \
-                      $(EVAS_CFLAGS) \
-                      $(ECORE_CFLAGS) \
-                      $(DLOG_CFLAGS) \
-                      $(XML_CFLAGS) \
-                      $(VCONF_CFLAGS) \
-                      $(EXIF_CFLAGS) \
-                      $(MMFSOUND_CFLAGS) \
-                      $(DEVICED_CFLAGS) \
-                      $(TTS_CFLAGS) \
-                      $(NATIVE_BUFFER_CFLAGS) \
-                      $(NATIVE_BUFFER_POOL_CFLAGS)
-
-libdali_native_buffer_plugin_la_LIBADD = \
-                      $(NATIVE_BUFFER_LIBS) \
-                      $(NATIVE_BUFFER_POOL_LIBS)
-
-tizenadaptordaliheaderdir = $(devincludepath)/dali/public-api/adaptor-framework
-tizenadaptordaliheader_HEADERS = $(tizen_native_buffer_plugin_public_api_header_files) \
-                                 $(native_buffer_plugin_public_api_header_files)
-
-# linking test
-
-noinst_PROGRAMS = linker.test
-
-linker_test_SOURCES = linker-test.cpp
-
-linker_test_CXXFLAGS = \
-  -I../../../adaptors/common \
-  -I../../../adaptors/public-api \
-  $(DALI_ADAPTOR_CFLAGS) \
-  $(DALICORE_CFLAGS) \
-  $(DALIX11_CFLAGS) \
-  $(ELEMENTARY_CFLAGS) \
-  $(EVAS_CFLAGS) \
-  $(ECORE_CFLAGS) \
-  -Werror -Wall
-
-linker_test_DEPENDENCIES = libdali-native-buffer-plugin.la
-linker_test_LDADD = \
-  $(DALICORE_LIBS) \
-  libdali-native-buffer-plugin.la \
-  ../common/libdali-adaptor-common.la \
-  -L${prefix}/lib
diff --git a/build/tizen/dali-native-buffer/linker-test.cpp b/build/tizen/dali-native-buffer/linker-test.cpp
deleted file mode 100644 (file)
index 3533494..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- * 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 <dali/public-api/dali-core.h>
-
-#include <native-buffer-plugin.h>
-#include <adaptor.h>
-#include <render-surface.h>
-#include <orientation.h>
-#include <timer.h>
-
-using namespace Dali;
-
-/*****************************************************************************
- * Test to see if the dali-adaptor is linking correctly.
- */
-
-class LinkerApp : public ConnectionTracker
-{
-public:
-  LinkerApp(NativeBufferPlugin &app)
-  {
-    app.InitSignal().Connect(this, &LinkerApp::Create);
-  }
-
-public:
-
-  void Create(NativeBufferPlugin& app)
-  {
-  }
-};
-
-/*****************************************************************************/
-
-int
-main(int argc, char **argv)
-{
-  Any nullPtr;
-
-  NativeBufferPlugin* plugin = new NativeBufferPlugin(400, 400, false, 2, RenderSurface::RENDER_30FPS);
-
-  LinkerApp linkerApp (*plugin);
-
-  plugin->Run();
-
-  delete plugin;
-  return 0;
-}
index af33353..b3113ae 100644 (file)
@@ -42,7 +42,7 @@ BuildRequires:  libdrm-devel
 BuildRequires:  pkgconfig(libexif)
 BuildRequires:  pkgconfig(capi-system-system-settings)
 BuildRequires:  pkgconfig(libpng)
-BuildRequires:  pkgconfig(gles20)
+BuildRequires:  pkgconfig(opengl-es-20)
 BuildRequires:  pkgconfig(efl-assist)
 BuildRequires:  pkgconfig(assimp)