Added managed Caret implementation to the TextEditor.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@3113 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/Caret.cs

@@ -8,6 +8,7 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Diagnostics;
 using System.Runtime.InteropServices;
 
 using ICSharpCode.TextEditor.Document;
@@ -44,6 +45,7 @@ namespace ICSharpCode.TextEditor
 		TextArea textArea;
 		Point    currentPos   = new Point(-1, -1);
 		Ime      ime          = null;
+		CaretImplementation caretImplementation;
 		
 		/// <value>
 		/// The 'prefered' xPos in which the caret moves, when it is moved
@@ -119,6 +121,10 @@ namespace ICSharpCode.TextEditor
 			this.textArea = textArea;
 			textArea.GotFocus  += new EventHandler(GotFocus);
 			textArea.LostFocus += new EventHandler(LostFocus);
+			if (Environment.OSVersion.Platform == PlatformID.Unix)
+				caretImplementation = new ManagedCaret(this);
+			else
+				caretImplementation = new Win32Caret(this);
 		}
 		
 		public void Dispose()
@@ -126,8 +132,7 @@ namespace ICSharpCode.TextEditor
 			textArea.GotFocus  -= new EventHandler(GotFocus);
 			textArea.LostFocus -= new EventHandler(LostFocus);
 			textArea = null;
-//			DestroyCaret();
-//			caretCreated = false;
+			caretImplementation.Dispose();
 		}
 		
 		public TextLocation ValidatePosition(TextLocation pos)
@@ -162,10 +167,10 @@ namespace ICSharpCode.TextEditor
 			while (!caretCreated) {
 				switch (caretMode) {
 					case CaretMode.InsertMode:
-						caretCreated = CreateCaret(textArea.Handle, 0, 2, textArea.TextView.FontHeight);
+						caretCreated = caretImplementation.Create(2, textArea.TextView.FontHeight);
 						break;
 					case CaretMode.OverwriteMode:
-						caretCreated = CreateCaret(textArea.Handle, 0, (int)textArea.TextView.SpaceWidth, textArea.TextView.FontHeight);
+						caretCreated = caretImplementation.Create((int)textArea.TextView.SpaceWidth, textArea.TextView.FontHeight);
 						break;
 				}
 			}
@@ -173,8 +178,8 @@ namespace ICSharpCode.TextEditor
 				ValidateCaretPos();
 				currentPos = ScreenPosition;
 			}
-			SetCaretPos(currentPos.X, currentPos.Y);
-			ShowCaret(textArea.Handle);
+			caretImplementation.SetPosition(currentPos.X, currentPos.Y);
+			caretImplementation.Show();
 		}
 		
 		public void RecreateCaret()
@@ -190,8 +195,8 @@ namespace ICSharpCode.TextEditor
 		{
 			if (caretCreated) {
 				caretCreated = false;
-				HideCaret(textArea.Handle);
-				DestroyCaret();
+				caretImplementation.Hide();
+				caretImplementation.Destroy();
 			}
 		}
 		
@@ -234,9 +239,15 @@ namespace ICSharpCode.TextEditor
 		{
 			Log("UpdateCaretPosition");
 			
-			if (textArea.MotherTextAreaControl.TextEditorProperties.LineViewerStyle == LineViewerStyle.FullRow && oldLine != line) {
+			if (caretImplementation.RequireRedrawOnPositionChange) {
 				textArea.UpdateLine(oldLine);
-				textArea.UpdateLine(line);
+				if (line != oldLine)
+					textArea.UpdateLine(line);
+			} else {
+				if (textArea.MotherTextAreaControl.TextEditorProperties.LineViewerStyle == LineViewerStyle.FullRow && oldLine != line) {
+					textArea.UpdateLine(oldLine);
+					textArea.UpdateLine(line);
+				}
 			}
 			oldLine = line;
 			
@@ -254,14 +265,14 @@ namespace ICSharpCode.TextEditor
 			Point pos = ScreenPosition;
 			if (xpos >= 0) {
 				CreateCaret();
-				bool success = SetCaretPos(pos.X, pos.Y);
+				bool success = caretImplementation.SetPosition(pos.X, pos.Y);
 				if (!success) {
-					DestroyCaret();
+					caretImplementation.Destroy();
 					caretCreated = false;
 					UpdateCaretPosition();
 				}
 			} else {
-				DestroyCaret();
+				caretImplementation.Destroy();
 			}
 			
 			// set the input method editor location
@@ -276,58 +287,145 @@ namespace ICSharpCode.TextEditor
 			currentPos = pos;
 		}
 		
-		#region Native caret functions
-		static bool CreateCaret(IntPtr hWnd, int hBitmap, int nWidth, int nHeight)
-		{
-			Log("CreateCaret(...)");
-			return NativeMethods.CreateCaret(hWnd, hBitmap, nWidth, nHeight);
-		}
-		
-		static bool SetCaretPos(int x, int y)
+		[Conditional("DEBUG")]
+		static void Log(string text)
 		{
-			Log("SetCaretPos(x=" + x + ", y=" + y + ")");
-			return NativeMethods.SetCaretPos(x, y);
+			//Console.WriteLine(text);
 		}
 		
-		static bool DestroyCaret()
+		#region Caret implementation
+		public void PaintCaret(Graphics g)
 		{
-			Log("DestroyCaret()");
-			return NativeMethods.DestroyCaret();
+			caretImplementation.PaintCaret(g);
 		}
 		
-		static bool ShowCaret(IntPtr hWnd)
+		abstract class CaretImplementation : IDisposable
 		{
-			Log("ShowCaret()");
-			return NativeMethods.ShowCaret(hWnd);
+			public bool RequireRedrawOnPositionChange;
+			
+			public abstract bool Create(int width, int height);
+			public abstract void Hide();
+			public abstract void Show();
+			public abstract bool SetPosition(int x, int y);
+			public abstract void PaintCaret(Graphics g);
+			public abstract void Destroy();
+			
+			public virtual void Dispose()
+			{
+				Destroy();
+			}
 		}
 		
-		static bool HideCaret(IntPtr hWnd)
+		class ManagedCaret : CaretImplementation
 		{
-			Log("HideCaret()");
-			return NativeMethods.HideCaret(hWnd);
+			System.Windows.Forms.Timer timer = new System.Windows.Forms.Timer { Interval = 300 };
+			bool visible;
+			bool blink = true;
+			int x, y, width, height;
+			TextArea textArea;
+			Caret parentCaret;
+			
+			public ManagedCaret(Caret caret)
+			{
+				base.RequireRedrawOnPositionChange = true;
+				this.textArea = caret.textArea;
+				this.parentCaret = caret;
+				timer.Tick += CaretTimerTick;
+			}
+			
+			void CaretTimerTick(object sender, EventArgs e)
+			{
+				blink = !blink;
+				if (visible)
+					textArea.UpdateLine(parentCaret.Line);
+			}
+			
+			public override bool Create(int width, int height)
+			{
+				this.visible = true;
+				this.width = width - 2;
+				this.height = height;
+				timer.Enabled = true;
+				return true;
+			}
+			public override void Hide()
+			{
+				visible = false;
+			}
+			public override void Show()
+			{
+				visible = true;
+			}
+			public override bool SetPosition(int x, int y)
+			{
+				this.x = x - 1;
+				this.y = y;
+				return true;
+			}
+			public override void PaintCaret(Graphics g)
+			{
+				if (visible && blink)
+					g.DrawRectangle(Pens.Gray, x, y, width, height);
+			}
+			public override void Destroy()
+			{
+				visible = false;
+				timer.Enabled = false;
+			}
+			public override void Dispose()
+			{
+				base.Dispose();
+				timer.Dispose();
+			}
 		}
 		
-		[System.Diagnostics.Conditional("DEBUG")]
-		static void Log(string text)
+		class Win32Caret : CaretImplementation
 		{
-			//Console.WriteLine("Caret: " + text);
-		}
-		
-		static class NativeMethods {
 			[DllImport("User32.dll")]
-			internal static extern bool CreateCaret(IntPtr hWnd, int hBitmap, int nWidth, int nHeight);
+			static extern bool CreateCaret(IntPtr hWnd, int hBitmap, int nWidth, int nHeight);
 			
 			[DllImport("User32.dll")]
-			internal static extern bool SetCaretPos(int x, int y);
+			static extern bool SetCaretPos(int x, int y);
 			
 			[DllImport("User32.dll")]
-			internal static extern bool DestroyCaret();
+			static extern bool DestroyCaret();
 			
 			[DllImport("User32.dll")]
-			internal static extern bool ShowCaret(IntPtr hWnd);
+			static extern bool ShowCaret(IntPtr hWnd);
 			
 			[DllImport("User32.dll")]
-			internal static extern bool HideCaret(IntPtr hWnd);
+			static extern bool HideCaret(IntPtr hWnd);
+			
+			TextArea textArea;
+			
+			public Win32Caret(Caret caret)
+			{
+				this.textArea = caret.textArea;
+			}
+			
+			public override bool Create(int width, int height)
+			{
+				return CreateCaret(textArea.Handle, 0, width, height);
+			}
+			public override void Hide()
+			{
+				HideCaret(textArea.Handle);
+			}
+			public override void Show()
+			{
+				ShowCaret(textArea.Handle);
+			}
+			public override bool SetPosition(int x, int y)
+			{
+				return SetCaretPos(x, y);
+			}
+			public override void PaintCaret(Graphics g)
+			{
+			}
+			public override void Destroy()
+			{
+				DestroyCaret();
+			}
 		}
 		#endregion
 		
@@ -373,11 +471,11 @@ namespace ICSharpCode.TextEditor
 			if (CaretModeChanged != null) {
 				CaretModeChanged(this, e);
 			}
-			HideCaret(textArea.Handle);
-			DestroyCaret();
+			caretImplementation.Hide();
+			caretImplementation.Destroy();
 			caretCreated = false;
 			CreateCaret();
-			ShowCaret(textArea.Handle);
+			caretImplementation.Show();
 		}
 		
 		/// <remarks>

src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/Ime.cs

@@ -20,11 +20,12 @@ namespace ICSharpCode.TextEditor
 		public Ime(IntPtr hWnd, Font font)
 		{
 			string PROCESSOR_ARCHITEW6432 = Environment.GetEnvironmentVariable("PROCESSOR_ARCHITEW6432");
-			if (PROCESSOR_ARCHITEW6432 == "IA64" || PROCESSOR_ARCHITEW6432 == "AMD64") {
+			if (PROCESSOR_ARCHITEW6432 == "IA64" || PROCESSOR_ARCHITEW6432 == "AMD64" || Environment.OSVersion.Platform == PlatformID.Unix) {
 				disableIME = true;
+			} else {
+				this.hIMEWnd = ImmGetDefaultIMEWnd(hWnd);
 			}
 			this.hWnd = hWnd;
-			this.hIMEWnd = ImmGetDefaultIMEWnd(hWnd);
 			this.font = font;
 			SetIMEWindowFont(font);
 		}
@@ -49,7 +50,8 @@ namespace ICSharpCode.TextEditor
 			set {
 				if (this.hWnd != value) {
 					this.hWnd = value;
-					this.hIMEWnd = ImmGetDefaultIMEWnd(value);
+					if (!disableIME)
+						this.hIMEWnd = ImmGetDefaultIMEWnd(value);
 					SetIMEWindowFont(font);
 				}
 			}

src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextView.cs

@@ -174,6 +174,7 @@ namespace ICSharpCode.TextEditor
 			if (horizontalDelta > 0) {
 				g.ResetClip();
 			}
+			textArea.Caret.PaintCaret(g);
 		}
 		
 		void PaintDocumentLine(Graphics g, int lineNumber, Rectangle lineRectangle)

src/Main/Base/Project/Src/Gui/WorkbenchSingleton.cs

@@ -81,7 +81,10 @@ namespace ICSharpCode.SharpDevelop.Gui
 		/// </summary>
 		public static void InitializeWorkbench()
 		{
-			InitializeWorkbench(new DefaultWorkbench(), new SdiWorkbenchLayout());
+			if (Environment.OSVersion.Platform == PlatformID.Unix)
+				InitializeWorkbench(new DefaultWorkbench(), new SimpleWorkbenchLayout());
+			else
+				InitializeWorkbench(new DefaultWorkbench(), new SdiWorkbenchLayout());
 		}
 		
 		public static void InitializeWorkbench(IWorkbench workbench, IWorkbenchLayout layout)
@@ -103,10 +106,10 @@ namespace ICSharpCode.SharpDevelop.Gui
 			ResourceService.LanguageChanged += delegate { workbench.RedrawAllComponents(); };
 			
 			caller = new STAThreadCaller(workbench.MainForm);
-						
+			
 			workbench.Initialize();
-			workbench.SetMemento(PropertyService.Get(workbenchMemento, new Properties()));			
-			workbench.WorkbenchLayout = layout;				
+			workbench.SetMemento(PropertyService.Get(workbenchMemento, new Properties()));
+			workbench.WorkbenchLayout = layout;
 			
 			OnWorkbenchCreated();