diff --git a/external/ejson b/external/ejson index 61f4b686..b442284f 160000 --- a/external/ejson +++ b/external/ejson @@ -1 +1 @@ -Subproject commit 61f4b68621a3ba5cc137901956d8f021fc7ef7a2 +Subproject commit b442284f092295f31f6016aa060643d3d42ceb61 diff --git a/external/etk b/external/etk index 21c190ed..5ceab908 160000 --- a/external/etk +++ b/external/etk @@ -1 +1 @@ -Subproject commit 21c190edeec50092bf76b7c5841b63082c107c40 +Subproject commit 5ceab908cf8d069404e62c107db2807bad486925 diff --git a/external/exml b/external/exml index 6a652e96..83786689 160000 --- a/external/exml +++ b/external/exml @@ -1 +1 @@ -Subproject commit 6a652e96c9b07919882a82d6f11f7d331f7414d6 +Subproject commit 83786689c4fa6abd688ea2318b54d97233b01075 diff --git a/external/portaudio b/external/portaudio index 6c815e5a..aaca1592 160000 --- a/external/portaudio +++ b/external/portaudio @@ -1 +1 @@ -Subproject commit 6c815e5adec48a48a9b22b6bc61c5c91ab22b055 +Subproject commit aaca1592f23a89bf4fe55b8890d273fec5caef4d diff --git a/sources/ewol/compositing/Text.cpp b/sources/ewol/compositing/Text.cpp index 25e50268..74bb7bae 100644 --- a/sources/ewol/compositing/Text.cpp +++ b/sources/ewol/compositing/Text.cpp @@ -561,7 +561,7 @@ void ewol::Text::print(const etk::UString& _text, const etk::VectorgetHeight(m_mode)), m_position.z()) ); m_nbCharDisplayed++; - } else if(_text[stop] == etk::UniChar::Return) { + } else if(_text[stop] == etk::UChar::Return) { currentId = stop+1; // reset position : setPos(vec3(m_startTextpos, @@ -685,7 +685,7 @@ void ewol::Text::print(const etk::UString& _text, const etk::Vector maybe move this in the font property. - uniChar_t m_previousCharcode; //!< we remember the previous charcode to perform the kerning. @ref Kerning + etk::UChar m_previousCharcode; //!< we remember the previous charcode to perform the kerning. @ref Kerning private: float m_startTextpos; //!< start position of the Alignement (when \n the text return at this position) float m_stopTextPos; //!< end of the alignement (when a string is too hight it cut at the word previously this virtual line and the center is perform with this one) @@ -306,7 +306,7 @@ namespace ewol { * @brief display the current char in the current element (note that the kerning is availlable if the position is not changed) * @param[in] _charcode Char that might be dispalyed */ - void print(const uniChar_t& _charcode); + void print(const etk::UChar& _charcode); /** * @brief This generate the line return == > it return to the alignement position start and at the correct line position ==> it might be use to not know the line height */ @@ -358,7 +358,7 @@ namespace ewol { * @param[in] _charcode The ľUnicode value to calculate dimention. * @return The theoric size used. */ - vec3 calculateSize(const uniChar_t& _charcode); + vec3 calculateSize(const etk::UChar& _charcode); /** * @brief draw a cursor at the specify position * @param[in] _isInsertMode True if the insert mode is activated diff --git a/sources/ewol/renderer/Android/Context.cpp b/sources/ewol/renderer/Android/Context.cpp index 76459f28..dedf7f44 100644 --- a/sources/ewol/renderer/Android/Context.cpp +++ b/sources/ewol/renderer/Android/Context.cpp @@ -385,7 +385,7 @@ class AndroidContext : public ewol::eContext { ewol::eContext::OS_SetMouseState(_pointerID, _isDown, vec2(_pos.x(),m_currentHeight-_pos.y()) ); } - void ANDROID_SetKeyboard(uniChar_t _myChar, bool _isDown, bool _isARepeateKey=false) { + void ANDROID_SetKeyboard(etk::UChar _myChar, bool _isDown, bool _isARepeateKey=false) { OS_SetKeyboard(m_guiKeyBoardSpecialKeyMode, _myChar, _isDown, _isARepeateKey); } diff --git a/sources/ewol/renderer/EventEntry.h b/sources/ewol/renderer/EventEntry.h index 744b5c70..9648e29b 100644 --- a/sources/ewol/renderer/EventEntry.h +++ b/sources/ewol/renderer/EventEntry.h @@ -18,12 +18,12 @@ namespace ewol { ewol::keyEvent::keyboard_te m_type; //!< type of hardware event ewol::keyEvent::status_te m_status; //!< status of hardware event ewol::SpecialKey m_specialKey; //!< input key status (prevent change in time..) - uniChar_t m_unicodeData; //!< Unicode data (in some case) + etk::UChar m_unicodeData; //!< Unicode data (in some case) public: EventEntry(ewol::keyEvent::keyboard_te _type, ewol::keyEvent::status_te _status, ewol::SpecialKey _specialKey, - uniChar_t _char) : + etk::UChar _char) : m_type(_type), m_status(_status), m_specialKey(_specialKey), @@ -47,10 +47,10 @@ namespace ewol { inline const ewol::SpecialKey& getSpecialKey(void) const { return m_specialKey; }; - void setChar(uniChar_t _char) { + void setChar(etk::UChar _char) { m_unicodeData = _char; }; - inline const uniChar_t& getChar(void) const { + inline const etk::UChar& getChar(void) const { return m_unicodeData; }; }; @@ -61,7 +61,7 @@ namespace ewol { EventEntrySystem(ewol::keyEvent::keyboard_te _type, ewol::keyEvent::status_te _status, ewol::SpecialKey _specialKey, - uniChar_t _char) : + etk::UChar _char) : m_event(_type, _status, _specialKey, _char) { }; ewol::EventEntry m_event; diff --git a/sources/ewol/renderer/Windows/Context.cpp b/sources/ewol/renderer/Windows/Context.cpp index 3803fbd1..e9285a04 100644 --- a/sources/ewol/renderer/Windows/Context.cpp +++ b/sources/ewol/renderer/Windows/Context.cpp @@ -277,7 +277,7 @@ class WindowsContext : public ewol::eContext { case WM_KEYUP: buttonIsDown = false; case WM_KEYDOWN: { - etk::UniChar tmpChar = 0; + etk::UChar tmpChar = 0; ewol::keyEvent::keyboard_te keyInput; switch (_wParam) { //case 80: // keypad diff --git a/sources/ewol/renderer/X11/Context.cpp b/sources/ewol/renderer/X11/Context.cpp index 3fd33bbf..385134f1 100644 --- a/sources/ewol/renderer/X11/Context.cpp +++ b/sources/ewol/renderer/X11/Context.cpp @@ -658,7 +658,7 @@ class X11Interface : public ewol::eContext { } if (count>0) { // transform it in unicode - etk::UniChar tmpChar = 0; + etk::UChar tmpChar = 0; tmpChar.setUtf8(buf); //EWOL_INFO("event Key : " << event.xkey.keycode << " char=\"" << buf << "\"'len=" << strlen(buf) << " unicode=" << unicodeValue); OS_SetKeyboard(m_guiKeyBoardMode, tmpChar, (event.type == KeyPress), thisIsAReapeateKey); diff --git a/sources/ewol/renderer/eContext.cpp b/sources/ewol/renderer/eContext.cpp index da92f44a..bdb39326 100644 --- a/sources/ewol/renderer/eContext.cpp +++ b/sources/ewol/renderer/eContext.cpp @@ -363,7 +363,7 @@ void ewol::eContext::OS_SetMouseState(int _pointerID, bool _isDown, const vec2& } void ewol::eContext::OS_SetKeyboard(ewol::SpecialKey& _special, - uniChar_t _myChar, + etk::UChar _myChar, bool _isDown, bool _isARepeateKey) { eSystemMessage data; diff --git a/sources/ewol/renderer/eContext.h b/sources/ewol/renderer/eContext.h index f424a7c9..aa2011a7 100644 --- a/sources/ewol/renderer/eContext.h +++ b/sources/ewol/renderer/eContext.h @@ -56,7 +56,7 @@ class eSystemMessage { // keyboard events : bool repeateKey; //!< special flag for the repeating key on the PC interface bool stateIsDown; - uniChar_t keyboardChar; + etk::UChar keyboardChar; ewol::keyEvent::keyboard_te keyboardMove; ewol::SpecialKey keyboardSpecial; @@ -142,7 +142,7 @@ namespace ewol { virtual void OS_SetMouseState(int _pointerID, bool _isDown, const vec2& _pos); virtual void OS_SetKeyboard(ewol::SpecialKey& _special, - uniChar_t _myChar, + etk::UChar _myChar, bool _isDown, bool _isARepeateKey=false); virtual void OS_SetKeyboardMove(ewol::SpecialKey& _special, diff --git a/sources/ewol/resources/Mesh.h b/sources/ewol/resources/Mesh.h index 33c9756d..fb86a5ee 100644 --- a/sources/ewol/resources/Mesh.h +++ b/sources/ewol/resources/Mesh.h @@ -10,7 +10,7 @@ #define __MESH_H__ #include -#include +#include #include #include #include diff --git a/sources/ewol/resources/TexturedFont.cpp b/sources/ewol/resources/TexturedFont.cpp index 4daf42b2..3e17ee68 100644 --- a/sources/ewol/resources/TexturedFont.cpp +++ b/sources/ewol/resources/TexturedFont.cpp @@ -205,13 +205,13 @@ ewol::TexturedFont::TexturedFont(etk::UString fontName) : } // add error glyph { - etk::UniChar tmpchar; + etk::UChar tmpchar; tmpchar.set(0); addGlyph(tmpchar); } // by default we set only the first AINSI char availlable for (int32_t iii=0x20; iii<0x7F; iii++) { - etk::UniChar tmpchar; + etk::UChar tmpchar; tmpchar.set(iii); addGlyph(tmpchar); } @@ -229,7 +229,7 @@ ewol::TexturedFont::~TexturedFont(void) { } } -bool ewol::TexturedFont::addGlyph(const etk::UniChar& _val) { +bool ewol::TexturedFont::addGlyph(const etk::UChar& _val) { bool hasChange = false; // for each font : for (int32_t iii=0; iii<4 ; iii++) { @@ -306,7 +306,7 @@ bool ewol::TexturedFont::hasName(const etk::UString& _fileName) { } -int32_t ewol::TexturedFont::getIndex(const uniChar_t& _charcode, const ewol::font::mode_te _displayMode) { +int32_t ewol::TexturedFont::getIndex(const etk::UChar& _charcode, const ewol::font::mode_te _displayMode) { if (_charcode.get() < 0x20) { return 0; } else if (_charcode.get() < 0x80) { @@ -332,7 +332,7 @@ int32_t ewol::TexturedFont::getIndex(const uniChar_t& _charcode, const ewol::fon return 0; } -ewol::GlyphProperty* ewol::TexturedFont::getGlyphPointer(const uniChar_t& _charcode, const ewol::font::mode_te _displayMode) { +ewol::GlyphProperty* ewol::TexturedFont::getGlyphPointer(const etk::UChar& _charcode, const ewol::font::mode_te _displayMode) { //EWOL_DEBUG("Get glyph property for mode: " << _displayMode << " == > wrapping index : " << m_modeWraping[_displayMode]); int32_t index = getIndex(_charcode, _displayMode); if( index < 0 diff --git a/sources/ewol/resources/TexturedFont.h b/sources/ewol/resources/TexturedFont.h index 581fb7f5..76f3b2d2 100644 --- a/sources/ewol/resources/TexturedFont.h +++ b/sources/ewol/resources/TexturedFont.h @@ -69,14 +69,14 @@ namespace ewol { * @param[in] _displayMode Mode to display the currrent font * @return The ID in the table (if it does not exist : return 0) */ - int32_t getIndex(const uniChar_t& _charcode, const ewol::font::mode_te _displayMode); + int32_t getIndex(const etk::UChar& _charcode, const ewol::font::mode_te _displayMode); /** * @brief get the pointer on the coresponding glyph * @param[in] _charcode The unicodeValue * @param[in] _displayMode Mode to display the currrent font * @return The pointer on the glyph == > never NULL */ - ewol::GlyphProperty* getGlyphPointer(const uniChar_t& _charcode, const ewol::font::mode_te _displayMode); + ewol::GlyphProperty* getGlyphPointer(const etk::UChar& _charcode, const ewol::font::mode_te _displayMode); /** * @brief The wrapping mode is used to prevent the non existance of a specific mode. * For exemple when a blod mode does not exist, this resend a regular mode. @@ -105,7 +105,7 @@ namespace ewol { * @param[in] _val Char value to add. * @return true if the image size have change, false otherwise */ - bool addGlyph(const etk::UniChar& _val); + bool addGlyph(const etk::UChar& _val); }; diff --git a/sources/ewol/resources/font/GlyphProperty.h b/sources/ewol/resources/font/GlyphProperty.h index 1bd15b31..b2bf06b5 100644 --- a/sources/ewol/resources/font/GlyphProperty.h +++ b/sources/ewol/resources/font/GlyphProperty.h @@ -50,7 +50,7 @@ namespace ewol { class GlyphProperty { public: - uniChar_t m_UVal; //!< Unicode value + etk::UChar m_UVal; //!< Unicode value private: bool m_exist; public: @@ -74,7 +74,7 @@ namespace ewol { m_texturePosSize(0,0) { }; - float kerningGet(const uniChar_t _charcode) { + float kerningGet(const etk::UChar _charcode) { for(esize_t iii=0; iii in this case we need to center the text in the shaper ... - int32_t minHeight = m_oObjectText.calculateSize(etk::UniChar('A')).y(); + int32_t minHeight = m_oObjectText.calculateSize(etk::UChar('A')).y(); if (tmpSizeText.y()>minHeight) { tmpOriginText += vec2(0,(tmpSizeText.y()-minHeight)/2.0f); } diff --git a/sources/ewol/widget/Label.cpp b/sources/ewol/widget/Label.cpp index 1b1da30f..ef26f91d 100644 --- a/sources/ewol/widget/Label.cpp +++ b/sources/ewol/widget/Label.cpp @@ -67,7 +67,7 @@ void widget::Label::onRegenerateDisplay(void) { vec2 tmpMax = m_userMaxSize.getPixel(); // to know the size of one line : - vec3 minSize = m_text.calculateSize(etk::UniChar('A')); + vec3 minSize = m_text.calculateSize(etk::UChar('A')); if (tmpMax.x() <= 999999) { m_text.setTextAlignement(0, tmpMax.x()-2*paddingSize, ewol::Text::alignLeft); } diff --git a/sources/ewol/widget/List.cpp b/sources/ewol/widget/List.cpp index 01cc01c9..d3602065 100644 --- a/sources/ewol/widget/List.cpp +++ b/sources/ewol/widget/List.cpp @@ -175,7 +175,7 @@ void widget::List::onRegenerateDisplay(void) { ewol::Text * tmpText = new ewol::Text(); if (NULL != tmpText) { // get font size : - int32_t tmpFontHeight = tmpText->calculateSize(etk::UniChar('A')).y(); + int32_t tmpFontHeight = tmpText->calculateSize(etk::UChar('A')).y(); displayPositionY-=(tmpFontHeight+m_paddingSizeY); BGOObjects->setColor(bg); diff --git a/sources/ewol/widget/Widget.cpp b/sources/ewol/widget/Widget.cpp index a1f8ef43..541e994a 100644 --- a/sources/ewol/widget/Widget.cpp +++ b/sources/ewol/widget/Widget.cpp @@ -605,7 +605,7 @@ void ewol::Widget::shortCutClean(void) { } bool ewol::Widget::onEventShortCut(ewol::SpecialKey& _special, - uniChar_t _unicodeValue, + etk::UChar _unicodeValue, ewol::keyEvent::keyboard_te _kbMove, bool _isDown) { if (_unicodeValue >= 'A' && _unicodeValue <= 'Z') { diff --git a/sources/ewol/widget/Widget.h b/sources/ewol/widget/Widget.h index 22ba1536..ab241716 100644 --- a/sources/ewol/widget/Widget.h +++ b/sources/ewol/widget/Widget.h @@ -85,7 +85,7 @@ namespace ewol { const char* generateEventId; //!< Local generated event etk::UString eventData; //!< data link with the event ewol::SpecialKey specialKey; //!< special board key - uniChar_t unicodeValue; //!< 0 if not used + etk::UChar unicodeValue; //!< 0 if not used ewol::keyEvent::keyboard_te keyboardMoveValue; //!< ewol::EVENT_KB_MOVE_TYPE_NONE if not used EventShortCut(void) { broadcastEvent = false; @@ -605,7 +605,7 @@ namespace ewol { * @note To prevent some error when you get an event get it if it is down and Up ... == > like this it could not generate some ununderstanding error. */ virtual bool onEventShortCut(ewol::SpecialKey& _special, - uniChar_t _unicodeValue, + etk::UChar _unicodeValue, ewol::keyEvent::keyboard_te _kbMove, bool _isDown); // ---------------------------------------------------------------------------------------------------------------- diff --git a/sources/ewol/widget/WidgetManager.h b/sources/ewol/widget/WidgetManager.h index a9ba88dd..7dc48489 100644 --- a/sources/ewol/widget/WidgetManager.h +++ b/sources/ewol/widget/WidgetManager.h @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include namespace ewol {