Text Markers: multiple, coloured selections within a Text object with group relationships. They allow portions of text to be edited as one and enable quick jumping between and editing of different areas.

Flags control the behaviour and grouping of markers. At present, Ctrl+M places a marker with TMARK_EDITALL set for testing purposes.

I have also split the text area event handler into separate methods for marker handling and the existing text tools. This makes the events system much easier to follow as it was getting a little hairy.

1 files changed, 7 insertions, 1 deletions

diff --git a/source/blender/makesdna/DNA_text_types.h b/source/blender/makesdna/DNA_text_types.h
index bec4e0062f9..41ea0b23323 100644
--- a/source/blender/makesdna/DNA_text_types.h
+++ b/source/blender/makesdna/DNA_text_types.h
@@ -42,6 +42,12 @@ typedef struct TextLine {
 	int len, blen;
 } TextLine;
 
+typedef struct TextMarker {
+	struct TextMarker *next, *prev;
+	int lineno, start, end, flags;
+	char clr[4], pad[4];
+} TextMarker;
+
 typedef struct Text {
 	ID id;
 	
@@ -52,12 +58,12 @@ typedef struct Text {
 	ListBase lines;
 	TextLine *curl, *sell;
 	int curc, selc;
+	ListBase markers;
 	
 	char *undo_buf;
 	int undo_pos, undo_len;
 	
 	void *compiled;
-
 	double mtime;
 } Text;