riched20: Speed up text insertion.

dlls/riched20/caret.c

@@ -331,19 +331,13 @@ ME_InternalInsertTextFromCursor(ME_TextEditor *editor, int nCursor,
                                 const WCHAR *str, int len, ME_Style *style,
                                 int flags)
 {
-  ME_DisplayItem *pNewRun = NULL;
   ME_Cursor *p = &editor->pCursors[nCursor];
 
   editor->bCaretAtEnd = FALSE;
   
   assert(p->pRun->type == diRun);
   
-  ME_AddRefStyle(style);
-  
-  pNewRun = ME_MakeRun(style, ME_MakeStringN(str, len), flags); /* addrefs style */
-  ME_InsertRun(editor, ME_CharOfsFromRunOfs(editor, p->pRun, p->nOffset), pNewRun);
-  ME_DestroyDisplayItem(pNewRun);
-  ME_ReleaseStyle(style);
+  ME_InsertRunAtCursor(editor, p, style, str, len, flags);
 }
 
 
@@ -385,14 +379,10 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor,
     }
     if (pos-str < len) {   /* handle EOLs */
       ME_DisplayItem *tp, *end_run;
-      ME_Paragraph *para;
       ME_Style *tmp_style;
       if (pos!=str)
         ME_InternalInsertTextFromCursor(editor, nCursor, str, pos-str, style, 0);
       p = &editor->pCursors[nCursor];
-      tp = ME_FindItemBack(p->pRun, diParagraph);
-      para = &tp->member.para;
-      assert(tp);
       if (p->nOffset) {
         ME_SplitRunSimple(editor, p->pRun, p->nOffset);
         p = &editor->pCursors[nCursor];

dlls/riched20/editor.h

@@ -107,6 +107,8 @@ int ME_RowNumberFromCharOfs(ME_TextEditor *editor, int nOfs);
 ME_DisplayItem *ME_MakeRun(ME_Style *s, ME_String *strData, int nFlags);
 /* note: ME_InsertRun inserts a copy of the specified run - so you need to destroy the original */
 ME_DisplayItem *ME_InsertRun(ME_TextEditor *editor, int nCharOfs, ME_DisplayItem *pItem);
+ME_DisplayItem *ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor,
+                                     ME_Style *style, const WCHAR *str, int len, int flags);
 void ME_CheckCharOffsets(ME_TextEditor *editor);
 void ME_PropagateCharOffset(ME_DisplayItem *p, int shift);
 void ME_GetGraphicsSize(ME_TextEditor *editor, ME_Run *run, SIZE *pSize);

dlls/riched20/para.c

@@ -303,21 +303,37 @@ void ME_SetParaFormat(ME_TextEditor *editor, ME_DisplayItem *para, PARAFORMAT2 *
     para->member.para.nFlags |= MEPF_REWRAP;
 }
 
-void ME_SetSelectionParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt)
+
+void
+ME_GetSelectionParas(ME_TextEditor *editor, ME_DisplayItem **para, ME_DisplayItem **para_end)
 {
-  int nFrom, nTo;
-  ME_DisplayItem *para, *para_end, *run;
-  int nOffset;
+  ME_Cursor *pEndCursor = &editor->pCursors[1];
   
-  ME_GetSelection(editor, &nFrom, &nTo);
-  if (nTo>nFrom) /* selection consists of chars from nFrom up to nTo-1 */
-    nTo--;
+  *para = ME_GetParagraph(editor->pCursors[0].pRun);
+  *para_end = ME_GetParagraph(editor->pCursors[1].pRun);
+  if ((*para_end)->member.para.nCharOfs < (*para)->member.para.nCharOfs) {
+    ME_DisplayItem *tmp = *para;
+
+    *para = *para_end;
+    *para_end = tmp;
+    pEndCursor = &editor->pCursors[0];
+  }
   
-  ME_RunOfsFromCharOfs(editor, nFrom, &run, &nOffset);
-  para = ME_GetParagraph(run);
-  ME_RunOfsFromCharOfs(editor, nTo, &run, &nOffset);
-  para_end = ME_GetParagraph(run);
+  /* selection consists of chars from nFrom up to nTo-1 */
+  if ((*para_end)->member.para.nCharOfs > (*para)->member.para.nCharOfs) {
+    if (!pEndCursor->nOffset) {
+      *para_end = ME_GetParagraph(ME_FindItemBack(pEndCursor->pRun, diRun));
+    }
+  }
+}
+
+
+void ME_SetSelectionParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt)
+{
+  ME_DisplayItem *para, *para_end;
   
+  ME_GetSelectionParas(editor, &para, &para_end);
+ 
   do {
     ME_SetParaFormat(editor, para, pFmt);
     if (para == para_end)
@@ -338,19 +354,10 @@ void ME_GetParaFormat(ME_TextEditor *editor, ME_DisplayItem *para, PARAFORMAT2 *
 
 void ME_GetSelectionParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt)
 {
-  int nFrom, nTo;
-  ME_DisplayItem *para, *para_end, *run;
-  int nOffset;
+  ME_DisplayItem *para, *para_end;
   PARAFORMAT2 tmp;
   
-  ME_GetSelection(editor, &nFrom, &nTo);
-  if (nTo>nFrom) /* selection consists of chars from nFrom up to nTo-1 */
-    nTo--;
-  
-  ME_RunOfsFromCharOfs(editor, nFrom, &run, &nOffset);
-  para = ME_GetParagraph(run);
-  ME_RunOfsFromCharOfs(editor, nTo, &run, &nOffset);
-  para_end = ME_GetParagraph(run);
+  ME_GetSelectionParas(editor, &para, &para_end);
   
   ME_GetParaFormat(editor, para, pFmt);
   if (para == para_end) return;

dlls/riched20/run.c

@@ -293,31 +293,47 @@ ME_DisplayItem *ME_MakeRun(ME_Style *s, ME_String *strData, int nFlags)
   return item;
 }
 
+
 ME_DisplayItem *ME_InsertRun(ME_TextEditor *editor, int nCharOfs, ME_DisplayItem *pItem)
 {
   ME_Cursor tmp;
   ME_DisplayItem *pDI;
-  ME_UndoItem *pUI;
 
   assert(pItem->type == diRun || pItem->type == diUndoInsertRun);
 
+  ME_CursorFromCharOfs(editor, nCharOfs, &tmp);
+  pDI = ME_InsertRunAtCursor(editor, &tmp, pItem->member.run.style,
+                             pItem->member.run.strText->szData,
+                             pItem->member.run.strText->nLen,
+                             pItem->member.run.nFlags);
+  
+  return pDI;
+}
+
+ME_DisplayItem *
+ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style,
+                     const WCHAR *str, int len, int flags)
+{
+  ME_DisplayItem *pDI;
+  ME_UndoItem *pUI;
+  
+  if (cursor->nOffset) {
+    cursor->pRun = ME_SplitRunSimple(editor, cursor->pRun, cursor->nOffset);
+    cursor->nOffset = 0;
+  }
+  
   pUI = ME_AddUndoItem(editor, diUndoDeleteRun, NULL);
   if (pUI) {
-    pUI->nStart = nCharOfs;
-    pUI->nLen = pItem->member.run.strText->nLen;
+    pUI->nStart = cursor->pRun->member.run.nCharOfs;
+    pUI->nLen = len;
   }
-  ME_CursorFromCharOfs(editor, nCharOfs, &tmp);
-  if (tmp.nOffset) {
-    tmp.pRun = ME_SplitRunSimple(editor, tmp.pRun, tmp.nOffset);
-    tmp.nOffset = 0;
-  }
-  pDI = ME_MakeRun(pItem->member.run.style, ME_StrDup(pItem->member.run.strText), pItem->member.run.nFlags);
-  pDI->member.run.nCharOfs = tmp.pRun->member.run.nCharOfs;
-  ME_InsertBefore(tmp.pRun, pDI);
-  TRACE("Shift length:%d\n", pDI->member.run.strText->nLen);
-  ME_PropagateCharOffset(tmp.pRun, pDI->member.run.strText->nLen);
-  ME_GetParagraph(tmp.pRun)->member.para.nFlags |= MEPF_REWRAP;
-
+  
+  pDI = ME_MakeRun(style, ME_MakeStringN(str, len), flags);
+  pDI->member.run.nCharOfs = cursor->pRun->member.run.nCharOfs;
+  ME_InsertBefore(cursor->pRun, pDI);
+  TRACE("Shift length:%d\n", len);
+  ME_PropagateCharOffset(cursor->pRun, len);
+  ME_GetParagraph(cursor->pRun)->member.para.nFlags |= MEPF_REWRAP;
   return pDI;
 }