Text Editor (GSOC 2008)

=======================
Merge of branch soc-2008-quorn to trunk:
Merged 14970:16308 to trunk@16307, updated to HEAD.
Merged 16318

Main features from this branch:
 - Python text plugins
 - Suggestions and documentation elements
 - Improved syntax highlighting
 - Word wrap
 - Additional editing tools
 - Various undo and clipboard fixes
 - File header info and modification checks

5 files changed, 19 insertions, 5 deletions

diff --git a/source/blender/include/BIF_drawtext.h b/source/blender/include/BIF_drawtext.h
index a75e0f1bd86..bc4d5e3f9c8 100644
--- a/source/blender/include/BIF_drawtext.h
+++ b/source/blender/include/BIF_drawtext.h
@@ -38,14 +38,15 @@ void unlink_text(struct Text *text);
 
 void free_textspace(struct SpaceText *st);
 
+int txt_file_modified(struct Text *text);
 void txt_write_file(struct Text *text);
 void add_text_fs(char *file);
 
 void free_txt_data(void);
 void pop_space_text(struct SpaceText *st);
 
-void get_format_string(struct SpaceText *st);
-void do_brackets(void);
+void txt_format_text(struct SpaceText *st);
+void txt_format_line(struct SpaceText *st, struct TextLine *line, int do_next);
 
 #endif
 
diff --git a/source/blender/include/BIF_keyval.h b/source/blender/include/BIF_keyval.h
index 70d248ded91..9693684e425 100644
--- a/source/blender/include/BIF_keyval.h
+++ b/source/blender/include/BIF_keyval.h
@@ -31,6 +31,9 @@
 #define BIF_KEYVAL_H
 
 char *key_event_to_string(unsigned short event);
+int decode_key_string(char *str, unsigned short *key, unsigned short *qual);
 
 #endif
 
+
+
diff --git a/source/blender/include/BIF_resources.h b/source/blender/include/BIF_resources.h
index 0d27804dd1a..5099c253c79 100644
--- a/source/blender/include/BIF_resources.h
+++ b/source/blender/include/BIF_resources.h
@@ -57,8 +57,8 @@ typedef enum {
 	ICON_TRIA_UP,
 	ICON_FONTPREVIEW,
 	ICON_BLANK4,
-	ICON_BLANK5,
-	ICON_BLANK6,
+	ICON_WORDWRAP,
+	ICON_WORDWRAP_OFF,
 	
 	ICON_ORTHO,
 	ICON_PERSP,
@@ -108,7 +108,7 @@ typedef enum {
 	ICON_FF,
 	ICON_REW,
 	ICON_PYTHON,
-	ICON_BLANK11,
+	ICON_PYTHON_ON,
 	ICON_BLANK12,
 	ICON_BLANK13,
 	ICON_BLANK14,
diff --git a/source/blender/include/BIF_space.h b/source/blender/include/BIF_space.h
index 4b2b8e14bb6..b441bfe3663 100644
--- a/source/blender/include/BIF_space.h
+++ b/source/blender/include/BIF_space.h
@@ -83,6 +83,9 @@ struct SpaceOops;
 /* nodes handler codes */
 #define NODES_HANDLER_GREASEPENCIL		80
 
+/* text handler codes */
+#define TEXT_HANDLER_FIND	90
+
 /* theme codes */
 #define B_ADD_THEME 	3301
 #define B_DEL_THEME 	3302
diff --git a/source/blender/include/blendef.h b/source/blender/include/blendef.h
index 6f8b94d7cd1..228530db445 100644
--- a/source/blender/include/blendef.h
+++ b/source/blender/include/blendef.h
@@ -377,6 +377,13 @@
 #define B_TEXTLINENUM		507
 #define B_TAB_NUMBERS		508
 #define B_SYNTAX		509
+#define B_WORDWRAP		510
+#define B_TEXTPLUGINS	511
+#define B_PASTEFIND		512
+#define B_PASTEREPLACE	513
+#define B_TEXTREPLACE	514
+#define B_TEXTFIND		515
+#define B_TEXTMARKALL	516
 
 /* SCRIPT: 525 */
 #define B_SCRIPTBROWSE		526