atria-soft/ewol
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] rework some _ at function parameter

Browse Source
This commit is contained in:
Edouard DUPIN 2013-05-31 09:03:03 +02:00
parent 6ff6693871
commit 426403da3b
18 changed files with 190 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sources/ewol/Dimension.cpp
View File

@ -12,6 +12,7 @@
#undef __class__ #undef __class__
#define __class__ "Dimension" #define __class__ "Dimension"
// TODO : Set this in a super class acced in a statin fuction...
// ratio in milimeter : // ratio in milimeter :
static vec2 ratio(9999999,888888); static vec2 ratio(9999999,888888);
static vec2 invRatio(1,1); static vec2 invRatio(1,1);

48
sources/ewol/clipBoard.cpp
View File

@ -43,14 +43,14 @@ static const char* clipboardDescriptionString[ewol::clipBoard::clipboardCount+1]
"clipboardCount" "clipboardCount"
}; };
etk::CCout& ewol::clipBoard::operator <<(etk::CCout &os, const ewol::clipBoard::clipboardListe_te obj) etk::CCout& ewol::clipBoard::operator <<(etk::CCout& _os, const ewol::clipBoard::clipboardListe_te _obj)
{ {
if (obj>=0 && obj <ewol::clipBoard::clipboardCount) { if (_obj>=0 && _obj <ewol::clipBoard::clipboardCount) {
os << clipboardDescriptionString[obj]; _os << clipboardDescriptionString[_obj];
} else { } else {
os << "[ERROR]"; _os << "[ERROR]";
} }
return os; return _os;
} }
@ -72,64 +72,64 @@ void ewol::clipBoard::UnInit(void)
} }
void ewol::clipBoard::Set(ewol::clipBoard::clipboardListe_te clipboardID, etk::UString &data) void ewol::clipBoard::Set(ewol::clipBoard::clipboardListe_te _clipboardID, const etk::UString& _data)
{ {
// check if ID is correct // check if ID is correct
if(0 == data.Size()) { if(0 == _data.Size()) {
EWOL_INFO("request a copy of nothing"); EWOL_INFO("request a copy of nothing");
return; return;
} else } else
if(clipboardID >= ewol::clipBoard::clipboardCount) { if(_clipboardID >= ewol::clipBoard::clipboardCount) {
EWOL_WARNING("request ClickBoard id error"); EWOL_WARNING("request ClickBoard id error");
return; return;
} }
ewol::clipBoard::SetSystem(clipboardID, data); ewol::clipBoard::SetSystem(_clipboardID, _data);
if( ewol::clipBoard::clipboardStd == clipboardID if( ewol::clipBoard::clipboardStd == _clipboardID
|| ewol::clipBoard::clipboardSelection == clipboardID) { || ewol::clipBoard::clipboardSelection == _clipboardID) {
guiInterface::ClipBoardSet(clipboardID); guiInterface::ClipBoardSet(_clipboardID);
} }
} }
void ewol::clipBoard::Request(ewol::clipBoard::clipboardListe_te clipboardID) void ewol::clipBoard::Request(ewol::clipBoard::clipboardListe_te _clipboardID)
{ {
if(clipboardID >= ewol::clipBoard::clipboardCount) { if(_clipboardID >= ewol::clipBoard::clipboardCount) {
EWOL_WARNING("request ClickBoard id error"); EWOL_WARNING("request ClickBoard id error");
return; return;
} }
if( ewol::clipBoard::clipboardStd == clipboardID if( ewol::clipBoard::clipboardStd == _clipboardID
|| ewol::clipBoard::clipboardSelection == clipboardID) { || ewol::clipBoard::clipboardSelection == _clipboardID) {
guiInterface::ClipBoardGet(clipboardID); guiInterface::ClipBoardGet(_clipboardID);
} else { } else {
// generate an event on the main thread ... // generate an event on the main thread ...
eSystem::ClipBoardArrive(clipboardID); eSystem::ClipBoardArrive(_clipboardID);
} }
} }
void ewol::clipBoard::SetSystem(ewol::clipBoard::clipboardListe_te clipboardID, etk::UString &data) void ewol::clipBoard::SetSystem(ewol::clipBoard::clipboardListe_te _clipboardID, const etk::UString& _data)
{ {
if(clipboardID >= ewol::clipBoard::clipboardCount) { if(_clipboardID >= ewol::clipBoard::clipboardCount) {
EWOL_WARNING("request ClickBoard id error"); EWOL_WARNING("request ClickBoard id error");
return; return;
} }
// Copy datas ... // Copy datas ...
mesCopy[clipboardID] = data; mesCopy[_clipboardID] = _data;
} }
etk::UString ewol::clipBoard::Get(ewol::clipBoard::clipboardListe_te clipboardID) const etk::UString& ewol::clipBoard::Get(ewol::clipBoard::clipboardListe_te _clipboardID)
{ {
if(clipboardID >= ewol::clipBoard::clipboardCount) { if(_clipboardID >= ewol::clipBoard::clipboardCount) {
EWOL_WARNING("request ClickBoard id error"); EWOL_WARNING("request ClickBoard id error");
return ""; return "";
} }
// Copy datas ... // Copy datas ...
return mesCopy[clipboardID]; return mesCopy[_clipboardID];
} }

22
sources/ewol/clipBoard.h
View File

@ -35,37 +35,37 @@ namespace ewol {
/** /**
* @brief Debug operator To display the curent element in a Human redeable information * @brief Debug operator To display the curent element in a Human redeable information
*/ */
etk::CCout& operator <<(etk::CCout &os, const ewol::clipBoard::clipboardListe_te obj); etk::CCout& operator <<(etk::CCout& _os, const ewol::clipBoard::clipboardListe_te _obj);
/** /**
* @brief Set the string data on a specific clipboard. The Gui system is notify that the clipboard "SELECTION" and "COPY" are change * @brief Set the string data on a specific clipboard. The Gui system is notify that the clipboard "SELECTION" and "COPY" are change
* @param[in] clipboardID Select the specific ID of the clipboard * @param[in] _clipboardID Select the specific ID of the clipboard
* @param[in] data The string that might be send to the clipboard * @param[in] _data The string that might be send to the clipboard
*/ */
void Set(ewol::clipBoard::clipboardListe_te clipboardID, etk::UString &data); void Set(ewol::clipBoard::clipboardListe_te _clipboardID, const etk::UString& _data);
/** /**
* @brief Call system to request the current clipboard. * @brief Call system to request the current clipboard.
* @note Due to some system that manage the clipboard request asynchronous (like X11) and ewol managing the system with only one thread, * @note Due to some system that manage the clipboard request asynchronous (like X11) and ewol managing the system with only one thread,
* we need the call the system to send us the buffer, this is really ambigous, but the widget (who has focus) receive the * we need the call the system to send us the buffer, this is really ambigous, but the widget (who has focus) receive the
* notification of the arrival of this buffer id * notification of the arrival of this buffer id
* @param[in] clipboardID the needed clipboard ID * @param[in] _clipboardID the needed clipboard ID
*/ */
void Request(ewol::clipBoard::clipboardListe_te clipboardID); void Request(ewol::clipBoard::clipboardListe_te _clipboardID);
/** /**
* @brief Set the ewol internal buffer (no notification at the GUI). This fuction might be use by the * @brief Set the ewol internal buffer (no notification at the GUI). This fuction might be use by the
* Gui abstraction to set the buffer we receive. The end user must not use it. * Gui abstraction to set the buffer we receive. The end user must not use it.
* @param[in] clipboardID selected clipboard ID * @param[in] _clipboardID selected clipboard ID
* @param[in] data new buffer data * @param[in] _data new buffer data
*/ */
void SetSystem(ewol::clipBoard::clipboardListe_te clipboardID, etk::UString &data); void SetSystem(ewol::clipBoard::clipboardListe_te _clipboardID,const etk::UString& _data);
/** /**
* @brief Get the ewol internal buffer of the curent clipboard. The end user can use it when he receive the event in * @brief Get the ewol internal buffer of the curent clipboard. The end user can use it when he receive the event in
* the widget : @ref OnEventClipboard ==> we can nothe this function is the only one which permit it. * the widget : @ref OnEventClipboard ==> we can nothe this function is the only one which permit it.
* @note if we call this fuction withoutcallin @ref ewol::clipBoard::Request, we only get the previous clipboard * @note if we call this fuction withoutcallin @ref ewol::clipBoard::Request, we only get the previous clipboard
* @param[in] clipboardID selected clipboard ID * @param[in] _clipboardID selected clipboard ID
* @return the requested buffer * @return the requested buffer
*/ */
etk::UString Get(ewol::clipBoard::clipboardListe_te clipboardID); const etk::UString& Get(ewol::clipBoard::clipboardListe_te _clipboardID);
// internal section // internal section

10
sources/ewol/commandLine.cpp
View File

@ -29,17 +29,17 @@ int32_t ewol::commandLine::Size(void)
return listArgs.Size(); return listArgs.Size();
} }
etk::UString ewol::commandLine::Get(int32_t id) etk::UString ewol::commandLine::Get(int32_t _id)
{ {
if (id<0 && id>=listArgs.Size()) { if (_id<0 && _id>=listArgs.Size()) {
return ""; return "";
} }
return listArgs[id]; return listArgs[_id];
} }
void ewol::commandLine::Add(etk::UString& newElement) void ewol::commandLine::Add(const etk::UString& _newElement)
{ {
listArgs.PushBack(newElement); listArgs.PushBack(_newElement);
} }

8
sources/ewol/commandLine.h
View File

@ -26,14 +26,14 @@ namespace ewol
int32_t Size(void); int32_t Size(void);
/** /**
* @brief Get an element with a specific ID * @brief Get an element with a specific ID
* @return The cmdLine Id element * @return _id The cmdLine Id element
*/ */
etk::UString Get(int32_t id); etk::UString Get(int32_t _id);
/** /**
* @brief Add one element at the Command Line * @brief Add one element at the Command Line
* @param[in] newElement String in the input that might be added. * @param[in] _newElement String in the input that might be added.
*/ */
void Add(etk::UString& newElement); void Add(const etk::UString& _newElement);
}; };
}; };

13
sources/ewol/compositing/Area.h
View File

@ -40,9 +40,9 @@ namespace ewol
public: public:
/** /**
* @brief generic constructor * @brief generic constructor
* @param[in] imageName Name of the file that might be loaded * @param[in] _size Basic size of the area.
*/ */
Area(ivec2 size); Area(const ivec2& _size);
/** /**
* @brief generic destructor * @brief generic destructor
*/ */
@ -63,14 +63,15 @@ namespace ewol
vec3 GetPos(void); vec3 GetPos(void);
/** /**
* @brief Set position for the next text writen * @brief Set position for the next text writen
* @param[in] pos Position of the text (in 3D) * @param[in] _pos Position of the text (in 3D)
*/ */
void SetPos(vec3 pos); void SetPos(const vec3& _pos);
inline void SetPos(const vec2& _pos) { SetPos(vec3(_pos.x(),_pos.y())); };
/** /**
* @brief Set relative position for the next text writen * @brief Set relative position for the next text writen
* @param[in] pos ofset apply of the text (in 3D) * @param[in] _pos ofset apply of the text (in 3D)
*/ */
void SetRelPos(vec3 pos); void SetRelPos(const vec3& _pos);
/** /**
* @brief Add a compleate of the image to display with the requested size * @brief Add a compleate of the image to display with the requested size
* @param[in] size Size of the output image * @param[in] size Size of the output image

12
sources/ewol/config.cpp
View File

@ -31,18 +31,18 @@ void ewol::config::UnInit(void)
ewol::FreeTypeUnInit(); ewol::FreeTypeUnInit();
} }
void ewol::config::FontFolder(etk::UString folder) void ewol::config::FontFolder(const etk::UString& _folder)
{ {
l_fontConfigFolder = folder; l_fontConfigFolder = _folder;
} }
void ewol::config::FontSetDefault(etk::UString fontName, int32_t size) void ewol::config::FontSetDefault(const etk::UString& _fontName, int32_t _size)
{ {
l_fontConfigName = fontName; l_fontConfigName = _fontName;
l_fontConfigSize = size; l_fontConfigSize = _size;
} }
etk::UString& ewol::config::FontGetDefaultName(void) const etk::UString& ewol::config::FontGetDefaultName(void)
{ {
return l_fontConfigName; return l_fontConfigName;
} }

12
sources/ewol/config.h
View File

@ -18,20 +18,20 @@ namespace ewol
{ {
/** /**
* @brief Specify the default font folder for the Ewol search system (only needed when embended font) * @brief Specify the default font folder for the Ewol search system (only needed when embended font)
* @param[in] folder basic folder of the font (ex: DATA:fonts) * @param[in] _folder basic folder of the font (ex: DATA:fonts)
*/ */
void FontFolder(etk::UString folder); void FontFolder(const etk::UString& _folder);
/** /**
* @brief Set the defaut font for all the widgets and basics display. * @brief Set the defaut font for all the widgets and basics display.
* @param[in] fontName The font name requested (not case sensitive) ex "Arial". * @param[in] _fontName The font name requested (not case sensitive) ex "Arial".
* @param[in] size The default size of the font default=10. * @param[in] _size The default size of the font default=10.
*/ */
void FontSetDefault(etk::UString fontName, int32_t size); void FontSetDefault(const etk::UString& _fontName, int32_t _size);
/** /**
* @brief Get the current default font name * @brief Get the current default font name
* @raturn a reference on the font name string * @raturn a reference on the font name string
*/ */
etk::UString& FontGetDefaultName(void); const etk::UString& FontGetDefaultName(void);
/** /**
* @brief Get the default font size. * @brief Get the default font size.
* @return the font size. * @return the font size.

10
sources/ewol/cursor.cpp
View File

@ -33,14 +33,14 @@ static const char* cursorDescriptionString[ewol::cursorCount+1] = {
"cursorCount" "cursorCount"
}; };
etk::CCout& ewol::operator <<(etk::CCout &os, const ewol::cursorDisplay_te obj) etk::CCout& ewol::operator <<(etk::CCout& _os, const ewol::cursorDisplay_te _obj)
{ {
if (obj>=0 && obj <ewol::cursorCount) { if (_obj>=0 && _obj <ewol::cursorCount) {
os << cursorDescriptionString[obj]; _os << cursorDescriptionString[_obj];
} else { } else {
os << "[ERROR]"; _os << "[ERROR]";
} }
return os; return _os;
} }

2
sources/ewol/cursor.h
View File

@ -41,7 +41,7 @@ namespace ewol
/** /**
* @brief Debug operator To display the curent element in a Human readable information * @brief Debug operator To display the curent element in a Human readable information
*/ */
etk::CCout& operator <<(etk::CCout &os, const ewol::cursorDisplay_te obj); etk::CCout& operator <<(etk::CCout& _os, const ewol::cursorDisplay_te _obj);
}; };
#endif #endif

2
sources/ewol/debug.cpp
View File

@ -8,4 +8,4 @@
#include <ewol/debug.h> #include <ewol/debug.h>
const char * ewolLibName = "ewol "; const char * g_ewolLibName = "ewol ";

20
sources/ewol/debug.h
View File

@ -12,17 +12,17 @@
#include <etk/types.h> #include <etk/types.h>
#include <etk/Debug.h> #include <etk/Debug.h>
extern const char * ewolLibName; extern const char * g_ewolLibName;
#define EWOL_CRITICAL(data) ETK_CRITICAL(ewolLibName, data) #define EWOL_CRITICAL(data) ETK_CRITICAL(g_ewolLibName, data)
#define EWOL_WARNING(data) ETK_WARNING(ewolLibName, data) #define EWOL_WARNING(data) ETK_WARNING(g_ewolLibName, data)
#define EWOL_ERROR(data) ETK_ERROR(ewolLibName, data) #define EWOL_ERROR(data) ETK_ERROR(g_ewolLibName, data)
#define EWOL_INFO(data) ETK_INFO(ewolLibName, data) #define EWOL_INFO(data) ETK_INFO(g_ewolLibName, data)
#define EWOL_DEBUG(data) ETK_DEBUG(ewolLibName, data) #define EWOL_DEBUG(data) ETK_DEBUG(g_ewolLibName, data)
#define EWOL_VERBOSE(data) ETK_VERBOSE(ewolLibName, data) #define EWOL_VERBOSE(data) ETK_VERBOSE(g_ewolLibName, data)
#define EWOL_ASSERT(cond, data) ETK_ASSERT(ewolLibName, cond, data) #define EWOL_ASSERT(cond, data) ETK_ASSERT(g_ewolLibName, cond, data)
#define EWOL_CHECK_INOUT(cond) ETK_CHECK_INOUT(ewolLibName, cond) #define EWOL_CHECK_INOUT(cond) ETK_CHECK_INOUT(g_ewolLibName, cond)
#define EWOL_TODO(cond) ETK_TODO(ewolLibName, cond) #define EWOL_TODO(cond) ETK_TODO(g_ewolLibName, cond)
#endif #endif

36
sources/ewol/eObject/EObjectManager.cpp
View File

@ -53,10 +53,10 @@ void ewol::EObjectManager::UnInit(void)
IsInit = false; IsInit = false;
} }
void ewol::EObjectManager::Add(ewol::EObject* object) void ewol::EObjectManager::Add(ewol::EObject* _object)
{ {
if (NULL != object) { if (NULL != _object) {
m_eObjectList.PushBack(object); m_eObjectList.PushBack(_object);
} else { } else {
EWOL_ERROR("try to add an inexistant EObject in manager"); EWOL_ERROR("try to add an inexistant EObject in manager");
} }
@ -67,7 +67,7 @@ int32_t ewol::EObjectManager::GetNumberObject(void)
return m_eObjectList.Size() + m_eObjectAutoRemoveList.Size(); return m_eObjectList.Size() + m_eObjectAutoRemoveList.Size();
} }
void informOneObjectIsRemoved(ewol::EObject* object) void informOneObjectIsRemoved(ewol::EObject* _object)
{ {
for (int32_t iii=0; iii<m_eObjectList.Size(); iii++) { for (int32_t iii=0; iii<m_eObjectList.Size(); iii++) {
if (m_eObjectList[iii] != NULL) { if (m_eObjectList[iii] != NULL) {
@ -76,33 +76,33 @@ void informOneObjectIsRemoved(ewol::EObject* object)
} }
for (int32_t iii=0; iii<m_eObjectAutoRemoveList.Size(); iii++) { for (int32_t iii=0; iii<m_eObjectAutoRemoveList.Size(); iii++) {
if( m_eObjectAutoRemoveList[iii] != NULL if( m_eObjectAutoRemoveList[iii] != NULL
&& m_eObjectAutoRemoveList[iii] != object) { && m_eObjectAutoRemoveList[iii] != _object) {
m_eObjectAutoRemoveList[iii]->OnObjectRemove(object); m_eObjectAutoRemoveList[iii]->OnObjectRemove(_object);
} }
} }
// call input event manager to remove linked widget ... // call input event manager to remove linked widget ...
eSystem::OnObjectRemove(object); eSystem::OnObjectRemove(_object);
} }
void ewol::EObjectManager::Rm(ewol::EObject* object) void ewol::EObjectManager::Rm(ewol::EObject* _object)
{ {
if (NULL == object) { if (NULL == _object) {
EWOL_ERROR("Try to remove (NULL) EObject"); EWOL_ERROR("Try to remove (NULL) EObject");
return; return;
} }
for (int32_t iii=0; iii<m_eObjectList.Size(); iii++) { for (int32_t iii=0; iii<m_eObjectList.Size(); iii++) {
if (m_eObjectList[iii] == object) { if (m_eObjectList[iii] == _object) {
// Remove Element // Remove Element
m_eObjectList[iii] = NULL; m_eObjectList[iii] = NULL;
m_eObjectList.Erase(iii); m_eObjectList.Erase(iii);
informOneObjectIsRemoved(object); informOneObjectIsRemoved(_object);
return; return;
} }
} }
// check if the object has not been auto removed ... or remove in defered time ... // check if the object has not been auto removed ... or remove in defered time ...
for (int32_t iii=0; iii<m_eObjectAutoRemoveList.Size(); iii++) { for (int32_t iii=0; iii<m_eObjectAutoRemoveList.Size(); iii++) {
if( m_eObjectAutoRemoveList[iii] != NULL if( m_eObjectAutoRemoveList[iii] != NULL
&& m_eObjectAutoRemoveList[iii] == object) { && m_eObjectAutoRemoveList[iii] == _object) {
return; return;
} }
} }
@ -110,20 +110,20 @@ void ewol::EObjectManager::Rm(ewol::EObject* object)
EWOL_ERROR("Try to remove EObject that is not referenced ..."); EWOL_ERROR("Try to remove EObject that is not referenced ...");
} }
void ewol::EObjectManager::AutoRemove(ewol::EObject* object) void ewol::EObjectManager::AutoRemove(ewol::EObject* _object)
{ {
if (NULL == object) { if (NULL == _object) {
EWOL_ERROR("Try to Auto-Remove (NULL) EObject"); EWOL_ERROR("Try to Auto-Remove (NULL) EObject");
return; return;
} }
for (int32_t iii=0; iii<m_eObjectList.Size(); iii++) { for (int32_t iii=0; iii<m_eObjectList.Size(); iii++) {
if (m_eObjectList[iii] == object) { if (m_eObjectList[iii] == _object) {
// Remove Element // Remove Element
m_eObjectList[iii] = NULL; m_eObjectList[iii] = NULL;
m_eObjectList.Erase(iii); m_eObjectList.Erase(iii);
EWOL_DEBUG("Auto-Remove EObject : [" << object->GetId() << "] type=\"" << object->GetObjectType() << "\""); EWOL_DEBUG("Auto-Remove EObject : [" << _object->GetId() << "] type=\"" << _object->GetObjectType() << "\"");
informOneObjectIsRemoved(object); informOneObjectIsRemoved(_object);
m_eObjectAutoRemoveList.PushBack(object); m_eObjectAutoRemoveList.PushBack(_object);
ewol::ForceRedrawAll(); ewol::ForceRedrawAll();
return; return;
} }

6
sources/ewol/eObject/EObjectManager.h
View File

@ -16,11 +16,11 @@ namespace ewol {
namespace EObjectManager { namespace EObjectManager {
void Init(void); void Init(void);
void UnInit(void); void UnInit(void);
void Add(ewol::EObject* object); void Add(ewol::EObject* _object);
void Rm(ewol::EObject* object); void Rm(ewol::EObject* _object);
int32_t GetNumberObject(void); int32_t GetNumberObject(void);
void AutoRemove(ewol::EObject* object); void AutoRemove(ewol::EObject* _object);
void RemoveAllAutoRemove(void); void RemoveAllAutoRemove(void);
ewol::EObject* Get(const etk::UString& _name); ewol::EObject* Get(const etk::UString& _name);

79
sources/ewol/ewol.cpp
View File

@ -20,15 +20,15 @@
#undef __class__ #undef __class__
#define __class__ "ewol" #define __class__ "ewol"
void ewol::SetFontSourcesFolder(bool inOsSystem) void ewol::SetFontSourcesFolder(bool _inOsSystem)
{ {
ewol::font::SetFontPropety(inOsSystem); ewol::font::SetFontPropety(_inOsSystem);
} }
int32_t ewol::Run(int32_t argc, const char* argv[]) int32_t ewol::Run(int32_t _argc, const char* _argv[])
{ {
if (NULL!=argv) { if (NULL!=_argv) {
etk::SetArgZero(argv[0]); etk::SetArgZero(_argv[0]);
} }
// init display convertions: // init display convertions:
ewol::dimension::Init(); ewol::dimension::Init();
@ -36,32 +36,31 @@ int32_t ewol::Run(int32_t argc, const char* argv[])
EWOL_DEBUG("Store commangLine in the specific system"); EWOL_DEBUG("Store commangLine in the specific system");
ewol::commandLine::Clean(); ewol::commandLine::Clean();
for( int32_t i=1 ; i<argc; i++) { for( int32_t i=1 ; i<_argc; i++) {
EWOL_INFO("commandLine : \"" << argv[i] << "\"" ); EWOL_INFO("commandLine : \"" << _argv[i] << "\"" );
if (0==strncmp("-l0", argv[i], 256)) { if (0==strncmp("-l0", _argv[i], 256)) {
GeneralDebugSetLevel(etk::LOG_LEVEL_NONE); GeneralDebugSetLevel(etk::LOG_LEVEL_NONE);
} else if (0==strncmp("-l1", argv[i], 256)) { } else if (0==strncmp("-l1", _argv[i], 256)) {
GeneralDebugSetLevel(etk::LOG_LEVEL_CRITICAL); GeneralDebugSetLevel(etk::LOG_LEVEL_CRITICAL);
} else if (0==strncmp("-l2", argv[i], 256)) { } else if (0==strncmp("-l2", _argv[i], 256)) {
GeneralDebugSetLevel(etk::LOG_LEVEL_ERROR); GeneralDebugSetLevel(etk::LOG_LEVEL_ERROR);
} else if (0==strncmp("-l3", argv[i], 256)) { } else if (0==strncmp("-l3", _argv[i], 256)) {
GeneralDebugSetLevel(etk::LOG_LEVEL_WARNING); GeneralDebugSetLevel(etk::LOG_LEVEL_WARNING);
} else if (0==strncmp("-l4", argv[i], 256)) { } else if (0==strncmp("-l4", _argv[i], 256)) {
GeneralDebugSetLevel(etk::LOG_LEVEL_INFO); GeneralDebugSetLevel(etk::LOG_LEVEL_INFO);
} else if (0==strncmp("-l5", argv[i], 256)) { } else if (0==strncmp("-l5", _argv[i], 256)) {
GeneralDebugSetLevel(etk::LOG_LEVEL_DEBUG); GeneralDebugSetLevel(etk::LOG_LEVEL_DEBUG);
} else if( 0==strncmp("-l6", argv[i], 256) } else if( 0==strncmp("-l6", _argv[i], 256)
|| 0==strncmp("-l7", argv[i], 256) || 0==strncmp("-l7", _argv[i], 256)
|| 0==strncmp("-l8", argv[i], 256) || 0==strncmp("-l8", _argv[i], 256)
|| 0==strncmp("-l9", argv[i], 256)) { || 0==strncmp("-l9", _argv[i], 256)) {
GeneralDebugSetLevel(etk::LOG_LEVEL_VERBOSE); GeneralDebugSetLevel(etk::LOG_LEVEL_VERBOSE);
} else { } else {
etk::UString tmpString(argv[i]); ewol::commandLine::Add(_argv[i]);
ewol::commandLine::Add(tmpString);
} }
} }
// call standard RUN ... // call standard RUN ...
int32_t error = guiInterface::main(argc, argv); int32_t error = guiInterface::main(_argc, _argv);
ewol::commandLine::Clean(); ewol::commandLine::Clean();
@ -75,33 +74,33 @@ void ewol::Stop(void)
} }
void ewol::WindowsSet(ewol::Windows * windows) void ewol::WindowsSet(ewol::Windows* _windows)
{ {
// Remove current Focus : // Remove current Focus :
ewol::widgetManager::FocusSetDefault(NULL); ewol::widgetManager::FocusSetDefault(NULL);
ewol::widgetManager::FocusRelease(); ewol::widgetManager::FocusRelease();
// set display of the windows : // set display of the windows :
eSystem::SetCurrentWindows(windows); eSystem::SetCurrentWindows(_windows);
// Set the new default Focus : // Set the new default Focus :
ewol::widgetManager::FocusSetDefault(windows); ewol::widgetManager::FocusSetDefault(_windows);
} }
void ewol::WindowsPopUpAdd(ewol::Widget * tmpWidget) void ewol::WindowsPopUpAdd(ewol::Widget* _tmpWidget)
{ {
ewol::Windows* tmpWindows = eSystem::GetCurrentWindows(); ewol::Windows* tmpWindows = eSystem::GetCurrentWindows();
if (NULL != tmpWindows && NULL != tmpWidget) { if (NULL != tmpWindows && NULL != _tmpWidget) {
tmpWindows->PopUpWidgetPush(tmpWidget); tmpWindows->PopUpWidgetPush(_tmpWidget);
} }
} }
void ewol::ChangeSize(ivec2 size) void ewol::ChangeSize(const ivec2& _size)
{ {
guiInterface::ChangeSize(size); guiInterface::ChangeSize(_size);
} }
void ewol::ChangePos(ivec2 pos) void ewol::ChangePos(const ivec2& _pos)
{ {
guiInterface::ChangePos(pos); guiInterface::ChangePos(_pos);
} }
void ewol::ForceRedrawAll(void) void ewol::ForceRedrawAll(void)
@ -114,17 +113,17 @@ void ewol::RequestUpdateSize(void)
eSystem::RequestUpdateSize(); eSystem::RequestUpdateSize();
} }
void ewol::Keyboard(bool hide) void ewol::Keyboard(bool _hide)
{ {
if (true == hide) { if (true == _hide) {
guiInterface::KeyboardHide(); guiInterface::KeyboardHide();
} else { } else {
guiInterface::KeyboardShow(); guiInterface::KeyboardShow();
} }
} }
void ewol::SetTitle(etk::UString title) void ewol::SetTitle(const etk::UString& _title)
{ {
guiInterface::SetTitle(title); guiInterface::SetTitle(_title);
} }
etk::UString ewol::GetVersion(void) etk::UString ewol::GetVersion(void)
@ -143,20 +142,20 @@ int64_t ewol::GetTime(void)
return guiInterface::GetTime(); return guiInterface::GetTime();
} }
void ewol::InputEventTransfertWidget(ewol::Widget* source, ewol::Widget* destination) void ewol::InputEventTransfertWidget(ewol::Widget* _source, ewol::Widget* _destination)
{ {
eSystem::InputEventTransfertWidget(source, destination); eSystem::InputEventTransfertWidget(_source, _destination);
} }
void ewol::ForceOrientation(ewol::orientation_te orientation) void ewol::ForceOrientation(ewol::orientation_te _orientation)
{ {
guiInterface::ForceOrientation(orientation); guiInterface::ForceOrientation(_orientation);
} }
void ewol::SetIcon(etk::UString icon) void ewol::SetIcon(const etk::UString& _icon)
{ {
guiInterface::SetIcon(icon); guiInterface::SetIcon(_icon);
} }

44
sources/ewol/ewol.h
View File

@ -23,37 +23,37 @@ namespace ewol
* Does not exist in the android platform, then ewol call other start * Does not exist in the android platform, then ewol call other start
* and stop function, to permit to have only one code * and stop function, to permit to have only one code
* @note The main can not be in the ewol, due to the fact thet is an librairy * @note The main can not be in the ewol, due to the fact thet is an librairy
* @param[in] argc Standard argc * @param[in] _argc Standard argc
* @param[in] argv Standard argv * @param[in] _argv Standard argv
* @return normal error int for the application error management * @return normal error int for the application error management
*/ */
int32_t Run(int32_t argc, const char* argv[]); int32_t Run(int32_t _argc, const char* _argv[]);
/** /**
* @brief Request the stop of the program (teminate all the process) no more call at hte application without APP_UnInit(); * @brief Request the stop of the program (teminate all the process) no more call at hte application without APP_UnInit();
*/ */
void Stop(void); void Stop(void);
/** /**
* @brief Set a windows to diaplay * @brief Set a windows to diaplay
* @param[in] windows The requested windows that migt be use for the display * @param[in] _windows The requested windows that migt be use for the display
*/ */
void WindowsSet(ewol::Windows * windows); void WindowsSet(ewol::Windows* _windows);
/** /**
* @brief Add a PopUp at the current windows ==> this widget is display over the current element * @brief Add a PopUp at the current windows ==> this widget is display over the current element
* @param[in] tmpWidget A pointer on the pop-up widget that might be displayed * @param[in] _tmpWidget A pointer on the pop-up widget that might be displayed
*/ */
void WindowsPopUpAdd(ewol::Widget * tmpWidget); void WindowsPopUpAdd(ewol::Widget* _tmpWidget);
/** /**
* @brief Change the windows size * @brief Change the windows size
* @note work only on computer * @note work only on computer
* @param[in] size The new windows size * @param[in] _size The new windows size
*/ */
void ChangeSize(ivec2 size); void ChangeSize(const ivec2& _size);
/** /**
* @brief Change the windows curent position * @brief Change the windows curent position
* @note work only on computer * @note work only on computer
* @param[in] pos The new windows position * @param[in] _pos The new windows position
*/ */
void ChangePos(ivec2 pos); void ChangePos(const ivec2& _pos);
/** /**
* @brief Generate the action of redrawing all the display. * @brief Generate the action of redrawing all the display.
*/ */
@ -65,14 +65,14 @@ namespace ewol
/** /**
* @brief Change the status of the Keyboard displat * @brief Change the status of the Keyboard displat
* @note Specific for mobile platform * @note Specific for mobile platform
* @param[in] hide Status of the visibility of the keyboard * @param[in] _hide Status of the visibility of the keyboard
*/ */
void Keyboard(bool hide); void Keyboard(bool _hide);
/** /**
* @brief Change the title display. * @brief Change the title display.
* @param[in] title the new title that might be displayed * @param[in] title the new title that might be displayed
*/ */
void SetTitle(etk::UString title); void SetTitle(const etk::UString& _title);
/** /**
* @brief Get EWOL version * @brief Get EWOL version
* @return The string that describe ewol version * @return The string that describe ewol version
@ -85,10 +85,10 @@ namespace ewol
int64_t GetTime(void); int64_t GetTime(void);
/** /**
* @brief This is to transfert the event from one widget to another one * @brief This is to transfert the event from one widget to another one
* @param source the widget where the event came from * @param _source the widget where the event came from
* @param destination the widget where the event mitgh be generated now * @param _destination the widget where the event mitgh be generated now
*/ */
void InputEventTransfertWidget(ewol::Widget* source, ewol::Widget* destination); void InputEventTransfertWidget(ewol::Widget* _source, ewol::Widget* _destination);
typedef enum { typedef enum {
SCREEN_ORIENTATION_AUTO = 0, SCREEN_ORIENTATION_AUTO = 0,
SCREEN_ORIENTATION_LANDSCAPE, SCREEN_ORIENTATION_LANDSCAPE,
@ -98,18 +98,18 @@ namespace ewol
* @brief Force a specific orientation for mobile devices * @brief Force a specific orientation for mobile devices
* @param[in] orientation the requested position. * @param[in] orientation the requested position.
*/ */
void ForceOrientation(ewol::orientation_te orientation); void ForceOrientation(ewol::orientation_te _orientation);
/** /**
* @brief Set the Icon of the program * @brief Set the Icon of the program
* @param[in] icon new filename icon of the curent program. * @param[in] _icon new filename icon of the curent program.
* @note Does not work on Andoid * @note Does not work on Andoid
*/ */
void SetIcon(etk::UString icon); void SetIcon(const etk::UString& _icon);
/** /**
* @brief Select the position of the font folder (in the OS path or in the DATA: path) * @brief Select the position of the font folder (in the OS path or in the DATA: path)
* @param[in] inOsSystem Set at true if you want to select the os system folder. * @param[in] _inOsSystem Set at true if you want to select the os system folder.
*/ */
void SetFontSourcesFolder(bool inOsSystem); void SetFontSourcesFolder(bool _inOsSystem);
}; };
#endif #endif

46
sources/ewol/key.cpp
View File

@ -25,12 +25,12 @@ static const char* statusDescriptionString[ewol::keyEvent::statusCount+1] = {
"statusCount" "statusCount"
}; };
etk::CCout& ewol::keyEvent::operator <<(etk::CCout &os, const ewol::keyEvent::status_te obj) etk::CCout& ewol::keyEvent::operator <<(etk::CCout& _os, const ewol::keyEvent::status_te _obj)
{ {
if (obj>=0 && obj <ewol::keyEvent::statusCount) { if (_obj>=0 && _obj <ewol::keyEvent::statusCount) {
os << statusDescriptionString[obj]; _os << statusDescriptionString[_obj];
} else { } else {
os << "[ERROR]"; _os << "[ERROR]";
} }
return os; return os;
} }
@ -77,14 +77,14 @@ static const char* keyboardDescriptionString[ewol::keyEvent::keyboardCount+1] =
"keyboardCount" "keyboardCount"
}; };
etk::CCout& ewol::keyEvent::operator <<(etk::CCout &os, const ewol::keyEvent::keyboard_te obj) etk::CCout& ewol::keyEvent::operator <<(etk::CCout& _os, const ewol::keyEvent::keyboard_te _obj)
{ {
if (obj>=0 && obj <ewol::keyEvent::keyboardCount) { if (_obj>=0 && _obj <ewol::keyEvent::keyboardCount) {
os << keyboardDescriptionString[obj]; _os << keyboardDescriptionString[_obj];
} else { } else {
os << "[ERROR]"; _os << "[ERROR]";
} }
return os; return _os;
} }
@ -96,12 +96,12 @@ static const char* typeDescriptionString[ewol::keyEvent::typeCount+1] = {
"typeCount" "typeCount"
}; };
etk::CCout& ewol::keyEvent::operator <<(etk::CCout &os, const ewol::keyEvent::type_te obj) etk::CCout& ewol::keyEvent::operator <<(etk::CCout& _os, const ewol::keyEvent::type_te _obj)
{ {
if (obj>=0 && obj < ewol::keyEvent::typeCount) { if (_obj>=0 && _obj < ewol::keyEvent::typeCount) {
os << typeDescriptionString[obj]; _os << typeDescriptionString[_obj];
} else { } else {
os << "[ERROR]"; _os << "[ERROR]";
} }
return os; return os;
} }
@ -161,15 +161,15 @@ bool ewol::SpecialKey::IsSetInsert(void)
etk::CCout& ewol::operator <<(etk::CCout &os, const ewol::SpecialKey obj) etk::CCout& ewol::operator <<(etk::CCout& _os, const ewol::SpecialKey _obj)
{ {
os << " capLock=" << obj.capLock; _os << " capLock=" << _obj.capLock;
os << " shift=" << obj.shift; _os << " shift=" << _obj.shift;
os << " ctrl=" << obj.ctrl; _os << " ctrl=" << _obj.ctrl;
os << " meta=" << obj.meta; _os << " meta=" << _obj.meta;
os << " alt=" << obj.alt; _os << " alt=" << _obj.alt;
os << " altGr=" << obj.altGr; _os << " altGr=" << _obj.altGr;
os << " verNum=" << obj.numLock; _os << " verNum=" << _obj.numLock;
os << " insert=" << obj.insert; _os << " insert=" << _obj.insert;
return os; return _os;
} }

8
sources/ewol/key.h
View File

@ -29,7 +29,7 @@ namespace ewol
/** /**
* @brief Debug operator To display the curent element in a Human redeable information * @brief Debug operator To display the curent element in a Human redeable information
*/ */
etk::CCout& operator <<(etk::CCout &os, const ewol::keyEvent::type_te obj); etk::CCout& operator <<(etk::CCout& _os, const ewol::keyEvent::type_te _obj);
/** /**
* @brief Keybord event or joyestick event * @brief Keybord event or joyestick event
*/ */
@ -52,7 +52,7 @@ namespace ewol
/** /**
* @brief Debug operator To display the curent element in a Human redeable information * @brief Debug operator To display the curent element in a Human redeable information
*/ */
etk::CCout& operator <<(etk::CCout &os, const ewol::keyEvent::status_te obj); etk::CCout& operator <<(etk::CCout& _os, const ewol::keyEvent::status_te _obj);
/** /**
* @brief Keybord event or joyestick event * @brief Keybord event or joyestick event
*/ */
@ -99,7 +99,7 @@ namespace ewol
/** /**
* @brief Debug operator To display the curent element in a Human redeable information * @brief Debug operator To display the curent element in a Human redeable information
*/ */
etk::CCout& operator <<(etk::CCout &os, const ewol::keyEvent::keyboard_te obj); etk::CCout& operator <<(etk::CCout& _os, const ewol::keyEvent::keyboard_te _obj);
}; };
@ -167,7 +167,7 @@ namespace ewol
/** /**
* @brief Debug operator To display the curent element in a Human redeable information * @brief Debug operator To display the curent element in a Human redeable information
*/ */
etk::CCout& operator <<(etk::CCout &os, const ewol::SpecialKey obj); etk::CCout& operator <<(etk::CCout& _os, const ewol::SpecialKey _obj);
SpecialKey& GetCurrentSpecialKeyStatus(void); SpecialKey& GetCurrentSpecialKeyStatus(void);
}; };