[DEV] update to the etk normalisation

This commit is contained in:
Edouard DUPIN 2013-12-28 14:23:08 +01:00
parent f7f0c7e636
commit bcfd9a54c3
43 changed files with 79 additions and 96 deletions

2
external/agg vendored

@ -1 +1 @@
Subproject commit e8d0ddca2bc3940816ba2fe87ed65934a506ccd0
Subproject commit 9d19bb097a2330ec6c2403a0afebc8aa6b855dcc

2
external/egami vendored

@ -1 +1 @@
Subproject commit 9d23505904cbb0ca4447ab53d42c0d0322358384
Subproject commit 0da224d3e4c49445352258cc9247a98a6214e5f8

2
external/ege vendored

@ -1 +1 @@
Subproject commit 65bc92f98e8d96a8b1f5a96032ced7e812d41904
Subproject commit 8f291a74be65fa6a543a734c4fd0c2375a36aecf

2
external/ejson vendored

@ -1 +1 @@
Subproject commit bf82bb3bbd41b7634e19cfe4a27c0b7d53d8f278
Subproject commit 39dfd1793b0873a8bcb973b6e126d9eb35bd1d0e

2
external/esvg vendored

@ -1 +1 @@
Subproject commit 40494649a6c7e035679d005b57412368715b5ec7
Subproject commit 05790483276c1340e623b0050fa8acefcd8a5bc7

2
external/etk vendored

@ -1 +1 @@
Subproject commit 6f8a4f85102af6f23f51907f65c30ce47cd022ff
Subproject commit df148eca2325b2dff7567aebf81e6908c2a47cdb

2
external/exml vendored

@ -1 +1 @@
Subproject commit b12dde7668267b4f91fa5daa063d83b49c7e4da2
Subproject commit f8526c27e002c5c9d87b328fb7f776423aff2a73

2
monk

@ -1 +1 @@
Subproject commit 7d217467dc265495236c087b11e369e3f4a8952c
Subproject commit 5e80692aa8a46264c9d0b3c04bfa750bd0230369

View File

@ -10,7 +10,7 @@
#define __EWOL_DIMENSION_H__
#include <etk/types.h>
#include <etk/UString.h>
#include <etk/types.h>
#include <etk/math/Vector2D.h>
namespace ewol {

View File

@ -10,7 +10,7 @@
#define __EWOL_COMPOSITING_H__
#include <ewol/debug.h>
#include <etk/UString.h>
#include <etk/types.h>
#include <etk/math/Matrix4.h>
namespace ewol {

View File

@ -9,7 +9,7 @@
#include <ewol/debug.h>
#include <ewol/compositing/Text.h>
#include <ewol/context/Context.h>
#include <etk/UString.h>
#include <etk/types.h>
#undef __class__
#define __class__ "ewol::compositing::Text"
@ -635,7 +635,7 @@ void ewol::compositing::Text::print(const std::string& _text, const std::vector<
}
}
// special for the justify mode
if ((char32_t)_text[iii] == etk::UChar::Space) {
if ((char32_t)_text[iii] == u32char::Space) {
//EWOL_DEBUG(" generateString : \" \"");
if( m_needDisplay == true
&& m_colorBg.a() != 0) {
@ -673,14 +673,14 @@ void ewol::compositing::Text::print(const std::string& _text, const std::vector<
}
if (currentId == stop) {
currentId++;
} else if((char32_t)_text[stop] == etk::UChar::Space) {
} else if((char32_t)_text[stop] == u32char::Space) {
currentId = stop+1;
// reset position :
setPos(vec3(m_startTextpos,
(float)(m_position.y() - m_font->getHeight(m_mode)),
m_position.z()) );
m_nbCharDisplayed++;
} else if((char32_t)_text[stop] == etk::UChar::Return) {
} else if((char32_t)_text[stop] == u32char::Return) {
currentId = stop+1;
// reset position :
setPos(vec3(m_startTextpos,
@ -824,7 +824,7 @@ void ewol::compositing::Text::print(const std::u32string& _text, const std::vect
}
}
// special for the justify mode
if ((char32_t)_text[iii] == etk::UChar::Space) {
if ((char32_t)_text[iii] == u32char::Space) {
//EWOL_DEBUG(" generateString : \" \"");
if( m_needDisplay == true
&& m_colorBg.a() != 0) {
@ -862,14 +862,14 @@ void ewol::compositing::Text::print(const std::u32string& _text, const std::vect
}
if (currentId == stop) {
currentId++;
} else if(_text[stop] == etk::UChar::Space) {
} else if(_text[stop] == u32char::Space) {
currentId = stop+1;
// reset position :
setPos(vec3(m_startTextpos,
(float)(m_position.y() - m_font->getHeight(m_mode)),
m_position.z()) );
m_nbCharDisplayed++;
} else if(_text[stop] == etk::UChar::Return) {
} else if(_text[stop] == u32char::Return) {
currentId = stop+1;
// reset position :
setPos(vec3(m_startTextpos,
@ -1201,11 +1201,11 @@ bool ewol::compositing::Text::extrapolateLastId(const std::string& _text,
break;
}
// save number of space :
if ((char32_t)_text[iii] == etk::UChar::Space) {
if ((char32_t)_text[iii] == u32char::Space) {
_space++;
lastSpacePosition = iii;
lastSpacefreeSize = stopPosition - endPos;
} else if ((char32_t)_text[iii] == etk::UChar::Return) {
} else if ((char32_t)_text[iii] == u32char::Return) {
_stop = iii;
endOfLine = true;
break;
@ -1264,11 +1264,11 @@ bool ewol::compositing::Text::extrapolateLastId(const std::u32string& _text,
break;
}
// save number of space :
if (_text[iii] == etk::UChar::Space) {
if (_text[iii] == u32char::Space) {
_space++;
lastSpacePosition = iii;
lastSpacefreeSize = stopPosition - endPos;
} else if (_text[iii] == etk::UChar::Return) {
} else if (_text[iii] == u32char::Return) {
_stop = iii;
endOfLine = true;
break;

View File

@ -10,7 +10,7 @@
#define __EWOL_CONFIG_FONT_H__
#include <etk/types.h>
#include <etk/UString.h>
#include <etk/types.h>
namespace ewol {
namespace context {

View File

@ -10,7 +10,7 @@
#define __EWOL_CONTEXT_H__
#include <etk/types.h>
#include <etk/MessageFifo.h>
#include <etk/os/Fifo.h>
#include <ewol/ewol.h>
#include <ewol/key/key.h>
#include <ewol/object/Manager.h>
@ -85,7 +85,7 @@ namespace ewol {
private:
int64_t m_previousDisplayTime; // this is to limit framerate ... in case...
ewol::context::InputManager m_input;
etk::MessageFifo<ewol::eSystemMessage*> m_msgSystem;
etk::Fifo<ewol::eSystemMessage*> m_msgSystem;
bool m_displayFps;
ewol::context::Fps m_FpsSystemEvent;
ewol::context::Fps m_FpsSystemContext;

View File

@ -7,7 +7,7 @@
*/
#include <etk/types.h>
#include <etk/UString.h>
#include <etk/types.h>
#include <ewol/debug.h>

View File

@ -11,7 +11,7 @@
#include <ewol/ewol.h>
#include <ewol/key/key.h>
#include <ewol/context/commandLine.h>
#include <etk/UString.h>
#include <etk/types.h>
#include <etk/unicode.h>
#include <etk/os/FSNode.h>
#include <ewol/widget/Manager.h>
@ -78,13 +78,13 @@ class MacOSInterface : public ewol::Context {
OS_SetMouseMotion(_id, vec2(_x, _y));
}
void MAC_SetKeyboard(ewol::key::Special _keyboardMode, int32_t _unichar, bool _isDown, bool _isAReapeateKey) {
if (_unichar == etk::UChar::Delete) {
_unichar = etk::UChar::Suppress;
} else if (_unichar == etk::UChar::Suppress) {
_unichar = etk::UChar::Delete;
if (_unichar == u32char::Delete) {
_unichar = u32char::Suppress;
} else if (_unichar == u32char::Suppress) {
_unichar = u32char::Delete;
}
if (_unichar == etk::UChar::CarrierReturn) {
_unichar = etk::UChar::Return;
if (_unichar == u32char::CarrierReturn) {
_unichar = u32char::Return;
}
//EWOL_DEBUG("key: " << _unichar << " up=" << !_isDown);
if (_unichar <= 4) {

View File

@ -12,7 +12,7 @@
#include <etk/math/Vector2D.h>
#include <etk/math/Vector3D.h>
#include <etk/UString.h>
#include <etk/types.h>
#include <etk/unicode.h>
#include <ewol/widget/Manager.h>

View File

@ -13,8 +13,7 @@
#include <stdio.h>
#include <string.h>
#include <etk/UString.h>
#include <etk/unicode.h>
#include <etk/types.h>
#include <etk/os/FSNode.h>
#include <ewol/debug.h>
@ -663,7 +662,7 @@ class X11Interface : public ewol::Context {
// repeated kay from previous element :
if (count>0) {
// transform it in unicode
m_lastKeyPressed = etk::setUtf8(buf);
m_lastKeyPressed = utf8::convertChar32(buf);
}
//EWOL_INFO("event Key : " << event.xkey.keycode << " char=\"" << buf << "\"'len=" << strlen(buf) << " unicode=" << unicodeValue);
OS_SetKeyboard(m_guiKeyBoardMode, m_lastKeyPressed, (event.type == KeyPress), thisIsAReapeateKey);

View File

@ -11,7 +11,7 @@
#define __EWOL_AUDIO_H__
#include <etk/types.h>
#include <etk/UString.h>
#include <etk/types.h>
namespace ewol {
namespace audio {

View File

@ -7,7 +7,7 @@
*/
#include <etk/types.h>
#include <etk/UString.h>
#include <etk/types.h>
#include <etk/os/FSNode.h>
#include <ewol/debug.h>
#include <ewol/renderer/audio/decWav.h>

View File

@ -10,7 +10,7 @@
#define __EWOL_AUDIO_DEC_WAV_H__
#include <etk/types.h>
#include <etk/UString.h>
#include <etk/types.h>
namespace ewol {
namespace audio {

View File

@ -7,7 +7,7 @@
*/
#include <etk/types.h>
#include <etk/UString.h>
#include <etk/types.h>
#include <ewol/debug.h>
#include <ewol/renderer/audio/interfacePortAudio.h>
#include <ewol/renderer/audio/audio.h>

View File

@ -10,7 +10,7 @@
#define __EWOL_CLIPBOARD_H__
#include <ewol/debug.h>
#include <etk/UString.h>
#include <etk/types.h>
// TODO : Remove this ... ==> set it in the context ....
namespace ewol {

View File

@ -10,7 +10,7 @@
#define __EWOL_COMMAND_LINE_H__
#include <etk/types.h>
#include <etk/UString.h>
#include <etk/types.h>
namespace ewol {
namespace context {

View File

@ -30,7 +30,7 @@
#include <ewol/key.h>
#include <ewol/config.h>
#include <ewol/commandLine.h>
#include <etk/UString.h>
#include <etk/types.h>
#include <etk/unicode.h>
#include <ewol/widget/Manager.h>

View File

@ -10,7 +10,7 @@
#define __EWOL_H__
#include <etk/types.h>
#include <etk/UString.h>
#include <etk/types.h>
namespace ewol {
/**

View File

@ -7,7 +7,7 @@
*/
#include <ewol/object/Config.h>
#include <etk/UString.h>
#include <etk/types.h>
#undef __class__

View File

@ -10,7 +10,7 @@
#define __EWOL_OBJECT_MULTICAST_H__
#include <etk/types.h>
#include <etk/UString.h>
#include <etk/types.h>
#include <vector>
#include <exml/exml.h>

View File

@ -10,7 +10,7 @@
#define __EWOL_OBJECT_H__
#include <etk/types.h>
#include <etk/UString.h>
#include <etk/types.h>
#include <vector>
#include <exml/exml.h>
#include <vector>

View File

@ -6,7 +6,7 @@
* @license BSD v3 (see license file)
*/
#include <etk/unicode.h>
#include <etk/types.h>
#include <vector>
#include <etk/os/FSNode.h>

View File

@ -10,7 +10,7 @@
#define __EWOL_TEXTURE_FILE_H__
#include <etk/types.h>
#include <etk/UString.h>
#include <etk/types.h>
#include <egami/Image.h>
#include <ewol/resource/Texture.h>
#include <ewol/resource/Resource.h>

View File

@ -11,7 +11,7 @@
#define __RESOURCES_H__
#include <etk/types.h>
#include <etk/UString.h>
#include <etk/types.h>
#include <ewol/debug.h>
#include <ewol/object/Object.h>

View File

@ -26,9 +26,9 @@ ewol::resource::Shader::Shader(const std::string& _filename) :
EWOL_DEBUG("OGL : load SHADER \"" << _filename << "\"");
// load data from file "all the time ..."
if (end_with(m_name, ".frag") == true) {
if (std::end_with(m_name, ".frag") == true) {
m_type = GL_FRAGMENT_SHADER;
} else if (end_with(m_name, ".vert") == true) {
} else if (std::end_with(m_name, ".vert") == true) {
m_type = GL_VERTEX_SHADER;
} else {
EWOL_ERROR("File does not have extention \".vert\" for Vertex Shader or \".frag\" for Fragment Shader. but : \"" << m_name << "\"");
@ -87,7 +87,7 @@ void ewol::resource::Shader::updateContext(void) {
}
EWOL_ERROR("Could not compile \"" << tmpShaderType << "\" name='" << m_name << "'");
EWOL_ERROR("Error " << l_bufferDisplayError);
std::vector<std::string> lines = string_split(m_fileData, '\n');
std::vector<std::string> lines = std::split(m_fileData, '\n');
for (size_t iii=0 ; iii<lines.size() ; iii++) {
EWOL_ERROR("file " << (iii+1) << "|" << lines[iii]);
}

View File

@ -98,7 +98,7 @@ ewol::resource::TexturedFont::TexturedFont(const std::string& _fontName) :
// find the real Font name :
std::vector<std::string> output;
myFolder.folderGetRecursiveFiles(output);
std::vector<std::string> split = string_split(localName, ';');
std::vector<std::string> split = std::split(localName, ';');
EWOL_INFO("try to find font named : " << split << " in: " << myFolder);
//EWOL_CRITICAL("parse string : " << split);
bool hasFindAFont = false;

View File

@ -453,7 +453,7 @@ bool ewol::widget::Button::onSetConfig(const ewol::object::Config& _conf) {
return true;
}
if (_conf.getConfig() == configToggle) {
setToggleMode(stobool(_conf.getData()));
setToggleMode(std::stob(_conf.getData()));
return true;
}
if (_conf.getConfig() == configLock) {
@ -472,7 +472,7 @@ bool ewol::widget::Button::onSetConfig(const ewol::object::Config& _conf) {
return true;
}
if (_conf.getConfig() == configValue) {
setValue(stobool(_conf.getData()));
setValue(std::stob(_conf.getData()));
return true;
}
if (_conf.getConfig() == configShaper) {
@ -487,11 +487,7 @@ bool ewol::widget::Button::onGetConfig(const char* _config, std::string& _result
return true;
}
if (_config == configToggle) {
if (getToggleMode() == true) {
_result = "true";
} else {
_result = "false";
}
_result = std::to_string(getToggleMode());
return true;
}
if (_config == configLock) {
@ -513,11 +509,7 @@ bool ewol::widget::Button::onGetConfig(const char* _config, std::string& _result
return true;
}
if (_config == configValue) {
if (getValue() == true) {
_result = "true";
} else {
_result = "false";
}
_result = std::to_string(getValue());
return true;
}
if (_config == configShaper) {

View File

@ -6,7 +6,7 @@
* @license BSD v3 (see license file)
*/
#include <etk/unicode.h>
#include <etk/types.h>
#include <ewol/widget/Entry.h>
#include <ewol/widget/Manager.h>
#include <ewol/ewol.h>
@ -563,10 +563,10 @@ void ewol::widget::Entry::periodicCall(const ewol::event::Time& _event) {
void ewol::widget::Entry::setRegExp(const std::string& _expression) {
std::string previousRegExp = m_regExp.getRegExp();
EWOL_DEBUG("change input regExp \"" << previousRegExp << "\" == > \"" << _expression << "\"");
m_regExp.setRegExp(_expression);
m_regExp.compile(_expression);
if (m_regExp.getStatus() == false) {
EWOL_ERROR("error when adding regExp ... == > set the previous back ...");
m_regExp.setRegExp(previousRegExp);
m_regExp.compile(previousRegExp);
}
}

View File

@ -225,7 +225,7 @@ bool ewol::widget::Image::onSetConfig(const ewol::object::Config& _conf) {
return true;
}
if (_conf.getConfig() == configRatio) {
setKeepRatio(stobool(_conf.getData()));
setKeepRatio(std::stob(_conf.getData()));
return true;
}
if (_conf.getConfig() == configSize) {
@ -248,11 +248,7 @@ bool ewol::widget::Image::onGetConfig(const char* _config, std::string& _result)
return true;
}
if (_config == configRatio) {
if (true == getKeepRatio()) {
_result = "true";
} else {
_result = "false";
}
_result = std::to_string(getKeepRatio());
return true;
}
if (_config == configSize) {

View File

@ -246,7 +246,7 @@ void ewol::widget::Manager::addWidgetCreator(const std::string& _name,
return;
}
//Keep name in lower case :
std::string nameLower = to_lower(_name);
std::string nameLower = std::tolower(_name);
if (true == m_creatorList.exist(nameLower)) {
EWOL_WARNING("Replace Creator of a specify widget : " << nameLower);
m_creatorList[nameLower] = _pointer;
@ -257,7 +257,7 @@ void ewol::widget::Manager::addWidgetCreator(const std::string& _name,
}
ewol::Widget* ewol::widget::Manager::create(const std::string& _name) {
std::string nameLower = to_lower(_name);
std::string nameLower = std::tolower(_name);
if (true == m_creatorList.exist(nameLower)) {
ewol::widget::Manager::creator_tf pointerFunction = m_creatorList[nameLower];
if (NULL != pointerFunction) {
@ -269,7 +269,7 @@ ewol::Widget* ewol::widget::Manager::create(const std::string& _name) {
}
bool ewol::widget::Manager::exist(const std::string& _name) {
std::string nameLower = to_lower(_name);
std::string nameLower = std::tolower(_name);
return m_creatorList.exist(nameLower);
}

View File

@ -10,7 +10,7 @@
#define __EWOL_MENU_H__
#include <etk/types.h>
#include <etk/UString.h>
#include <etk/types.h>
#include <ewol/debug.h>
#include <ewol/widget/Widget.h>
#include <ewol/widget/Sizer.h>

View File

@ -164,7 +164,7 @@ bool ewol::widget::PopUp::onSetConfig(const ewol::object::Config& _conf) {
return true;
}
if (_conf.getConfig() == configRemoveOnExternClick) {
setRemoveOnExternClick(stobool(_conf.getData()));
setRemoveOnExternClick(std::stob(_conf.getData()));
return true;
}
if (_conf.getConfig() == configLockExpand) {
@ -187,11 +187,7 @@ bool ewol::widget::PopUp::onGetConfig(const char* _config, std::string& _result)
return true;
}
if (_config == configRemoveOnExternClick) {
if (getRemoveOnExternClick() == true) {
_result = "true";
} else {
_result = "false";
}
_result = std::to_string(getRemoveOnExternClick());
return true;
}
return false;

View File

@ -749,7 +749,7 @@ bool ewol::Widget::onSetConfig(const ewol::object::Config& _conf) {
return true;
}
if (_conf.getConfig() == ewol::Widget::configHide) {
if(true == stobool(_conf.getData())) {
if(true == std::stob(_conf.getData())) {
hide();
} else {
show();
@ -757,7 +757,7 @@ bool ewol::Widget::onSetConfig(const ewol::object::Config& _conf) {
return true;
}
if (_conf.getConfig() == ewol::Widget::configFocus) {
if(true == stobool(_conf.getData())) {
if(true == std::stob(_conf.getData())) {
keepFocus();
} else {
//nothing to do ...
@ -808,12 +808,7 @@ bool ewol::Widget::onGetConfig(const char* _config, std::string& _result) const
return true;
}
if (_config == ewol::Widget::configHide) {
// TODO : Understand why it does not work : _result = m_hide;
if (true == m_hide) {
_result = "true";
} else {
_result = "false";
}
_result = std::to_string(m_hide);
return true;
}
if (_config == ewol::Widget::configMinSize) {

View File

@ -107,7 +107,12 @@ namespace ewol {
~EventShortCut(void) { };
};
/**
* @ingroup ewolWidgetGroup
* @brief Widget class is the main widget interface, it hase some generic properties:
* :** known his parent
* :** Can be display at a special position with a special scale
* :** Can get focus
* :** Receive Event (keyboard / mouse / ...)
*
*/
class Widget : public ewol::Object {
public:

View File

@ -7,7 +7,7 @@
*/
#include <etk/types.h>
#include <etk/UString.h>
#include <etk/types.h>
#include <ewol/ewol.h>
#include <ewol/openGL/openGL.h>
#include <ewol/context/Context.h>

View File

@ -10,7 +10,7 @@
#define __EWOL_WIDGET_PARAMETER_H__
#include <etk/types.h>
#include <etk/UString.h>
#include <etk/types.h>
#include <ewol/debug.h>
#include <ewol/widget/PopUp.h>
#include <ewol/widget/Button.h>