Merge (There are No Build-Errors No Linking Errors)
authorkhee85.lee <khee85.lee@samsung.com>
Fri, 12 Jul 2013 06:53:51 +0000 (15:53 +0900)
committerkhee85.lee <khee85.lee@samsung.com>
Fri, 12 Jul 2013 06:53:51 +0000 (15:53 +0900)
    <3.0 Base Commit>
    commit 11a4440ebf555a1cf8b693fb6883df38bf7630a0
    Author: Heeyong Song <heeyong.song@samsung.com>
    Date:   Fri Jul 5 14:18:20 2013 +0900

        Add color shader

Change-Id: I2a9ed9351539b7636d30131d586d2dfd939b0f51

30 files changed:
src/app/FApp_UiAppImpl.cpp
src/app/inc/FApp_UiAppImpl.h
src/graphics/FGrp_BitmapScreenCapture.cpp
src/graphics/FGrp_CanvasShow.cpp
src/graphics/opengl/FGrpGles1.cpp
src/graphics/opengl/FGrpGles2.cpp
src/graphics/opengl/FGrp_VideoTexture.cpp
src/ui/FUiInputConnection.cpp
src/ui/FUi_Clipboard.cpp
src/ui/FUi_ImeOrientationAgent.cpp
src/ui/FUi_KeyEventManager.cpp
src/ui/FUi_ModalLoopManager.cpp
src/ui/FUi_NativeObjectHandler.cpp
src/ui/FUi_OrientationAgent.cpp
src/ui/FUi_SystemUtilImpl.cpp
src/ui/FUi_TouchLongPressGestureDetector.cpp
src/ui/FUi_UiBuilderControlMaker.cpp
src/ui/FUi_UiEventManager.cpp
src/ui/controls/FUiCtrl_FormImpl.cpp
src/ui/controls/FUiCtrl_Frame.cpp
src/ui/controls/FUiCtrl_OverlayAgent.cpp
src/ui/controls/FUiCtrl_OverlayPanel.cpp
src/ui/controls/FUiCtrl_OverlayRegionImpl.cpp
src/ui/controls/FUiCtrl_ScrollPanelImpl.cpp
src/ui/controls/FUiCtrl_TableViewItem.cpp
src/ui/inc/FUiCtrl_EditAreaImpl.h
src/ui/inc/FUi_IUiEventManager.h
src/ui/inc/FUi_KeyEventManager.h
src/ui/inc/FUi_UiEventManager.h
src/ui/resource/FUi_ResourceSizeInfo.cpp

index 0ab942b..0306cab 100755 (executable)
@@ -20,6 +20,7 @@
  * @brief      This is the implementation for the _UiAppImpl class.
  */
 
+#include <bundle.h>
 #include <appsvc/appsvc.h>
 #include <bundle.h>
 #include <glib.h>
 #include <FUi_ControlImplManager.h>
 #include <FUi_KeyEventManager.h>
 #include <FUi_WindowImpl.h>
-#include <FUi_EcoreEvasMgr.h>
-#include <FUi_EcoreEvas.h>
+//#include <FUi_EcoreEvasMgr.h>
+//#include <FUi_EcoreEvas.h>
 #include <FUi_UiNotificationEvent.h>
+#include <FUiAnim_Looper.h>
+#include <FUiAnim_AnimationManager.h>
+#include <FUiAnim_GlDisplayManager.h>
 #include <FUi_UiEventManager.h>
 #include <FUiCtrl_FrameImpl.h>
 #include <FSys_PowerManagerImpl.h>
 #include <FSys_SettingInfoImpl.h>
 
+#include "FUiAnim_GlLayer.h"
+#include "FUiAnim_DisplayContextImpl.h"
+
 #include "FApp_AppFrame.h"
 #include "FApp_AppInfo.h"
 #include "FApp_AppImpl.h"
@@ -56,12 +63,15 @@ using namespace Tizen::Base;
 using namespace Tizen::Base::Collection;
 using namespace Tizen::Base::Runtime;
 using namespace Tizen::Ui;
+using namespace Tizen::Ui::Animations;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::System;
 using namespace Tizen::Graphics;
 
+//#define PRINT printf
+#define PRINT
 
-extern "C" int appsvc_request_transient_app(bundle*, Ecore_X_Window, appsvc_host_res_fn, void*);
+//extern "C" int appsvc_request_transient_app(bundle*, Ecore_X_Window, appsvc_host_res_fn, void*);
 extern "C" int appcore_set_app_state(int);
 
 namespace Tizen { namespace App
@@ -108,16 +118,19 @@ _UiAppImpl::OnCreate(void)
 void
 _UiAppImpl::RaiseFrame(Frame& frame)
 {
+
        _FrameImpl* pFrameImpl = _FrameImpl::GetInstance(frame);
 
        if (pFrameImpl)
        {
+#ifdef VE_EFL
                // [N_SE-39536] Window raise is requested as synchronous due to B/S issue
                _EcoreEvas* pEvas = GetEcoreEvasMgr()->GetEcoreEvas();
                if (pEvas)
                {
                        pEvas->ActivateWindow(pFrameImpl->GetCore());
                }
+#endif
        }
 }
 
@@ -126,7 +139,7 @@ long
 _UiAppImpl::GetTargetWindowHandle(void) const
 {
        result r = E_SUCCESS;
-
+#ifdef VE_EFL
        _EcoreEvasMgr* pEcoreEvasMgr = GetEcoreEvasMgr();
        r = GetLastResult();
        SysTryReturn(NID_APP, pEcoreEvasMgr, -1, r, "Propagating.");
@@ -170,9 +183,11 @@ _UiAppImpl::GetTargetWindowHandle(void) const
        }
 
        return targetWindow? targetWindow: -1;
+#endif
 }
 
 
+
 static int
 TransientResponseCb(void* pData)
 {
@@ -185,7 +200,9 @@ TransientResponseCb(void* pData)
 void
 _UiAppImpl::OnService(service_s* service, bool initial)
 {
+
        Frame* pFrame = dynamic_cast<Frame*>(__pFrameList->GetAt(0));
+#ifdef BUILD_BREAK
        _EcoreEvas* pEvas = GetEcoreEvasMgr()->GetEcoreEvas();
 
        // make OnForeground event
@@ -269,6 +286,7 @@ _UiAppImpl::OnService(service_s* service, bool initial)
                        }
                }
        }
+#endif
 }
 
 
@@ -335,7 +353,7 @@ _UiAppImpl::OnFrameRaiseRequested(void)
        return E_SUCCESS;
 }
 
-
+#ifdef VE_EFL
 long
 _UiAppImpl::OnWindowHandleRequest(void)
 {
@@ -352,9 +370,87 @@ _UiAppImpl::OnWindowHandleRequest(void)
                handle = (pEvas) ? static_cast<long>(pEvas->GetXWindow()) : -1;
        }
 
+
        return handle;
 }
+#endif
+
+void
+_UiAppImpl::OnDeviceOrientationChanged(app_device_orientation_e orientation)
+{
+       SysLog(NID_APP, "System device orientation event.");
 
+       _ControlImplManager* pControlImplManager = _ControlImplManager::GetInstance();
+       if (pControlImplManager == null)
+       {
+               SysLog(NID_APP, "Device orientation event arrived too early.");
+               return;
+       }
+
+       pControlImplManager->OnScreenRotated(orientation);
+}
+
+
+long
+_UiAppImpl::OnWindowHandleRequest(void)
+{
+       Frame* pFrame = GetFrameAt(0);
+       if(pFrame && pFrame->GetDisplayContext())
+       {
+               _DisplayContextImpl* pImpl= _DisplayContextImpl::GetInstance(*pFrame->GetDisplayContext());
+               if(pImpl)
+               {
+                       _GlLayer* pLayer = dynamic_cast<_GlLayer*>(pImpl->GetNativeLayer());
+                       if(pLayer)
+                       {
+                               return pLayer->GetNativeWindow();
+                       }
+               }
+       }
+       return -1;
+}
+
+void
+_UiAppImpl::OnMainLoop(void)
+{
+       result r = E_SUCCESS;
+//     r = _AnimationManager::CreateInstance();
+//     SysAssertf(r == E_SUCCESS, "Failed to create animation manager!");
+
+//     r = _GlDisplayManager::CreateInstance();
+//     SysAssertf(r == E_SUCCESS, "Failed to create display manager!");
+
+
+       _AppImpl::OnCreate(__pAppImpl);
+
+       _AppImpl::OnService(null, null);
+       _Looper* pLooper = _Looper::GetInstance();
+
+//     pLooper->AddRawEventHandler(this);
+//     PRINT("OnMainLoop: Enter (%#x)\n", (unsigned int)pLooper);
+
+
+//     PRINT("ecore_main_loop_begin\n");
+//     ecore_main_loop_begin();
+//#else
+       for (;;)
+       {
+               _RawEvent rawEvent;
+               
+               if (!pLooper->GetRawEvent(rawEvent, -1))
+                       continue;
+
+               PRINT("OnMainLoop:event(%d) \n",rawEvent.type);
+
+#if 0
+               if (rawEvent.type == _RawEvent::RAWEVENT_KEYPRESS && rawEvent.data.keyPress.keySymbol == XK_Escape)
+                       break;
+#endif
+
+               pLooper->DispatchRawEvent(rawEvent);
+       }
+
+}
 
 result
 _UiAppImpl::AddFrame(const Frame& frame)
@@ -563,7 +659,9 @@ _UiAppImpl::OnAppInitialized(void)
                {
                        SysLog(NID_APP, "Defering frame update for IME app.");
                        pFrame->SetShowState(false);
+#ifdef BUILD_BREAK                     
                        appcore_set_app_state(3);
+#endif
                }
        }
 
index 0546e1d..126cd01 100755 (executable)
@@ -23,6 +23,8 @@
 #ifndef _FAPP_INTERNAL_UI_APP_IMPL_H_
 #define _FAPP_INTERNAL_UI_APP_IMPL_H_
 
+#include <app.h>
+
 #include <FAppUiApp.h>
 #include <FBaseRtIEventListener.h>
 #include <FSysISettingEventListener.h>
@@ -124,6 +126,14 @@ public:
        virtual void OnTerminate(void);
 
        /**
+        * Called when an orintation event occurs.
+        *
+        * @since 2.1
+        * @param[in]   orientation     The information about the orientation event
+        */
+       virtual void OnDeviceOrientationChanged(app_device_orientation_e orientation);
+
+       /**
         * Called when the window is requested to be raised
         */
        virtual result OnFrameRaiseRequested(void);
@@ -154,6 +164,8 @@ public:
         */
        virtual long OnWindowHandleRequest(void);
 
+       virtual void OnMainLoop(void);
+
        /**
         * Called when the application's state change to Tizen::App::AppState::TERMINATING. @n
         *
index 712a233..0d17ca7 100644 (file)
@@ -44,6 +44,7 @@ namespace // unnamed
        Window
        GetEvasWindow(void)
        {
+#ifdef VE_EFL
                Ecore_Evas* pEcoreEvas = static_cast<Ecore_Evas*>(Tizen::Graphics::_GetDefaultFrameEcoreEvasHandle());
 
                if (pEcoreEvas == null)
@@ -52,7 +53,8 @@ namespace // unnamed
                }
 
                return (Window) ecore_evas_window_get(pEcoreEvas);
-       }
+#endif
+    }
 }
 
 namespace Tizen { namespace Graphics
index eb320ed..d01b1ba 100644 (file)
@@ -46,12 +46,14 @@ namespace Tizen { namespace Graphics
 void
 _FlushCanvas(void)
 {
+#ifdef VE_EFL
        Ecore_Evas* pEcoreEvas = static_cast<Ecore_Evas*>(_GetDefaultFrameEcoreEvasHandle());
 
        if (pEcoreEvas)
        {
                ecore_evas_manual_render(pEcoreEvas);
        }
+#endif
 }
 
 bool
@@ -75,7 +77,7 @@ _CanvasShowFromMemory(int xDest, int yDest, int xSour, int ySour, int wSour, int
                        return false;
                }
        }
-
+#ifdef VE_EFL
        Ecore_Evas* pEcoreEvas = static_cast<Ecore_Evas*>(_GetDefaultFrameEcoreEvasHandle());
 
        if (pEcoreEvas == null)
@@ -179,6 +181,7 @@ CLEAN_UP:
        XCloseDisplay(pHdisplay);
 
        return false;
+    #endif
 }
 
 }} // Tizen::Graphics
index 7387b69..57bfa21 100644 (file)
@@ -1446,7 +1446,7 @@ _GlesInterfaceInitialize_1(void)
        }
 
 #if defined(FGRAPHICS_INTERNAL_USE_RESTORE_CONTEXT)
-       _RestoreContext();
+//     _RestoreContext();
 #endif
 
        return true;
index 6377041..3abd3e8 100644 (file)
@@ -1300,7 +1300,7 @@ _GlesInterfaceInitialize_2(void)
        }
 
 #if defined(FGRAPHICS_INTERNAL_USE_RESTORE_CONTEXT)
-       _RestoreContext();
+//     _RestoreContext();
 #endif
 
        return true;
index 46b47de..798ce8e 100644 (file)
@@ -281,7 +281,7 @@ _VideoTexture::Construct(const int textureId, const int width, const int height)
        BufferInfo bufferInfo;
        bufferInfo.width = width;
        bufferInfo.height = height;
-       bufferInfo.bitsPerPixel = ecore_x_default_depth_get(ecore_x_display_get(), ecore_x_default_screen_get());
+       bufferInfo.bitsPerPixel;// = ecore_x_default_depth_get(ecore_x_display_get(), ecore_x_default_screen_get());
 
        for (int i = 0; i < _VIDEO_TEXTURE_BUFFER_MAX; i++)
        {
index 7ad8449..108b311 100644 (file)
@@ -52,9 +52,11 @@ InputConnection::~InputConnection(void)
 result
 InputConnection::Construct(const Control* pControl, IInputConnectionEventListener& listener, IInputConnectionProvider& provider)
 {
+#ifdef VE_EFL
        SysTryReturnResult(NID_UI, pControl, E_INVALID_ARG, "The argument is invalid.");
 
        __pInputConnectionImpl = _InputConnectionImpl::CreateInputConnectionImplN(this);
+//     __pInputConnectionImpl = _NewInputConnectionImpl::CreateInputConnectionImplN(this);
        result r = GetLastResult();
        SysTryReturn(NID_UI, __pInputConnectionImpl, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
@@ -67,14 +69,17 @@ CATCH:
        delete __pInputConnectionImpl;
        __pInputConnectionImpl = null;
        return r;
+#endif
 }
 
 result
 InputConnection::Construct(const Control* pControl, IInputConnectionEventListenerF& listener, IInputConnectionProvider& provider)
 {
+#ifdef VE_EFL
        SysTryReturnResult(NID_UI, pControl, E_INVALID_ARG, "The argument is invalid.");
 
        __pInputConnectionImpl = _InputConnectionImpl::CreateInputConnectionImplN(this);
+//     __pInputConnectionImpl = _NewInputConnectionImpl::CreateInputConnectionImplN(this);
        result r = GetLastResult();
        SysTryReturn(NID_UI, __pInputConnectionImpl, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
@@ -87,160 +92,179 @@ CATCH:
        delete __pInputConnectionImpl;
        __pInputConnectionImpl = null;
        return r;
+#endif
 }
 
 result
 InputConnection::BindInputMethod(void)
 {
-       result r = E_SUCCESS;
 
+       result r = E_SUCCESS;
+#ifdef VE_EFL
        SysAssertf(__pInputConnectionImpl, "Not yet constructed. Construct() should be called before use.");
 
        r = __pInputConnectionImpl->BindInputMethod();
        SysTryReturn(NID_UI, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-
+#endif
        return r;
 }
 
 void
 InputConnection::UnbindInputMethod(void)
 {
+#ifdef VE_EFL
        SysAssertf(__pInputConnectionImpl, "Not yet constructed. Construct() should be called before use.");
 
        __pInputConnectionImpl->UnbindInputMethod();
-
+#endif
        return;
 }
 
 result
 InputConnection::ShowInputPanel(void)
 {
-       result r = E_SUCCESS;
 
+       result r = E_SUCCESS;
+#ifdef VE_EFL
        SysAssertf(__pInputConnectionImpl, "Not yet constructed. Construct() should be called before use.");
 
        r = __pInputConnectionImpl->ShowInputPanel();
        SysTryReturn(NID_UI, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-
+#endif
        return r;
 }
 
 result
 InputConnection::HideInputPanel(void)
 {
-       result r = E_SUCCESS;
 
+       result r = E_SUCCESS;
+#ifdef VE_EFL
        SysAssertf(__pInputConnectionImpl, "Not yet constructed. Construct() should be called before use.");
 
        r = __pInputConnectionImpl->HideInputPanel();
        SysTryReturn(NID_UI, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-
+#endif
        return r;
 }
 
 void
 InputConnection::SetInputPanelStyle(InputPanelStyle style)
 {
+#ifdef VE_EFL
        SysAssertf(__pInputConnectionImpl, "Not yet constructed. Construct() should be called before use.");
 
        __pInputConnectionImpl->SetInputPanelStyle(style);
-
+#endif
        return;
 }
 
 void
 InputConnection::SetAutoCapitalizationMode(AutoCapitalizationMode autoCapitalizationMode)
 {
+#ifdef VE_EFL
        SysAssertf(__pInputConnectionImpl, "Not yet constructed. Construct() should be called before use.");
 
        __pInputConnectionImpl->SetAutoCapitalizationMode(autoCapitalizationMode);
-
+#endif
        return;
 }
 
 result
 InputConnection::FinishTextComposition(void)
 {
-       result r = E_SUCCESS;
 
+       result r = E_SUCCESS;
+#ifdef VE_EFL
        SysAssertf(__pInputConnectionImpl, "Not yet constructed. Construct() should be called before use.");
 
        r = __pInputConnectionImpl->FinishTextComposition();
        SysTryReturn(NID_UI, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-
+#endif
        return r;
 }
 
 void
 InputConnection::SetInputPanelAction(InputPanelAction inputPanelAction)
 {
+#ifdef VE_EFL
        SysAssertf(__pInputConnectionImpl, "Not yet constructed. Construct() should be called before use.");
 
        __pInputConnectionImpl->SetInputPanelAction(inputPanelAction);
-
+#endif
        return;
 }
 
 void
 InputConnection::SetInputPanelActionEnabled(bool enable)
 {
+#ifdef VE_EFL
        SysAssertf(__pInputConnectionImpl, "Not yet constructed. Construct() should be called before use.");
 
        __pInputConnectionImpl->SetInputPanelActionEnabled(enable);
-
+#endif
        return;
 }
 
 result
 InputConnection::SetInputPanelLanguage(LanguageCode languageCode)
 {
+#ifdef VE_EFL
        SysAssertf(__pInputConnectionImpl, "Not yet constructed. Construct() should be called before use.");
 
        return __pInputConnectionImpl->SetInputPanelLanguage(languageCode);
+#endif
 }
 
 result
 InputConnection::SetCursorPosition(int position)
 {
-       result r = E_SUCCESS;
 
+       result r = E_SUCCESS;
+#ifdef VE_EFL
        SysAssertf(__pInputConnectionImpl, "Not yet constructed. Construct() should be called before use.");
 
        r = __pInputConnectionImpl->SetCursorPosition(position);
        SysTryReturn(NID_UI, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-
+#endif
        return r;
+
 }
 
 result
 InputConnection::SetCursorBounds(const Rectangle& rect)
 {
-       result r = E_SUCCESS;
 
+       result r = E_SUCCESS;
+#ifdef VE_EFL
        SysAssertf(__pInputConnectionImpl, "Not yet constructed. Construct() should be called before use.");
 
        r = __pInputConnectionImpl->SetCursorBounds(rect);
        SysTryReturn(NID_UI, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-
+#endif
        return r;
+
 }
 
 result
 InputConnection::SetCursorBounds(const FloatRectangle& rect)
 {
-       result r = E_SUCCESS;
 
+       result r = E_SUCCESS;
+#ifdef VE_EFL
        SysAssertf(__pInputConnectionImpl, "Not yet constructed. Construct() should be called before use.");
 
        r = __pInputConnectionImpl->SetCursorBounds(rect);
        SysTryReturn(NID_UI, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-
+#endif
        return r;
+    
 }
 
 Rectangle
 InputConnection::GetInputPanelBounds(void) const
 {
+#ifdef VE_EFL
        result r = E_SUCCESS;
 
        SysAssertf(__pInputConnectionImpl, "Not yet constructed. Construct() should be called before use.");
@@ -250,11 +274,13 @@ InputConnection::GetInputPanelBounds(void) const
        SysTryReturn(NID_UI, r == E_SUCCESS, Rectangle(0, 0, 0, 0), r, "[%s] Propagating.", GetErrorMessage(r));
 
        return bounds;
+    #endif
 }
 
 FloatRectangle
 InputConnection::GetInputPanelBoundsF(void) const
 {
+#ifdef VE_EFL
        result r = E_SUCCESS;
 
        SysAssertf(__pInputConnectionImpl, "Not yet constructed. Construct() should be called before use.");
@@ -264,25 +290,28 @@ InputConnection::GetInputPanelBoundsF(void) const
        SysTryReturn(NID_UI, r == E_SUCCESS, FloatRectangle(0.0f, 0.0f, 0.0f, 0.0f), r, "[%s] Propagating.", GetErrorMessage(r));
 
        return bounds;
+    #endif
 }
 
 void
 InputConnection::SetTextPredictionEnabled(bool enable)
 {
+#ifdef VE_EFL
        SysAssertf(__pInputConnectionImpl, "Not yet constructed. Construct() should be called before use.");
 
        __pInputConnectionImpl->SetTextPredictionEnabled(enable);
-
+#endif
        return;
 }
 
 void
 InputConnection::SendOpaqueCommand(const String& command)
 {
+#ifdef VE_EFL
        SysAssertf(__pInputConnectionImpl, "Not yet constructed. Construct() should be called before use.");
 
        __pInputConnectionImpl->SendOpaqueCommand(command);
-
+#endif
        return;
 }
 
index 89a1d2f..82d2d22 100644 (file)
@@ -108,6 +108,7 @@ _Clipboard::~_Clipboard(void)
 result
 _Clipboard::CopyItem(const _ClipboardItem& item)
 {
+#ifdef BUILD_BREAK
        SysTryReturn(NID_UI, IsValidDataType(item.GetDataType()), E_INVALID_ARG, E_INVALID_ARG,
                                "[E_INVALID_ARG] The data type is invalid.");
 
@@ -151,11 +152,13 @@ CATCH:
        }
 
        return r;
+#endif
 }
 
 IList*
 _Clipboard::RetrieveItemsN(unsigned long dataTypes)
 {
+#ifdef BUILD_BREAK
        SysTryReturn(NID_UI, IsValidDataType(dataTypes), null, E_INVALID_ARG,
                                "[E_INVALID_ARG] The data type is invalid.");
 
@@ -265,11 +268,13 @@ _Clipboard::RetrieveItemsN(unsigned long dataTypes)
 CATCH:
        delete pList;
        return null;
+#endif
 }
 
 const _ClipboardItem*
 _Clipboard::RetrieveLatestItemN(unsigned long dataTypes)
 {
+#ifdef BUILD_BREAK
        SysTryReturn(NID_UI, IsValidDataType(dataTypes), null, E_INVALID_ARG,
                                "[E_INVALID_ARG] The data type is invalid.");
 
@@ -361,11 +366,13 @@ CATCH:
 
        free(pData);
        return null;
+#endif
 }
 
 result
 _Clipboard::ShowPopup(unsigned long dataTypes, const IClipboardPopupEventListener &listener)
 {
+#ifdef BUILD_BREAK
        SysTryReturn(NID_UI, IsPopupVisible() == false, E_INVALID_OPERATION, E_INVALID_OPERATION,
                                "[E_INVALID_OPERATION] The popup is already shown.");
 
@@ -392,11 +399,13 @@ _Clipboard::ShowPopup(unsigned long dataTypes, const IClipboardPopupEventListene
        pEcoreEvas->OpenClipboard(clipFormats);
 
        return r;
+#endif
 }
 
 result
 _Clipboard::HidePopup(void)
 {
+#ifdef BUILD_BREAK
        SysTryReturn(NID_UI, IsPopupVisible() == true, E_INVALID_OPERATION, E_INVALID_OPERATION,
                                "[E_INVALID_OPERATION] The popup is not shown.");
 
@@ -410,17 +419,20 @@ _Clipboard::HidePopup(void)
        }
 
        return E_SUCCESS;
+#endif
 }
 
 bool
 _Clipboard::IsPopupVisible(void)
 {
+#ifdef BUILD_BREAK
        _EcoreEvas* pEcoreEvas = GetEcoreEvasMgr()->GetEcoreEvas();
 
        bool opened = pEcoreEvas->IsClipboardOpened();
 
        SetLastResult(E_SUCCESS);
        return opened;
+#endif
 }
 
 void
@@ -788,6 +800,7 @@ _Clipboard::CreateImageFilePath(void)
 result
 _Clipboard::RemoveUnnecessaryImageFiles(void)
 {
+#ifdef BUILD_BREAK
        _EcoreEvas* pEcoreEvas = GetEcoreEvasMgr()->GetEcoreEvas();
        SysTryReturn(NID_UI, pEcoreEvas, E_SYSTEM, E_SYSTEM, "[E_SYSTEM] A system error occurred.");
 
@@ -925,6 +938,7 @@ CATCH:
        }
 
        return r;
+#endif
 }
 
 result
index fd88b73..e3c253b 100644 (file)
@@ -158,7 +158,9 @@ _ImeOrientationAgent::UpdateOrientation(int angle)
 
        if (pWinObj)
        {
+#ifdef VE_EFL
                elm_win_rotation_with_resize_set(pWinObj, rotation);
+#endif
        }
 
        OrientationStatus status = ORIENTATION_STATUS_NONE;
index 633eba2..e7e1cd2 100644 (file)
@@ -264,4 +264,36 @@ _KeyEventManager::GetKeyEventListener(void) const
        return __pKeyEventListeners;
 }
 
+_Control*
+_KeyEventManager::GetCapturingControl(_KeyCode keyCode) const
+{
+       _ControlManager* pControlManager = _ControlManager::GetInstance();
+       SysAssert(pControlManager != null);
+
+        _ControlHandle handle;
+       __pKeyCapturingMap->GetValue(keyCode, handle);
+       return pControlManager->GetObject(handle);
+}
+
+void
+_KeyEventManager::SetCapturingControl(const _Control& control,  _KeyCode keyCode, bool captureAllowed)
+{
+       if (captureAllowed)
+       {
+               bool exist = false;
+               __pKeyCapturingMap->ContainsKey(keyCode, exist);
+
+               if (exist)
+               {
+                       __pKeyCapturingMap->Remove(keyCode);
+               }
+
+               __pKeyCapturingMap->Add(keyCode, control.GetHandle());
+       }
+       else
+       {
+               __pKeyCapturingMap->Add(keyCode, _ControlHandle());
+       }
+}
+
 } } //Tizen::Ui
index af004c4..ff3d5d8 100644 (file)
@@ -73,7 +73,9 @@ int
 _ModalLoopManager::BeginMainLoop(void)
 {
        __nestedMainLoop++;
+#ifdef BUILD_BREAK     
        ::GetEcoreEvasMgr()->BeginMainLoop();
+#endif
 
        return __nestedMainLoop;
 }
@@ -146,7 +148,9 @@ _ModalLoopManager::EndMainLoop(int exitCode, bool endAllLoops)
                                __lastExitCode = -2;
                        }
                }
+#ifdef BUILD_BREAK
                ::GetEcoreEvasMgr()->EndMainLoop();
+#endif
                __nestedMainLoop--;
        }
 
index 8e68c01..311212a 100644 (file)
@@ -19,8 +19,9 @@
  * @file               FUi_NativeObjectHandler.cpp
  * @brief              This is the implementation file for the _NativeObjectHandler class.
  */
-
+#ifdef BUILD_BREAK
 #include <Evas.h>
+#endif
 #include "FUiAnimDisplayContext.h"
 #include "FUiAnimVisualElement.h"
 
 
 #include "FUiAnim_VisualElementImpl.h"
 #include "FUiAnim_DisplayContextImpl.h"
+#ifdef BUILD_BREAK
 #include "FUiAnim_EflNode.h"
 #include "FUiAnim_EflLayer.h"
+#endif
 
 #include <FUiControl.h>
 #include "FUi_ControlImpl.h"
@@ -44,6 +47,7 @@ namespace Tizen { namespace Ui {
 Handle
 _NativeObjectHandler::CreateNativeImageObjectN(const DisplayContext* pDisplayContext, int width, int height)
 {
+#ifdef BUILD_BREAK
 //    * @exception    E_SUCCESS                             The method is successful.
 //    * @exception    E_INVALID_ARG                       The specified @c pDisplayContext is invalid.
 //    * @exception    E_UNSUPPORTED_OPERATION             This operation is not supported.
@@ -71,11 +75,13 @@ _NativeObjectHandler::CreateNativeImageObjectN(const DisplayContext* pDisplayCon
 //     evas_object_show(pImage);
 
        return reinterpret_cast<Handle>(pImage);
+#endif
 }
 
 result
 _NativeObjectHandler::SetNativeObjectToVisualElement(VisualElement* pVisualElement, Handle nativeObjectHandle)
 {
+#ifdef BUILD_BREAK     
 //    * @exception    E_SUCCESS                                        The method is successful.
 //    * @exception    E_INVALID_ARG                       The specified @c pNativeObject is @c null.
 //    * @exception    E_UNSUPPORTED_OPERATION             This operation is not supported.
@@ -101,6 +107,7 @@ _NativeObjectHandler::SetNativeObjectToVisualElement(VisualElement* pVisualEleme
                evas_object_image_size_get(pNative, &imageWidth, &imageHeight);
                evas_object_image_data_update_add(pNative, 0, 0, imageWidth, imageHeight);
        }
+#endif 
        return E_SUCCESS;
 }
 
@@ -108,6 +115,7 @@ _NativeObjectHandler::SetNativeObjectToVisualElement(VisualElement* pVisualEleme
 result
 _NativeObjectHandler::SetNativeObjectShowState(Handle nativeObjectHandle, bool show)
 {
+#ifdef BUILD_BREAK
 //    * @exception    E_SUCCESS                                        The method is successful.
 //    * @exception    E_INVALID_ARG                       The specified @c pVisualElement or @c pNativeObject is invalid.
 //    * @exception    E_UNSUPPORTED_OPERATION             This operation is not supported.
@@ -126,12 +134,14 @@ _NativeObjectHandler::SetNativeObjectShowState(Handle nativeObjectHandle, bool s
        }
 
        return E_SUCCESS;
+#endif
 }
 
 
 result
 _NativeObjectHandler::DestroyNativeObject(VisualElement* pVisualElement, Handle nativeObjectHandle)
 {
+#ifdef BUILD_BREAK
 //    * @exception    E_SUCCESS                                        The method is successful.
 //    * @exception    E_UNSUPPORTED_OPERATION             This operation is not supported.
 
@@ -150,6 +160,7 @@ _NativeObjectHandler::DestroyNativeObject(VisualElement* pVisualElement, Handle
 
        }
        return E_SUCCESS;
+#endif
 }
 
 }}  // namespace Tizen { namespace Ui {
index 690d85a..c495ce7 100644 (file)
@@ -163,12 +163,13 @@ _OrientationAgent::Update(bool draw)
        {
                return;
        }
-
+#ifdef BUILD_BREAK
        _EcoreEvas* pEcoreEvas = GetEcoreEvasMgr()->GetEcoreEvas();
        if (!pEcoreEvas)
        {
                return;
        }
+#endif
 
        bool autoMode = false;
 
@@ -207,11 +208,11 @@ _OrientationAgent::Update(bool draw)
                }
 
                __status = status;
-
+#ifdef BUILD_BREAK
                pEcoreEvas->AllowSetWindowBounds(false);
                FireEvent(status);
                pEcoreEvas->AllowSetWindowBounds(true);
-
+#endif         
                // For the form to be made by Ui-Builder
                if ((draw == true) && (__statusChanged == true))
                {
@@ -264,7 +265,7 @@ _OrientationAgent::UpdateOrientation(void)
        // Invalidate
 
        SysLog(NID_UI, "[Window Manager Rotation] ---------- UpdateOrientation : START ----------");
-
+#ifdef BUILD_BREAK
        _EcoreEvas* pEcoreEvas = GetEcoreEvasMgr()->GetEcoreEvas();
        if (!pEcoreEvas)
        {
@@ -351,6 +352,7 @@ _OrientationAgent::UpdateOrientation(void)
        SysLog(NID_UI, "[Window Manager Rotation][Window : 0x%x, rot = %d, %d, %d, %d, %d] Update Orientation.", pRootWindow->GetNativeHandle(), rotation, bounds.x, bounds.y, bounds.width, bounds.height);
 
        SysLog(NID_UI, "[Window Manager Rotation] ---------- UpdateOrientation : END ----------");
+#endif 
 }
 
 void
@@ -413,13 +415,13 @@ _OrientationAgent::FireEvent(OrientationStatus status, bool callback)
        {
                return;
        }
-
+#ifdef BUILD_BREAK
        _EcoreEvas* pEcoreEvas = GetEcoreEvasMgr()->GetEcoreEvas();
        if (!pEcoreEvas)
        {
                return;
        }
-
+#endif
        _ControlOrientation coreOrientation =
                (status == ORIENTATION_STATUS_PORTRAIT || status == ORIENTATION_STATUS_PORTRAIT_REVERSE) ?
                _CONTROL_ORIENTATION_PORTRAIT : _CONTROL_ORIENTATION_LANDSCAPE;
@@ -451,7 +453,9 @@ _OrientationAgent::FireEvent(OrientationStatus status, bool callback)
 
                                if (pOwnee->GetVisibleState() == true)
                                {
+#ifdef BUILD_BREAK
                                        pEcoreEvas->SetOwner(*pOwnee, pImpl->GetCore());
+#endif
                                }
                        }
                }
@@ -479,7 +483,9 @@ _OrientationAgent::FireEvent(OrientationStatus status, bool callback)
 
                                        if (pOwnee->GetVisibleState() == true)
                                        {
+#ifdef BUILD_BREAK
                                                pEcoreEvas->SetOwner(*pOwnee, *pParent);
+#endif
                                        }
                                }
                        }
@@ -499,6 +505,7 @@ _OrientationAgent::FireEvent(OrientationStatus status, bool callback)
 void
 _OrientationAgent::SetRotation(const _Window& window, Orientation orientation)
 {
+#ifdef BUILD_BREAK
        _EcoreEvas* pEcoreEvas = GetEcoreEvasMgr()->GetEcoreEvas();
        if (!pEcoreEvas)
        {
@@ -538,6 +545,7 @@ _OrientationAgent::SetRotation(const _Window& window, Orientation orientation)
        default:
                break;
        }
+#endif
 }
 
 }} // Tizen::Ui
index 8945ee1..1d9a1d4 100644 (file)
@@ -216,6 +216,7 @@ _SystemUtilImpl::~_SystemUtilImpl(void)
 result
 _SystemUtilImpl::GenerateKeyEvent(Tizen::Ui::KeyEventType keyEvent, Tizen::Ui::_KeyCode keyCode)
 {
+#ifdef BUILD_BREAK     
        result r = E_SUCCESS;
 
        Display* pDisplay = (Display*)ecore_x_display_get();
@@ -259,6 +260,7 @@ _SystemUtilImpl::GenerateKeyEvent(Tizen::Ui::KeyEventType keyEvent, Tizen::Ui::_
 
        SysTryReturn(NID_UI, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
        return r;
+#endif
 }
 
 result
@@ -270,6 +272,7 @@ _SystemUtilImpl::GenerateTouchEvent(TouchEventType touchEvent, const Tizen::Grap
 result
 _SystemUtilImpl::GenerateTouchEvent(TouchEventType touchEvent, const Tizen::Graphics::FloatPoint& point)
 {
+#ifdef BUILD_BREAK
        result r = E_SUCCESS;
 
        Display* pDisplay = (Display*)ecore_x_display_get();
@@ -313,6 +316,7 @@ _SystemUtilImpl::GenerateTouchEvent(TouchEventType touchEvent, const Tizen::Grap
 
        SysTryReturn(NID_UI, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
        return r;
+#endif
 }
 
 Tizen::Graphics::Bitmap*
@@ -351,8 +355,8 @@ result
 _SystemUtilImpl::SendKeyStopMessage(void)
 {
        bool r = false;
-       int num;
-       Ecore_X_Window *_keygrab_win = null;
+#ifdef BUILD_BREAK
+       Ecore_X_Atom type = ecore_x_atom_get("_HWKEY_EMULATION");
        char msg_data[] = "PxXF86Stop";
 
        Ecore_X_Atom type = ecore_x_atom_get("_HWKEY_EMULATION");
@@ -365,7 +369,7 @@ _SystemUtilImpl::SendKeyStopMessage(void)
                r = ecore_x_client_message8_send(xWindow, type, msg_data, sizeof(msg_data));
                SysTryReturn(NID_UI, r == true, E_OPERATION_FAILED, E_OPERATION_FAILED, "ecore_x_client_message8_send failed.");
        }
-
+#endif
        return E_SUCCESS;
 }
 
index 376b42b..6f27902 100644 (file)
@@ -66,8 +66,12 @@ _TouchLongPressGestureDetector::_TouchLongPressGestureDetector(void)
 
        __pLongPressInfoList = new (std::nothrow) ArrayListT<_LongPressInfo*>;
        SysTryReturnVoidResult(NID_UI, __pLongPressInfoList, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
-
+#ifdef VE_EFL
        int __duration = static_cast<int>(elm_config_longpress_timeout_get() * 1000);
+#else
+       int __duration;
+#endif
+
        if (__duration == 0)
        {
                __duration = 500;
index c75ad92..e870c71 100644 (file)
@@ -299,7 +299,7 @@ _UiBuilderControlMaker::GetProperty(_UiBuilderControl* pControl, _UiBuilderContr
                        autoRotateLock = false;
                        SysLog(NID_UI, "It's failed to get the flag of auto-rotate.");
                }
-
+#ifdef BUILD_BREAK
                app_device_orientation_e deviceOrientation = app_get_device_orientation();
                bool isHorizontal = (deviceOrientation == APP_DEVICE_ORIENTATION_90) || (deviceOrientation == APP_DEVICE_ORIENTATION_270);
 
@@ -311,6 +311,7 @@ _UiBuilderControlMaker::GetProperty(_UiBuilderControl* pControl, _UiBuilderContr
                {
                        __pUiBuilder->SetUiBuilderRotateState(UIBUIDER_SCREEN_VERTICAL);
                }
+#endif
        }
 
        if (__pUiBuilder->GetUiBuilderRotateState() == UIBUIDER_SCREEN_HORIZONTAL)
index fddb8b5..575afd9 100644 (file)
@@ -30,7 +30,7 @@
 #include "FUi_IKeyEventListener.h"
 #include "FUi_ITouchEventListener.h"
 #include "FUi_IFocusEventListener.h"
-#include "FUi_EflUiEventManager.h"
+#include "FUi_XUiEventManager.h"
 #include "FUi_Control.h"
 #include "FUi_ControlManager.h"
 #include "FUi_TouchManager.h"
@@ -676,6 +676,28 @@ _UiEventManager::GetTarget(int x, int y) const
 }
 
 void
+_UiEventManager::SetKeyCapture(const _Control& control, _KeyCode keyCode)
+{
+       __pEventManager->SetKeyCapture(control, keyCode);
+
+       _KeyEventManager* pKeyEventManager = _KeyEventManager::GetInstance();
+       SysAssert(pKeyEventManager != null);
+
+       pKeyEventManager->SetCapturingControl(control, keyCode, true);
+}
+
+void
+_UiEventManager::ReleaseKeyCapture(const _Control& control, _KeyCode keyCode)
+{
+       __pEventManager->ReleaseKeyCapture(control, keyCode);
+
+       _KeyEventManager* pKeyEventManager = _KeyEventManager::GetInstance();
+       SysAssert(pKeyEventManager != null);
+
+       pKeyEventManager->SetCapturingControl(control, keyCode, false);
+}
+
+void
 _UiEventManager::RemoveAllEventListenerList(Tizen::Base::Collection::HashMapT<_UiEventType, Tizen::Base::Collection::LinkedListT<_IUiEventListener*>*>* pMap)
 {
        Tizen::Base::Collection::IMapEnumeratorT<_UiEventType, Tizen::Base::Collection::LinkedListT<_IUiEventListener*>*>* pMapEnumerator = pMap->GetMapEnumeratorN();
@@ -698,7 +720,7 @@ _UiEventManager::RemoveAllEventListenerList(Tizen::Base::Collection::HashMapT<_U
 }
 
 _UiEventManager::_UiEventManager(void)
-       : __pEventManager(new (std::nothrow) _EflUiEventManager)
+       : __pEventManager(new (std::nothrow) _XUiEventManager)
 {
        unique_ptr<HashMapT<_UiEventType, LinkedListT<_IUiEventListener*>*> > pEventListenerMap(new (std::nothrow) HashMapT<_UiEventType, LinkedListT<_IUiEventListener*>*>);
        SysTryReturnVoidResult(NID_UI, pEventListenerMap, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory is insufficient.");
index 4428b27..11ea9e5 100644 (file)
@@ -29,8 +29,8 @@
 #include <FGrpFloatRectangle.h>
 #include "FUi_LayoutImpl.h"
 #include "FUi_LayoutLayoutMaker.h"
-#include "FUi_EcoreEvasMgr.h"
-#include "FUi_EcoreEvas.h"
+//#include "FUi_EcoreEvasMgr.h"
+//#include "FUi_EcoreEvas.h"
 #include "FUi_ControlImplManager.h"
 #include "FUi_OrientationAgent.h"
 #include "FUi_ImeOrientationAgent.h"
@@ -316,10 +316,10 @@ _FormImpl::SetFormStyle(unsigned long formStyle)
                }
                return;
        }
-
+#ifdef VE_EFL
        _EcoreEvas* pEcoreEvas = GetEcoreEvasMgr()->GetEcoreEvas();
        SysTryReturnVoidResult(NID_UI_CTRL, pEcoreEvas, E_SYSTEM, "[E_SYSTEM] Unable to get evas.");
-
+#endif
        GetCore().SetFormStyle(formStyle);
 
        FloatRectangle indicatorBounds(0.0f, 0.0f, 0.0f, 0.0f);
@@ -1762,10 +1762,12 @@ protected:
                //Set rect
                (pControl->GetAttribute(UIBUILDER_ATTRIBUTE_PORTRAIT))->SetRect(0.0f, 0.0f, screenSize.width, screenSize.height);
                (pControl->GetAttribute(UIBUILDER_ATTRIBUTE_LANDSCAPE))->SetRect(0.0f, 0.0f, screenSize.height, screenSize.width);
-
+#ifdef BUILD_BREAK
                // Get device orientation
                app_device_orientation_e deviceOrientation = app_get_device_orientation();
                bool isHorizontal = (deviceOrientation == APP_DEVICE_ORIENTATION_90) || (deviceOrientation == APP_DEVICE_ORIENTATION_270);
+#endif
+               bool isHorizontal = false;
 
                if (isHorizontal)
                {
index af15a84..e50b19b 100644 (file)
 #include "FUi_UiNotificationEvent.h"
 #include "FUi_UiEventManager.h"
 #include "FUi_ControlManager.h"
+#ifdef VE_EFL
 #include "FUi_EcoreEvasMgr.h"
 #include "FUi_EcoreEvas.h"
+#endif
 #include "FUi_TouchManager.h"
 #include "FUi_CoordinateSystemUtils.h"
 #include "FUiCtrl_Frame.h"
 #include "FUiCtrl_FrameImpl.h"
 #include "FUiAnim_VisualElement.h"
 #include "FUiAnim_RootVisualElement.h"
+#include "FUiAnim_GlLayer.h"
+#ifdef VE_EFL
 #include "FUiAnim_EflLayer.h"
+#endif
 #include "FUi_AccessibilityManager.h"
 
 using namespace Tizen::App;
@@ -111,7 +116,11 @@ _Frame::CreateFrameN(void)
 {
        result r = E_SUCCESS;
        _RootVisualElement* pRootVE = null;
+
+       _GlLayer* pLayer = null;
+#ifdef VE_EFL
        _EflLayer* pLayer = null;
+#endif
        int appType = _AppInfo::GetAppType();
 
        _Frame* pFrame = new (std::nothrow) _Frame;
@@ -132,8 +141,11 @@ _Frame::CreateFrameN(void)
 
        pRootVE = pFrame->GetRootVisualElement();
        SysAssert(pRootVE);
-
+#ifdef VE_EFL
        pLayer = static_cast<_EflLayer*>(pRootVE->GetNativeLayer());
+#else
+       pLayer = static_cast<_GlLayer*>(pRootVE->GetNativeLayer());
+#endif 
        SysAssert(pLayer);
 
        if (!(appType & _APP_TYPE_IME_APP))
@@ -242,11 +254,13 @@ _Frame::OnNotifiedN(const _Control& source, IList* pArgs)
        }
        else if (*pType == _ACTIVATE_FRAME)
        {
+#ifdef BUILD_BREAK             
                _EcoreEvas* pEcoreEvas = GetEcoreEvasMgr()->GetEcoreEvas();
                if (pEcoreEvas)
                {
                        pEcoreEvas->ActivateWindow(*this);
                }
+#endif         
 
                pArgs->RemoveAll(true);
                delete pArgs;
@@ -278,6 +292,7 @@ _Frame::OnFrameActivated(void)
 
        if (GetChildCount() < 1)
        {
+#ifdef BUILD_BREAK             
                _EcoreEvas* pEcoreEvas = GetEcoreEvasMgr()->GetEcoreEvas();
                SysTryReturnVoidResult(NID_UI_CTRL, pEcoreEvas, E_SYSTEM, "[E_SYSTEM] Unable to get evas");
 
@@ -285,6 +300,7 @@ _Frame::OnFrameActivated(void)
                {
                        pEcoreEvas->SetIndicatorShowState(*GetRootWindow(), false);
                }
+#endif
        }
 }
 
@@ -451,8 +467,10 @@ _Frame::SetFloatingBounds(const Rectangle& rect)
 result
 _Frame::SetShowMode(FrameShowMode showMode)
 {
+#ifdef BUILD_BREAK     
        _EcoreEvas* pEcoreEvas = GetEcoreEvasMgr()->GetEcoreEvas();
        SysTryReturnResult(NID_UI_CTRL, pEcoreEvas, E_SYSTEM, "The method cannot proceed due to a severe system error.");
+#endif 
 
        if (showMode == FRAME_SHOW_MODE_MINIMIZED)
        {
@@ -460,8 +478,9 @@ _Frame::SetShowMode(FrameShowMode showMode)
                {
                        return E_SUCCESS;
                }
-
+#ifdef BUILD_BREAK
                pEcoreEvas->MinimizeWindow(*GetRootWindow());
+#endif
                __minimized = true;
 
                return E_SUCCESS;
@@ -501,8 +520,10 @@ _Frame::SetShowMode(FrameShowMode showMode)
        case FRAME_SHOW_MODE_FULL_SCREEN:
                if (oldShowMode == FRAME_SHOW_MODE_PARTIAL_SCREEN_FLOATING)
                {
+#ifdef BUILD_BREAK                     
                        r = pEcoreEvas->SetFloatingMode(*GetRootWindow(), false);
                        SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+#endif                 
                }
 
                if (oldShowMode != FRAME_SHOW_MODE_FULL_SCREEN)
@@ -527,8 +548,10 @@ _Frame::SetShowMode(FrameShowMode showMode)
        case FRAME_SHOW_MODE_PARTIAL_SCREEN:
                if (oldShowMode == FRAME_SHOW_MODE_PARTIAL_SCREEN_FLOATING)
                {
+#ifdef BUILD_BREAK                     
                        r = pEcoreEvas->SetFloatingMode(*GetRootWindow(), false);
                        SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+#endif                 
                }
 
                if (oldShowMode == FRAME_SHOW_MODE_FULL_SCREEN)
@@ -537,15 +560,18 @@ _Frame::SetShowMode(FrameShowMode showMode)
                }
                else if (oldShowMode == FRAME_SHOW_MODE_PARTIAL_SCREEN_FLOATING)
                {
-                       pEcoreEvas->SetWindowBounds(*GetRootWindow(), _CoordinateSystemUtils::ConvertToInteger(__floatingBounds));
+                       SetBounds(__floatingBounds);
+//                     pEcoreEvas->SetWindowBounds(*GetRootWindow(), _CoordinateSystemUtils::ConvertToInteger(__floatingBounds));
                }
 
                break;
        case FRAME_SHOW_MODE_PARTIAL_SCREEN_FLOATING:
                if (oldShowMode != FRAME_SHOW_MODE_PARTIAL_SCREEN_FLOATING)
                {
+#ifdef BUILD_BREAK                     
                        r = pEcoreEvas->SetFloatingMode(*GetRootWindow(), true);
                        SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+#endif                 
                }
 
                if (oldShowMode == FRAME_SHOW_MODE_FULL_SCREEN)
@@ -618,9 +644,11 @@ _Frame::OnChildDetached(const _Control& child)
        }
        else
        {
+#ifdef BUILD_BREAK             
                _EcoreEvas* pEcoreEvas = GetEcoreEvasMgr()->GetEcoreEvas();
                SysTryReturnVoidResult(NID_UI_CTRL, pEcoreEvas, E_SYSTEM, "[E_SYSTEM] Unable to get evas");
                pEcoreEvas->SetIndicatorShowState(*GetRootWindow(), false);
+#endif         
        }
 }
 
@@ -662,7 +690,7 @@ _Frame::OnBoundsChanging(const FloatRectangle& bounds)
        {
                return E_SUCCESS;
        }
-
+#ifdef BUILD_BREAK
        _EcoreEvas* pEcoreEvas = GetEcoreEvasMgr()->GetEcoreEvas();
        SysTryReturn(NID_UI, pEcoreEvas, E_SYSTEM, E_SYSTEM, "[E_SYSTEM] A system error occurred.");
 
@@ -671,17 +699,19 @@ _Frame::OnBoundsChanging(const FloatRectangle& bounds)
        SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
        return r;
+#endif 
 }
 
 
 result
 _Frame::OnAttached(void)
 {
+#ifdef BUILD_BREAK     
        _EcoreEvas* pEcoreEvas = GetEcoreEvasMgr()->GetEcoreEvas();
        SysAssert(pEcoreEvas);
 
        pEcoreEvas->SetWindowVisibleState(*GetRootWindow(), true);
-
+#endif
        return E_SUCCESS;
 }
 
@@ -690,8 +720,11 @@ _Frame::OnBackgroundColorChanged(Color& backgroundColor)
 {
        _RootVisualElement* pRootVE = GetRootVisualElement();
        SysAssert(pRootVE);
-
+#ifdef VE_EFL
        _EflLayer* pLayer = static_cast<_EflLayer*>(pRootVE->GetNativeLayer());
+#else
+       _GlLayer* pLayer = static_cast<_GlLayer*>(pRootVE->GetNativeLayer());
+#endif
        SysAssert(pLayer);
 
        byte alpha = backgroundColor.GetAlpha();
@@ -704,7 +737,7 @@ _Frame::OnBackgroundColorChanged(Color& backgroundColor)
        SetShowMode(FRAME_SHOW_MODE_FULL_SCREEN);
 
        SetShowMode(showMode);
-
+#ifdef VE_EFL
        _EcoreEvas* pEcoreEvas = GetEcoreEvasMgr()->GetEcoreEvas();
        if (!pEcoreEvas)
        {
@@ -762,6 +795,7 @@ _Frame::OnBackgroundColorChanged(Color& backgroundColor)
        default:
                break;
        }
+#endif
 }
 
 void
index 7475793..d81ac8d 100644 (file)
@@ -267,25 +267,25 @@ _OverlayAgent::~_OverlayAgent(void)
 
        if (__pPixmapEventHandler)
        {
-               ecore_event_handler_del(__pPixmapEventHandler);
+//             ecore_event_handler_del(__pPixmapEventHandler);
                __pPixmapEventHandler = null;
        }
 
        if (__pixmapDamageHandle)
        {
-               ecore_x_damage_free(__pixmapDamageHandle);
+//             ecore_x_damage_free(__pixmapDamageHandle);
                __pixmapDamageHandle = 0;
        }
 
        if (__pixmap != 0)
        {
-               XFreePixmap((Display*)ecore_x_display_get(), __pixmap);
+//             XFreePixmap((Display*)ecore_x_display_get(), __pixmap);
                __pixmap = 0;
        }
 
        if (__pShmInfo)
        {
-               XShmDetach((Display*)ecore_x_display_get(), __pShmInfo);
+//             XShmDetach((Display*)ecore_x_display_get(), __pShmInfo);
                shmdt(__pShmInfo->shmaddr);
                shmctl(__pShmInfo->shmid, IPC_RMID, NULL);
                __pShmInfo = null;
@@ -318,7 +318,7 @@ _OverlayAgent::~_OverlayAgent(void)
 
        if (__pImageObject)
        {
-               evas_object_del(__pImageObject);
+//             evas_object_del(__pImageObject);
                __pImageObject = null;
        }
 }
@@ -331,8 +331,9 @@ _OverlayAgent::GetBufferInfo(BufferInfo& bufferInfo) const
 
        int width = 0;
        int height = 0;
+#ifdef VE_EFL
        evas_object_geometry_get(__pImageObject, NULL, NULL, &width, &height);
-
+#endif
        bufferInfo.width = width;
        bufferInfo.pitch = width;
        bufferInfo.height = height;
@@ -442,7 +443,7 @@ _OverlayAgent::Draw(void)
 result
 _OverlayAgent::GrabXvPort(void)
 {
-       Display* pDisplay = (Display*)ecore_x_display_get();
+       Display* pDisplay;// = (Display*)ecore_x_display_get();
        SysTryReturnResult(NID_UI_CTRL, pDisplay != null, E_SYSTEM, "The current value of Display is null");
 
        int baseXvPort = -1;
@@ -488,7 +489,7 @@ _OverlayAgent::UngrabXvPort(void)
 
        if (__isPortGrabbed[__xvPort - __baseXvPort])
        {
-               Display* pDisplay = (Display*) ecore_x_display_get();
+               Display* pDisplay;// = (Display*) ecore_x_display_get();
                Atom atom = XInternAtom(pDisplay, "_USER_WM_PORT_ATTRIBUTE_STREAM_OFF", False);
                XvSetPortAttribute(pDisplay, __xvPort, atom, 1);
                XvUngrabPort(pDisplay, __xvPort, 0);
@@ -505,7 +506,7 @@ _OverlayAgent::PutXvImage(void)
 {
        SysTryReturnResult(NID_UI_CTRL, __pixmap != 0, E_SYSTEM, "The current value of pixmap is null");
 
-       Display* pDisplay = (Display*)ecore_x_display_get();
+       Display* pDisplay;// = (Display*)ecore_x_display_get();
        SysTryReturnResult(NID_UI_CTRL, pDisplay != null, E_SYSTEM, "The current value of Display is null");
 
        if (__pXvImage == null || __needToRellaocImage)
@@ -575,7 +576,7 @@ _OverlayAgent::PutXvImage(void)
 
        int imageWidth = 0;
        int imageHeight = 0;
-       evas_object_image_size_get(__pImageObject, &imageWidth, &imageHeight);
+//     evas_object_image_size_get(__pImageObject, &imageWidth, &imageHeight);
 
        GC gc= DefaultGCOfScreen(DefaultScreenOfDisplay(pDisplay));
        XvShmPutImage(pDisplay, __xvPort, __pixmap, gc, __pXvImage, 0, 0, __currentSourceBufferSize.width, __currentSourceBufferSize.height, 0, 0, imageWidth, imageHeight, False);
@@ -656,12 +657,12 @@ _OverlayAgent::PutEvasImage(void)
        __pCurrentSourceBuffer = null;
        void* pImageData = (void*)(__pConvertedSourceBuffer->GetPointer());
        SysTryReturnResult(NID_UI_CTRL, pImageData != null, E_SYSTEM, "The converted image data for Overlay Renderer VisualElement is invalid.");
-
+#ifdef VE_EFL
        evas_object_image_size_set(__pImageObject, __currentSourceBufferSize.width, __currentSourceBufferSize.height);
        evas_object_image_data_set(__pImageObject, pImageData);
        evas_object_image_data_update_add(__pImageObject, 0, 0, __currentSourceBufferSize.width, __currentSourceBufferSize.height);
        evas_object_show(__pImageObject);
-
+#endif
        if (__needToRellaocImage)
        {
                SysSecureLog(NID_UI_CTRL, "The current value of source buffer bounds is [%d,%d,%d, %d]", 0, 0, __currentSourceBufferSize.width, __currentSourceBufferSize.height);
@@ -914,6 +915,7 @@ _OverlayAgent::CreateRendererVisualElement(const _Control& parentControl, const
        r = __pParentVE->SetSurfaceOpaque(true);
        SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
 
+#ifdef VE_EFL
 
        // Get and Set ImageObject of Renderer VisualElement
        _EflNode* pEflNode = dynamic_cast<_EflNode*>(pRendererVE->GetNativeNode());
@@ -959,7 +961,7 @@ _OverlayAgent::CreateRendererVisualElement(const _Control& parentControl, const
        {
                evas_object_image_pixels_get_callback_set(__pImageObject, OnEvasImageDamaged,(void*)this);
        }
-
+#endif
        return r;
 }
 
@@ -972,6 +974,7 @@ _OverlayAgent::CreatePixmap(const Rectangle& physicalBounds)
                E_SYSTEM, "input size (%d, %d) is too small to create a pixmap",pixmapSize.width, pixmapSize.height);
 
        // Create pixmap
+#ifdef VE_EFL
        Display *pDisplay = (Display*)ecore_x_display_get();
        SysTryReturnResult(NID_UI_CTRL, pDisplay != null, E_SYSTEM, "The current value of Display is null");
 
@@ -986,14 +989,17 @@ _OverlayAgent::CreatePixmap(const Rectangle& physicalBounds)
        XFillRectangle(pDisplay, __pixmap, gc, 0, 0, pixmapSize.width, pixmapSize.height);
        XSync(pDisplay, 0);
        XFreeGC(pDisplay, gc);
-
+#endif
        //Set evas native surface
        Evas_Native_Surface evasNativeSuface = {0,};
 
        evasNativeSuface.version = EVAS_NATIVE_SURFACE_VERSION;
        evasNativeSuface.type = EVAS_NATIVE_SURFACE_X11;
+#ifdef VE_EFL
        evasNativeSuface.data.x11.visual = ecore_x_default_visual_get(ecore_x_display_get(), ecore_x_default_screen_get());
+#endif
        evasNativeSuface.data.x11.pixmap = __pixmap;
+#ifdef VE_EFL
 
        evas_object_lower(__pImageObject);
        evas_object_image_native_surface_set(__pImageObject, &evasNativeSuface);
@@ -1024,7 +1030,7 @@ CATCH:
                XFreePixmap((Display*)ecore_x_display_get(), __pixmap);
                __pixmap = 0;
        }
-
+#endif
        return E_SYSTEM;
 }
 
@@ -1156,7 +1162,7 @@ _OverlayAgent::EvaluateBounds(OverlayAgentEvaluationOption option, FloatRectangl
        int screenWidth = _Screen::GetWidth();
        int screenHeight = _Screen::GetHeight();
        SysTryReturnResult(NID_UI_CTRL, screenWidth > 0 && screenHeight > 0, E_SYSTEM, "The value of screen size is invalid.");
-
+#ifdef VE_EFL
        //If orientation status of screen is landscape mode, swap width and height.
        {
                _EcoreEvas* pEcoreEvas = GetEcoreEvasMgr()->GetEcoreEvas();
@@ -1170,6 +1176,7 @@ _OverlayAgent::EvaluateBounds(OverlayAgentEvaluationOption option, FloatRectangl
                        SysSecureLog(NID_UI_CTRL, "The current value of device screen width is %d, device screen height is %d and orientation is %d", screenWidth, screenHeight, orientation);
                }
        }
+#endif
 
        int physicalMaxWidth= screenWidth - (screenWidth % widthUnit);
        int physicalMaxHeight = screenHeight - (screenHeight % heightUnit);
index 3b7a42b..e0ae6bd 100644 (file)
@@ -228,9 +228,11 @@ _OverlayPanel::OnAttachedToMainTree(void)
        }
 
 
+
        // Get style of OverlayPanel
        _OverlayAgentStyle overlayAgentType = _OVERLAY_AGENT_STYLE_NONE;
        {
+        #ifdef VE_EFL
                String preferredEngineConfig(elm_config_preferred_engine_get());
                if(preferredEngineConfig.Equals("opengl_x11", true))
                {
@@ -256,9 +258,11 @@ _OverlayPanel::OnAttachedToMainTree(void)
                                SysLog(NID_UI_CTRL,"The current value of HwAcceleration is Off (System Default)");
                        }
                }
+        #endif
        }
 
 
+
        // Create Overlay Agent
        __pOverlayAgent = _OverlayAgent::CreateInstanceN(overlayAgentType, *this, logicalBoundsF, physicalBounds);
        r = GetLastResult();
index e4a7f65..67671a7 100644 (file)
@@ -285,6 +285,7 @@ _OverlayRegionImpl::Construct(_Form* pParentForm, OverlayRegionType overlayRegio
 
        _OverlayAgentStyle overlayAgentType = _OVERLAY_AGENT_STYLE_REGION_SW;
        {
+#ifdef VE_EFL
                String preferredEngineConfig(elm_config_preferred_engine_get());
                if(preferredEngineConfig.Equals("opengl_x11", true))
                {
@@ -309,6 +310,7 @@ _OverlayRegionImpl::Construct(_Form* pParentForm, OverlayRegionType overlayRegio
                                SysLog(NID_UI_CTRL,"The current value of HwAcceleration is Off (System Default)");
                        }
                }
+#endif
        }
 
        std::unique_ptr<_OverlayAgent> pOverlayAgent(_OverlayAgent::CreateInstanceN(overlayAgentType, *pParentForm, overlayLogRect, finalPhyRect));
index 750f26d..d6120f3 100644 (file)
@@ -328,7 +328,7 @@ result
 _ScrollPanelImpl::CloseOverlayWindow(void)
 {
        ClearLastResult();
-
+#ifdef VE_EFL
        const _Control* pControl = GetCore().GetControlKeypadBinding();
 
        _Edit* pKeypadBindingEdit = dynamic_cast <_Edit*>(const_cast <_Control*>(pControl));
@@ -340,7 +340,7 @@ _ScrollPanelImpl::CloseOverlayWindow(void)
 
        result r = pKeypadBindingEdit->HideKeypad();
        SysTryReturn(NID_UI_CTRL, r != E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-
+#endif
        return E_SUCCESS;
 }
 
index d92266d..6b0dce9 100644 (file)
@@ -1104,7 +1104,7 @@ Tizen::Graphics::Canvas*
 _TableViewItem::OnCanvasRequestedN(const Tizen::Graphics::FloatRectangle& bounds)
 {
        Canvas* pCanvas = null;
-
+#ifdef VE_EFL
        if(__pBitmapVisualElement != null && __pBitmapVisualElement->GetImageSource().IsEmpty())
        {
                Bitmap* pDrawBitmap = __pItemBgBitmap[__drawingStatus];
@@ -1119,6 +1119,7 @@ _TableViewItem::OnCanvasRequestedN(const Tizen::Graphics::FloatRectangle& bounds
                        DrawBitmap(*pCanvas, FloatRectangle(0.0f, 0.0f, bounds.width, bounds.height), *pDrawBitmap);
                }
        }
+#endif
 
 CATCH:
 
index 31b3be4..3641e53 100644 (file)
@@ -60,8 +60,8 @@ class _EditAreaImpl
 public:
        class EditAreaSizeInfo : public _ControlImpl::SizeInfo
        {
-               virtual Tizen::Graphics::Dimension GetDefaultMinimumSize(Tizen::Ui::_ControlOrientation orientation) const;
-               virtual Tizen::Graphics::FloatDimension GetDefaultMinimumSizeF(Tizen::Ui::_ControlOrientation orientation) const;
+        virtual Tizen::Graphics::Dimension GetDefaultMinimumSize(Tizen::Ui::_ControlOrientation orientation) const {}
+        virtual Tizen::Graphics::FloatDimension GetDefaultMinimumSizeF(Tizen::Ui::_ControlOrientation orientation) const {}
        };
 
 public:
index da702a2..a08823b 100644 (file)
@@ -49,6 +49,9 @@ public:
        virtual result UnregisterKeyEventHandler(const _Control& control) = 0;
        virtual result UnregisterTouchEventHandler(const _Control& control) = 0;
        virtual result PostEvent(const _UiEvent& event) = 0;
+
+       virtual void SetKeyCapture(const _Control& control, _KeyCode keyCode) = 0;
+       virtual void ReleaseKeyCapture(const _Control& control, _KeyCode keyCode) = 0;
 }; // _IUiEventManager
 
 }} // Tizen::Ui
index b8e5f76..da6410c 100644 (file)
@@ -98,6 +98,10 @@ public:
         */
        Tizen::Base::Collection::LinkedListT<Tizen::Ui::_IKeyEventListener*>*  GetKeyEventListener(void) const;
 
+       _Control* GetCapturingControl(_KeyCode keyCode) const;
+
+       void SetCapturingControl(const _Control& control, _KeyCode keyCode, bool captureAllowed);
+
        static void InitializeInstance(void);
        static void ReleaseInstance(void);
 
index a08d744..2de8f25 100644 (file)
@@ -85,6 +85,9 @@ public:
 
        _IUiEventManager* GetEventManager(void) const;
 
+       void SetKeyCapture(const _Control& control, _KeyCode keyCode);
+       void ReleaseKeyCapture(const _Control& control, _KeyCode keyCode);
+
 private:
        static void InitInstance(void);
        result AddEventListener(_UiEventType eventType, bool postListener, const _IUiEventListener& listener);
index 002e9ab..5664549 100644 (file)
@@ -143,10 +143,12 @@ SizeInfo::GetEditAreaSizeInfo(void)
 _ControlImpl::SizeInfo&
 SizeInfo::GetEditFieldSizeInfo(bool isSmallStyle, EditFieldTitleStyle titleStlye)
 {
+#ifdef BUILD_BREAK
        static _EditFieldImpl::EditFieldSizeInfo editFieldSizeInfo;
        editFieldSizeInfo.SetSmallStyle(isSmallStyle);
        editFieldSizeInfo.SetTitleStyle(titleStlye);
        return editFieldSizeInfo;
+#endif
 }
 
 _ControlImpl::SizeInfo&