diff --git a/.gitignore b/.gitignore index b8bd026..b08d134 100644 --- a/.gitignore +++ b/.gitignore @@ -1,28 +1,64 @@ -# Compiled Object files -*.slo -*.lo -*.o -*.obj -# Precompiled Headers -*.gch -*.pch +################################### +# folders +################################### +CVS +.svn +Object_* +doxygen/API/ +doxygen/ALL/ -# Compiled Dynamic libraries -*.so -*.dylib +################################### +# backup files +################################### +*~ +*.swp +*.old +*.bck + +################################### +# Compiled source # +################################### +*.com +*.class *.dll - -# Fortran module files -*.mod - -# Compiled Static libraries -*.lai -*.la -*.a -*.lib - -# Executables *.exe -*.out -*.app +*.o +*.so +*.pyc +tags +#ewol +out +ewol_debug +ewol_release + +################################### +# Packages # +################################### +# it's better to unpack these files and commit the raw source +# git has its own built in compression methods +*.7z +*.dmg +*.gz +*.iso +*.jar +*.rar +*.tar +*.zip + +################################### +# Logs and databases # +################################### +*.log +*.sql +*.sqlite + +################################### +# OS generated files # +################################### +.DS_Store? +ehthumbs.db +Icon? +Thumbs.db +Sources/libewol/ewol/os/AndroidAbstraction.cpp +org_ewol_EwolConstants.h diff --git a/gale/Application.cpp b/gale/Application.cpp index efd1ace..192a8c4 100644 --- a/gale/Application.cpp +++ b/gale/Application.cpp @@ -146,3 +146,7 @@ void gale::Application::setOrientation(enum gale::orientation _orientation) { enum gale::orientation gale::Application::getOrientation() { return gale::orientation_screenAuto; } + +void gale::Application::onClipboardEvent(enum gale::context::clipBoard::clipboardListe _clipboardId) { + +} diff --git a/gale/Application.h b/gale/Application.h index 8702119..a7e1ef5 100644 --- a/gale/Application.h +++ b/gale/Application.h @@ -17,6 +17,7 @@ #include #include #include +#include namespace gale { class Context; @@ -187,6 +188,12 @@ namespace gale { * @return Current orientation. */ virtual enum gale::orientation getOrientation(); + public: + /** + * @brief A clipboard data is back (apear after a request of a new clipboard). + * @param[in] _clipboardId Id of the clipboard. + */ + virtual void onClipboardEvent(enum gale::context::clipBoard::clipboardListe _clipboardId); }; } diff --git a/gale/context/Context.cpp b/gale/context/Context.cpp index b4d4ec4..b0b056d 100644 --- a/gale/context/Context.cpp +++ b/gale/context/Context.cpp @@ -237,14 +237,12 @@ void gale::Context::processEvents() { #endif break; case eSystemMessage::msgClipboardArrive: - #if 0 { - std::shared_ptr tmpWidget = m_widgetManager.focusGet(); - if (tmpWidget != nullptr) { - tmpWidget->onEventClipboard(data->clipboardID); + std::shared_ptr appl = m_application; + if (appl != nullptr) { + appl->onClipboardEvent(data->clipboardID); } } - #endif break; case eSystemMessage::msgHide: GALE_DEBUG("Receive MSG : msgHide"); @@ -560,6 +558,8 @@ void gale::Context::clipBoardSet(enum gale::context::clipBoard::clipboardListe _ } bool gale::Context::OS_Draw(bool _displayEveryTime) { + // TODO : Remove this force at true ... + _displayEveryTime = true; int64_t currentTime = gale::getTime(); // this is to prevent the multiple display at the a high frequency ... #if (!defined(__TARGET_OS__Android) && !defined(__TARGET_OS__Windows)) diff --git a/gale/context/Context.h b/gale/context/Context.h index f8b513b..11849c5 100644 --- a/gale/context/Context.h +++ b/gale/context/Context.h @@ -21,6 +21,7 @@ #include #include #include +#include #define MAX_MANAGE_INPUT (15) diff --git a/gale/resource/Manager.cpp b/gale/resource/Manager.cpp index 6455bcf..0c13442 100644 --- a/gale/resource/Manager.cpp +++ b/gale/resource/Manager.cpp @@ -61,7 +61,7 @@ void gale::resource::Manager::display() { std::shared_ptr tmpRessource = it.lock(); if (tmpRessource != nullptr) { GALE_INFO(" [" << tmpRessource->getId() << "]" - << tmpRessource->getObjectType() + << tmpRessource->getType() << "=\"" << tmpRessource->getName() << "\" " << tmpRessource.use_count() << " elements"); } @@ -80,7 +80,7 @@ void gale::resource::Manager::reLoadResources() { if(tmpRessource != nullptr) { if (jjj == tmpRessource->getResourceLevel()) { tmpRessource->reload(); - GALE_INFO(" [" << tmpRessource->getId() << "]="<< tmpRessource->getObjectType()); + GALE_INFO(" [" << tmpRessource->getId() << "]="<< tmpRessource->getType()); } } } @@ -106,6 +106,7 @@ void gale::resource::Manager::update(const std::shared_ptr& _obj // Specific to load or update the data in the openGl context == > system use only void gale::resource::Manager::updateContext() { + // TODO : Check the number of call this ... GALE_INFO("update open-gl context ... "); if (m_contextHasBeenRemoved == true) { // need to update all ... m_contextHasBeenRemoved = false; diff --git a/gale/resource/Resource.cpp b/gale/resource/Resource.cpp index ace6609..7f4e035 100644 --- a/gale/resource/Resource.cpp +++ b/gale/resource/Resource.cpp @@ -32,7 +32,7 @@ void gale::Resource::init(const std::string& _name) { m_name = _name; } -const char * const gale::Resource::getObjectType() { +const char * const gale::Resource::getType() { if (m_listType.size() == 0) { return "gale::Resource"; } diff --git a/gale/resource/Resource.h b/gale/resource/Resource.h index d7dbc1a..9db5725 100644 --- a/gale/resource/Resource.h +++ b/gale/resource/Resource.h @@ -139,7 +139,7 @@ namespace gale { * @brief get the current type of the Resource * @return the last type name of the element */ - const char* const getObjectType(); + const char* const getType(); /** * @brief Get the herarchic of the Resource type. * @return descriptive string. diff --git a/gale/resource/Texture.h b/gale/resource/Texture.h index 28c48a6..2a3ceed 100644 --- a/gale/resource/Texture.h +++ b/gale/resource/Texture.h @@ -33,9 +33,9 @@ namespace gale { bool m_loaded; //!< internal state of the openGl system. // Gale internal API: public: - void updateContext(); - void removeContext(); - void removeContextToLate(); + virtual void updateContext(); + virtual void removeContext(); + virtual void removeContextToLate(); // middleware interface: public: uint32_t getRendererId() const {