Grasshopper project system now uses csproj extension
[mono.git] / mcs / class / Managed.Windows.Forms / System.Windows.Forms / RichTextBox.cs
index 4259fb6b797357d84e4999608429c08d76e15abc..d307ed5ce101178be24dd0d87ed56452ca9409bb 100644 (file)
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-// Copyright (c) 2005 Novell, Inc. (http://www.novell.com)
+// Copyright (c) 2005-2006 Novell, Inc. (http://www.novell.com)
 //
 // Authors:
 //     Peter Bartok    <pbartok@novell.com>
 //
 //
 
-// NOT COMPLETE
+// #define DEBUG
 
 using System;
 using System.Collections;
@@ -32,18 +32,21 @@ using System.ComponentModel;
 using System.Drawing;
 using System.IO;
 using System.Text;
+using System.Runtime.InteropServices;
 using RTF=System.Windows.Forms.RTF;
 
 namespace System.Windows.Forms {
+#if NET_2_0
+       [ClassInterface (ClassInterfaceType.AutoDispatch)]
+       [Docking (DockingBehavior.Ask)]
+       [ComVisible (true)]
+#endif
        public class RichTextBox : TextBoxBase {
                #region Local Variables
                internal bool           auto_word_select;
                internal int            bullet_indent;
-               internal bool           can_redo;
                internal bool           detect_urls;
-               internal string         redo_action_name;
                internal int            margin_right;
-               internal string         undo_action_name;
                internal float          zoom;
 
                private RTF.TextMap     rtf_text_map;
@@ -57,6 +60,7 @@ namespace System.Windows.Forms {
                private HorizontalAlignment rtf_rtfalign;
                private int             rtf_cursor_x;
                private int             rtf_cursor_y;
+               private int             rtf_chars;
                #endregion      // Local Variables
 
                #region Public Constructors
@@ -64,12 +68,9 @@ namespace System.Windows.Forms {
                        accepts_return = true;
                        auto_word_select = false;
                        bullet_indent = 0;
-                       can_redo = false;
                        detect_urls = true;
                        max_length = Int32.MaxValue;
-                       redo_action_name = string.Empty;
                        margin_right = 0;
-                       undo_action_name = string.Empty;
                        zoom = 1;
                        base.Multiline = true;
                        document.CRLFSize = 1;
@@ -82,22 +83,27 @@ namespace System.Windows.Forms {
                        ForeColor = ThemeEngine.Current.ColorWindowText;
                        base.HScrolled += new EventHandler(RichTextBox_HScrolled);
                        base.VScrolled += new EventHandler(RichTextBox_VScrolled);
+
+#if NET_2_0
+                       SetStyle (ControlStyles.StandardDoubleClick, false);
+#endif
                }
                #endregion      // Public Constructors
 
                #region Private & Internal Methods
                private void RichTextBox_LostFocus(object sender, EventArgs e) {
-                       has_focus = false;
                        Invalidate();
                }
 
                private void RichTextBox_GotFocus(object sender, EventArgs e) {
-                       has_focus = true;
                        Invalidate();
                }
                #endregion      // Private & Internal Methods
 
                #region Public Instance Properties
+#if NET_2_0
+               [Browsable (false)]
+#endif
                public override bool AllowDrop {
                        get {
                                return base.AllowDrop;
@@ -109,7 +115,14 @@ namespace System.Windows.Forms {
                }
 
                [DefaultValue(false)]
+#if NET_2_0
+               [DesignerSerializationVisibility (DesignerSerializationVisibility.Visible)]
+               [RefreshProperties (RefreshProperties.Repaint)]
+               [EditorBrowsable (EditorBrowsableState.Never)]
+               [Browsable (false)]
+#else
                [Localizable(true)]
+#endif
                public override bool AutoSize {
                        get {
                                return auto_size;
@@ -134,13 +147,8 @@ namespace System.Windows.Forms {
                [Browsable(false)]
                [EditorBrowsable(EditorBrowsableState.Never)]
                public override System.Drawing.Image BackgroundImage {
-                       get {
-                               return background_image;
-                       }
-
-                       set {
-                               base.BackgroundImage = value;
-                       }
+                       get { return base.BackgroundImage; }
+                       set { base.BackgroundImage = value; }
                }
 
                [DefaultValue(0)]
@@ -159,7 +167,7 @@ namespace System.Windows.Forms {
                [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
                public bool CanRedo {
                        get {
-                               return can_redo;
+                               return document.undo.CanRedo;
                        }
                }
 
@@ -195,7 +203,7 @@ namespace System.Windows.Forms {
                                        // Font changes always set the whole doc to that font
                                        start = document.GetLine(1);
                                        end = document.GetLine(document.Lines);
-                                       document.FormatText(start, 1, end, end.text.Length + 1, base.Font, new SolidBrush(this.ForeColor));
+                                       document.FormatText(start, 1, end, end.text.Length + 1, base.Font, null, null, FormatSpecified.Font);
                                }
                        }
                }
@@ -237,7 +245,7 @@ namespace System.Windows.Forms {
                [MonoTODO]
                public string RedoActionName {
                        get {
-                               return redo_action_name;
+                               return document.undo.RedoActionName;
                        }
                }
 
@@ -255,14 +263,16 @@ namespace System.Windows.Forms {
                }
 
                [Browsable(false)]
-               [DefaultValue("")]
                [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+#if NET_2_0
+               [RefreshProperties (RefreshProperties.All)]
+#else
+               [DefaultValue("")]
+#endif
                public string Rtf {
                        get {
                                Line            start_line;
                                Line            end_line;
-                               int             current;
-                               int             total;
 
                                start_line = document.GetLine(1);
                                end_line = document.GetLine(document.Lines);
@@ -278,6 +288,8 @@ namespace System.Windows.Forms {
                                InsertRTFFromStream(data, 0, 1);
 
                                data.Close();
+
+                               Invalidate();
                        }
                }
 
@@ -305,21 +317,26 @@ namespace System.Windows.Forms {
                                MemoryStream    data;
                                int             x;
                                int             y;
+                               int             sel_start;
+                               int             chars;
                                Line            line;
+                               LineTag         tag;
 
                                if (document.selection_visible) {
-                                       document.ReplaceSelection("");
+                                       document.ReplaceSelection("", false);
                                }
 
+                               sel_start = document.LineTagToCharIndex(document.selection_start.line, document.selection_start.pos);
+
                                data = new MemoryStream(Encoding.ASCII.GetBytes(value), false);
-                               InsertRTFFromStream(data, document.selection_start.pos, document.selection_start.line.line_no, out x, out y);
+                               InsertRTFFromStream(data, document.selection_start.pos, document.selection_start.line.line_no, out x, out y, out chars);
                                data.Close();
 
-                               line = document.GetLine(y);
-                               document.SetSelection(document.GetLine(y), x);
-                               document.PositionCaret(line, x);
+                               document.CharIndexToLineTag(sel_start + chars + (y - document.selection_start.line.line_no) * 2, out line, out tag, out sel_start);
+                               document.SetSelection(line, sel_start);
+                               document.PositionCaret(line, sel_start);
                                document.DisplayCaret();
-
+                               ScrollToCaret();
                                OnTextChanged(EventArgs.Empty);
                        }
                }
@@ -391,6 +408,32 @@ namespace System.Windows.Forms {
                        }
                }
 
+               [Browsable(false)]
+               [DefaultValue(false)]
+               [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+               [MonoTODO]
+               public bool SelectionBullet {
+                       get {
+                               return false;
+                       }
+
+                       set {
+                       }
+               }
+
+               [Browsable(false)]
+               [DefaultValue(0)]
+               [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+               [MonoTODO]
+               public int SelectionCharOffset {
+                       get {
+                               return 0;
+                       }
+
+                       set {
+                       }
+               }
+
                [Browsable(false)]
                [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
                public Color SelectionColor {
@@ -425,13 +468,17 @@ namespace System.Windows.Forms {
                        }
 
                        set {
-                               int     sel_start;
-                               int     sel_end;
+                               FontDefinition  attributes;
+                               int             sel_start;
+                               int             sel_end;
+
+                               attributes = new FontDefinition();
+                               attributes.color = value;
 
                                sel_start = document.LineTagToCharIndex(document.selection_start.line, document.selection_start.pos);
                                sel_end = document.LineTagToCharIndex(document.selection_end.line, document.selection_end.pos);
-Console.WriteLine("FIXME - SelectionColor should not alter font");
-                               document.FormatText(document.selection_start.line, document.selection_start.pos + 1, document.selection_end.line, document.selection_end.pos + 1, document.selection_start.tag.font, new SolidBrush(value));
+
+                               document.FormatText(document.selection_start.line, document.selection_start.pos + 1, document.selection_end.line, document.selection_end.pos + 1, attributes);
 
                                document.CharIndexToLineTag(sel_start, out document.selection_start.line, out document.selection_start.tag, out document.selection_start.pos);
                                document.CharIndexToLineTag(sel_end, out document.selection_end.line, out document.selection_end.tag, out document.selection_end.pos);
@@ -475,20 +522,50 @@ Console.WriteLine("FIXME - SelectionColor should not alter font");
                        }
 
                        set {
-                               int     sel_start;
-                               int     sel_end;
+                               FontDefinition  attributes;
+                               int             sel_start;
+                               int             sel_end;
+
+                               attributes = new FontDefinition();
+                               attributes.font_obj = value;
 
                                sel_start = document.LineTagToCharIndex(document.selection_start.line, document.selection_start.pos);
                                sel_end = document.LineTagToCharIndex(document.selection_end.line, document.selection_end.pos);
 
-                               document.FormatText(document.selection_start.line, document.selection_start.pos + 1, document.selection_end.line, document.selection_end.pos + 1, value, document.selection_start.tag.color);
+                               document.FormatText(document.selection_start.line, document.selection_start.pos + 1, document.selection_end.line, document.selection_end.pos + 1, attributes);
 
                                document.CharIndexToLineTag(sel_start, out document.selection_start.line, out document.selection_start.tag, out document.selection_start.pos);
                                document.CharIndexToLineTag(sel_end, out document.selection_end.line, out document.selection_end.tag, out document.selection_end.pos);
 
                                document.UpdateView(document.selection_start.line, 0);
                                document.AlignCaret();
-                               
+
+                       }
+               }
+
+               [Browsable(false)]
+               [DefaultValue(0)]
+               [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+               [MonoTODO]
+               public int SelectionHangingIndent {
+                       get {
+                               return 0;
+                       }
+
+                       set {
+                       }
+               }
+
+               [Browsable(false)]
+               [DefaultValue(0)]
+               [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+               [MonoTODO]
+               public int SelectionIndent {
+                       get {
+                               return 0;
+                       }
+
+                       set {
                        }
                }
 
@@ -504,6 +581,44 @@ Console.WriteLine("FIXME - SelectionColor should not alter font");
                        }
                }
 
+               [Browsable(false)]
+               [DefaultValue(false)]
+               [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+               [MonoTODO]
+               public bool SelectionProtected {
+                       get {
+                               return false;
+                       }
+
+                       set {
+                       }
+               }
+
+               [Browsable(false)]
+               [DefaultValue(0)]
+               [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+               [MonoTODO]
+               public int SelectionRightIndent {
+                       get {
+                               return 0;
+                       }
+
+                       set {
+                       }
+               }
+
+               [Browsable(false)]
+               [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+               [MonoTODO]
+               public int[] SelectionTabs {
+                       get {
+                               return new int[0];
+                       }
+
+                       set {
+                       }
+               }
+
                [Browsable(false)]
                [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
                public RichTextBoxSelectionTypes SelectionType {
@@ -521,7 +636,21 @@ Console.WriteLine("FIXME - SelectionColor should not alter font");
                        }
                }
 
+               [DefaultValue(false)]
+               [MonoTODO]
+               public bool ShowSelectionMargin {
+                       get {
+                               return false;
+                       }
+
+                       set {
+                       }
+               }
+
                [Localizable(true)]
+#if NET_2_0
+               [RefreshProperties (RefreshProperties.All)]
+#endif
                public override string Text {
                        get {
                                return base.Text;
@@ -543,7 +672,7 @@ Console.WriteLine("FIXME - SelectionColor should not alter font");
                [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
                public string UndoActionName {
                        get {
-                               return document.undo.UndoName;
+                               return document.undo.UndoActionName;
                        }
                }
 
@@ -734,8 +863,6 @@ Console.WriteLine("FIXME - SelectionColor should not alter font");
                }
 
                public void LoadFile(System.IO.Stream data, RichTextBoxStreamType fileType) {
-                       RTF.RTF rtf;    // Not 'using SWF.RTF' to avoid ambiguities with font and color
-
                        document.Empty();
 
                        // FIXME - ignoring unicode
@@ -747,9 +874,7 @@ Console.WriteLine("FIXME - SelectionColor should not alter font");
                                try {
                                        sb = new StringBuilder((int)data.Length);
                                        buffer = new byte[1024];
-                               }
-
-                               catch {
+                               } catch {
                                        throw new IOException("Not enough memory to load document");
                                }
 
@@ -763,6 +888,10 @@ Console.WriteLine("FIXME - SelectionColor should not alter font");
                        }
 
                        InsertRTFFromStream(data, 0, 1);
+
+                       document.PositionCaret (document.GetLine (1), 0);
+                       document.SetSelectionToCaret (true);
+                       ScrollToCaret ();
                }
 
                [MonoTODO("Make smarter RTF detection?")]
@@ -779,15 +908,17 @@ Console.WriteLine("FIXME - SelectionColor should not alter font");
 
                        data = null;
 
+
                        try {
                                data = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read, 1024);
+
                                LoadFile(data, fileType);
                        }
-
+#if !DEBUG
                        catch {
                                throw new IOException("Could not open file " + path);
                        }
-
+#endif
                        finally {
                                if (data != null) {
                                        data.Close();
@@ -796,11 +927,12 @@ Console.WriteLine("FIXME - SelectionColor should not alter font");
                }
 
                public void Paste(DataFormats.Format clipFormat) {
-                       base.Paste(clipFormat, false);
+                       base.Paste(Clipboard.GetDataObject(), clipFormat, false);
                }
 
-               [MonoTODO()]
-               public void Redo() {
+               public void Redo()
+               {
+                       document.undo.Redo ();
                }
 
                public void SaveFile(Stream data, RichTextBoxStreamType fileType) {
@@ -901,9 +1033,9 @@ Console.WriteLine("FIXME - SelectionColor should not alter font");
                }
 
                protected virtual void OnContentsResized(ContentsResizedEventArgs e) {
-                       if (ContentsResized != null) {
-                               ContentsResized(this, e);
-                       }
+                       ContentsResizedEventHandler eh = (ContentsResizedEventHandler)(Events [ContentsResizedEvent]);
+                       if (eh != null)
+                               eh (this, e);
                }
 
                protected override void OnContextMenuChanged(EventArgs e) {
@@ -919,28 +1051,28 @@ Console.WriteLine("FIXME - SelectionColor should not alter font");
                }
 
                protected virtual void OnHScroll(EventArgs e) {
-                       if (HScroll != null) {
-                               HScroll(this, e);
-                       }
+                       EventHandler eh = (EventHandler)(Events [HScrollEvent]);
+                       if (eh != null)
+                               eh (this, e);
                }
 
                [MonoTODO("Determine when to call this")]
                protected virtual void OnImeChange(EventArgs e) {
-                       if (ImeChange != null) {
-                               ImeChange(this, e);
-                       }
+                       EventHandler eh = (EventHandler)(Events [ImeChangeEvent]);
+                       if (eh != null)
+                               eh (this, e);
                }
 
                protected virtual void OnLinkClicked(LinkClickedEventArgs e) {
-                       if (LinkClicked != null) {
-                               LinkClicked(this, e);
-                       }
+                       LinkClickedEventHandler eh = (LinkClickedEventHandler)(Events [LinkClickedEvent]);
+                       if (eh != null)
+                               eh (this, e);
                }
 
                protected virtual void OnProtected(EventArgs e) {
-                       if (Protected != null) {
-                               Protected(this, e);
-                       }
+                       EventHandler eh = (EventHandler)(Events [ProtectedEvent]);
+                       if (eh != null)
+                               eh (this, e);
                }
 
                protected override void OnRightToLeftChanged(EventArgs e) {
@@ -948,9 +1080,9 @@ Console.WriteLine("FIXME - SelectionColor should not alter font");
                }
 
                protected virtual void OnSelectionChanged(EventArgs e) {
-                       if (SelectionChanged != null) {
-                               SelectionChanged(this, e);
-                       }
+                       EventHandler eh = (EventHandler)(Events [SelectionChangedEvent]);
+                       if (eh != null)
+                               eh (this, e);
                }
 
                protected override void OnSystemColorsChanged(EventArgs e) {
@@ -962,9 +1094,9 @@ Console.WriteLine("FIXME - SelectionColor should not alter font");
                }
 
                protected virtual void OnVScroll(EventArgs e) {
-                       if (VScroll != null) {
-                               VScroll(this, e);
-                       }
+                       EventHandler eh = (EventHandler)(Events [VScrollEvent]);
+                       if (eh != null)
+                               eh (this, e);
                }
 
                protected override void WndProc(ref Message m) {
@@ -973,84 +1105,121 @@ Console.WriteLine("FIXME - SelectionColor should not alter font");
                #endregion      // Protected Instance Methods
 
                #region Events
+               static object ContentsResizedEvent = new object ();
+               static object HScrollEvent = new object ();
+               static object ImeChangeEvent = new object ();
+               static object LinkClickedEvent = new object ();
+               static object ProtectedEvent = new object ();
+               static object SelectionChangedEvent = new object ();
+               static object VScrollEvent = new object ();
+
                [Browsable(false)]
                [EditorBrowsable(EditorBrowsableState.Never)]
-               public event EventHandler                       BackgroundImageChanged;
+               public new event EventHandler BackgroundImageChanged {
+                       add { base.BackgroundImageChanged += value; }
+                       remove { base.BackgroundImageChanged -= value; }
+               }
 
-               public event ContentsResizedEventHandler        ContentsResized;
+               public event ContentsResizedEventHandler ContentsResized {
+                       add { Events.AddHandler (ContentsResizedEvent, value); }
+                       remove { Events.RemoveHandler (ContentsResizedEvent, value); }
+               }
 
                [Browsable(false)]
                [EditorBrowsable(EditorBrowsableState.Never)]
-               public event EventHandler                       DoubleClick;
+               public new event EventHandler DoubleClick {
+                       add { base.DoubleClick += value; }
+                       remove { base.DoubleClick -= value; }
+               }
 
                [Browsable(false)]
+#if !NET_2_0
                [EditorBrowsable(EditorBrowsableState.Never)]
-               public event DragEventHandler DragDrop {
-                       add {
-                               base.DragDrop += value;
-                       }
-
-                       remove {
-                               base.DragDrop -= value;
-                       }
+#endif
+               public new event DragEventHandler DragDrop {
+                       add { base.DragDrop += value; }
+                       remove { base.DragDrop -= value; }
                }
 
                [Browsable(false)]
+#if !NET_2_0
                [EditorBrowsable(EditorBrowsableState.Never)]
-               public event DragEventHandler DragEnter {
-                       add {
-                               base.DragEnter += value;
-                       }
-
-                       remove {
-                               base.DragEnter -= value;
-                       }
+#endif
+               public new event DragEventHandler DragEnter {
+                       add { base.DragEnter += value; }
+                       remove { base.DragEnter -= value; }
                }
 
                [Browsable(false)]
                [EditorBrowsable(EditorBrowsableState.Never)]
-               public event EventHandler DragLeave {
-                       add {
-                               base.DragLeave += value;
-                       }
-
-                       remove {
-                               base.DragLeave -= value;
-                       }
+               public new event EventHandler DragLeave {
+                       add { base.DragLeave += value; }
+                       remove { base.DragLeave -= value; }
                }
 
 
                [Browsable(false)]
                [EditorBrowsable(EditorBrowsableState.Never)]
-               public event DragEventHandler DragOver {
-                       add {
-                               base.DragOver += value;
-                       }
-
-                       remove {
-                               base.DragOver -= value;
-                       }
+               public new event DragEventHandler DragOver {
+                       add { base.DragOver += value; }
+                       remove { base.DragOver -= value; }
                }
 
 
                [Browsable(false)]
                [EditorBrowsable(EditorBrowsableState.Never)]
-               public event GiveFeedbackEventHandler           GiveFeedback;
+               public new event GiveFeedbackEventHandler GiveFeedback {
+                       add { base.GiveFeedback += value; }
+                       remove { base.GiveFeedback -= value; }
+               }
+
+               public event EventHandler HScroll {
+                       add { Events.AddHandler (HScrollEvent, value); }
+                       remove { Events.RemoveHandler (HScrollEvent, value); }
+               }
+
+               public event EventHandler ImeChange {
+                       add { Events.AddHandler (ImeChangeEvent, value); }
+                       remove { Events.RemoveHandler (ImeChangeEvent, value); }
+               }
 
-               public event EventHandler                       HScroll;
-               public event EventHandler                       ImeChange;
-               public event LinkClickedEventHandler            LinkClicked;
-               public event EventHandler                       Protected;
+               public event LinkClickedEventHandler LinkClicked {
+                       add { Events.AddHandler (LinkClickedEvent, value); }
+                       remove { Events.RemoveHandler (LinkClickedEvent, value); }
+               }
+
+               public event EventHandler Protected {
+                       add { Events.AddHandler (ProtectedEvent, value); }
+                       remove { Events.RemoveHandler (ProtectedEvent, value); }
+               }
 
                [Browsable(false)]
                [EditorBrowsable(EditorBrowsableState.Never)]
-               public event QueryContinueDragEventHandler      QueryContinueDrag;
-               public event EventHandler                       SelectionChanged;
-               public event EventHandler                       VScroll;
+               public new event QueryContinueDragEventHandler QueryContinueDrag {
+                       add { base.QueryContinueDrag += value; }
+                       remove { base.QueryContinueDrag -= value; }
+               }
+
+               public event EventHandler SelectionChanged {
+                       add { Events.AddHandler (SelectionChangedEvent, value); }
+                       remove { Events.RemoveHandler (SelectionChangedEvent, value); }
+               }
+
+               public event EventHandler VScroll {
+                       add { Events.AddHandler (VScrollEvent, value); }
+                       remove { Events.RemoveHandler (VScrollEvent, value); }
+               }
                #endregion      // Events
 
                #region Private Methods
+
+               internal override void SelectWord ()
+               {
+                       document.ExpandSelection(CaretSelection.Word, false);
+               }
+
                private void HandleControl(RTF.RTF rtf) {
+//                     Console.WriteLine ("HANDLING MAJOR:  {0}      MINOR:  {1}", rtf.Major, rtf.Minor);
                        switch(rtf.Major) {
                                case RTF.Major.Unicode: {
                                        switch(rtf.Minor) {
@@ -1069,7 +1238,7 @@ Console.WriteLine("FIXME - SelectionColor should not alter font");
                                }
 
                                case RTF.Major.Destination: {
-                                       Console.Write("[Got Destination control {0}]", rtf.Minor);
+//                                     Console.Write("[Got Destination control {0}]", rtf.Minor);
                                        rtf.SkipGroup();
                                        break;
                                }
@@ -1080,6 +1249,7 @@ Console.WriteLine("FIXME - SelectionColor should not alter font");
                                                        System.Windows.Forms.RTF.Color  color;
 
                                                        color = System.Windows.Forms.RTF.Color.GetColor(rtf, rtf.Param);
+                                                       
                                                        if (color != null) {
                                                                FlushText(rtf, false);
                                                                if (color.Red == -1 && color.Green == -1 && color.Blue == -1) {
@@ -1087,6 +1257,7 @@ Console.WriteLine("FIXME - SelectionColor should not alter font");
                                                                } else {
                                                                        this.rtf_color = new SolidBrush(Color.FromArgb(color.Red, color.Green, color.Blue));
                                                                }
+                                                               FlushText (rtf, false);
                                                        }
                                                        break;
                                                }
@@ -1164,7 +1335,7 @@ Console.WriteLine("FIXME - SelectionColor should not alter font");
                                }
 
                                case RTF.Major.SpecialChar: {
-                                       Console.Write("[Got SpecialChar control {0}]", rtf.Minor);
+                                       //Console.Write("[Got SpecialChar control {0}]", rtf.Minor);
                                        SpecialChar(rtf);
                                        break;
                                }
@@ -1193,52 +1364,59 @@ Console.WriteLine("FIXME - SelectionColor should not alter font");
                                }
 
                                case Minor.Tab: {
-                                       Console.Write("\t");
+                                       rtf_line.Append ("\t");
+//                                     FlushText (rtf, false);
                                        break;
                                }
 
+                               case Minor.NoReqHyphen:
                                case Minor.NoBrkHyphen: {
-                                       Console.Write("-");
+                                       rtf_line.Append ("-");
+//                                     FlushText (rtf, false);
                                        break;
                                }
 
                                case Minor.Bullet: {
-                                       Console.Write("*");
+                                       Console.WriteLine("*");
                                        break;
                                }
 
+                       case Minor.WidowCtrl:
+                               break;
+
                                case Minor.EmDash: {
-                                       Console.Write("\97");
+                               rtf_line.Append ("\u2014");
                                        break;
                                }
 
                                case Minor.EnDash: {
-                                       Console.Write("\96");
+                                       rtf_line.Append ("\u2013");
                                        break;
                                }
-
+/*
                                case Minor.LQuote: {
-                                       Console.Write("\91");
+                                       Console.Write("\u2018");
                                        break;
                                }
 
                                case Minor.RQuote: {
-                                       Console.Write("\92");
+                                       Console.Write("\u2019");
                                        break;
                                }
 
                                case Minor.LDblQuote: {
-                                       Console.Write("\93");
+                                       Console.Write("\u201C");
                                        break;
                                }
 
                                case Minor.RDblQuote: {
-                                       Console.Write("\94");
+                                       Console.Write("\u201D");
                                        break;
                                }
-
+*/
                                default: {
-                                       rtf.SkipGroup();
+//                                     Console.WriteLine ("skipped special char:   {0}", rtf.Minor);
+//                                     rtf.SkipGroup();
                                        break;
                                }
                        }
@@ -1267,7 +1445,7 @@ Console.WriteLine("FIXME - SelectionColor should not alter font");
                        Font            font;
 
                        length = rtf_line.Length;
-                       if (length == 0) {
+                       if (!newline && (length == 0)) {
                                return;
                        }
 
@@ -1289,16 +1467,24 @@ Console.WriteLine("FIXME - SelectionColor should not alter font");
                                } else {
                                        rtf_color = new SolidBrush(Color.FromArgb(color.Red, color.Green, color.Blue));
                                }
+                               
                        }
 
+                       rtf_chars += rtf_line.Length;
+
                        if (rtf_cursor_x == 0) {
                                document.Add(rtf_cursor_y, rtf_line.ToString(), rtf_rtfalign, font, rtf_color);
                        } else {
                                Line    line;
 
                                line = document.GetLine(rtf_cursor_y);
-                               document.InsertString(line, rtf_cursor_x, rtf_line.ToString());
-                               document.FormatText(line, rtf_cursor_x + 1, line, rtf_cursor_x + 1 + length, font, rtf_color); // FormatText is 1-based
+                               if (rtf_line.Length > 0) {
+                                       document.InsertString(line, rtf_cursor_x, rtf_line.ToString());
+                                       document.FormatText(line, rtf_cursor_x + 1, line, rtf_cursor_x + 1 + length, font, rtf_color, null, FormatSpecified.Font | FormatSpecified.Color); // FormatText is 1-based
+                               }
+                               if (newline) {
+                                       document.Split(line, rtf_cursor_x + length);
+                               }
                        }
 
                        if (newline) {
@@ -1313,11 +1499,12 @@ Console.WriteLine("FIXME - SelectionColor should not alter font");
                private void InsertRTFFromStream(Stream data, int cursor_x, int cursor_y) {
                        int     x;
                        int     y;
+                       int     chars;
 
-                       InsertRTFFromStream(data, cursor_x, cursor_y, out x, out y);
+                       InsertRTFFromStream(data, cursor_x, cursor_y, out x, out y, out chars);
                }
 
-               private void InsertRTFFromStream(Stream data, int cursor_x, int cursor_y, out int to_x, out int to_y) {
+               private void InsertRTFFromStream(Stream data, int cursor_x, int cursor_y, out int to_x, out int to_y, out int chars) {
                        RTF.RTF         rtf;
 
                        rtf = new RTF.RTF(data);
@@ -1336,26 +1523,37 @@ Console.WriteLine("FIXME - SelectionColor should not alter font");
                        rtf_rtffont = null;
                        rtf_cursor_x = cursor_x;
                        rtf_cursor_y = cursor_y;
+                       rtf_chars = 0;
                        rtf.DefaultFont(this.Font.Name);
 
                        rtf_text_map = new RTF.TextMap();
                        RTF.TextMap.SetupStandardTable(rtf_text_map.Table);
 
+                       document.SuspendRecalc ();
+
                        try {
                                rtf.Read();     // That's it
                                FlushText(rtf, false);
-                       }
 
-                       catch (RTF.RTFException) {
-                               // Seems to be plain text...
-                               
                        }
 
+
+                       catch (RTF.RTFException e) {
+#if DEBUG
+                               throw e;
+#endif
+                               // Seems to be plain text or broken RTF
+                               Console.WriteLine("RTF Parsing failure: {0}", e.Message);
+                       }                     
+
                        to_x = rtf_cursor_x;
                        to_y = rtf_cursor_y;
+                       chars = rtf_chars;
+
+                       document.RecalculateDocument(CreateGraphicsInternal(), cursor_y, document.Lines, false);
+                       document.ResumeRecalc (true);
 
-                       document.RecalculateDocument(CreateGraphics(), cursor_y, document.Lines, false);
-                       document.Invalidate(document.GetLine(cursor_y), 0, document.GetLine(document.Lines), -1);
+                       document.Invalidate (document.GetLine(cursor_y), 0, document.GetLine(document.Lines), -1);
                }
 
                private void RichTextBox_HScrolled(object sender, EventArgs e) {