[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15782] branches/soc-2008-quorn/source/ blender: Word-wrap initial commit.

Ian Thompson quornian at googlemail.com
Sat Jul 26 20:38:59 CEST 2008


Revision: 15782
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15782
Author:   quorn
Date:     2008-07-26 20:38:59 +0200 (Sat, 26 Jul 2008)

Log Message:
-----------
Word-wrap initial commit. Added button to header and updated draw code for text and cursor. Simple typing/deleting works fine. Other events (selections, clicking) behave as if text has not been wrapped and need work.

Modified Paths:
--------------
    branches/soc-2008-quorn/source/blender/include/BIF_resources.h
    branches/soc-2008-quorn/source/blender/include/blendef.h
    branches/soc-2008-quorn/source/blender/makesdna/DNA_space_types.h
    branches/soc-2008-quorn/source/blender/src/blenderbuttons.c
    branches/soc-2008-quorn/source/blender/src/drawtext.c
    branches/soc-2008-quorn/source/blender/src/header_text.c
    branches/soc-2008-quorn/source/blender/src/space.c

Modified: branches/soc-2008-quorn/source/blender/include/BIF_resources.h
===================================================================
--- branches/soc-2008-quorn/source/blender/include/BIF_resources.h	2008-07-26 17:27:50 UTC (rev 15781)
+++ branches/soc-2008-quorn/source/blender/include/BIF_resources.h	2008-07-26 18:38:59 UTC (rev 15782)
@@ -57,8 +57,8 @@
 	ICON_TRIA_UP,
 	ICON_FONTPREVIEW,
 	ICON_BLANK4,
-	ICON_BLANK5,
-	ICON_BLANK6,
+	ICON_WORDWRAP,
+	ICON_WORDWRAP_OFF,
 	
 	ICON_ORTHO,
 	ICON_PERSP,

Modified: branches/soc-2008-quorn/source/blender/include/blendef.h
===================================================================
--- branches/soc-2008-quorn/source/blender/include/blendef.h	2008-07-26 17:27:50 UTC (rev 15781)
+++ branches/soc-2008-quorn/source/blender/include/blendef.h	2008-07-26 18:38:59 UTC (rev 15782)
@@ -377,6 +377,7 @@
 #define B_TEXTLINENUM		507
 #define B_TAB_NUMBERS		508
 #define B_SYNTAX		509
+#define B_WORDWRAP		510
 
 /* SCRIPT: 525 */
 #define B_SCRIPTBROWSE		526

Modified: branches/soc-2008-quorn/source/blender/makesdna/DNA_space_types.h
===================================================================
--- branches/soc-2008-quorn/source/blender/makesdna/DNA_space_types.h	2008-07-26 17:27:50 UTC (rev 15781)
+++ branches/soc-2008-quorn/source/blender/makesdna/DNA_space_types.h	2008-07-26 18:38:59 UTC (rev 15782)
@@ -275,22 +275,23 @@
 	struct Text *text;	
 
 	int top, viewlines;
-	short flags, menunr;
-	
-	int font_id;	
+	short flags, menunr;	
+	int font_id;
+
 	int lheight;
 	int left;
 	int showlinenrs;
-	
 	int tabnumber;
+
 	int currtab_set; 
 	int showsyntax;
 	int overwrite;
-	
 	float pix_per_line;
 
 	struct rcti txtscroll, txtbar;
 
+	int wordwrap, pad1;
+
 } SpaceText;
 
 typedef struct Script {

Modified: branches/soc-2008-quorn/source/blender/src/blenderbuttons.c
===================================================================
--- branches/soc-2008-quorn/source/blender/src/blenderbuttons.c	2008-07-26 17:27:50 UTC (rev 15781)
+++ branches/soc-2008-quorn/source/blender/src/blenderbuttons.c	2008-07-26 18:38:59 UTC (rev 15782)
@@ -1,2181 +1,2128 @@
 /* DataToC output of file <blenderbuttons> */
 
-int datatoc_blenderbuttons_size= 69599;
+int datatoc_blenderbuttons_size= 67881;
 char datatoc_blenderbuttons[]= {
-137, 80, 78, 71, 13, 10, 26, 10,  0,  0,  0, 13, 73, 72, 68, 82,  0,  0,  2,  0,  0,  0,  1,  0,  8,  6,  0,  0,  0,197,144,
-206,103,  0,  0,  0,  1,115, 82, 71, 66,  0,174,206, 28,233,  0,  0,  0,  6, 98, 75, 71, 68,  0,255,  0,255,  0,255,160,189,167,
-147,  0,  0,  0,  9,112, 72, 89,115,  0,  0, 11, 19,  0,  0, 11, 19,  1,  0,154,156, 24,  0,  0,  0,  7,116, 73, 77, 69,  7,216,
-  5, 19, 11,  8,  1, 11,126, 22,156,  0,  0, 32,  0, 73, 68, 65, 84,120,218,236,125,121, 92, 84,229,254,255,251, 57,179,179,239,
-168,184,128,138,251,130,224, 26,106, 80,168,201,215, 52, 21, 48,179,237,214,189, 78,150,173,150,102,117,111,245,203, 43,106,218,
-170,233,216,162, 89,106,  9,106,120,115,  5, 29,212,144,220, 21, 75, 19,  5, 17, 65,144,109, 96,134,217,207,156,231,247,199,204,
-208,128,192, 44,160, 81,205,251,197,188,152,115,230,204,123,158,115,158,229,253,249,124,158,141, 68, 69, 69, 81,184,225,134, 27,
-110,184,225,134, 27,127, 43, 48,238, 71,224,134, 27,110,184,225,134, 27,127, 31,156, 57,155,  5,  0, 32,238,  8,128, 27,110,184,
-225,134, 27,110,184, 35,  0,110,184,225,134, 27,110,184,225,134,219,  0,112,195, 13, 55,220,112,195, 13, 55,220,  6,128, 27,110,
-184,225,134, 27,110,184,241,151,  0,223,246, 96,222,188,121,196, 85,162,181,107,215,222, 54,150,192,205,231,230,107,  5,116,237,
-218,181,127, 88,250,178,179,179,105, 92, 92, 28,113,231,199,159,151,239,220,185,115, 46, 23,190,168,168, 40,184,243,195,205,247,
- 87,230,115,218,  0,248, 59, 67, 42,149, 54,122,128, 50,153,140,116,228,116,174, 91,183, 14,132, 16,226,206, 57,215,242,120,246,
-236,217, 72, 79, 79,111, 56, 78, 74, 74,250, 75, 60,203, 61,123,207,180,218, 16, 36, 78,142,254, 75,151, 25,137,255, 78,136,117,
-189, 17,  1,  3,234,177, 23,249,218,183, 58,108, 89,236,168,109,140, 27,127,211,  8,192,221, 40,172,123,246,236,137,203,200,200,
-144, 91,143,167, 77,155, 22,159,152,152,152,221, 17, 30,  6,165,230,182,179,163,234,170, 84, 42,165, 69, 69, 69,  0,128,240,240,
-112,  0,248, 83, 52, 34, 77,141, 43,139,129,213,162,103,238, 40,239,214,173, 91, 29, 54,212,164, 82, 41,221,182,109, 91,195,241,
-206,157, 59, 49, 97,194,132,134,227,244,244,116,250, 71, 25,  1, 49, 49, 49, 20,  0, 78,159, 62, 77,218,227,186,140, 31,100,173,
- 24,  0,178, 54,231, 95, 88, 68, 55,  0,192, 45,157, 14,172, 86,111, 62, 89,171,  4,  0, 36, 39, 39, 35, 33, 33,161,197,244,173,
- 79, 88, 79, 35,203, 34,157,250,253,248, 95,227, 29,200, 23,  9,252,159,189,  0, 93,198, 78, 40, 20,211,161,  0, 16, 45,121, 31,
-111, 73, 78,163,155, 24,168,212, 21,224, 45,109,138, 83,191,155,149,149, 21,151,150,150, 38,183, 61,151,156,156, 28,159,144,144,
-144,221,145,234, 86,123,181,  1,127,134,251,189, 19,120,231,141, 23,136,151,192,151,232,197, 66,170,175,213, 50,245, 90, 37,247,
-193, 39,171,255, 22,179,227,236, 26,  0,123,246,236,137,179,254,111,171, 80, 91, 27,146,119,183, 45,129, 87, 55, 95,212,223,168,
-195,219, 41,111,201, 51, 50, 50,224,182,134,237, 67, 38,147,145,240,240,112, 90, 84, 84,132,162,162, 34,236,219,183,175,195,122,
- 18,214,188,150,201,100, 68, 38,147,  9,164, 82,169,113,197,138, 21, 39,  1, 96,225,194,133, 35, 90,251,238,244,233,211, 27,222,
-179,172,  9,  6,163, 30,  6,189,  1,  6,131,249,197,178, 44, 22, 46, 92,232, 84, 90,108,197,191, 57, 76,152, 48,225, 15, 53,  2,
- 28, 49,126, 98, 98, 98,236,114, 36, 78,142, 38,174,136,188,195,240,243, 65, 94,225,119,144,160, 43, 76,200, 65,197, 23,103,112,
-190,160, 26, 51,150,109,112,232,235,145,101,145, 14, 10,186, 25,242,129,114,187, 13,177, 36,241, 45,  4, 76,123, 26,165, 47, 69,
-  3, 90, 69,195,249, 51,218,215,112,  6,  0,180,192,120, 73, 50, 14,250,159,134, 31,128, 24, 69,140,195,229,183, 41,210,210,210,
-228,105,105,105, 29,162,189,178,166,177, 61,218,128, 63,195,253,182, 55, 54,173, 89, 75, 30, 13,139,224,191,144,244, 56, 47,164,
-127, 24,195, 39, 33, 68, 83, 87,199,137, 17,106, 98,186,116, 53,233,110, 94, 51, 57,248,236,110, 58,209,134,119,113,128,111,129,
- 19,124,171,238,168,  1,144,145,145, 33,223,246,239, 55,144,242,222, 82,121, 98, 98, 34,105, 75,  1,179, 10, 63,  0, 84,105,170,
-129, 64, 96,241,193,119,160, 44, 84, 64,250,175,142, 37,100, 45, 85,136, 63, 58,141,182, 70,192,  3, 15, 60,128,162,162, 34,132,
-135,135,119,184,103, 39,151,155, 29,137,248,248,120, 42,147,201, 24,153, 76, 22, 38,149, 74, 75, 87,172, 88,113,218, 81, 30,150,
-101, 97, 48, 24, 27,132,223, 86,252, 79,157, 58,133,225,195,135, 59,149,174,148,148,223, 61,192,217,179,103, 35, 51, 51,179,145,
-  1,208, 30,101,197,149,124, 56,125,250, 52,201,206,206,166, 19, 39, 78,188,237,179,  3,  7, 14, 96,235,214,173, 13,199,173,141,
- 91,184,205,120,111,199,238,128,176,136,110, 40, 85,212, 97,199, 51, 51, 17, 72, 98, 81,240,249,171,232, 57,189, 39, 50,157, 16,
-127, 43,230,206,157, 75,  1, 96,253,250,245,109, 46,179, 97,219,114,160,185, 94,143, 82,105, 68,171,215, 93, 16,103,225,221,193,
-183,144,122,225,205, 54,229,103,123,136,110,123,114,180, 71, 36,224, 78,223,111,123, 33, 39, 39,199,  3,192, 61,  0,188,108, 78,
-215,  2,200,139,141,141,173,113,148, 71,203,105, 25, 67,149, 94, 48,121,234,116,177,  2, 70,177, 64,192,231, 43,117, 98, 70, 40,
-212,114, 60, 31, 79,214, 32, 49, 26,249,229, 55,245, 98,158, 72,167, 51,233, 77, 82,169,148, 52, 55,102,196, 22,181,181,181,255,
-181,190,207,207,207,175,242,244,244,100,212,106, 53,103,123,205,200,145, 35, 63,116, 52,141,148, 82,187,194, 78,  8, 89,208,214,
-103,202,183,231,253,247,233,211,  7,145, 94, 62,104, 75, 20,192, 86,252,171, 52,213, 72,189,255,157,134,207,254,145,241, 44, 16,
-  2, 76, 95,145,226, 84, 33,107, 73,160,219, 75,164,111,220,184,  1,  0,232,214,173, 91,163,247,214,223,181, 87, 32,238,100,136,
-207,214,  8, 48, 26, 89,172, 91,183,238,142,121,  1,206,114, 54, 17,127,219,239,223,148,201,100,254, 82,169, 84,225,176,248, 27,
-141, 48, 24,244,208, 27, 12, 48, 54, 17,127,202, 57, 23,161, 75, 73, 73,193,169, 83,167, 26,142, 87,173, 90,133,164,164,164,134,
-227,244,244,244, 54, 27, 59, 54,  6, 79,155,203,159,173,240,207,158, 61, 27,195,134, 13,115,137,167,189,186,  3, 74, 10,139,161,
-222,249, 31,120, 61,245, 49,194, 34,186, 33, 52, 80,130,194,157,133,102,241,247,243, 49,119,  1,  8,120, 14,113,181,135,240,  3,
- 64,159,139, 87,113,227,237, 37,208,166,109,108, 61, 66, 32,145, 64,167,211,161,160,160,  0, 21,186,203,232,131,176, 22,175,205,
-202,202,138,107,173,236,203,100, 50, 98,173, 39, 89, 89, 89,113,206,132,199,109,163, 98,214,250,106,123,206, 89, 71,160, 37,225,
-118,166, 45,104,238,126, 51, 51, 51, 41, 33,  4,  9,  9,  9,164, 45,247,107,197,211, 79, 63, 77,191,252,242,203, 54,229,121, 78,
- 78,142, 47,128,233,  7, 15, 30,252, 15,199,113,122, 27, 17,228,243,120, 60, 79,  0,255,140,141,141,221, 99,143, 39,191, 48,159,
- 47, 17,138,197,  2,129,200,147,225, 19, 31,202, 19,121,112, 60, 30,159, 35, 12, 56,194, 55, 81, 30, 79,207,227,136, 78,205, 51,
-105, 60,133,  2,194,235,213, 77, 39,158, 26,194,161,216,126, 26, 21, 10,133, 82,163,209,176,  0,160, 86,171,185, 55,222,120,163,
- 65,240,151, 46, 93,250,114, 91,203,251,132,  9, 19,158,177,190,207,204,204, 92,215, 30,117,136,177,231,253, 47,153,149,  4, 93,
-101, 37, 94, 29,216, 15,182,125,247, 14,123, 33,150, 46,  4, 91,241,159, 54,109, 90,188, 76, 38, 35,211,166, 77,139,223, 48,237,
- 51,115,100,177,111, 80,163,235, 29,193,194, 53,249, 88,184, 38, 31,207,173,188,132, 39,222,251,  5, 51, 22,159,107,243,  3, 41,
- 41, 41,113,200, 48,184, 91,226, 95, 84, 84,212,162, 48,135,135,135,195,104, 48, 96,212,200,145,109,254, 29,107,152,124,219,182,
-109,144,203,229, 13,175,214, 12,173,150,196, 48, 62, 62,190,169,248, 55, 24,202,142, 52, 76, 44,107, 50,123,254,122,115,232,191,
-169,248,155, 76, 38,168,181,106,167,238,209, 26, 49,104, 26, 53, 72, 79, 79, 71,122,122,122, 35, 99,192,169,251,205,110,220, 30,
-202,179,179,157,122,102,173,137,255,236,217,179,177, 98,197,138,  6,241, 23,240,  5, 78,241, 36, 78,142, 38,150, 46,152,102, 95,
-206,112,105, 81,140,250,233,163, 64,211, 94, 69, 73, 97, 49,232,244,254,191,123, 43,105,175,130,223, 57, 24,240,243,187,171, 30,
-161,186,170,  0,218,180,141,160,148,226,194,133, 11, 24, 63,126, 60, 36, 18, 73, 35,225,247,247,247,135, 86,171,133, 86,171, 69,

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list