X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2FguiTextInputMenu.cpp;h=535bf497e099eba1093426867d222701daa570b7;hb=32ab6c2a32ff4336edca87d58efe2e6fa7df6c48;hp=bfe0ea5de259b0123a0d20f80a864f7049d92b5e;hpb=1d1aec9631e3ae077db6060f0fe19487b7b23aae;p=dragonfireclient.git

diff --git a/src/guiTextInputMenu.cpp b/src/guiTextInputMenu.cpp
index bfe0ea5de..535bf497e 100644
--- a/src/guiTextInputMenu.cpp
+++ b/src/guiTextInputMenu.cpp
@@ -1,18 +1,18 @@
 /*
-Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -20,10 +20,21 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "guiTextInputMenu.h"
 #include "debug.h"
 #include "serialization.h"
+#include "main.h" // for g_settings
+#include "settings.h"
 #include <string>
+#include <IGUICheckBox.h>
+#include <IGUIEditBox.h>
+#include <IGUIButton.h>
+#include <IGUIStaticText.h>
+#include <IGUIFont.h>
 
 #include "gettext.h"
 
+#if USE_FREETYPE
+#include "intlGUIEditBox.h"
+#endif
+
 GUITextInputMenu::GUITextInputMenu(gui::IGUIEnvironment* env,
 		gui::IGUIElement* parent, s32 id,
 		IMenuManager *menumgr,
@@ -100,18 +111,36 @@ void GUITextInputMenu::regenerateGui(v2u32 screensize)
 	{
 		core::rect<s32> rect(0, 0, 300, 30);
 		rect = rect + v2s32(size.X/2-300/2, size.Y/2-30/2-25);
-		gui::IGUIElement *e = 
-		Environment->addEditBox(text.c_str(), rect, true, this, 256);
+		gui::IGUIElement *e;
+		#if USE_FREETYPE
+		if (g_settings->getBool("freetype")) {
+			e = (gui::IGUIElement *) new gui::intlGUIEditBox(text.c_str(), true, Environment, this, 256, rect);
+			e->drop();
+		} else {
+			e = Environment->addEditBox(text.c_str(), rect, true, this, 256);
+		}
+		#else
+			e = Environment->addEditBox(text.c_str(), rect, true, this, 256);
+		#endif
 		Environment->setFocus(e);
+
+		irr::SEvent evt;
+		evt.EventType = EET_KEY_INPUT_EVENT;
+		evt.KeyInput.Key = KEY_END;
+		evt.KeyInput.PressedDown = true;
+		evt.KeyInput.Char = 0;
+		evt.KeyInput.Control = 0;
+		evt.KeyInput.Shift = 0;
+		e->OnEvent(evt);
 	}
-	changeCtype("");
 	{
 		core::rect<s32> rect(0, 0, 140, 30);
 		rect = rect + v2s32(size.X/2-140/2, size.Y/2-30/2+25);
+		wchar_t* text = wgettext("Proceed");
 		Environment->addButton(rect, this, 257,
-			wgettext("Proceed"));
+			text);
+		delete[] text;
 	}
-	changeCtype("C");
 }
 
 void GUITextInputMenu::drawMenu()