Fix revoke debug privs not reliably turn off stuff (#11409)

[dragonfireclient.git] / src / gui / guiEditBox.cpp

diff --git a/src/gui/guiEditBox.cpp b/src/gui/guiEditBox.cpp
index 11d080be9738816e4cf20c0cca02f4db4e1d7e00..43afb6e3e46a82f882094872e0fb8ead9160da91 100644 (file)
--- a/src/gui/guiEditBox.cpp
+++ b/src/gui/guiEditBox.cpp
@@ -19,6 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "guiEditBox.h"
 
+#include "IrrCompileConfig.h"
 #include "IGUISkin.h"
 #include "IGUIEnvironment.h"
 #include "IGUIFont.h"
@@ -208,35 +209,19 @@ bool GUIEditBox::OnEvent(const SEvent &event)
                                }
                        }
                        break;
-               case EET_KEY_INPUT_EVENT: {
-#if (defined(__linux__) || defined(__FreeBSD__)) || defined(__DragonFly__)
-                       // ################################################################
-                       // ValkaTR:
-                       // This part is the difference from the original intlGUIEditBox
-                       // It converts UTF-8 character into a UCS-2 (wchar_t)
-                       wchar_t wc = L'_';
-                       mbtowc(&wc, (char *)&event.KeyInput.Char,
-                                       sizeof(event.KeyInput.Char));
-
-                       // printf( "char: %lc (%u)  \r\n", wc, wc );
-
-                       SEvent irrevent(event);
-                       irrevent.KeyInput.Char = wc;
-                       // ################################################################
-
-                       if (processKey(irrevent))
-                               return true;
-#else
+               case EET_KEY_INPUT_EVENT:
                        if (processKey(event))
                                return true;
-#endif // defined(linux)
-
                        break;
-               }
                case EET_MOUSE_INPUT_EVENT:
                        if (processMouse(event))
                                return true;
                        break;
+#if (IRRLICHT_VERSION_MT_REVISION >= 2)
+               case EET_STRING_INPUT_EVENT:
+                       inputString(*event.StringInput.Str);
+                       return true;
+#endif
                default:
                        break;
                }
@@ -247,10 +232,6 @@ bool GUIEditBox::OnEvent(const SEvent &event)
 
 bool GUIEditBox::processKey(const SEvent &event)
 {
-       if (!m_writable) {
-               return false;
-       }
-
        if (!event.KeyInput.PressedDown)
                return false;
 
@@ -546,6 +527,9 @@ bool GUIEditBox::onKeyControlX(const SEvent &event, s32 &mark_begin, s32 &mark_e
        // First copy to clipboard
        onKeyControlC(event);
 
+       if (!m_writable)
+               return false;
+
        if (m_passwordbox || !m_operator || m_mark_begin == m_mark_end)
                return false;
 
@@ -571,7 +555,7 @@ bool GUIEditBox::onKeyControlX(const SEvent &event, s32 &mark_begin, s32 &mark_e
 
 bool GUIEditBox::onKeyControlV(const SEvent &event, s32 &mark_begin, s32 &mark_end)
 {
-       if (!isEnabled())
+       if (!isEnabled() || !m_writable)
                return false;
 
        // paste from the clipboard
@@ -617,7 +601,7 @@ bool GUIEditBox::onKeyControlV(const SEvent &event, s32 &mark_begin, s32 &mark_e
 
 bool GUIEditBox::onKeyBack(const SEvent &event, s32 &mark_begin, s32 &mark_end)
 {
-       if (!isEnabled() || Text.empty())
+       if (!isEnabled() || Text.empty() || !m_writable)
                return false;
 
        core::stringw s;
@@ -655,7 +639,7 @@ bool GUIEditBox::onKeyBack(const SEvent &event, s32 &mark_begin, s32 &mark_end)
 
 bool GUIEditBox::onKeyDelete(const SEvent &event, s32 &mark_begin, s32 &mark_end)
 {
-       if (!isEnabled() || Text.empty())
+       if (!isEnabled() || Text.empty() || !m_writable)
                return false;
 
        core::stringw s;
@@ -689,6 +673,51 @@ bool GUIEditBox::onKeyDelete(const SEvent &event, s32 &mark_begin, s32 &mark_end
        return true;
 }
 
+void GUIEditBox::inputChar(wchar_t c)
+{
+       if (c == 0)
+               return;
+       core::stringw s(&c, 1);
+       inputString(s);
+}
+
+void GUIEditBox::inputString(const core::stringw &str)
+{
+       if (!isEnabled() || !m_writable)
+               return;
+
+       u32 len = str.size();
+       if (Text.size()+len <= m_max || m_max == 0) {
+               core::stringw s;
+               if (m_mark_begin != m_mark_end) {
+                       // replace marked text
+                       s32 real_begin = m_mark_begin < m_mark_end ? m_mark_begin : m_mark_end;
+                       s32 real_end = m_mark_begin < m_mark_end ? m_mark_end : m_mark_begin;
+
+                       s = Text.subString(0, real_begin);
+                       s.append(str);
+                       s.append(Text.subString(real_end, Text.size() - real_end));
+                       Text = s;
+                       m_cursor_pos = real_begin + len;
+               } else {
+                       // append string
+                       s = Text.subString(0, m_cursor_pos);
+                       s.append(str);
+                       s.append(Text.subString(m_cursor_pos,
+                                       Text.size() - m_cursor_pos));
+                       Text = s;
+                       m_cursor_pos += len;
+               }
+
+               m_blink_start_time = porting::getTimeMs();
+               setTextMarkers(0, 0);
+       }
+
+       breakText();
+       sendGuiEvent(EGET_EDITBOX_CHANGED);
+       calculateScrollPos();
+}
+
 bool GUIEditBox::processMouse(const SEvent &event)
 {
        switch (event.MouseInput.Event) {
@@ -747,6 +776,7 @@ bool GUIEditBox::processMouse(const SEvent &event)
                        s32 pos = m_vscrollbar->getPos();
                        s32 step = m_vscrollbar->getSmallStep();
                        m_vscrollbar->setPos(pos - event.MouseInput.Wheel * step);
+                       return true;
                }
                break;
        default:
@@ -817,3 +847,54 @@ void GUIEditBox::updateVScrollBar()
                }
        }
 }
+
+void GUIEditBox::deserializeAttributes(
+               io::IAttributes *in, io::SAttributeReadWriteOptions *options = 0)
+{
+       IGUIEditBox::deserializeAttributes(in, options);
+
+       setOverrideColor(in->getAttributeAsColor("OverrideColor"));
+       enableOverrideColor(in->getAttributeAsBool("OverrideColorEnabled"));
+       setMax(in->getAttributeAsInt("MaxChars"));
+       setWordWrap(in->getAttributeAsBool("WordWrap"));
+       setMultiLine(in->getAttributeAsBool("MultiLine"));
+       setAutoScroll(in->getAttributeAsBool("AutoScroll"));
+       core::stringw ch = in->getAttributeAsStringW("PasswordChar");
+
+       if (ch.empty())
+               setPasswordBox(in->getAttributeAsBool("PasswordBox"));
+       else
+               setPasswordBox(in->getAttributeAsBool("PasswordBox"), ch[0]);
+
+       setTextAlignment((EGUI_ALIGNMENT)in->getAttributeAsEnumeration(
+                                        "HTextAlign", GUIAlignmentNames),
+                       (EGUI_ALIGNMENT)in->getAttributeAsEnumeration(
+                                       "VTextAlign", GUIAlignmentNames));
+
+       setWritable(in->getAttributeAsBool("Writable"));
+       // setOverrideFont(in->getAttributeAsFont("OverrideFont"));
+}
+
+//! Writes attributes of the element.
+void GUIEditBox::serializeAttributes(
+               io::IAttributes *out, io::SAttributeReadWriteOptions *options = 0) const
+{
+       // IGUIEditBox::serializeAttributes(out,options);
+
+       out->addBool("OverrideColorEnabled", m_override_color_enabled);
+       out->addColor("OverrideColor", m_override_color);
+       // out->addFont("OverrideFont",m_override_font);
+       out->addInt("MaxChars", m_max);
+       out->addBool("WordWrap", m_word_wrap);
+       out->addBool("MultiLine", m_multiline);
+       out->addBool("AutoScroll", m_autoscroll);
+       out->addBool("PasswordBox", m_passwordbox);
+       core::stringw ch = L" ";
+       ch[0] = m_passwordchar;
+       out->addString("PasswordChar", ch.c_str());
+       out->addEnum("HTextAlign", m_halign, GUIAlignmentNames);
+       out->addEnum("VTextAlign", m_valign, GUIAlignmentNames);
+       out->addBool("Writable", m_writable);
+
+       IGUIEditBox::serializeAttributes(out, options);
+}