X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.cpp;h=efb4b45c57d354ca4f11b453ff567fe58d108421;hb=9b29612d1cde85fee9b3f011e86a5cabe5dbcce3;hp=7e503b3dbc0e960b8c04397dc27b0ff14e640436;hpb=8f6f543758fb1b2b17ae2db519198d420eb9982d;p=libs%2Fgltk.git

diff --git a/source/entry.cpp b/source/entry.cpp
index 7e503b3..efb4b45 100644
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -8,6 +8,7 @@ Distributed under the LGPL
 #include <msp/gl/matrix.h>
 #include <msp/gl/texture.h>
 #include <msp/gl/transform.h>
+#include <msp/input/keys.h>
 #include "entry.h"
 #include "graphic.h"
 #include "part.h"
@@ -15,13 +16,15 @@ Distributed under the LGPL
 
 using namespace std;
 
+#include <iostream>
+
 namespace Msp {
 namespace GLtk {
 
 Entry::Entry(const Resources &r, const string &t):
 	Widget(r),
 	text(t),
-	edit_pos(0)
+	edit_pos(text.size())
 {
 	update_style();
 }
@@ -29,46 +32,33 @@ Entry::Entry(const Resources &r, const string &t):
 void Entry::set_text(const string &t)
 {
 	text=t;
-	if(edit_pos>text.size())
-		edit_pos=text.size();
+	edit_pos=text.size();
 }
 
 void Entry::key_press(unsigned key, unsigned, wchar_t ch)
 {
-	if(key==100)
+	if(key==Input::KEY_LEFT)
 	{
 		if(edit_pos>0)
 			--edit_pos;
 	}
-	else if(key==102)
+	else if(key==Input::KEY_RIGHT)
 	{
 		if(edit_pos<text.size())
 			++edit_pos;
 	}
-	else if(key==22)
+	else if(key==Input::KEY_BACKSPACE)
 	{
 		if(edit_pos>0)
 			text.erase(--edit_pos, 1);
 	}
 	else
 	{
-		text+=ch;
+		text.insert(edit_pos, Codecs::encode<Codecs::Utf8>(Codecs::ustring(1, ch)));
 		++edit_pos;
 	}
 }
 
-void Entry::focus_in()
-{
-	if(state!=DISABLED)
-		state=ACTIVE;
-}
-
-void Entry::focus_out()
-{
-	if(state==ACTIVE)
-		state=NORMAL;
-}
-
 void Entry::render_special(const Part &part) const
 {
 	if(part.get_name()=="text")