[Monodevelop-patches-list] r1096 - in trunk/MonoDevelop: . src/AddIns/DisplayBindings/SourceEditor/Gui src/Main/Base/Services

[commit-watcher at mono-cvs.ximian.com]

Author: tberman
Date: 2004-03-03 18:26:00 -0500 (Wed, 03 Mar 2004)
New Revision: 1096

Modified:
   trunk/MonoDevelop/ChangeLog
   trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs
   trunk/MonoDevelop/src/Main/Base/Services/DebuggingService.cs
Log:
fix execution marker


Modified: trunk/MonoDevelop/ChangeLog
===================================================================
--- trunk/MonoDevelop/ChangeLog	2004-03-03 23:12:11 UTC (rev 1095)
+++ trunk/MonoDevelop/ChangeLog	2004-03-03 23:26:00 UTC (rev 1096)
@@ -3,6 +3,13 @@
 
 2004-03-03  Todd Berman  <tberman at sevenl.net>
 
+	* src/AddIns/DisplayBindings/Gui/SourceEditorWidget.cs:
+		Fix ExecutingAt.
+	* src/Main/Base/Services/DebuggingService.cs:
+		Threading issue fixed.
+
+2004-03-03  Todd Berman  <tberman at sevenl.net>
+
 	* src/AddIns/DisplayBindings/Gui/SourceEditor*:
 		Add ExecutingAt code.
 	* src/Main/Base/Services/DebuggingService.cs:

Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs	2004-03-03 23:12:11 UTC (rev 1095)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs	2004-03-03 23:26:00 UTC (rev 1096)
@@ -33,6 +33,7 @@
 
 		public void ExecutingAt (int linenumber)
 		{
+			Console.WriteLine ("Inside mainwidget");
 			View.ExecutingAt (linenumber);
 		}		
 

Modified: trunk/MonoDevelop/src/Main/Base/Services/DebuggingService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/DebuggingService.cs	2004-03-03 23:12:11 UTC (rev 1095)
+++ trunk/MonoDevelop/src/Main/Base/Services/DebuggingService.cs	2004-03-03 23:26:00 UTC (rev 1096)
@@ -27,6 +27,7 @@
 		Process proc;
 		Hashtable breakpoints = new Hashtable ();
 		DebuggerBackend backend;
+		Breakpoint point;
 
 		public DebuggingService()
 		{
@@ -149,11 +150,14 @@
 			backend = null;
 		}
 
-		private void OnBreakpointHit (Breakpoint point)
+		private void OnBreakpointHit (Breakpoint pointFromDbg)
 		{
-			if (this.BreakpointHit == null) 
-				return;
+			point = pointFromDbg;
+			Gtk.Timeout.Add (1, new Gtk.Function (MainThreadNotify));
+		}
 
+		bool MainThreadNotify ()
+		{
 			string[] toks = point.Name.Split (':');
 			string filename = toks [0];
 			int linenumber = Int32.Parse (toks [1]);
@@ -161,14 +165,17 @@
 			IFileService fs = (IFileService)ServiceManager.Services.GetService (typeof (IFileService));
 			fs.OpenFile (filename);
 
-			if (WorkbenchSingleton.Workbench.ActiveWorkbenchWindow is IDebuggableEditor)
+			if (WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent is IDebuggableEditor)
 			{
-				((IDebuggableEditor)WorkbenchSingleton.Workbench.ActiveWorkbenchWindow).ExecutingAt (linenumber);
+				((IDebuggableEditor)WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent).ExecutingAt (linenumber - 1);
 			}	
 
+			if (this.BreakpointHit == null)
+				return false;
+			
 			BreakpointHitArgs args = new BreakpointHitArgs (filename, linenumber);
 			BreakpointHit (this, args);
-			Console.WriteLine ("hit breakpoint " + point.Name);
+			return false;
 		}
 
 		public event DebuggingService.BreakpointHitHandler BreakpointHit;