X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fsystem%2Ftizen-wayland%2Fwidget-application-impl-tizen.cpp;h=2faa238d6b6cc6d9666da61b5199bbbd569a99f1;hb=92144f335342483cd0b17a2c3997c685cc0417c3;hp=7c12ef92aa8659d716439002b44a4ece7c9c5fc3;hpb=17d2a940c64470c442a4ad1c8a61df5e4189a7a1;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/dali/internal/system/tizen-wayland/widget-application-impl-tizen.cpp b/dali/internal/system/tizen-wayland/widget-application-impl-tizen.cpp index 7c12ef9..2faa238 100644 --- a/dali/internal/system/tizen-wayland/widget-application-impl-tizen.cpp +++ b/dali/internal/system/tizen-wayland/widget-application-impl-tizen.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 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. @@ -19,80 +19,140 @@ #include // INTERNAL INCLUDE -#include -#include +#include +#include #include +#include +#include +#include -#ifdef WIDGET_SUPPOERTED +// EXTERNAL INCLUDES #include #include -#endif namespace Dali { - namespace Internal { - -#ifdef WIDGET_SUPPOERTED namespace { +/** + * This Api is called when widget viewer send keyEvent. + * In this API, widget framework create a new keyEvent, find the proper widget and send this event. + * Finally widget framework receive feedback from widget. + */ +#ifdef OVER_TIZEN_VERSION_7 +bool OnKeyEventCallback(const char *id, screen_connector_event_type_e eventType, int keyCode, const char *keyName, long long cls, long long subcls, const char* identifier, long long timestamp, void *userData) +{ + Dali::Internal::Adaptor::WidgetApplicationTizen* application = static_cast(userData); -int OnInstanceInit(widget_base_instance_h instanceHandle, bundle *content, int w, int h, void *classData) + // Create new key for widget + Dali::KeyEvent::State state = Dali::KeyEvent::DOWN; + if(eventType == SCREEN_CONNECTOR_EVENT_TYPE_KEY_DOWN) + { + state = Dali::KeyEvent::DOWN; + } + else if(eventType == SCREEN_CONNECTOR_EVENT_TYPE_KEY_UP) + { + state = Dali::KeyEvent::UP; + } + + bool consumed = true; + std::string keyEventName = std::string(keyName); + Dali::KeyEvent event = Dali::DevelKeyEvent::New(keyEventName, "", "", keyCode, 0, timestamp, state, "", "", Device::Class::NONE, Device::Subclass::NONE); + + if(application) + { + std::string widgetId = std::string(id); + widget_base_instance_h instanceHandle = application->GetWidgetInstanceFromWidgetId(widgetId); + if(instanceHandle) + { + consumed = application->FeedKeyEvent(instanceHandle, event); + } + } + + return consumed; +} +#endif + +int OnInstanceInit(widget_base_instance_h instanceHandle, bundle* content, int w, int h, void* classData) { - char *id; + char* id; widget_base_context_get_id(instanceHandle, &id); widget_base_class_on_create(instanceHandle, content, w, h); Dali::Internal::Adaptor::WidgetApplicationTizen* application = static_cast(classData); - // After DALi can support multi window, this part should be changed. - Dali::Window window = application->GetWindow(); - window.ShowIndicator(Dali::Window::INVISIBLE); + Dali::Window window; + if(application->GetWidgetCount() == 0) + { + window = application->GetWindow(); + DALI_LOG_RELEASE_INFO("Widget Instance use default Window(win:%p), so it need to bind widget (%dx%d) (id:%s) \n", window, w, h, std::string(id).c_str()); + } + else + { + window = Dali::Window::New(PositionSize(0, 0, w, h), "", false); + if(window) + { + DALI_LOG_RELEASE_INFO("Widget Instance create new Window (win:%p, cnt:%d) (%dx%d) (id:%s )\n", window, application->GetWidgetCount(), w, h, std::string(id).c_str()); + } + else + { + DALI_LOG_ERROR("This device can't support Multi Widget. it means UI may not be properly drawn."); + window = application->GetWindow(); + } + } + Any nativeHandle = window.GetNativeHandle(); #ifdef ECORE_WAYLAND2 - Ecore_Wl2_Window * wlWindow = AnyCast( nativeHandle ); + Ecore_Wl2_Window* wlWindow = AnyCast(nativeHandle); #else - Ecore_Wl_Window * wlWindow = AnyCast( nativeHandle ); + Ecore_Wl_Window* wlWindow = AnyCast(nativeHandle); #endif - widget_base_context_window_bind( instanceHandle, id, wlWindow ); - window.SetSize( Dali::Window::WindowSize( w, h ) ); + widget_base_context_window_bind(instanceHandle, id, wlWindow); + window.SetSize(Dali::Window::WindowSize(w, h)); + + Dali::Internal::Adaptor::WidgetApplication::CreateWidgetFunctionPair pair = application->GetWidgetCreatingFunctionPair(std::string(id)); + Dali::WidgetApplication::CreateWidgetFunction createFunction = pair.second; - Dali::Internal::Adaptor::WidgetApplication::CreateWidgetFunctionPair pair = application->GetWidgetCreatingFunctionPair(std::string(id)); - Dali::WidgetApplication::CreateWidgetFunction createFunction = pair.second; + Dali::Widget widgetInstance = createFunction(pair.first); - Dali::Widget widgetInstance = createFunction( pair.first ); - application->AddWidget( instanceHandle, widgetInstance ); + Dali::Internal::Adaptor::Widget::Impl* widgetImpl = new Dali::Internal::Adaptor::WidgetImplTizen(instanceHandle); + Internal::Adaptor::GetImplementation(widgetInstance).SetImpl(widgetImpl); - Dali::Internal::Adaptor::Widget::Impl *widgetImpl = new Dali::Internal::Adaptor::WidgetImplTizen(instanceHandle); - Internal::Adaptor::GetImplementation(widgetInstance).SetImpl( widgetImpl ); + application->AddWidget(instanceHandle, widgetInstance, window, std::string(id)); std::string encodedContentString = ""; - if( bundle_get_count( content ) ) + if(bundle_get_count(content)) { - bundle_raw *bundleRaw; - int len; + bundle_raw* bundleRaw; + int len; bundle_encode(content, &bundleRaw, &len); - char* encodedContent = reinterpret_cast< char* >( bundleRaw ); - encodedContentString = std::string( encodedContent ); + char* encodedContent = reinterpret_cast(bundleRaw); + encodedContentString = std::string(encodedContent); free(bundleRaw); } - Internal::Adaptor::GetImplementation(widgetInstance).OnCreate( encodedContentString, window ); + Internal::Adaptor::GetImplementation(widgetInstance).OnCreate(encodedContentString, window); + + // connect keyEvent for widget +#ifdef OVER_TIZEN_VERSION_7 + application->ConnectKeyEvent(window); +#endif return 0; } -int OnInstanceDestroy(widget_base_instance_h instanceHandle, widget_base_destroy_type_e reason, bundle *content, void *classData) +int OnInstanceDestroy(widget_base_instance_h instanceHandle, widget_base_destroy_type_e reason, bundle* content, void* classData) { Dali::Internal::Adaptor::WidgetApplicationTizen* application = static_cast(classData); // Get Dali::Widget instance. - Dali::Widget widgetInstance = application->GetWidget( instanceHandle ); + Dali::Widget widgetInstance = application->GetWidget(instanceHandle); Dali::Widget::Termination destroyReason = Dali::Widget::Termination::TEMPORARY; @@ -103,114 +163,117 @@ int OnInstanceDestroy(widget_base_instance_h instanceHandle, widget_base_destroy std::string encodedContentString = ""; - if( bundle_get_count( content ) ) + if(bundle_get_count(content)) { - bundle_raw *bundleRaw; - int len; + bundle_raw* bundleRaw; + int len; bundle_encode(content, &bundleRaw, &len); - char* encodedContent = reinterpret_cast< char* >( bundleRaw ); + char* encodedContent = reinterpret_cast(bundleRaw); encodedContentString = std::string(encodedContent); free(bundleRaw); } - Internal::Adaptor::GetImplementation(widgetInstance).OnTerminate( encodedContentString, destroyReason ); + Internal::Adaptor::GetImplementation(widgetInstance).OnTerminate(encodedContentString, destroyReason); widget_base_class_on_destroy(instanceHandle, reason, content); - application->DeleteWidget( instanceHandle ); + application->DeleteWidget(instanceHandle); return 0; } -int OnInstancePause(widget_base_instance_h instanceHandle, void *classData) +int OnInstancePause(widget_base_instance_h instanceHandle, void* classData) { widget_base_class_on_pause(instanceHandle); Dali::Internal::Adaptor::WidgetApplicationTizen* application = static_cast(classData); // Get Dali::Widget instance. - Dali::Widget widgetInstance = application->GetWidget( instanceHandle ); + Dali::Widget widgetInstance = application->GetWidget(instanceHandle); Internal::Adaptor::GetImplementation(widgetInstance).OnPause(); return 0; } -int OnInstanceResume(widget_base_instance_h instanceHandle, void *classData) +int OnInstanceResume(widget_base_instance_h instanceHandle, void* classData) { widget_base_class_on_resume(instanceHandle); Dali::Internal::Adaptor::WidgetApplicationTizen* application = static_cast(classData); // Get Dali::Widget instance. - Dali::Widget widgetInstance = application->GetWidget( instanceHandle ); + Dali::Widget widgetInstance = application->GetWidget(instanceHandle); Internal::Adaptor::GetImplementation(widgetInstance).OnResume(); return 0; } -int OnInstanceResize(widget_base_instance_h instanceHandle, int w, int h, void *classData) +int OnInstanceResize(widget_base_instance_h instanceHandle, int w, int h, void* classData) { widget_base_class_on_resize(instanceHandle, w, h); Dali::Internal::Adaptor::WidgetApplicationTizen* application = static_cast(classData); // Get Dali::Widget instance. - Dali::Widget widgetInstance = application->GetWidget( instanceHandle ); - - Dali::Window window = application->GetWindow(); - window.SetSize( Dali::Window::WindowSize(w, h) ); + Dali::Widget widgetInstance = application->GetWidget(instanceHandle); + Dali::Window window = application->GetWindowFromWidget(widgetInstance); + window.SetSize(Dali::Window::WindowSize(w, h)); Internal::Adaptor::GetImplementation(widgetInstance).OnResize(window); return 0; } -int OnInstanceUpdate(widget_base_instance_h instanceHandle, bundle *content, int force, void *classData) +int OnInstanceUpdate(widget_base_instance_h instanceHandle, bundle* content, int force, void* classData) { widget_base_class_on_update(instanceHandle, content, force); Dali::Internal::Adaptor::WidgetApplicationTizen* application = static_cast(classData); // Get Dali::Widget instance. - Dali::Widget widgetInstance = application->GetWidget( instanceHandle ); + Dali::Widget widgetInstance = application->GetWidget(instanceHandle); std::string encodedContentString = ""; - if( bundle_get_count( content ) ) + if(bundle_get_count(content)) { - bundle_raw *bundleRaw; - int len; + bundle_raw* bundleRaw; + int len; bundle_encode(content, &bundleRaw, &len); - char* encodedContent = reinterpret_cast< char* >( bundleRaw ); + char* encodedContent = reinterpret_cast(bundleRaw); encodedContentString = std::string(encodedContent); free(bundleRaw); } - Internal::Adaptor::GetImplementation(widgetInstance).OnUpdate( encodedContentString, force ); + Internal::Adaptor::GetImplementation(widgetInstance).OnUpdate(encodedContentString, force); return 0; } -} // anonymous namespace +unsigned int GetEnvWidgetRenderRefreshRate() +{ + const char* envVariable = std::getenv(DALI_WIDGET_REFRESH_RATE); -#endif + return envVariable ? std::atoi(envVariable) : 1u; // Default 60 fps +} + +} // anonymous namespace namespace Adaptor { - -#ifdef WIDGET_SUPPOERTED - WidgetApplicationPtr WidgetApplicationTizen::New( - int* argc, - char **argv[], + int* argc, + char** argv[], const std::string& stylesheet) { - return new WidgetApplicationTizen(argc, argv, stylesheet ); + return new WidgetApplicationTizen(argc, argv, stylesheet); } -WidgetApplicationTizen::WidgetApplicationTizen( int* argc, char** argv[], const std::string& stylesheet ) -:WidgetApplication(argc, argv, stylesheet) +WidgetApplicationTizen::WidgetApplicationTizen(int* argc, char** argv[], const std::string& stylesheet) +: WidgetApplication(argc, argv, stylesheet), + mConnectedKeyEvent(false), + mReceivedKeyEvent(false) { } @@ -218,71 +281,152 @@ WidgetApplicationTizen::~WidgetApplicationTizen() { } - -void WidgetApplicationTizen::RegisterWidgetCreatingFunction( const std::string& widgetName, Dali::WidgetApplication::CreateWidgetFunction createFunction ) +void WidgetApplicationTizen::RegisterWidgetCreatingFunction(const std::string& widgetName, Dali::WidgetApplication::CreateWidgetFunction createFunction) { - AddWidgetCreatingFunctionPair( CreateWidgetFunctionPair(widgetName, createFunction) ); + AddWidgetCreatingFunctionPair(CreateWidgetFunctionPair(widgetName, createFunction)); // Register widget class to widget framework widget_base_class cls = widget_base_class_get_default(); - cls.ops.create = OnInstanceInit; - cls.ops.destroy = OnInstanceDestroy; - cls.ops.pause = OnInstancePause; - cls.ops.resume = OnInstanceResume; - cls.ops.resize = OnInstanceResize; - cls.ops.update = OnInstanceUpdate; + cls.ops.create = OnInstanceInit; + cls.ops.destroy = OnInstanceDestroy; + cls.ops.pause = OnInstancePause; + cls.ops.resume = OnInstanceResume; + cls.ops.resize = OnInstanceResize; + cls.ops.update = OnInstanceUpdate; widget_base_class_add(cls, widgetName.c_str(), this); } -void WidgetApplicationTizen::AddWidgetCreatingFunctionPair( CreateWidgetFunctionPair pair ) +void WidgetApplicationTizen::AddWidgetCreatingFunctionPair(CreateWidgetFunctionPair pair) { - mCreateWidgetFunctionContainer.push_back( pair ); + mCreateWidgetFunctionContainer.push_back(pair); } -WidgetApplicationTizen::CreateWidgetFunctionPair WidgetApplicationTizen::GetWidgetCreatingFunctionPair( const std::string& widgetName ) +WidgetApplicationTizen::CreateWidgetFunctionPair WidgetApplicationTizen::GetWidgetCreatingFunctionPair(const std::string& widgetName) { - for( CreateWidgetFunctionContainer::const_iterator iter = mCreateWidgetFunctionContainer.begin(); iter != mCreateWidgetFunctionContainer.end(); ++iter ) + int idx = widgetName.find(":"); + std::string widgetID = widgetName.substr(idx + 1); + for(CreateWidgetFunctionContainer::const_iterator iter = mCreateWidgetFunctionContainer.begin(); iter != mCreateWidgetFunctionContainer.end(); ++iter) { - if( widgetName.find((*iter).first) != std::string::npos ) + if(widgetID.compare((*iter).first) == 0) { return *iter; } } - return CreateWidgetFunctionPair( "", NULL ); + return CreateWidgetFunctionPair("", NULL); } -void WidgetApplicationTizen::AddWidget( widget_base_instance_h widgetBaseInstance, Dali::Widget widget ) +void WidgetApplicationTizen::AddWidget(widget_base_instance_h widgetBaseInstance, Dali::Widget widget, Dali::Window window, const std::string& widgetId) { - mWidgetInstanceContainer.push_back( WidgetInstancePair(widgetBaseInstance, widget) ); + mWidgetInstanceContainer.push_back(WidgetInstancePair(widgetBaseInstance, widget)); + Internal::Adaptor::GetImplementation(widget).SetInformation(window, widgetId); } -Dali::Widget WidgetApplicationTizen::GetWidget( widget_base_instance_h widgetBaseInstance ) +Dali::Widget WidgetApplicationTizen::GetWidget(widget_base_instance_h widgetBaseInstance) const { - for( WidgetInstanceContainer::const_iterator iter = mWidgetInstanceContainer.begin(); iter != mWidgetInstanceContainer.end(); ++iter ) + for(auto&& iter : mWidgetInstanceContainer) { - if( (*iter).first == widgetBaseInstance ) + if((iter).first == widgetBaseInstance) { - return (*iter).second; + return (iter).second; } } return Dali::Widget(); } -void WidgetApplicationTizen::DeleteWidget( widget_base_instance_h widgetBaseInstance ) +void WidgetApplicationTizen::DeleteWidget(widget_base_instance_h widgetBaseInstance) +{ + // Delete WidgetInstance + auto widgetInstance = std::find_if(mWidgetInstanceContainer.begin(), + mWidgetInstanceContainer.end(), + [widgetBaseInstance](WidgetInstancePair pair) { return (pair.first == widgetBaseInstance); }); + + if(widgetInstance != mWidgetInstanceContainer.end()) + { + mWidgetInstanceContainer.erase(widgetInstance); + } +} + +Dali::Window WidgetApplicationTizen::GetWindowFromWidget(Dali::Widget widgetInstance) const { - for( WidgetInstanceContainer::const_iterator iter = mWidgetInstanceContainer.begin(); iter != mWidgetInstanceContainer.end(); ++iter ) + if(widgetInstance) { - if( (*iter).first == widgetBaseInstance ) + return Internal::Adaptor::GetImplementation(widgetInstance).GetWindow(); + } + + return Dali::Window(); +} + +widget_base_instance_h WidgetApplicationTizen::GetWidgetInstanceFromWidgetId(std::string& widgetId) const +{ + for(auto&& iter : mWidgetInstanceContainer) + { + if(widgetId == Internal::Adaptor::GetImplementation((iter).second).GetWidgetId()) { - mWidgetInstanceContainer.erase(iter); - break; + return (iter).first; } } + + return nullptr; } +int WidgetApplicationTizen::GetWidgetCount() +{ + return mWidgetInstanceContainer.size(); +} + +void WidgetApplicationTizen::ConnectKeyEvent(Dali::Window window) +{ + if(!mConnectedKeyEvent) + { +#ifdef OVER_TIZEN_VERSION_7 + screen_connector_provider_set_key_event_cb(OnKeyEventCallback, this); #endif + mConnectedKeyEvent = true; + } + window.KeyEventSignal().Connect(this, &WidgetApplicationTizen::OnWindowKeyEvent); +} + +void WidgetApplicationTizen::OnWindowKeyEvent(const Dali::KeyEvent& event) +{ + //If Widget Application consume key event, this api is not called. + mReceivedKeyEvent = true; +} + +bool WidgetApplicationTizen::FeedKeyEvent(widget_base_instance_h instanceHandle, const Dali::KeyEvent& keyEvent) +{ + bool consumed = true; + + // Check if application consume key event + Dali::Widget widgetInstance = GetWidget(instanceHandle); + if(widgetInstance) + { + Dali::Window window = GetWindowFromWidget(widgetInstance); + + // Reset the state of key received + mReceivedKeyEvent = false; + + // Feed the keyEvent to widget window + DevelWindow::FeedKeyEvent(window, keyEvent); + + // if the application is not using a key event, verify that the window in the widget has received a key event. + if(Internal::Adaptor::GetImplementation(widgetInstance).IsKeyEventUsing() == false) + { + // if the window has received a key event, widget need to consume its key event + consumed = (mReceivedKeyEvent) ? false : true; + } + } + + return consumed; +} + +void WidgetApplicationTizen::OnInit() +{ + WidgetApplication::OnInit(); + + Dali::Adaptor::Get().SetRenderRefreshRate(GetEnvWidgetRenderRefreshRate()); +} // factory function, must be implemented namespace WidgetApplicationFactory @@ -293,16 +437,12 @@ namespace WidgetApplicationFactory * @param[in] argv A pointer to the argument list * @param[in] stylesheet The path to user defined theme file */ -Dali::Internal::Adaptor::WidgetApplicationPtr Create( int* argc, char **argv[], const std::string& stylesheet ) +Dali::Internal::Adaptor::WidgetApplicationPtr Create(int* argc, char** argv[], const std::string& stylesheet) { -#ifdef WIDGET_SUPPOERTED - return WidgetApplicationTizen::New( argc, argv, stylesheet ); -#else - return nullptr; -#endif + return WidgetApplicationTizen::New(argc, argv, stylesheet); } -} // namespace Factory +} // namespace WidgetApplicationFactory } // namespace Adaptor