X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2FWM%2Frenderers%2Fwidget%2Ftextinput.c;h=de862bfe402efd0037fa21126e472e59343cc9f3;hb=4e407e69bd660e9a32644281733192193ee6e8c8;hp=9a0ae64191364450d66f07b26de05e12628eda3b;hpb=8c12dd82f2a4e01d8de5d29db6d4fdd0802c7e83;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin3_src/WM/renderers/widget/textinput.c b/Usermode/Applications/axwin3_src/WM/renderers/widget/textinput.c
index 9a0ae641..de862bfe 100644
--- a/Usermode/Applications/axwin3_src/WM/renderers/widget/textinput.c
+++ b/Usermode/Applications/axwin3_src/WM/renderers/widget/textinput.c
@@ -10,7 +10,7 @@
 #include <common.h>
 #include "./common.h"
 #include "./colours.h"
-#include <utf8.h>
+#include <unicode.h>
 #include <string.h>
 
 // TODO: Include a proper keysym header
@@ -117,6 +117,8 @@ void Widget_TextInput_Init(tElement *Element)
 	info = Element->Data = malloc(sizeof(*info));
 	info->DrawOfs = 0;
 	info->CursorXOfs = 0;
+	info->CursorByteOfs = 0;
+	info->Length = 0;
 
 	// No need to explicitly update parent min dims, as the AddElement routine does that	
 }
@@ -140,13 +142,25 @@ int Widget_TextInput_KeyFire(tElement *Element, int KeySym, int Character)
 			{
 				len = ReadUTF8Rev(Element->Text, info->CursorByteOfs, &cp);
 				info->CursorByteOfs -= len;
+				WM_Render_GetTextDims(
+					gpTextInput_Font,
+					Element->Text+info->CursorByteOfs,
+					len, &w, 0
+					);
+				info->CursorXOfs -= w;
 			}
 			break;
 		case KEYSYM_RIGHTARROW:
 			if( info->CursorByteOfs < info->Length )
 			{
 				len = ReadUTF8(Element->Text + info->CursorByteOfs, &cp);
+				WM_Render_GetTextDims(
+					gpTextInput_Font,
+					Element->Text+info->CursorByteOfs,
+					len, &w, 0
+					);
 				info->CursorByteOfs += len;
+				info->CursorXOfs += w;
 			}
 			break;
 		}
@@ -201,12 +215,12 @@ int Widget_TextInput_KeyFire(tElement *Element, int KeySym, int Character)
 	}
 
 	// TODO: Have a Widget_ function to do this instead
-	WM_Invalidate(Element->Window);
+	WM_Invalidate(Element->Window, 1);
 	
 	return 0;
 }
 
-DEFWIDGETTYPE(ELETYPE_TEXTINPUT,
+DEFWIDGETTYPE(ELETYPE_TEXTINPUT, "TextInput",
 	WIDGETTYPE_FLAG_NOCHILDREN,
 	.Render = Widget_TextInput_Render,
 	.Init = Widget_TextInput_Init,