Merge pull request #1 from ricochet1k/faster-field-changes

runrevfraser · runrevfraser · commit f0b9ba40bd73 · 2013-10-18T07:56:51.000-07:00
Paragraph layout only if necessary
diff --git a/engine/src/paragraf.cpp b/engine/src/paragraf.cpp
@@ -115,6 +115,7 @@ MCParagraph::MCParagraph()
 	opened = 0;
 	startindex = endindex = originalindex = MAXUINT2;
 	state = 0;
+	needs_layout = true;
 
 	// MW-2012-01-25: [[ ParaStyles ]] All attributes are unset to begin with.
 	attrs = nil;
@@ -155,6 +156,7 @@ MCParagraph::MCParagraph(const MCParagraph &pref) : MCDLlist(pref)
 	startindex = endindex = originalindex = MAXUINT2;
 	opened = 0;
 	state = 0;
+	needs_layout = true; // is this needed?
 }
 
 MCParagraph::~MCParagraph()
@@ -273,6 +275,8 @@ IO_stat MCParagraph::load(IO_handle stream, const char *version, bool is_ext)
 		}
 	}
 
+	needs_layout = true;
+
 	return IO_NORMAL;
 }
 
@@ -415,6 +419,8 @@ bool MCParagraph::recomputefonts(MCFontRef p_parent_font)
 	}
 	while(t_block != blocks);
 
+	if (t_changed)
+		needs_layout = true;
 	return t_changed;
 }
 
@@ -461,6 +467,8 @@ void MCParagraph::deletelines()
 		MCLine *lptr = lines->remove(lines);
 		delete lptr;
 	}
+	
+	needs_layout = true;
 }
 
 // **** mutate blocks
@@ -473,6 +481,7 @@ void MCParagraph::deleteblocks()
 	}
 
 	state |= PS_LINES_NOT_SYNCHED;
+	needs_layout = true;
 }
 
 //clear blocks with the same attributes
@@ -513,17 +522,23 @@ void MCParagraph::defrag()
 	if (t_blocks_changed)
 	{
 		state |= PS_LINES_NOT_SYNCHED;
+		needs_layout = true;
 	}
 }
 
 // MW-2012-01-25: [[ ParaStyles ]] This method causes a reflow of the paragraph depending
 //   on the setting of 'dontWrap'.
 void MCParagraph::layout()
 {
+	if (!needs_layout)
+		return;
+
 	if (getdontwrap())
 		noflow();
 	else
 		flow();
+
+	needs_layout = False;
 }
 
 //reflow paragraph with wrapping
@@ -601,13 +616,6 @@ void MCParagraph::noflow(void)
 			MCLine *lptr = lines->remove(lines);
 			delete lptr;
 		}
-	MCBlock *bptr = blocks;
-	do
-	{
-		bptr->reset();
-		bptr = bptr->next();
-	}
-	while (bptr != blocks);
 	lines->appendall(blocks);
 
 	// MW-2012-02-10: [[ FixedTable ]] If there is a non-zero table width then
@@ -1255,6 +1263,8 @@ void MCParagraph::setatts(uint2 si, uint2 ei, Properties p, void *value, bool p_
 {
 	bool t_blocks_changed;
 	t_blocks_changed = false;
+	bool t_needs_layout;
+	t_needs_layout = false;
 
 	defrag();
 	MCBlock *bptr = indextoblock(si, False);
@@ -1296,10 +1306,12 @@ void MCParagraph::setatts(uint2 si, uint2 ei, Properties p, void *value, bool p_
 			break;
 		case P_TEXT_SHIFT:
 			bptr->setshift((uint4)(intptr_t)value);
+			t_needs_layout = true;
 			break;
 		case P_IMAGE_SOURCE:
 			{
 				bptr->setatts(p, value);
+				t_needs_layout = true;
 				
 				// MW-2008-04-03: [[ Bug ]] Only add an extra block if this is coming from
 				//   html parsing.
@@ -1319,6 +1331,7 @@ void MCParagraph::setatts(uint2 si, uint2 ei, Properties p, void *value, bool p_
 			break;
 		default:
 			bptr->setatts(p, value);
+			t_needs_layout = true;
 			break;
 		}
 		// MW-2012-02-14: [[ FontRefs ]] If the block is open, pass in the parent's
@@ -1333,6 +1346,10 @@ void MCParagraph::setatts(uint2 si, uint2 ei, Properties p, void *value, bool p_
 	{
 		state |= PS_LINES_NOT_SYNCHED;
 	}
+	if (t_needs_layout || t_blocks_changed)
+	{
+		needs_layout = true;
+	}
 }
 
 // MW-2008-03-27: [[ Bug 5093 ]] Rewritten to more correctly insert blocks around
@@ -1518,6 +1535,7 @@ void MCParagraph::join()
 	delete pgptr;
 	clearzeros();
 	deletelines();
+	needs_layout = true;
 }
 
 void MCParagraph::split() //split paragraphs on return
@@ -1571,6 +1589,7 @@ void MCParagraph::split() //split paragraphs on return
 		pgptr->open(parent -> getfontref());
 	append(pgptr);
 	deletelines();
+	needs_layout = true;
 }
 
 void MCParagraph::deletestring(uint2 si, uint2 ei)
@@ -1634,6 +1653,7 @@ void MCParagraph::deletestring(uint2 si, uint2 ei)
 	clearzeros();
 
 	state |= PS_LINES_NOT_SYNCHED;
+	needs_layout = true;
 }
 
 MCParagraph *MCParagraph::copystring(uint2 si, uint2 ei)
@@ -1795,6 +1815,7 @@ void MCParagraph::finsertnobreak(const MCString& p_text, bool p_is_unicode)
 	}
 
 	delete t_native_text;
+	needs_layout = true;
 }
 
 // MW-2012-02-13: [[ Block Unicode ]] New implementation of finsert which understands unicodeness.
diff --git a/engine/src/paragraf.h b/engine/src/paragraf.h
@@ -137,6 +137,7 @@ class MCParagraph : public MCDLlist
 	uint2 startindex, endindex, originalindex;
 	uint2 opened;
 	uint1 state;
+	bool needs_layout : 1;
 	// MW-2012-01-25: [[ ParaStyles ]] This paragraphs collection of attrs.
 	MCParagraphAttrs *attrs;
 

Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,7 @@ MCParagraph::MCParagraph()`
`115`	`115`	`opened = 0;`
`116`	`116`	`startindex = endindex = originalindex = MAXUINT2;`
`117`	`117`	`state = 0;`
	`118`	`+ needs_layout = true;`
`118`	`119`
`119`	`120`	`// MW-2012-01-25: [[ ParaStyles ]] All attributes are unset to begin with.`
`120`	`121`	`attrs = nil;`
`@@ -155,6 +156,7 @@ MCParagraph::MCParagraph(const MCParagraph &pref) : MCDLlist(pref)`
`155`	`156`	`startindex = endindex = originalindex = MAXUINT2;`
`156`	`157`	`opened = 0;`
`157`	`158`	`state = 0;`
	`159`	`+ needs_layout = true; // is this needed?`
`158`	`160`	`}`
`159`	`161`
`160`	`162`	`MCParagraph::~MCParagraph()`
`@@ -273,6 +275,8 @@ IO_stat MCParagraph::load(IO_handle stream, const char *version, bool is_ext)`
`273`	`275`	`}`
`274`	`276`	`}`
`275`	`277`
	`278`	`+ needs_layout = true;`
	`279`	`+`
`276`	`280`	`return IO_NORMAL;`
`277`	`281`	`}`
`278`	`282`
`@@ -415,6 +419,8 @@ bool MCParagraph::recomputefonts(MCFontRef p_parent_font)`
`415`	`419`	`}`
`416`	`420`	`while(t_block != blocks);`
`417`	`421`
	`422`	`+ if (t_changed)`
	`423`	`+ needs_layout = true;`
`418`	`424`	`return t_changed;`
`419`	`425`	`}`
`420`	`426`
`@@ -461,6 +467,8 @@ void MCParagraph::deletelines()`
`461`	`467`	`MCLine *lptr = lines->remove(lines);`
`462`	`468`	`delete lptr;`
`463`	`469`	`}`
	`470`	`+`
	`471`	`+ needs_layout = true;`
`464`	`472`	`}`
`465`	`473`
`466`	`474`	`// **** mutate blocks`
`@@ -473,6 +481,7 @@ void MCParagraph::deleteblocks()`
`473`	`481`	`}`
`474`	`482`
`475`	`483`	`state \|= PS_LINES_NOT_SYNCHED;`
	`484`	`+ needs_layout = true;`
`476`	`485`	`}`
`477`	`486`
`478`	`487`	`//clear blocks with the same attributes`
`@@ -513,17 +522,23 @@ void MCParagraph::defrag()`
`513`	`522`	`if (t_blocks_changed)`
`514`	`523`	`{`
`515`	`524`	`state \|= PS_LINES_NOT_SYNCHED;`
	`525`	`+ needs_layout = true;`
`516`	`526`	`}`
`517`	`527`	`}`
`518`	`528`
`519`	`529`	`// MW-2012-01-25: [[ ParaStyles ]] This method causes a reflow of the paragraph depending`
`520`	`530`	`// on the setting of 'dontWrap'.`
`521`	`531`	`void MCParagraph::layout()`
`522`	`532`	`{`
	`533`	`+ if (!needs_layout)`
	`534`	`+ return;`
	`535`	`+`
`523`	`536`	`if (getdontwrap())`
`524`	`537`	`noflow();`
`525`	`538`	`else`
`526`	`539`	`flow();`
	`540`	`+`
	`541`	`+ needs_layout = False;`
`527`	`542`	`}`
`528`	`543`
`529`	`544`	`//reflow paragraph with wrapping`
`@@ -601,13 +616,6 @@ void MCParagraph::noflow(void)`
`601`	`616`	`MCLine *lptr = lines->remove(lines);`
`602`	`617`	`delete lptr;`
`603`	`618`	`}`
`604`		`- MCBlock *bptr = blocks;`
`605`		`- do`
`606`		`- {`
`607`		`- bptr->reset();`
`608`		`- bptr = bptr->next();`
`609`		`- }`
`610`		`- while (bptr != blocks);`
`611`	`619`	`lines->appendall(blocks);`
`612`	`620`
`613`	`621`	`// MW-2012-02-10: [[ FixedTable ]] If there is a non-zero table width then`
`@@ -1255,6 +1263,8 @@ void MCParagraph::setatts(uint2 si, uint2 ei, Properties p, void *value, bool p_`
`1255`	`1263`	`{`
`1256`	`1264`	`bool t_blocks_changed;`
`1257`	`1265`	`t_blocks_changed = false;`
	`1266`	`+ bool t_needs_layout;`
	`1267`	`+ t_needs_layout = false;`
`1258`	`1268`
`1259`	`1269`	`defrag();`
`1260`	`1270`	`MCBlock *bptr = indextoblock(si, False);`
`@@ -1296,10 +1306,12 @@ void MCParagraph::setatts(uint2 si, uint2 ei, Properties p, void *value, bool p_`
`1296`	`1306`	`break;`
`1297`	`1307`	`case P_TEXT_SHIFT:`
`1298`	`1308`	`bptr->setshift((uint4)(intptr_t)value);`
	`1309`	`+ t_needs_layout = true;`
`1299`	`1310`	`break;`
`1300`	`1311`	`case P_IMAGE_SOURCE:`
`1301`	`1312`	`{`
`1302`	`1313`	`bptr->setatts(p, value);`
	`1314`	`+ t_needs_layout = true;`
`1303`	`1315`
`1304`	`1316`	`// MW-2008-04-03: [[ Bug ]] Only add an extra block if this is coming from`
`1305`	`1317`	`// html parsing.`
`@@ -1319,6 +1331,7 @@ void MCParagraph::setatts(uint2 si, uint2 ei, Properties p, void *value, bool p_`
`1319`	`1331`	`break;`
`1320`	`1332`	`default:`
`1321`	`1333`	`bptr->setatts(p, value);`
	`1334`	`+ t_needs_layout = true;`
`1322`	`1335`	`break;`
`1323`	`1336`	`}`
`1324`	`1337`	`// MW-2012-02-14: [[ FontRefs ]] If the block is open, pass in the parent's`
`@@ -1333,6 +1346,10 @@ void MCParagraph::setatts(uint2 si, uint2 ei, Properties p, void *value, bool p_`
`1333`	`1346`	`{`
`1334`	`1347`	`state \|= PS_LINES_NOT_SYNCHED;`
`1335`	`1348`	`}`
	`1349`	`+ if (t_needs_layout \|\| t_blocks_changed)`
	`1350`	`+ {`
	`1351`	`+ needs_layout = true;`
	`1352`	`+ }`
`1336`	`1353`	`}`
`1337`	`1354`
`1338`	`1355`	`// MW-2008-03-27: [[ Bug 5093 ]] Rewritten to more correctly insert blocks around`
`@@ -1518,6 +1535,7 @@ void MCParagraph::join()`
`1518`	`1535`	`delete pgptr;`
`1519`	`1536`	`clearzeros();`
`1520`	`1537`	`deletelines();`
	`1538`	`+ needs_layout = true;`
`1521`	`1539`	`}`
`1522`	`1540`
`1523`	`1541`	`void MCParagraph::split() //split paragraphs on return`
`@@ -1571,6 +1589,7 @@ void MCParagraph::split() //split paragraphs on return`
`1571`	`1589`	`pgptr->open(parent -> getfontref());`
`1572`	`1590`	`append(pgptr);`
`1573`	`1591`	`deletelines();`
	`1592`	`+ needs_layout = true;`
`1574`	`1593`	`}`
`1575`	`1594`
`1576`	`1595`	`void MCParagraph::deletestring(uint2 si, uint2 ei)`
`@@ -1634,6 +1653,7 @@ void MCParagraph::deletestring(uint2 si, uint2 ei)`
`1634`	`1653`	`clearzeros();`
`1635`	`1654`
`1636`	`1655`	`state \|= PS_LINES_NOT_SYNCHED;`
	`1656`	`+ needs_layout = true;`
`1637`	`1657`	`}`
`1638`	`1658`
`1639`	`1659`	`MCParagraph *MCParagraph::copystring(uint2 si, uint2 ei)`
`@@ -1795,6 +1815,7 @@ void MCParagraph::finsertnobreak(const MCString& p_text, bool p_is_unicode)`
`1795`	`1815`	`}`
`1796`	`1816`
`1797`	`1817`	`delete t_native_text;`
	`1818`	`+ needs_layout = true;`
`1798`	`1819`	`}`
`1799`	`1820`
`1800`	`1821`	`// MW-2012-02-13: [[ Block Unicode ]] New implementation of finsert which understands unicodeness.`