initial support for unicode keyboard input for ghost & blenders WM.

- currently X11 only, depends on Xinput (but should not break other os's).
- ghost stores utf8 buffer, copies to wmEvent's
- UI text input is currently the only area that uses this - not console or text editor.
- no rna access yet.

3 files changed, 42 insertions, 3 deletions

diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 4df9d7f12e2..85103b42244 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -1428,6 +1428,36 @@ static void ui_textedit_set_cursor_select(uiBut *but, uiHandleButtonData *data,
 	ui_check_but(but);
 }
 
+/* note: utf8 & ascii funcs should be merged */
+static int ui_textedit_type_utf8(uiBut *but, uiHandleButtonData *data, const char utf8_buf[6])
+{
+	char *str;
+	int len, x, changed= 0;
+	size_t step= BLI_strnlen(utf8_buf, sizeof(utf8_buf));
+
+	str= data->str;
+	len= strlen(str);
+
+	if(len-(but->selend - but->selsta)+1 <= data->maxlen) {
+		/* type over the current selection */
+		if ((but->selend - but->selsta) > 0)
+			changed= ui_textedit_delete_selection(but, data);
+
+		len= strlen(str);
+		if(len+step < data->maxlen) {
+			for(x= data->maxlen; x>but->pos; x--)
+				str[x]= str[x-step];
+			memcpy(&str[but->pos], utf8_buf, step * sizeof(char));
+			str[len+step]= '\0';
+
+			but->pos += step;
+			changed= 1;
+		}
+	}
+
+	return changed;
+}
+
 static int ui_textedit_type_ascii(uiBut *but, uiHandleButtonData *data, char ascii)
 {
 	char *str;
@@ -1939,7 +1969,15 @@ static void ui_do_but_textedit(bContext *C, uiBlock *block, uiBut *but, uiHandle
 				if(event->type == PADPERIOD && ascii == ',')
 					ascii = '.';
 
-			changed= ui_textedit_type_ascii(but, data, ascii);
+			if(event->utf8_buf[0]) {
+				/* keep this printf until utf8 is well tested */
+				printf("%s: utf8 char '%s'\n", __func__, event->utf8_buf);
+				changed= ui_textedit_type_utf8(but, data, event->utf8_buf);
+			}
+			else {
+				changed= ui_textedit_type_ascii(but, data, ascii);
+			}
+
 			retval= WM_UI_HANDLER_BREAK;
 			
 		}
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index fec59e97194..f28fb08ac6e 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -341,8 +341,8 @@ typedef struct wmEvent {
 	short val;			/* press, release, scrollvalue */
 	int x, y;			/* mouse pointer position, screen coord */
 	int mval[2];		/* region mouse position, name convention pre 2.5 :) */
-	short unicode;		/* future, ghost? */
-	char ascii;			/* from ghost */
+	char utf8_buf[6];	/* from, ghost if utf8 is enabled for the platform */
+	char ascii;			/* from ghost, fallback if utf8 isnt set */
 	char pad;
 
 	/* previous state */
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 33e98007fed..7dcb4cf091f 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -2578,6 +2578,7 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int U
 			GHOST_TEventKeyData *kd= customdata;
 			event.type= convert_key(kd->key);
 			event.ascii= kd->ascii;
+			strcpy(event.utf8_buf, kd->utf8_buf);
 			event.val= (type==GHOST_kEventKeyDown)?KM_PRESS:KM_RELEASE;
 			
 			/* exclude arrow keys, esc, etc from text input */