pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fixed some bugs in the HexEditor 

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@3716 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Siegfried Pammer 17 years ago
parent
2c30b55515
commit
5e40d123b8
2 changed files with 95 additions and 76 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 169
      src/AddIns/DisplayBindings/HexEditor/Project/Src/Editor.cs
  2. 2
      src/Main/Base/Project/Src/Services/DisplayBinding/DisplayBindingDescriptor.cs

169
src/AddIns/DisplayBindings/HexEditor/Project/Src/Editor.cs
Unescape View File

@ -5,16 +5,19 @@
// <version>$Revision$</version> // <version>$Revision$</version>
// </file> // </file>
using ICSharpCode.Core;
using System; using System;
using System.Collections; using System.Collections;
using System.ComponentModel; using System.ComponentModel;
using System.Diagnostics;
using System.Drawing; using System.Drawing;
using System.Drawing.Drawing2D;
using System.IO; using System.IO;
using System.Text; using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using System.Xml; using System.Xml;
using HexEditor.Util; using HexEditor.Util;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop;
//using HexEditor.Commands; //using HexEditor.Commands;
@ -42,7 +45,7 @@ namespace HexEditor
bool insertmode, hexinputmode, selectionmode, handled, moved; bool insertmode, hexinputmode, selectionmode, handled, moved;
Point oldMousePos = new Point(0,0); Point oldMousePos = new Point(0,0);
Rectangle[] selregion; Rectangle[] selregion;
Point[] selpoints; Point[] selpoints;
BufferManager buffer; BufferManager buffer;
@ -92,7 +95,7 @@ namespace HexEditor
// The InitializeComponent() call is required for Windows Forms designer support. // The InitializeComponent() call is required for Windows Forms designer support.
// //
InitializeComponent(); InitializeComponent();
buffer = new BufferManager(this); buffer = new BufferManager(this);
selection = new SelectionManager(ref buffer); selection = new SelectionManager(ref buffer);
undoStack = new UndoManager(); undoStack = new UndoManager();
@ -820,77 +823,93 @@ namespace HexEditor
/// <param name="paintMarker">If true the marker is painted, otherwise not.</param> /// <param name="paintMarker">If true the marker is painted, otherwise not.</param>
void PaintSelection(Graphics hexView, Graphics textView, bool paintMarker) void PaintSelection(Graphics hexView, Graphics textView, bool paintMarker)
{ {
if (!selection.HasSomethingSelected) return; if (!selection.HasSomethingSelected) return;
int lines = Math.Abs(GetLineForOffset(selection.End) - GetLineForOffset(selection.Start)) + 1; int lines = Math.Abs(GetLineForOffset(selection.End) - GetLineForOffset(selection.Start)) + 1;
int start, end; int start, end;
if (selection.End > selection.Start) { if (selection.End > selection.Start) {
start = selection.Start; start = selection.Start;
end = selection.End; end = selection.End;
} else { } else {
start = selection.End; start = selection.End;
end = selection.Start; end = selection.Start;
} }
if (start > GetOffsetForLine(topline + GetMaxVisibleLines())) return; if (start > GetOffsetForLine(topline + GetMaxVisibleLines())) return;
if (start < GetOffsetForLine(topline)) start = GetOffsetForLine(topline) - 2; if (start < GetOffsetForLine(topline)) start = GetOffsetForLine(topline) - 2;
if (end > GetOffsetForLine(topline + GetMaxVisibleLines())) end = GetOffsetForLine(topline + GetMaxVisibleLines() + 1); if (end > GetOffsetForLine(topline + GetMaxVisibleLines())) end = GetOffsetForLine(topline + GetMaxVisibleLines() + 1);
if (this.activeView == this.hexView) { if (this.activeView == this.hexView) {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
for (int i = GetLineForOffset(start) + 1; i < GetLineForOffset(end); i++) { for (int i = GetLineForOffset(start) + 1; i < GetLineForOffset(end); i++) {
builder.AppendLine(GetLineHex(i)); builder.AppendLine(GetLineHex(i));
} }
if (selregion.Length == 3) { if (selregion.Length == 3) {
TextRenderer.DrawText(hexView, GetHex(buffer.GetBytes(start, this.BytesPerLine)), Settings.DataFont, (Rectangle)selregion[0], Color.White, SystemColors.Highlight, TextFormatFlags.Left & TextFormatFlags.SingleLine); TextRenderer.DrawText(hexView, GetHex(buffer.GetBytes(start, this.BytesPerLine)), Settings.DataFont, (Rectangle)selregion[0], Color.White, SystemColors.Highlight, TextFormatFlags.Left & TextFormatFlags.SingleLine);
TextRenderer.DrawText(hexView, builder.ToString(), Settings.DataFont, (Rectangle)selregion[1], Color.White, SystemColors.Highlight, TextFormatFlags.Left); TextRenderer.DrawText(hexView, builder.ToString(), Settings.DataFont, (Rectangle)selregion[1], Color.White, SystemColors.Highlight, TextFormatFlags.Left);
TextRenderer.DrawText(hexView, GetLineHex(GetLineForOffset(end)), Settings.DataFont, (Rectangle)selregion[2], Color.White, SystemColors.Highlight, TextFormatFlags.Left & TextFormatFlags.SingleLine); TextRenderer.DrawText(hexView, GetLineHex(GetLineForOffset(end)), Settings.DataFont, (Rectangle)selregion[2], Color.White, SystemColors.Highlight, TextFormatFlags.Left & TextFormatFlags.SingleLine);
} else if (selregion.Length == 2) { } else if (selregion.Length == 2) {
TextRenderer.DrawText(hexView, GetHex(buffer.GetBytes(start, this.BytesPerLine)), Settings.DataFont, (Rectangle)selregion[0], Color.White, SystemColors.Highlight, TextFormatFlags.Left & TextFormatFlags.SingleLine); TextRenderer.DrawText(hexView, GetHex(buffer.GetBytes(start, this.BytesPerLine)), Settings.DataFont, (Rectangle)selregion[0], Color.White, SystemColors.Highlight, TextFormatFlags.Left & TextFormatFlags.SingleLine);
TextRenderer.DrawText(hexView, GetLineHex(GetLineForOffset(end)), Settings.DataFont, (Rectangle)selregion[1], Color.White, SystemColors.Highlight, TextFormatFlags.Left & TextFormatFlags.SingleLine); TextRenderer.DrawText(hexView, GetLineHex(GetLineForOffset(end)), Settings.DataFont, (Rectangle)selregion[1], Color.White, SystemColors.Highlight, TextFormatFlags.Left & TextFormatFlags.SingleLine);
} else { } else {
TextRenderer.DrawText(hexView, GetHex(buffer.GetBytes(start, this.BytesPerLine)), Settings.DataFont, (Rectangle)selregion[0], Color.White, SystemColors.Highlight, TextFormatFlags.Left & TextFormatFlags.SingleLine); TextRenderer.DrawText(hexView, GetHex(buffer.GetBytes(start, this.BytesPerLine)), Settings.DataFont, (Rectangle)selregion[0], Color.White, SystemColors.Highlight, TextFormatFlags.Left & TextFormatFlags.SingleLine);
} }
} else {
if (!paintMarker) return; StringBuilder builder = new StringBuilder();
if ((selregion.Length > 1) && ((int)(Math.Abs(end - start)) <= this.BytesPerLine)) { for (int i = GetLineForOffset(start) + 1; i < GetLineForOffset(end); i++) {
if (selpoints.Length < 8) return; builder.AppendLine(GetLineText(i));
textView.DrawPolygon(Pens.Black, new Point[] {selpoints[0], selpoints[1], selpoints[6], selpoints[7]}); }
textView.DrawPolygon(Pens.Black, new Point[] {selpoints[4], selpoints[5], selpoints[2], selpoints[3]});
} else { if (selregion.Length == 3) {
textView.DrawPolygon(Pens.Black, selpoints); TextRenderer.DrawText(textView, GetText(buffer.GetBytes(start, this.BytesPerLine)), Settings.DataFont, (Rectangle)selregion[0], Color.White, SystemColors.Highlight, TextFormatFlags.Left & TextFormatFlags.SingleLine);
} TextRenderer.DrawText(textView, builder.ToString(), Settings.DataFont, (Rectangle)selregion[1], Color.White, SystemColors.Highlight, TextFormatFlags.Left);
TextRenderer.DrawText(textView, GetLineText(GetLineForOffset(end)), Settings.DataFont, (Rectangle)selregion[2], Color.White, SystemColors.Highlight, TextFormatFlags.Left & TextFormatFlags.SingleLine);
} else if (selregion.Length == 2) {
TextRenderer.DrawText(textView, GetText(buffer.GetBytes(start, this.BytesPerLine)), Settings.DataFont, (Rectangle)selregion[0], Color.White, SystemColors.Highlight, TextFormatFlags.Left & TextFormatFlags.SingleLine);
TextRenderer.DrawText(textView, GetLineText(GetLineForOffset(end)), Settings.DataFont, (Rectangle)selregion[1], Color.White, SystemColors.Highlight, TextFormatFlags.Left & TextFormatFlags.SingleLine);
} else {
TextRenderer.DrawText(textView, GetText(buffer.GetBytes(start, this.BytesPerLine)), Settings.DataFont, (Rectangle)selregion[0], Color.White, SystemColors.Highlight, TextFormatFlags.Left & TextFormatFlags.SingleLine);
}
}
if (!paintMarker) return;
GraphicsPath path = new GraphicsPath(FillMode.Winding);
if (GetLineForOffset(start) == GetLineForOffset(end) || ((start % this.bytesPerLine) == 0 && GetLineForOffset(start) + 1 == GetLineForOffset(end))) {
if (this.selpoints.Length == 8) {
path.AddLine(this.selpoints[0], this.selpoints[1]);
path.AddLine(this.selpoints[3], this.selpoints[4]);
path.AddLine(this.selpoints[4], this.selpoints[5]);
path.AddLine(this.selpoints[5], this.selpoints[0]);
} else
path.AddPolygon(this.selpoints);
} else {
if ((GetLineForOffset(start) == GetLineForOffset(end) - 1) && (start % this.bytesPerLine >= end % this.bytesPerLine)) {
if (this.selpoints.Length < 8) {
path.AddPolygon(this.selpoints);
} else { } else {
StringBuilder builder = new StringBuilder(); path.AddLine(this.selpoints[0], this.selpoints[1]);
path.AddLine(this.selpoints[6], this.selpoints[7]);
for (int i = GetLineForOffset(start) + 1; i < GetLineForOffset(end); i++) { path.CloseFigure();
builder.AppendLine(GetLineText(i)); path.AddLine(this.selpoints[2], this.selpoints[3]);
} path.AddLine(this.selpoints[4], this.selpoints[5]);
path.CloseFigure();
if (selregion.Length == 3) {
TextRenderer.DrawText(textView, GetText(buffer.GetBytes(start, this.BytesPerLine)), Settings.DataFont, (Rectangle)selregion[0], Color.White, SystemColors.Highlight, TextFormatFlags.Left & TextFormatFlags.SingleLine);
TextRenderer.DrawText(textView, builder.ToString(), Settings.DataFont, (Rectangle)selregion[1], Color.White, SystemColors.Highlight, TextFormatFlags.Left);
TextRenderer.DrawText(textView, GetLineText(GetLineForOffset(end)), Settings.DataFont, (Rectangle)selregion[2], Color.White, SystemColors.Highlight, TextFormatFlags.Left & TextFormatFlags.SingleLine);
} else if (selregion.Length == 2) {
TextRenderer.DrawText(textView, GetText(buffer.GetBytes(start, this.BytesPerLine)), Settings.DataFont, (Rectangle)selregion[0], Color.White, SystemColors.Highlight, TextFormatFlags.Left & TextFormatFlags.SingleLine);
TextRenderer.DrawText(textView, GetLineText(GetLineForOffset(end)), Settings.DataFont, (Rectangle)selregion[1], Color.White, SystemColors.Highlight, TextFormatFlags.Left & TextFormatFlags.SingleLine);
} else {
TextRenderer.DrawText(textView, GetText(buffer.GetBytes(start, this.BytesPerLine)), Settings.DataFont, (Rectangle)selregion[0], Color.White, SystemColors.Highlight, TextFormatFlags.Left & TextFormatFlags.SingleLine);
}
if (!paintMarker) return;
if ((selregion.Length > 1) && ((int)(Math.Abs(end - start)) <= this.BytesPerLine)) {
hexView.DrawPolygon(Pens.Black, new Point[] {selpoints[0], selpoints[1], selpoints[6], selpoints[7]});
hexView.DrawPolygon(Pens.Black, new Point[] {selpoints[4], selpoints[5], selpoints[2], selpoints[3]});
} else {
hexView.DrawPolygon(Pens.Black, selpoints);
}
} }
} else
path.AddPolygon(this.selpoints);
}
if (this.activeView == this.hexView)
textView.DrawPath(Pens.Black, path);
else
hexView.DrawPath(Pens.Black, path);
} }
#endregion #endregion
@ -1903,9 +1922,9 @@ namespace HexEditor
/// <remarks>returns 0 for first line ...</remarks> /// <remarks>returns 0 for first line ...</remarks>
internal int GetLineForOffset(int offset) internal int GetLineForOffset(int offset)
{ {
int line = (int)(offset / this.BytesPerLine); if (offset == 0)
if ((offset != 0) && ((offset % this.BytesPerLine) == 0)) line--; return 0;
return line; return (int)Math.Ceiling((double)offset / (double)this.BytesPerLine) - 1;
} }
/// <summary> /// <summary>

2
src/Main/Base/Project/Src/Services/DisplayBinding/DisplayBindingDescriptor.cs
Unescape View File

@ -104,7 +104,7 @@ namespace ICSharpCode.SharpDevelop
/// </remarks> /// </remarks>
public bool CanOpenFile(string fileName) public bool CanOpenFile(string fileName)
{ {
string fileNameRegex = this.FileNameRegex; string fileNameRegex = StringParser.Parse(this.FileNameRegex);
if (fileNameRegex == null || fileNameRegex.Length == 0) // no regex specified if (fileNameRegex == null || fileNameRegex.Length == 0) // no regex specified
return true; return true;
if (fileName == null) // regex specified but file has no name if (fileName == null) // regex specified but file has no name

Write Preview
Loading…
Cancel
Save