/*
- * Copyright (c) 2019 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.
#include <dali/internal/adaptor/common/framework.h>
// EXTERNAL INCLUDES
+#include <X11/Xlib.h>
#include <dali/internal/system/linux/dali-ecore.h>
+#include <dali/internal/system/linux/dali-efreet.h>
#include <dali/internal/system/linux/dali-elementary.h>
-#include <X11/Xlib.h>
#include <dali/integration-api/debug.h>
namespace Dali
{
-
namespace Internal
{
-
namespace Adaptor
{
-
namespace
{
-
/// Application Status Enum
enum
{
// Constructor
Impl(void* data)
- : mAbortCallBack( NULL ),
- mCallbackManager( CallbackManager::New() ),
- mLanguage( "NOT_SUPPORTED" ),
- mRegion( "NOT_SUPPORTED" )
+ : mAbortCallBack(NULL),
+ mCallbackManager(CallbackManager::New()),
+ mLanguage("NOT_SUPPORTED"),
+ mRegion("NOT_SUPPORTED")
{
}
}
// Data
- CallbackBase* mAbortCallBack;
- CallbackManager *mCallbackManager;
- std::string mLanguage;
- std::string mRegion;
+ CallbackBase* mAbortCallBack;
+ CallbackManager* mCallbackManager;
+ std::string mLanguage;
+ std::string mRegion;
// Static methods
/**
* Called by AppCore on application creation.
*/
- static bool AppCreate(void *data)
+ static bool AppCreate(void* data)
{
return static_cast<Framework*>(data)->AppStatusHandler(APP_CREATE, NULL);
}
/**
* Called by AppCore when the application should terminate.
*/
- static void AppTerminate(void *data)
+ static void AppTerminate(void* data)
{
static_cast<Framework*>(data)->AppStatusHandler(APP_TERMINATE, NULL);
}
/**
* Called by AppCore when the application is paused.
*/
- static void AppPause(void *data)
+ static void AppPause(void* data)
{
static_cast<Framework*>(data)->AppStatusHandler(APP_PAUSE, NULL);
}
/**
* Called by AppCore when the application is resumed.
*/
- static void AppResume(void *data)
+ static void AppResume(void* data)
{
static_cast<Framework*>(data)->AppStatusHandler(APP_RESUME, NULL);
}
{
static_cast<Framework*>(data)->AppStatusHandler(APP_LANGUAGE_CHANGE, NULL);
}
-
};
-Framework::Framework( Framework::Observer& observer, int *argc, char ***argv, Type type )
+Framework::Framework(Framework::Observer& observer, Framework::TaskObserver& taskObserver, int* argc, char*** argv, Type type, bool useUiThread)
: mObserver(observer),
+ mTaskObserver(taskObserver),
mInitialised(false),
+ mPaused(false),
mRunning(false),
mArgc(argc),
mArgv(argv),
mBundleName(""),
mBundleId(""),
- mAbortHandler( MakeCallback( this, &Framework::AbortCallback ) ),
+ mAbortHandler(MakeCallback(this, &Framework::AbortCallback)),
mImpl(NULL)
{
InitThreads();
Framework::~Framework()
{
- if (mRunning)
+ if(mRunning)
{
Quit();
}
{
mRunning = true;
- elm_init(*mArgc, *mArgv);
+ efreet_cache_disable();
+ elm_init(mArgc ? *mArgc : 0, mArgv ? *mArgv : nullptr);
Impl::AppCreate(this);
return mRunning;
}
-void Framework::AddAbortCallback( CallbackBase* callback )
+void Framework::AddAbortCallback(CallbackBase* callback)
{
mImpl->mAbortCallBack = callback;
}
{
// "DALI_APPLICATION_PACKAGE" is used by Ubuntu specifically to get the already configured Application package path.
const char* ubuntuEnvironmentVariable = "DALI_APPLICATION_PACKAGE";
- char* value = getenv( ubuntuEnvironmentVariable );
+ char* value = getenv(ubuntuEnvironmentVariable);
std::string resourcePath;
- if ( value != NULL )
+ if(value != NULL)
{
resourcePath = value;
}
- if( resourcePath.back() != '/' )
+ if(resourcePath.back() != '/')
{
- resourcePath+="/";
+ resourcePath += "/";
}
return resourcePath;
std::string Framework::GetDataPath()
{
const char* ubuntuEnvironmentVariable = "DALI_APPLICATION_DATA_DIR";
- char* value = getenv( ubuntuEnvironmentVariable );
+ char* value = getenv(ubuntuEnvironmentVariable);
std::string dataPath;
- if ( value != NULL )
+ if(value != NULL)
{
dataPath = value;
}
mBundleId = id;
}
-void Framework::AbortCallback( )
+void Framework::AbortCallback()
{
// if an abort call back has been installed run it.
- if (mImpl->mAbortCallBack)
+ if(mImpl->mAbortCallBack)
{
- CallbackBase::Execute( *mImpl->mAbortCallBack );
+ CallbackBase::Execute(*mImpl->mAbortCallBack);
}
else
{
}
}
-bool Framework::AppStatusHandler(int type, void *bundleData)
+bool Framework::AppStatusHandler(int type, void* bundleData)
{
- switch (type)
+ switch(type)
{
case APP_CREATE:
{