[Monodevelop-patches-list] r1093 - in trunk/MonoDevelop: . build/AddIns build/data/resources/icons src/AddIns/DisplayBindings/SourceEditor/Gui src/Main/Base/Services
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Wed Mar 3 17:14:54 EST 2004
Author: tberman
Date: 2004-03-03 17:14:54 -0500 (Wed, 03 Mar 2004)
New Revision: 1093
Modified:
trunk/MonoDevelop/ChangeLog
trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin
trunk/MonoDevelop/build/data/resources/icons/BreakPoint.png
trunk/MonoDevelop/build/data/resources/icons/ExecutionMarker.png
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs
trunk/MonoDevelop/src/Main/Base/Services/DebuggingService.cs
Log:
Added executingat support (i hope)
Modified: trunk/MonoDevelop/ChangeLog
===================================================================
--- trunk/MonoDevelop/ChangeLog 2004-03-03 21:35:11 UTC (rev 1092)
+++ trunk/MonoDevelop/ChangeLog 2004-03-03 22:14:54 UTC (rev 1093)
@@ -1,3 +1,14 @@
+2004-03-03 Todd Berman <tberman at sevenl.net>
+
+ * src/AddIns/DisplayBindings/Gui/SourceEditor*:
+ Add ExecutingAt code.
+ * src/Main/Base/Services/DebuggingService.cs:
+ Add ExecutingAt support.
+ * build/AddIns/SharpDevelopCore.addin:
+ rearrange service order.
+ * build/data/resources/icons/Breakpoint.png,ExecutionMarker.png:
+ import miguel's badass icons
+
2004-03-03 Mike Kestner <mkestner at ximian.com>
* Main/Base/Services/DebuggingService.cs : add some debugging info
Modified: trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin
===================================================================
--- trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin 2004-03-03 21:35:11 UTC (rev 1092)
+++ trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin 2004-03-03 22:14:54 UTC (rev 1093)
@@ -30,6 +30,8 @@
</Extension>
<Extension path = "/Workspace/Services">
+ <Class id = "DebuggingService"
+ class = "MonoDevelop.Services.DebuggingService"/>
<Class id = "ProjectService"
class = "ICSharpCode.SharpDevelop.Services.DefaultProjectService"/>
<Class id = "FileService"
@@ -54,8 +56,6 @@
class = "ICSharpCode.SharpDevelop.Services.AmbienceService"/>
<Class id = "MenuService"
class = "ICSharpCode.SharpDevelop.Services.MenuService"/>
- <Class id = "DebuggingService"
- class = "MonoDevelop.Services.DebuggingService"/>
</Extension>
<Extension path = "/SharpDevelop/Workbench/DisplayBindings">
Modified: trunk/MonoDevelop/build/data/resources/icons/BreakPoint.png
===================================================================
(Binary files differ)
Modified: trunk/MonoDevelop/build/data/resources/icons/ExecutionMarker.png
===================================================================
(Binary files differ)
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs 2004-03-03 21:35:11 UTC (rev 1092)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs 2004-03-03 22:14:54 UTC (rev 1093)
@@ -18,7 +18,8 @@
public enum SourceMarkerType {
SourceEditorBookmark,
- BreakpointMark
+ BreakpointMark,
+ ExecutionMark
}
// This gives us a nice way to avoid the try/finally
@@ -403,9 +404,14 @@
PlaceCursor (loc);
}
-
+
public void ClearBookmarks ()
{
+ ClearMarks (SourceMarkerType.SourceEditorBookmark);
+ }
+
+ public void ClearMarks (SourceMarkerType type)
+ {
TextIter begin = StartIter;
TextIter end = EndIter;
IntPtr lst = gtk_source_buffer_get_markers_in_region (Handle, ref begin, ref end);
@@ -416,7 +422,7 @@
IntPtr data = gtksharp_slist_get_data (current);
IntPtr nm = gtk_source_marker_get_marker_type (data);
string name = GLibSharp.Marshaller.PtrToStringGFree (nm);
- if (name == "SourceEditorBookmark")
+ if (name == type.ToString ())
gtk_source_buffer_delete_marker (Handle, data);
current = gtksharp_slist_get_next (current);
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs 2004-03-03 21:35:11 UTC (rev 1092)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs 2004-03-03 22:14:54 UTC (rev 1093)
@@ -17,6 +17,8 @@
using MonoDevelop.EditorBindings.Properties;
using MonoDevelop.EditorBindings.FormattingStrategy;
+using MonoDevelop.Services;
+
namespace MonoDevelop.SourceEditor.Gui {
public class SourceEditorDisplayBinding : IDisplayBinding {
@@ -81,9 +83,14 @@
}
public class SourceEditorDisplayBindingWrapper : AbstractViewContent,
- IEditable, IPositionable, IBookmarkOperations
+ IEditable, IPositionable, IBookmarkOperations, IDebuggableEditor
{
internal SourceEditor se;
+
+ public void ExecutingAt (int line)
+ {
+ se.ExecutingAt (line);
+ }
public override Gtk.Widget Control {
get {
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs 2004-03-03 21:35:11 UTC (rev 1092)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs 2004-03-03 22:14:54 UTC (rev 1093)
@@ -98,6 +98,12 @@
lineToMark = -1;
}
+ public void ExecutingAt (int linenumber)
+ {
+ buf.ClearMarks (SourceMarkerType.ExecutionMark);
+ buf.ToggleMark (linenumber, SourceMarkerType.ExecutionMark);
+ }
+
public void SimulateKeyPress (ref Gdk.EventKey evnt)
{
Gtk.Global.PropagateEvent (this, evnt);
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs 2004-03-03 21:35:11 UTC (rev 1092)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs 2004-03-03 22:14:54 UTC (rev 1093)
@@ -26,10 +26,16 @@
View.SetMarkerPixbuf ("SourceEditorBookmark", new Gdk.Pixbuf (drag_icon_xpm));
View.SetMarkerPixbuf ("BreakpointMark", new Gdk.Pixbuf ("../data/resources/icons/BreakPoint.png"));
+ View.SetMarkerPixbuf ("ExecutionMark", new Gdk.Pixbuf ("../data/resources/icons/ExecutionMarker.png"));
Add (View);
}
-
+
+ public void ExecutingAt (int linenumber)
+ {
+ View.ExecutingAt (linenumber);
+ }
+
public string Text {
get { return Buffer.Text; }
set { Buffer.Text = value; }
Modified: trunk/MonoDevelop/src/Main/Base/Services/DebuggingService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/DebuggingService.cs 2004-03-03 21:35:11 UTC (rev 1092)
+++ trunk/MonoDevelop/src/Main/Base/Services/DebuggingService.cs 2004-03-03 22:14:54 UTC (rev 1093)
@@ -10,11 +10,18 @@
using ICSharpCode.Core.Services;
using ICSharpCode.Core.AddIns;
+using ICSharpCode.SharpDevelop.Services;
+using ICSharpCode.SharpDevelop.Gui;
+
using Mono.Debugger;
namespace MonoDevelop.Services
{
+ public interface IDebuggableEditor {
+ void ExecutingAt (int lineNumber);
+ }
+
public class DebuggingService : AbstractService
{
Process proc;
@@ -143,6 +150,14 @@
string filename = toks [0];
int linenumber = Int32.Parse (toks [1]);
+ IFileService fs = (IFileService)ServiceManager.Services.GetService (typeof (IFileService));
+ fs.OpenFile (filename);
+
+ if (WorkbenchSingleton.Workbench.ActiveWorkbenchWindow is IDebuggableEditor)
+ {
+ ((IDebuggableEditor)WorkbenchSingleton.Workbench.ActiveWorkbenchWindow).ExecutingAt (linenumber);
+ }
+
BreakpointHitArgs args = new BreakpointHitArgs (filename, linenumber);
BreakpointHit (this, args);
Console.WriteLine ("hit breakpoint " + point.Name);
More information about the Monodevelop-patches-list
mailing list