ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Hex Editor - add char viewer, shrink font, make drawing a bit more efficient

This commit is contained in:
andres.delikat 2011-08-07 19:12:26 +00:00
parent 52507fbb24
commit c00fe0d00b
2 changed files with 70 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BizHawk.MultiClient/tools/HexEditor.Designer.cs generated
View File

@ -69,7 +69,7 @@
this.settingsToolStripMenuItem}); this.settingsToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(572, 24); this.menuStrip1.Size = new System.Drawing.Size(651, 24);
this.menuStrip1.TabIndex = 1; this.menuStrip1.TabIndex = 1;
this.menuStrip1.Text = "menuStrip1"; this.menuStrip1.Text = "menuStrip1";
// //
@ -234,7 +234,7 @@
// AddressBox // AddressBox
// //
this.AddressBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.AddressBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.AddressBox.Location = new System.Drawing.Point(487, 37); this.AddressBox.Location = new System.Drawing.Point(566, 37);
this.AddressBox.Name = "AddressBox"; this.AddressBox.Name = "AddressBox";
this.AddressBox.ReadOnly = true; this.AddressBox.ReadOnly = true;
this.AddressBox.Size = new System.Drawing.Size(57, 20); this.AddressBox.Size = new System.Drawing.Size(57, 20);
@ -282,7 +282,7 @@
this.MemoryViewer.ContextMenuStrip = this.ViewerContextMenuStrip; this.MemoryViewer.ContextMenuStrip = this.ViewerContextMenuStrip;
this.MemoryViewer.Location = new System.Drawing.Point(12, 37); this.MemoryViewer.Location = new System.Drawing.Point(12, 37);
this.MemoryViewer.Name = "MemoryViewer"; this.MemoryViewer.Name = "MemoryViewer";
this.MemoryViewer.Size = new System.Drawing.Size(458, 295); this.MemoryViewer.Size = new System.Drawing.Size(537, 242);
this.MemoryViewer.TabIndex = 0; this.MemoryViewer.TabIndex = 0;
this.MemoryViewer.Text = "RAM"; this.MemoryViewer.Text = "RAM";
this.MemoryViewer.Paint += new System.Windows.Forms.PaintEventHandler(this.MemoryViewer_Paint); this.MemoryViewer.Paint += new System.Windows.Forms.PaintEventHandler(this.MemoryViewer_Paint);
@ -292,7 +292,7 @@
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(572, 344); this.ClientSize = new System.Drawing.Size(651, 291);
this.Controls.Add(this.AddressBox); this.Controls.Add(this.AddressBox);
this.Controls.Add(this.MemoryViewer); this.Controls.Add(this.MemoryViewer);
this.Controls.Add(this.menuStrip1); this.Controls.Add(this.menuStrip1);

98
BizHawk.MultiClient/tools/MemoryViewer.cs
View File

@ -19,7 +19,7 @@ namespace BizHawk.MultiClient
public Label info; public Label info;
MemoryDomain Domain = new MemoryDomain("NULL", 1024, Endian.Little, addr => { return 0; }, (a, v) => { v = 0; }); MemoryDomain Domain = new MemoryDomain("NULL", 1024, Endian.Little, addr => { return 0; }, (a, v) => { v = 0; });
Font font = new Font("Courier New", 10); Font font = new Font("Courier New", 8);
public Brush regBrush = Brushes.Black; public Brush regBrush = Brushes.Black;
public Brush highlightBrush = Brushes.LightBlue; public Brush highlightBrush = Brushes.LightBlue;
int RowsVisible = 0; int RowsVisible = 0;
@ -32,7 +32,7 @@ namespace BizHawk.MultiClient
int addrOffset = 0; //If addresses are > 4 digits, this offset is how much the columns are moved to the right int addrOffset = 0; //If addresses are > 4 digits, this offset is how much the columns are moved to the right
int maxRow = 0; int maxRow = 0;
const int rowX = 8; const int rowX = 12;
const int rowY = 16; const int rowY = 16;
const int rowYoffset = 20; const int rowYoffset = 20;
@ -167,54 +167,94 @@ namespace BizHawk.MultiClient
if (addressHighlighted >= 0 && IsVisible(addressHighlighted)) if (addressHighlighted >= 0 && IsVisible(addressHighlighted))
{ {
int left = ((addressHighlighted % 16) * 25) + 56 + addrOffset - (addressHighlighted % 4); int left = ((addressHighlighted % 16) * 20) + 52 + addrOffset - (addressHighlighted % 4);
int top = (((addressHighlighted / 16) - vScrollBar1.Value) * 16) + 36; int top = (((addressHighlighted / 16) - vScrollBar1.Value) * (font.Height - 1)) + 36;
Rectangle rect = new Rectangle(left, top, 25, 16); Rectangle rect = new Rectangle(left, top, 16, 14);
g.DrawRectangle(new Pen(highlightBrush), rect); g.DrawRectangle(new Pen(highlightBrush), rect);
g.FillRectangle(highlightBrush, rect); g.FillRectangle(highlightBrush, rect);
} }
switch (DataSize)
{
case 1:
Header = " 0 1 2 3 4 5 6 7 8 9 A B C D E F";
break;
case 2:
Header = " 0 2 4 6 8 A C E";
break;
case 4:
Header = " 0 4 8 C";
break;
}
g.DrawString(Domain.Name, font, Brushes.Black, new Point(1, 1));
g.DrawString(Header, font, Brushes.Black, new Point(rowX + addrOffset, rowY));
for (int i = 0; i < RowsVisible; i++) for (int i = 0; i < RowsVisible; i++)
{ {
row = i + vScrollBar1.Value; row = i + vScrollBar1.Value;
rowStr = new StringBuilder(String.Format("{0:X" + GetNumDigits(Domain.Size) + "}", row * 16) + " "); rowStr.AppendFormat("{0:X" + GetNumDigits(Domain.Size) + "} ", row * 16);
switch (DataSize) switch (DataSize)
{ {
default: default:
case 1: case 1:
Header = " 0 1 2 3 4 5 6 7 8 9 A B C D E F"; addr = (row * 16);
for (int j = 0; j < 16; j++) for (int j = 0; j < 16; j++)
{ {
addr = (row * 16) + j; if (addr + j < Domain.Size)
if (addr < Domain.Size) rowStr.AppendFormat("{0:X2} ", Domain.PeekByte(addr + j));
rowStr.Append(String.Format("{0:X2}", Domain.PeekByte(addr)) + " ");
} }
rowStr.Append(" | ");
for (int k = 0; k < 16; k++)
{
rowStr.Append(Remap(Domain.PeekByte(addr + k)));
}
rowStr.AppendLine();
break; break;
case 2: case 2:
Header = " 0 2 4 6 8 A C E"; addr = (row * 16);
for (int j = 0; j < 16; j += 2) for (int j = 0; j < 16; j += 2)
{ {
addr = (row * 16) + j; if (addr + j < Domain.Size)
if (addr < Domain.Size) rowStr.AppendFormat("{0:X4} ", MakeValue(addr + j, DataSize, BigEndian));
rowStr.Append(String.Format("{0:X4}", MakeValue(addr, DataSize, BigEndian)) + " "); }
rowStr.AppendLine();
rowStr.Append(" | ");
for (int k = 0; k < 16; k++)
{
rowStr.Append(Remap(Domain.PeekByte(addr + k)));
} }
break; break;
case 4: case 4:
Header = " 0 4 8 C"; addr = (row * 16);
for (int j = 0; j < 16; j += 4) for (int j = 0; j < 16; j += 4)
{ {
addr = (row * 16) + j;
if (addr < Domain.Size) if (addr < Domain.Size)
rowStr.Append(String.Format("{0:X8}", MakeValue(addr, DataSize, BigEndian)) + " "); rowStr.AppendFormat("{0:X8} ", MakeValue(addr + j, DataSize, BigEndian));
}
rowStr.AppendLine();
rowStr.Append(" | ");
for (int k = 0; k < 16; k++)
{
rowStr.Append(Remap(Domain.PeekByte(addr + k)));
} }
break; break;
} }
g.DrawString(Domain.Name, font, regBrush, new Point(1, 1)); if (row * 16 >= Domain.Size)
g.DrawString(Header, font, regBrush, new Point(rowX + addrOffset, rowY)); break;
if (row * 16 < Domain.Size)
g.DrawString(rowStr.ToString(), font, regBrush, new Point(rowX, (rowY * (i + 1)) + rowYoffset));
} }
g.DrawString(rowStr.ToString(), font, Brushes.Black, new Point(rowX, rowY + rowYoffset));
}
}
static char Remap(byte val)
{
unchecked
{
if (val < ' ') return '.';
else if (val >= 0x80) return '.';
else return (char)val;
} }
} }
@ -265,9 +305,9 @@ namespace BizHawk.MultiClient
public void SetUpScrollBar() public void SetUpScrollBar()
{ {
RowsVisible = ((this.Height - 8) >> 4) - 2; RowsVisible = ((this.Height - 8) / 13) - 2;
int totalRows = Domain.Size / 16; int totalRows = Domain.Size / 16;
int MaxRows = (totalRows - RowsVisible) + 17; int MaxRows = (totalRows - RowsVisible) + 16;
if (MaxRows > 0) if (MaxRows > 0)
{ {
@ -329,21 +369,13 @@ namespace BizHawk.MultiClient
private void SetAddressOver(int x, int y) private void SetAddressOver(int x, int y)
{ {
//info.Text = e.X.ToString() + "," + e.Y.ToString(); //Debug
//Determine row - 32 pix header, 16 pix width
//Scroll value determines the first row //Scroll value determines the first row
int row = vScrollBar1.Value; int row = vScrollBar1.Value;
row += (y - 36) / 16; row += (y - 36) / (font.Height - 1);
//info.Text += " " + row.ToString(); //Debug int column = (x - (49 + addrOffset)) / 20;
//Determine colums - 60 + addrOffset left padding
//25 pixel wide addresses (when 1 byte) (actually more like 24.75 ugh
int column = (x - (56 + addrOffset)) / 25;
//info.Text += " " + column.ToString(); //Debug
//TODO: 2 & 4 byte views //TODO: 2 & 4 byte views
if (row >= 0 && row <= maxRow && column >= 0 && column < 16) if (row >= 0 && row <= maxRow && column >= 0 && column < 16)
{ {
addressOver = row * 16 + column; addressOver = row * 16 + column;