[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32063] trunk/blender/source/blender: minor changes to text3d editing, skip wchar --> utf-8 conversion on cursor movement.

[Campbell Barton]

Revision: 32063
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32063
Author:   campbellbarton
Date:     2010-09-22 17:39:43 +0200 (Wed, 22 Sep 2010)

Log Message:
-----------
minor changes to text3d editing, skip wchar --> utf-8 conversion on cursor movement.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/font.c
    trunk/blender/source/blender/editors/curve/editfont.c
    trunk/blender/source/blender/makesdna/DNA_vfont_types.h

Modified: trunk/blender/source/blender/blenkernel/intern/font.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/font.c	2010-09-22 14:34:02 UTC (rev 32062)
+++ trunk/blender/source/blender/blenkernel/intern/font.c	2010-09-22 15:39:43 UTC (rev 32063)
@@ -1146,7 +1146,7 @@
 		return NULL;
 	}
 
-	if(mode==0) {
+	if(mode == FO_EDIT) {
 		/* make nurbdata */
 		unsigned long cha;
 		

Modified: trunk/blender/source/blender/editors/curve/editfont.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editfont.c	2010-09-22 14:34:02 UTC (rev 32062)
+++ trunk/blender/source/blender/editors/curve/editfont.c	2010-09-22 15:39:43 UTC (rev 32063)
@@ -259,7 +259,9 @@
 	if(obedit->totcol>0)
 		obedit->actcol= ef->textbufinfo[cu->pos?cu->pos-1:0].mat_nr;
 
-	update_string(cu);
+	if(mode == FO_EDIT)
+		update_string(cu);
+
 	BKE_text_to_curve(scene, obedit, mode);
 
 	if(recalc)
@@ -364,7 +366,7 @@
 	}
 	MEM_freeN(strp);
 
-	text_update_edited(C, scene, obedit, 1, 0);
+	text_update_edited(C, scene, obedit, 1, FO_EDIT);
 
 	return OPERATOR_FINISHED;
 }
@@ -747,7 +749,7 @@
 	copy_selection(obedit);
 	kill_selection(obedit, 0);
 
-	text_update_edited(C, scene, obedit, 1, 0);
+	text_update_edited(C, scene, obedit, 1, FO_EDIT);
 
 	return OPERATOR_FINISHED;
 }
@@ -805,7 +807,7 @@
 	if(!paste_selection(obedit, op->reports))
 		return OPERATOR_CANCELLED;
 
-	text_update_edited(C, scene, obedit, 1, 0);
+	text_update_edited(C, scene, obedit, 1, FO_EDIT);
 
 	return OPERATOR_FINISHED;
 }
@@ -846,7 +848,7 @@
 	Object *obedit= CTX_data_edit_object(C);
 	Curve *cu= obedit->data;
 	EditFont *ef= cu->editfont;
-	int cursmove= 0;
+	int cursmove= -1;
 
 	switch(type) {
 		case LINE_BEGIN:
@@ -916,7 +918,7 @@
 			break;
 	}
 		
-	if(!cursmove)
+	if(cursmove == -1)
 		return OPERATOR_CANCELLED;
 
 	if(select == 0) {
@@ -1010,7 +1012,7 @@
 
 	ef->textbufinfo[cu->pos-1].kern = kern;
 
-	text_update_edited(C, scene, obedit, 1, 0);
+	text_update_edited(C, scene, obedit, 1, FO_EDIT);
 
 	return OPERATOR_FINISHED;
 }
@@ -1055,7 +1057,7 @@
 
 	ef->textbuf[cu->pos - 1]= character;
 
-	text_update_edited(C, scene, obedit, 1, 0);
+	text_update_edited(C, scene, obedit, 1, FO_EDIT);
 
 	return OPERATOR_FINISHED;
 }
@@ -1098,7 +1100,7 @@
 
 	cu->selstart = cu->selend = 0;
 
-	text_update_edited(C, scene, obedit, 1, 0);
+	text_update_edited(C, scene, obedit, 1, FO_EDIT);
 
 	return OPERATOR_FINISHED;
 }
@@ -1188,7 +1190,7 @@
 			return OPERATOR_CANCELLED;
 	}
 
-	text_update_edited(C, scene, obedit, 1, 0);
+	text_update_edited(C, scene, obedit, 1, FO_EDIT);
 
 	return OPERATOR_FINISHED;
 }
@@ -1238,7 +1240,7 @@
 	MEM_freeN(inserted_utf8);
 
 	kill_selection(obedit, 1);
-	text_update_edited(C, scene, obedit, 1, 0);
+	text_update_edited(C, scene, obedit, 1, FO_EDIT);
 
 	return OPERATOR_FINISHED;
 }
@@ -1306,12 +1308,12 @@
 			}
 			
 			kill_selection(obedit, 1);
-			text_update_edited(C, scene, obedit, 1, 0);
+			text_update_edited(C, scene, obedit, 1, FO_EDIT);
 		}
 		else {
 			inserted_text[0]= ascii;
 			insert_into_textbuf(obedit, ascii);
-			text_update_edited(C, scene, obedit, 1, 0);
+			text_update_edited(C, scene, obedit, 1, FO_EDIT);
 		}
 	}
 	else if(val && event == BACKSPACEKEY) {
@@ -1553,7 +1555,7 @@
 		}
 	}
 
-	text_update_edited(C, scene, obedit, 1, 0);
+	text_update_edited(C, scene, obedit, 1, FO_EDIT);
 
 	return OPERATOR_FINISHED;
 }

Modified: trunk/blender/source/blender/makesdna/DNA_vfont_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_vfont_types.h	2010-09-22 14:34:02 UTC (rev 32062)
+++ trunk/blender/source/blender/makesdna/DNA_vfont_types.h	2010-09-22 15:39:43 UTC (rev 32063)
@@ -46,7 +46,7 @@
 } VFont;
 
 /* *************** FONT ****************** */
-
+#define FO_EDIT			0
 #define FO_CURS			1
 #define FO_CURSUP		2
 #define FO_CURSDOWN		3