empathicqubit/Mesen-SX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Debugger: Hex Editor - Added tooltip for labelled bytes

Browse source
This commit is contained in:
Sour 2019-05-05 19:30:41 -04:00
parent b4a14a1aca
commit 7ad3bef9fd
3 changed files with 47 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
UI/Debugger/MemoryTools/frmMemoryTools.Designer.cs generated
View file

@ -607,6 +607,7 @@
this.mnuIgnoreRedundantWrites.Name = "mnuIgnoreRedundantWrites";
this.mnuIgnoreRedundantWrites.Size = new System.Drawing.Size(256, 22);
this.mnuIgnoreRedundantWrites.Text = "Ignore writes that do not alter data";
this.mnuIgnoreRedundantWrites.Visible = false;
//
// mnuEnablePerByteNavigation
//
@ -744,6 +745,8 @@
this.MinimumSize = new System.Drawing.Size(429, 337);
this.Name = "frmMemoryTools";
this.Text = "Memory Tools";
this.Controls.SetChildIndex(this.menuStrip1, 0);
this.Controls.SetChildIndex(this.tabMain, 0);
this.flowLayoutPanel1.ResumeLayout(false);
this.flowLayoutPanel1.PerformLayout();
this.menuStrip1.ResumeLayout(false);

97
UI/Debugger/MemoryTools/frmMemoryTools.cs
View file

@ -7,6 +7,7 @@ using Mesen.GUI.Forms;
using Mesen.GUI.Debugger.Controls;
using System.Collections.Generic;
using Mesen.GUI.Debugger.Workspace;
using Mesen.GUI.Debugger.Labels;
namespace Mesen.GUI.Debugger
{
@ -518,24 +519,15 @@ namespace Mesen.GUI.Debugger
}
}
/*private frmCodeTooltip _tooltip = null;
private CodeLabel _lastLabelTooltip = null;
private int _lastLabelArrayOffset = -1;
private int _lastTooltipAddress = -1;*/
private int _lastTooltipAddress = -1;
private void ctrlHexViewer_ByteMouseHover(int address, Point position)
{
//TODO
/*if(address < 0 || !mnuShowLabelInfoOnMouseOver.Checked) {
if(_tooltip != null) {
_tooltip.Close();
_lastLabelTooltip = null;
_lastLabelArrayOffset = -1;
_lastTooltipAddress = -1;
}
ctrlTooltip tooltip = BaseForm.GetPopupTooltip(this);
if(address < 0 || !mnuShowLabelInfoOnMouseOver.Checked) {
_lastTooltipAddress = -1;
tooltip.Hide();
return;
}
if(_lastTooltipAddress == address) {
} else if(_lastTooltipAddress == address) {
return;
}
@ -544,64 +536,51 @@ namespace Mesen.GUI.Debugger
CodeLabel label = null;
int arrayOffset = 0;
switch(_memoryType) {
case DebugMemoryType.CpuMemory:
AddressTypeInfo info = new AddressTypeInfo();
InteropEmu.DebugGetAbsoluteAddressAndType((UInt32)address, info);
if(info.Address >= 0) {
label = LabelManager.GetLabel((UInt32)info.Address, info.Type);
case SnesMemoryType.CpuMemory:
case SnesMemoryType.SpcMemory:
AddressInfo relAddress = new AddressInfo() {
Address = address,
Type = _memoryType
};
AddressInfo absAddress = DebugApi.GetAbsoluteAddress(relAddress);
if(absAddress.Address >= 0) {
label = LabelManager.GetLabel((uint)absAddress.Address, absAddress.Type);
if(label != null) {
arrayOffset = info.Address - (int)label.Address;
arrayOffset = relAddress.Address - (int)label.Address;
}
}
if(label == null) {
label = LabelManager.GetLabel((UInt32)address, AddressType.Register);
}
break;
case DebugMemoryType.InternalRam:
case DebugMemoryType.WorkRam:
case DebugMemoryType.SaveRam:
case DebugMemoryType.PrgRom:
label = LabelManager.GetLabel((UInt32)address, _memoryType.ToAddressType());
case SnesMemoryType.WorkRam:
case SnesMemoryType.SaveRam:
case SnesMemoryType.PrgRom:
case SnesMemoryType.SpcRam:
case SnesMemoryType.SpcRom:
label = LabelManager.GetLabel((uint)address, _memoryType);
if(label != null) {
arrayOffset = address - (int)label.Address;
}
break;
}
if(label != null) {
if(_lastLabelTooltip != label || _lastLabelArrayOffset != arrayOffset) {
if(_tooltip != null) {
_tooltip.Close();
if(label != null && !string.IsNullOrWhiteSpace(label.Label)) {
Dictionary<string, string> values = new Dictionary<string, string>();
if(!string.IsNullOrWhiteSpace(label.Label)) {
values["Label"] = label.Label;
if(label.Length > 1) {
values["Label"] += "+" + arrayOffset.ToString();
}
Dictionary<string, string> values = new Dictionary<string, string>();
if(!string.IsNullOrWhiteSpace(label.Label)) {
values["Label"] = label.Label;
if(label.Length > 1) {
values["Label"] += "+" + arrayOffset.ToString();
}
}
values["Address"] = "$" + (label.Address + arrayOffset).ToString("X4");
values["Address Type"] = label.AddressType.ToString();
if(!string.IsNullOrWhiteSpace(label.Comment)) {
values["Comment"] = label.Comment;
}
_tooltip = new frmCodeTooltip(this, values);
_tooltip.FormClosed += (s, evt) => { _tooltip = null; };
_tooltip.SetFormLocation(new Point(position.X, position.Y), ctrlHexViewer);
_lastLabelTooltip = label;
_lastLabelArrayOffset = arrayOffset;
}
values["Address"] = "$" + (label.Address + arrayOffset).ToString("X4");
values["Type"] = ResourceHelper.GetEnumText(label.MemoryType);
if(!string.IsNullOrWhiteSpace(label.Comment)) {
values["Comment"] = label.Comment;
}
tooltip.SetTooltip(this.PointToClient(position), values);
} else {
if(_tooltip != null) {
_tooltip.Close();
_lastLabelTooltip = null;
_lastLabelArrayOffset = -1;
_lastTooltipAddress = -1;
}
}*/
tooltip.Hide();
}
}
private void mnuAutoRefreshSpeed_Click(object sender, EventArgs e)

6
UI/Debugger/Tooltips/ctrlTooltip.cs
View file

@ -25,6 +25,8 @@ namespace Mesen.GUI.Debugger
public void SetTooltip(Point location, Dictionary<string, string> values)
{
this.Visible = false;
_parentForm = this.FindForm();
_values = values;
location.Offset(5, 5);
@ -73,6 +75,10 @@ namespace Mesen.GUI.Debugger
this.Width = this.tlpMain.Width;
if(this.Left + this.Width > _parentForm.ClientSize.Width) {
this.Left = this.Left - this.Width - 5;
if(this.Left < 0) {
this.Left = 5;
this.Width += (this.Left - 5);
}
}
this.Height = this.tlpMain.Height;