OSDN Git Service

スクロールをピクセル単位で行うようにした
[fooeditengine/FooEditEngine.git] / Core / Controller.cs
index f5393c5..4e5949b 100644 (file)
@@ -20,10 +20,27 @@ using System.Drawing;
 
 namespace FooEditEngine
 {
-    internal enum MoveFlow
+    /// <summary>
+    /// 移動量の単位を表す
+    /// </summary>
+    public enum MoveFlow
     {
-        Horizontical,
-        Vertical,
+        /// <summary>
+        /// 文字
+        /// </summary>
+        Character,
+        /// <summary>
+        /// 単語単位
+        /// </summary>
+        Word,
+        /// <summary>
+        /// 行単位
+        /// </summary>
+        Line,
+        /// <summary>
+        /// パラグラフ単位
+        /// </summary>
+        Paragraph
     }
     internal enum ScrollDirection
     {
@@ -38,7 +55,13 @@ namespace FooEditEngine
     /// </summary>
     public enum IndentMode
     {
+        /// <summary>
+        /// タブ
+        /// </summary>
         Tab,
+        /// <summary>
+        /// スペース
+        /// </summary>
         Space,
     }
 
@@ -55,9 +78,8 @@ namespace FooEditEngine
             this.Document = doc;
             this.View = view;
             this.View.render.ChangedRenderResource += render_ChangedRenderResource;
-            this.View.PerformLayouted += View_LineBreakChanged;
             this.View.PageBoundChanged += View_PageBoundChanged;
-            this.Document.Clear();
+            //this.Document.Clear();
         }
 
         public Document Document
@@ -73,12 +95,42 @@ namespace FooEditEngine
                 {
                     this._Document.Update -= Document_Update;
                     this._Document.StatusUpdate -= Document_StatusChanged;
+                    this._Document.SelectionChanged -= Document_SelectionChanged;
+                    this._Document.PerformLayouted -= View_LineBreakChanged;
+                    this._Document.CaretChanged -= _Document_CaretChanged;
                 }
 
                 this._Document = value;
 
                 this._Document.Update += new DocumentUpdateEventHandler(Document_Update);
                 this._Document.StatusUpdate += Document_StatusChanged;
+                this._Document.SelectionChanged += Document_SelectionChanged;
+                this._Document.PerformLayouted += View_LineBreakChanged;
+                this._Document.CaretChanged += _Document_CaretChanged;
+            }
+        }
+
+        private void _Document_CaretChanged(object sender, EventArgs e)
+        {
+            TextPoint pos = this.Document.CaretPostion;
+            this.JumpCaret(pos.row, pos.col);
+        }
+
+        private void Document_SelectionChanged(object sender, EventArgs e)
+        {
+            if (this.IsReverseSelect())
+            {
+                if (this.Document.SelectGrippers.BottomRight.Enabled)
+                    this.Document.SelectGrippers.BottomRight.MoveByIndex(this.View, this.SelectionStart);
+                if (this.Document.SelectGrippers.BottomLeft.Enabled)
+                    this.Document.SelectGrippers.BottomLeft.MoveByIndex(this.View, this.SelectionStart + this.SelectionLength);
+            }
+            else
+            {
+                if (this.Document.SelectGrippers.BottomLeft.Enabled)
+                    this.Document.SelectGrippers.BottomLeft.MoveByIndex(this.View, this.SelectionStart);
+                if (this.Document.SelectGrippers.BottomRight.Enabled)
+                    this.Document.SelectGrippers.BottomRight.MoveByIndex(this.View, this.SelectionStart + this.SelectionLength);
             }
         }
 
@@ -193,9 +245,7 @@ namespace FooEditEngine
                 else
                     return false;
             }
-            this.Document.Lock();
             this.Document.Replace(this.SelectionStart, this.SelectionLength, result.ToString());
-            this.Document.UnLock();
             return true;
         }
 
@@ -219,9 +269,7 @@ namespace FooEditEngine
                 else
                     i++;
             }
-            this.Document.Lock();
             this.Document.Replace(this.SelectionStart, this.SelectionLength, result.ToString());
-            this.Document.UnLock();
         }
 
         /// <summary>
@@ -259,7 +307,7 @@ namespace FooEditEngine
         {
             foreach(int id in this.Document.Markers.IDs)
             {
-                foreach (Marker m in this.Document.GetMarkers(index, id))
+                foreach (Marker m in this.Document.GetMarkers(id, index))
                 {
                     if (m.hilight == type)
                         return true;
@@ -378,6 +426,46 @@ namespace FooEditEngine
         /// スクロールする
         /// </summary>
         /// <param name="dir">方向を指定する</param>
+        /// <param name="delta">ピクセル単位の値でスクロール量を指定する</param>
+        /// <param name="isSelected">選択状態にするなら真</param>
+        /// <param name="withCaret">同時にキャレットを移動させるなら真</param>
+        public void ScrollByPixel(ScrollDirection dir,double delta, bool isSelected, bool withCaret)
+        {
+            if (this.Document.FireUpdateEvent == false)
+                throw new InvalidOperationException("");
+
+            if (dir == ScrollDirection.Left || dir == ScrollDirection.Right)
+            {
+                this.View.TryScroll(delta, 0);
+                return;
+            }
+
+            if(dir == ScrollDirection.Up)
+            {
+                this.View.TryScroll(0, -delta);
+            }
+            else if (dir == ScrollDirection.Down)
+            {
+                this.View.TryScroll(0, delta);
+            }
+
+            if (withCaret)
+            {
+                //カーソルを適切な位置に移動させる必要がある
+                TextPoint tp = this.View.GetTextPointFromPostion(this.View.CaretLocation);
+                this.View.JumpCaret(tp.row, tp.col);
+                this.View.AdjustCaretAndSrc();
+                this.SelectWithMoveCaret(isSelected);
+            }
+
+            this.Document.SelectGrippers.BottomLeft.MoveByIndex(this.View, this.SelectionStart);
+            this.Document.SelectGrippers.BottomRight.MoveByIndex(this.View, this.SelectionStart + this.SelectionLength);
+        }
+
+        /// <summary>
+        /// スクロールする
+        /// </summary>
+        /// <param name="dir">方向を指定する</param>
         /// <param name="delta">スクロールする量。ScrollDirectionの値がUpやDownなら行数。LeftやRightならピクセル単位の値となる</param>
         /// <param name="isSelected">選択状態にするなら真</param>
         /// <param name="withCaret">同時にキャレットを移動させるなら真</param>
@@ -428,8 +516,10 @@ namespace FooEditEngine
             else
             {
                 this.View.Scroll(toX, toRow);
-                this.View.IsFocused = false;
             }
+
+            this.Document.SelectGrippers.BottomLeft.MoveByIndex(this.View, this.SelectionStart);
+            this.Document.SelectGrippers.BottomRight.MoveByIndex(this.View, this.SelectionStart + this.SelectionLength);
         }
 
         /// <summary>
@@ -441,38 +531,71 @@ namespace FooEditEngine
         /// <param name="alignWord">単語単位で移動するなら真。そうでないなら偽</param>
         public void MoveCaretHorizontical(int realLength, bool isSelected,bool alignWord = false)
         {
-            for (int i = Math.Abs(realLength); i > 0; i--)
-            {
-                bool MoveFlow = realLength > 0;
-                if (this.Document.RightToLeft)
-                    MoveFlow = !MoveFlow;
-                this.MoveCaretHorizontical(MoveFlow);
+            TextPoint caret = this.Document.CaretPostion;
+            int moved;
+            caret = GetNextCaret(caret, realLength, alignWord ? MoveFlow.Word : MoveFlow.Character,out moved);
+            this.View.JumpCaret(caret.row, caret.col, false);
+            this.View.AdjustCaretAndSrc(AdjustFlow.Both);
+            this.SelectWithMoveCaret(isSelected);
+        }
 
-                if (alignWord)
-                    this.AlignNearestWord(MoveFlow);
+        /// <summary>
+        /// 移動後のキャレット位置を求める
+        /// </summary>
+        /// <param name="caret">起点となるキャレット位置</param>
+        /// <param name="count">移動量</param>
+        /// <param name="method">移動方法</param>
+        /// <param name="moved">実際に移動した量</param>
+        /// <returns>移動後のキャレット位置</returns>
+        public TextPoint GetNextCaret(TextPoint caret, int count,MoveFlow method,out int moved)
+        {
+            moved = 0;
+            if(method == MoveFlow.Character || method == MoveFlow.Word)
+            {
+                for (int i = Math.Abs(count); i > 0; i--)
+                {
+                    bool moveFlow = count > 0;
+                    if (this.Document.RightToLeft)
+                        moveFlow = !moveFlow;
+                    caret = this.MoveCaretHorizontical(caret, moveFlow);
+
+                    if (method == FooEditEngine.MoveFlow.Word)
+                        caret = this.AlignNearestWord(caret, moveFlow);
+                    moved++;
+                }
             }
-            this.View.AdjustCaretAndSrc(AdjustFlow.Col);
-            this.SelectWithMoveCaret(isSelected);
+            if(method == MoveFlow.Line || method == MoveFlow.Paragraph)
+            {
+                for (int i = Math.Abs(count); i > 0; i--)
+                {
+                    caret = this.MoveCaretVertical(caret, count > 0, method == MoveFlow.Paragraph);
+                    moved++;
+                }
+            }
+            if (count < 0)
+                moved = -moved;
+            return caret;
         }
 
-        void AlignNearestWord(bool MoveFlow)
+        TextPoint AlignNearestWord(TextPoint caret,bool MoveFlow)
         {
-            string str = this.View.LayoutLines[this.Document.CaretPostion.row];
-            while (this.Document.CaretPostion.col > 0 &&
-                this.Document.CaretPostion.col < str.Length &&
-                str[this.Document.CaretPostion.col] != Document.NewLine)
+            string str = this.View.LayoutLines[caret.row];
+            while (caret.col > 0 &&
+                caret.col < str.Length &&
+                str[caret.col] != Document.NewLine)
             {
-                if (!Util.IsWordSeparator(str[this.Document.CaretPostion.col]))
+                if (!Util.IsWordSeparator(str[caret.col]))
                 {
-                    this.MoveCaretHorizontical(MoveFlow);
+                    caret = this.MoveCaretHorizontical(caret, MoveFlow);
                 }
                 else
                 {
                     if(MoveFlow)
-                        this.MoveCaretHorizontical(MoveFlow);
+                        caret = this.MoveCaretHorizontical(caret, MoveFlow);
                     break;
                 }
             }
+            return caret;
         }
 
         /// <summary>
@@ -483,8 +606,10 @@ namespace FooEditEngine
         /// <param name="isSelected"></param>
         public void MoveCaretVertical(int deltarow,bool isSelected)
         {
-            for (int i = Math.Abs(deltarow); i > 0; i--)
-                this.MoveCaretVertical(deltarow > 0);
+            TextPoint caret = this.Document.CaretPostion;
+            int moved;
+            caret = this.GetNextCaret(caret, deltarow, MoveFlow.Line,out moved);
+            this.View.JumpCaret(caret.row, caret.col, true);
             this.View.AdjustCaretAndSrc(AdjustFlow.Both);
             this.SelectWithMoveCaret(isSelected);
         }
@@ -515,9 +640,7 @@ namespace FooEditEngine
             if (this.Document[index] == Document.NewLine)
                 next = index + 1;
 
-            this.Document.Lock();
-            this.Document.Replace(index, next - index, "");
-            this.Document.UnLock();
+            this.Document.Replace(index, next - index, "", true);
         }
 
         public bool IsRectInsertMode()
@@ -570,9 +693,7 @@ namespace FooEditEngine
                 newIndex--;
             }
 
-            this.Document.Lock();
-            this.Document.Replace(newIndex, oldIndex - newIndex, "");
-            this.Document.UnLock();
+            this.Document.Replace(newIndex, oldIndex - newIndex, "", true);
         }
 
         /// <summary>
@@ -643,9 +764,7 @@ namespace FooEditEngine
                 if (foldingData != null && !foldingData.Expand && index > foldingData.Start && index <= foldingData.End)
                     index = foldingData.End + 1;
             }
-            this.Document.Lock();
-            this.Document.Replace(index, length, str);
-            this.Document.UnLock();
+            this.Document.Replace(index, length, str, true);
         }
 
         /// <summary>
@@ -679,11 +798,23 @@ namespace FooEditEngine
         /// JumpCaretで移動した位置からキャレットを移動し、選択状態にする
         /// </summary>
         /// <param name="tp"></param>
-        public void MoveCaretAndSelect(TextPoint tp)
+        /// <param name="alignWord">単語単位で選択するかどうか</param>
+        public void MoveCaretAndSelect(TextPoint tp,bool alignWord = false)
         {
+            TextPoint endSelectPostion = tp;
             int CaretPostion = this.View.GetIndexFromLayoutLine(tp);
+            if (alignWord)
+            {
+                if (this.IsReverseSelect())
+                    while (CaretPostion >= 0 && CaretPostion < this.Document.Length && !Util.IsWordSeparator(this.Document[CaretPostion])) CaretPostion--;
+                else
+                    while (CaretPostion < this.Document.Length && !Util.IsWordSeparator(this.Document[CaretPostion])) CaretPostion++;
+                if (CaretPostion < 0)
+                    CaretPostion = 0;
+                endSelectPostion = this.View.LayoutLines.GetTextPointFromIndex(CaretPostion);
+            }
             this.Document.Select(this.Document.AnchorIndex, CaretPostion - this.Document.AnchorIndex);
-            this.View.JumpCaret(tp.row, tp.col);
+            this.View.JumpCaret(endSelectPostion.row, endSelectPostion.col);
             this.View.AdjustCaretAndSrc();
         }
 
@@ -705,30 +836,35 @@ namespace FooEditEngine
 
             if (HittedCaret || hittedGripper != null)
             {
+                TextPointSearchRange searchRange;
+                if (this.View.HitTextArea(p.X, p.Y))
+                    searchRange = TextPointSearchRange.TextAreaOnly;
+                else if (this.SelectionLength > 0)
+                    searchRange = TextPointSearchRange.Full;
+                else
+                    return false;
+
                 if (hittedGripper != null)
                 {
-                    tp = this.View.GetTextPointFromPostion(hittedGripper.AdjustPoint(p));
-                    if (this.IsReverseSelect())
-                    {
-                        if (Object.ReferenceEquals(hittedGripper, this.Document.SelectGrippers.BottomRight))
-                            this.MoveSelectBefore(tp);
-                        else
-                            this.MoveCaretAndSelect(tp);
-                    }
-                    else
-                    {
-                        if (Object.ReferenceEquals(hittedGripper, this.Document.SelectGrippers.BottomLeft))
-                            this.MoveSelectBefore(tp);
-                        else
-                            this.MoveCaretAndSelect(tp);
-                    }
-                    hittedGripper.Move(this.View, tp);
+                    tp = this.View.GetTextPointFromPostion(hittedGripper.AdjustPoint(p), searchRange);
+                    if (tp == TextPoint.Null)
+                        return false;
+                    if (Object.ReferenceEquals(hittedGripper, this.Document.SelectGrippers.BottomRight))
+                        this.MoveCaretAndSelect(tp);
+                    else if(Object.ReferenceEquals(hittedGripper, this.Document.SelectGrippers.BottomLeft))
+                        this.MoveSelectBefore(tp);
                 }
                 else
                 {
-                    tp = this.View.GetTextPointFromPostion(p);
+                    tp = this.View.GetTextPointFromPostion(p, searchRange);
                     if (tp != TextPoint.Null)
+                    {
                         this.MoveCaretAndSelect(tp);
+                    }
+                    else
+                    {
+                        return false;
+                    }
                 }
                 this.Document.SelectGrippers.BottomLeft.Enabled = this.SelectionLength != 0;
                 return true;
@@ -756,34 +892,48 @@ namespace FooEditEngine
         }
 
         /// <summary>
-        /// キャレット位置を既定の位置に戻す
-        /// </summary>
-        public void ResetCaretPostion()
-        {
-            this.JumpCaret(0);
-        }
-
-        /// <summary>
         /// 行単位で移動後のキャレット位置を取得する
         /// </summary>
         /// <param name="count">移動量</param>
         /// <param name="current">現在のキャレット位置</param>
+        /// <param name="move_pargraph">パラグラフ単位で移動するなら真</param>
         /// <returns>移動後のキャレット位置</returns>
-        public TextPoint GetTextPointAfterMoveLine(int count, TextPoint current)
+        public TextPoint GetTextPointAfterMoveLine(int count, TextPoint current, bool move_pargraph = false)
         {
-            int row = current.row + count;
+            if(this.Document.LineBreak == LineBreakMethod.None || move_pargraph == true)
+            {
+                int row = current.row + count;
 
-            if (row < 0)
-                row = 0;
-            else if (row >= this.View.LayoutLines.Count)
-                row = this.View.LayoutLines.Count - 1;
+                if (row < 0)
+                    row = 0;
+                else if (row >= this.View.LayoutLines.Count)
+                    row = this.View.LayoutLines.Count - 1;
 
-            row = this.View.AdjustRow(row, count > 0);
+                row = this.View.AdjustRow(row, count > 0);
 
-            double colpos = this.View.GetColPostionFromIndex(current.row, current.col);
-            int col = this.View.GetIndexFromColPostion(row, colpos);
+                Point pos = this.View.LayoutLines.GetLayout(current.row).GetPostionFromIndex(current.col);
+                int col = this.View.LayoutLines.GetLayout(row).GetIndexFromPostion(pos.X, pos.Y);
+                return new TextPoint(row, col);
+            }
+            else
+            {
+                Point pos = this.View.GetPostionFromTextPoint(current);
+                pos.Y += this.View.render.emSize.Height * count;
+                //この値を足さないとうまく動作しない
+                pos.Y += this.View.render.emSize.Height / 2;   
+                var new_tp = this.View.GetTextPointFromPostion(pos,TextPointSearchRange.Full);
+                return new_tp;
 
-            return new TextPoint(row, col);
+            }
+        }
+
+
+        /// <summary>
+        /// キャレット位置を既定の位置に戻す
+        /// </summary>
+        public void ResetCaretPostion()
+        {
+            this.JumpCaret(0);
         }
 
         /// <summary>
@@ -809,7 +959,7 @@ namespace FooEditEngine
                 return;
             int selectionStart = this.SelectionStart;
             string insertStr = this.IndentMode == IndentMode.Space ? this.GetIndentSpace(0) : "\t";
-            string text = this.RemoveLineHead(GetTextFromLineSelectArea(this.View.Selections), insertStr);
+            string text = this.RemoveLineHead(GetTextFromLineSelectArea(this.View.Selections), insertStr, insertStr.Length);
             this.RepleaceSelectionArea(this.View.Selections, text);
             this.Document.Select(selectionStart, text.Length);
         }
@@ -828,14 +978,14 @@ namespace FooEditEngine
             return output.ToString();
         }
 
-        public string RemoveLineHead(string s, string str)
+        public string RemoveLineHead(string s, string str,int remove_count)
         {
             string[] lines = s.Split(new string[] { Document.NewLine.ToString() }, StringSplitOptions.None);
             StringBuilder output = new StringBuilder();
             for (int i = 0; i < lines.Length; i++)
             {
                 if (lines[i].StartsWith(str))
-                    output.Append(lines[i].Substring(1) + Document.NewLine);
+                    output.Append(lines[i].Substring(remove_count) + Document.NewLine);
                 else if (i < lines.Length - 1)
                     output.Append(lines[i] + Document.NewLine);
             }
@@ -845,58 +995,56 @@ namespace FooEditEngine
         /// <summary>
         /// キャレットを一文字移動させる
         /// </summary>
+        /// <param name="caret">キャレット</param>
         /// <param name="isMoveNext">真なら1文字すすめ、そうでなければ戻す</param>
         /// <remarks>このメソッドを呼び出した後でScrollToCaretメソッドとSelectWithMoveCaretメソッドを呼び出す必要があります</remarks>
-        void MoveCaretHorizontical(bool isMoveNext)
+        TextPoint MoveCaretHorizontical(TextPoint caret,bool isMoveNext)
         {
             if (this.Document.FireUpdateEvent == false)
                 throw new InvalidOperationException("");
             int delta = isMoveNext ? 0 : -1;
-            int prevcol = this.Document.CaretPostion.col;
-            int col = this.Document.CaretPostion.col + delta;
-            string lineString = this.View.LayoutLines[this.Document.CaretPostion.row];
-            if (col < 0 || this.Document.CaretPostion.row >= this.View.LayoutLines.Count)
+            int prevcol = caret.col;
+            int col = caret.col + delta;
+            string lineString = this.View.LayoutLines[caret.row];
+            if (col < 0 || caret.row >= this.View.LayoutLines.Count)
             {
-                if (this.Document.CaretPostion.row == 0)
+                if (caret.row == 0)
                 {
-                    col = 0;
-                    return;
+                    caret.col = 0;
+                    return caret;
                 }
-                this.MoveCaretVertical(false);
-                this.View.AdjustCaretAndSrc(AdjustFlow.Row);  //この段階で調整しないとスクロールされない
-                col = this.View.LayoutLines.GetLengthFromLineNumber(this.Document.CaretPostion.row) - 1;  //最終行以外はすべて改行コードが付くはず
+                caret = this.MoveCaretVertical(caret,false);
+                caret.col = this.View.LayoutLines.GetLengthFromLineNumber(caret.row) - 1;  //最終行以外はすべて改行コードが付くはず
             }
             else if (col >= lineString.Length || lineString[col] == Document.NewLine)
             {
-                if (this.Document.CaretPostion.row < this.View.LayoutLines.Count - 1)
+                if (caret.row < this.View.LayoutLines.Count - 1)
                 {
-                    this.MoveCaretVertical(true);
-                    this.View.AdjustCaretAndSrc(AdjustFlow.Row);  //この段階で調整しないとスクロールされない
-                    col = 0;
+                    caret = this.MoveCaretVertical(caret, true);
+                    caret.col = 0;
                 }
             }
             else
             {
                 AlignDirection direction = isMoveNext ? AlignDirection.Forward : AlignDirection.Back;
-                col = this.View.LayoutLines.GetLayout(this.Document.CaretPostion.row).AlignIndexToNearestCluster(col, direction);
+                caret.col = this.View.LayoutLines.GetLayout(caret.row).AlignIndexToNearestCluster(col, direction);
             }
-
-            this.View.JumpCaret(this.Document.CaretPostion.row, col,false);
+            return caret;
         }
 
         /// <summary>
         /// キャレットを行方向に移動させる
         /// </summary>
+        /// <param name="caret">計算の起点となるテキストポイント</param>
         /// <param name="isMoveNext">プラス方向に移動するなら真</param>
+        /// <param name="move_pargraph">パラグラフ単位で移動するするなら真</param>
         /// <remarks>このメソッドを呼び出した後でScrollToCaretメソッドとSelectWithMoveCaretメソッドを呼び出す必要があります</remarks>
-        void MoveCaretVertical(bool isMoveNext)
+        TextPoint MoveCaretVertical(TextPoint caret,bool isMoveNext, bool move_pargraph = false)
         {
             if (this.Document.FireUpdateEvent == false)
                 throw new InvalidOperationException("");
 
-            TextPoint nextPoint = this.GetTextPointAfterMoveLine(isMoveNext ? 1 : -1, this.Document.CaretPostion);
-            
-            this.View.JumpCaret(nextPoint.row, nextPoint.col,false);
+            return this.GetTextPointAfterMoveLine(isMoveNext ? 1 : -1, this.Document.CaretPostion, move_pargraph);
         }
 
         private void ReplaceBeforeSelectionArea(SelectCollection Selections, int removeLength, string insertStr)
@@ -957,9 +1105,7 @@ namespace FooEditEngine
         private void ReplaceBeforeSelection(Selection sel, int removeLength, string insertStr)
         {
             sel = Util.NormalizeIMaker<Selection>(sel);
-            this.Document.Lock();
             this.Document.Replace(sel.start - removeLength, removeLength, insertStr);
-            this.Document.UnLock();
         }
 
         private void RepleaceSelectionArea(SelectCollection Selections, string value,bool updateInsertPoint = false)
@@ -973,9 +1119,7 @@ namespace FooEditEngine
                 if (Selections.Count > 0)
                     sel = Util.NormalizeIMaker<Selection>(this.View.Selections.First());
 
-                this.Document.Lock();
                 this.Document.Replace(sel.start, sel.length, value);
-                this.Document.UnLock();
                 return;
             }
 
@@ -990,8 +1134,6 @@ namespace FooEditEngine
             {
                 int i;
 
-                this.Document.Lock();
-
                 this.Document.UndoManager.BeginUndoGroup();
 
                 this.Document.FireUpdateEvent = false;
@@ -1020,15 +1162,11 @@ namespace FooEditEngine
                 this.Document.FireUpdateEvent = true;
 
                 this.Document.UndoManager.EndUndoGroup();
-
-                this.Document.UnLock();
             }
             else
             {
                 SelectCollection temp = new SelectCollection(this.View.Selections); //コピーしないとReplaceCommandを呼び出した段階で書き換えられてしまう
 
-                this.Document.Lock();
-
                 this.Document.UndoManager.BeginUndoGroup();
 
                 this.Document.FireUpdateEvent = false;
@@ -1063,8 +1201,6 @@ namespace FooEditEngine
                 this.Document.FireUpdateEvent = true;
 
                 this.Document.UndoManager.EndUndoGroup();
-
-                this.Document.UnLock();
             }
             this.JumpCaret(StartIndex);
             if (updateInsertPoint && newInsertPoint.Count > 0)
@@ -1121,7 +1257,7 @@ namespace FooEditEngine
         void View_PageBoundChanged(object sender, EventArgs e)
         {
             if (this.Document.LineBreak == LineBreakMethod.PageBound && this.View.PageBound.Width - this.View.LineBreakingMarginWidth > 0)
-                this.View.PerfomLayouts();
+                this.Document.PerformLayout();
             this.AdjustCaret();
         }
 
@@ -1130,7 +1266,7 @@ namespace FooEditEngine
             if (e.type == ResourceType.Font)
             {
                 if (this.Document.LineBreak == LineBreakMethod.PageBound)
-                    this.View.PerfomLayouts();
+                    this.Document.PerformLayout();
                 this.AdjustCaret();
             }
             if (e.type == ResourceType.InlineChar)