diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs index 6696a03eef..819a8c0d4a 100644 --- a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs +++ b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs @@ -296,5 +296,10 @@ namespace BizHawk.Client.EmuHawk { FullUpdate(); } + + public void AddBreakpoint(uint address, MemoryCallbackType type) + { + this.BreakPointControl1.AddBreakpoint(address, type); + } } } diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs index 2186c56f10..85d7e6fcb4 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs @@ -113,6 +113,9 @@ this.DiffColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.DomainColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.NotesColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.Separator4 = new System.Windows.Forms.ToolStripSeparator(); + this.ReadBreakpointContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.WriteBreakpointContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ListViewContextMenu.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.toolStrip1.SuspendLayout(); @@ -122,9 +125,10 @@ // WatchCountLabel // this.WatchCountLabel.AutoSize = true; - this.WatchCountLabel.Location = new System.Drawing.Point(16, 57); + this.WatchCountLabel.Location = new System.Drawing.Point(21, 70); + this.WatchCountLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.WatchCountLabel.Name = "WatchCountLabel"; - this.WatchCountLabel.Size = new System.Drawing.Size(56, 13); + this.WatchCountLabel.Size = new System.Drawing.Size(71, 17); this.WatchCountLabel.TabIndex = 5; this.WatchCountLabel.Text = "0 watches"; // @@ -132,14 +136,16 @@ // this.MemDomainLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.MemDomainLabel.AutoSize = true; - this.MemDomainLabel.Location = new System.Drawing.Point(221, 57); + this.MemDomainLabel.Location = new System.Drawing.Point(295, 70); + this.MemDomainLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.MemDomainLabel.Name = "MemDomainLabel"; - this.MemDomainLabel.Size = new System.Drawing.Size(127, 13); + this.MemDomainLabel.Size = new System.Drawing.Size(168, 17); this.MemDomainLabel.TabIndex = 7; this.MemDomainLabel.Text = " "; // // ListViewContextMenu // + this.ListViewContextMenu.ImageScalingSize = new System.Drawing.Size(20, 20); this.ListViewContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.EditContextMenuItem, this.RemoveContextMenuItem, @@ -148,12 +154,15 @@ this.FreezeContextMenuItem, this.UnfreezeAllContextMenuItem, this.ViewInHexEditorContextMenuItem, + this.Separator4, + this.ReadBreakpointContextMenuItem, + this.WriteBreakpointContextMenuItem, this.Separator6, this.InsertSeperatorContextMenuItem, this.MoveUpContextMenuItem, this.MoveDownContextMenuItem}); this.ListViewContextMenu.Name = "contextMenuStrip1"; - this.ListViewContextMenu.Size = new System.Drawing.Size(204, 230); + this.ListViewContextMenu.Size = new System.Drawing.Size(244, 356); this.ListViewContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.ListViewContextMenu_Opening); // // EditContextMenuItem @@ -161,7 +170,7 @@ this.EditContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CutHS; this.EditContextMenuItem.Name = "EditContextMenuItem"; this.EditContextMenuItem.ShortcutKeyDisplayString = "Ctrl+E"; - this.EditContextMenuItem.Size = new System.Drawing.Size(203, 22); + this.EditContextMenuItem.Size = new System.Drawing.Size(243, 26); this.EditContextMenuItem.Text = "&Edit"; this.EditContextMenuItem.Click += new System.EventHandler(this.EditWatchMenuItem_Click); // @@ -170,7 +179,7 @@ this.RemoveContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; this.RemoveContextMenuItem.Name = "RemoveContextMenuItem"; this.RemoveContextMenuItem.ShortcutKeyDisplayString = "Ctrl+R"; - this.RemoveContextMenuItem.Size = new System.Drawing.Size(203, 22); + this.RemoveContextMenuItem.Size = new System.Drawing.Size(243, 26); this.RemoveContextMenuItem.Text = "&Remove"; this.RemoveContextMenuItem.Click += new System.EventHandler(this.RemoveWatchMenuItem_Click); // @@ -179,7 +188,7 @@ this.DuplicateContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Duplicate; this.DuplicateContextMenuItem.Name = "DuplicateContextMenuItem"; this.DuplicateContextMenuItem.ShortcutKeyDisplayString = "Ctrl+D"; - this.DuplicateContextMenuItem.Size = new System.Drawing.Size(203, 22); + this.DuplicateContextMenuItem.Size = new System.Drawing.Size(243, 26); this.DuplicateContextMenuItem.Text = "&Duplicate"; this.DuplicateContextMenuItem.Click += new System.EventHandler(this.DuplicateWatchMenuItem_Click); // @@ -188,7 +197,7 @@ this.PokeContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke; this.PokeContextMenuItem.Name = "PokeContextMenuItem"; this.PokeContextMenuItem.ShortcutKeyDisplayString = "Ctrl+P"; - this.PokeContextMenuItem.Size = new System.Drawing.Size(203, 22); + this.PokeContextMenuItem.Size = new System.Drawing.Size(243, 26); this.PokeContextMenuItem.Text = "&Poke"; this.PokeContextMenuItem.Click += new System.EventHandler(this.PokeAddressMenuItem_Click); // @@ -197,7 +206,7 @@ this.FreezeContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze; this.FreezeContextMenuItem.Name = "FreezeContextMenuItem"; this.FreezeContextMenuItem.ShortcutKeyDisplayString = "Ctrl+F"; - this.FreezeContextMenuItem.Size = new System.Drawing.Size(203, 22); + this.FreezeContextMenuItem.Size = new System.Drawing.Size(243, 26); this.FreezeContextMenuItem.Text = "&Freeze"; this.FreezeContextMenuItem.Click += new System.EventHandler(this.FreezeAddressMenuItem_Click); // @@ -205,28 +214,28 @@ // this.UnfreezeAllContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Unfreeze; this.UnfreezeAllContextMenuItem.Name = "UnfreezeAllContextMenuItem"; - this.UnfreezeAllContextMenuItem.Size = new System.Drawing.Size(203, 22); + this.UnfreezeAllContextMenuItem.Size = new System.Drawing.Size(243, 26); this.UnfreezeAllContextMenuItem.Text = "Unfreeze &All"; this.UnfreezeAllContextMenuItem.Click += new System.EventHandler(this.UnfreezeAllContextMenuItem_Click); // // ViewInHexEditorContextMenuItem // this.ViewInHexEditorContextMenuItem.Name = "ViewInHexEditorContextMenuItem"; - this.ViewInHexEditorContextMenuItem.Size = new System.Drawing.Size(203, 22); + this.ViewInHexEditorContextMenuItem.Size = new System.Drawing.Size(243, 26); this.ViewInHexEditorContextMenuItem.Text = "View in Hex Editor"; this.ViewInHexEditorContextMenuItem.Click += new System.EventHandler(this.ViewInHexEditorContextMenuItem_Click); // // Separator6 // this.Separator6.Name = "Separator6"; - this.Separator6.Size = new System.Drawing.Size(200, 6); + this.Separator6.Size = new System.Drawing.Size(240, 6); // // InsertSeperatorContextMenuItem // this.InsertSeperatorContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator; this.InsertSeperatorContextMenuItem.Name = "InsertSeperatorContextMenuItem"; this.InsertSeperatorContextMenuItem.ShortcutKeyDisplayString = "Ctrl+I"; - this.InsertSeperatorContextMenuItem.Size = new System.Drawing.Size(203, 22); + this.InsertSeperatorContextMenuItem.Size = new System.Drawing.Size(243, 26); this.InsertSeperatorContextMenuItem.Text = "&Insert Separator"; this.InsertSeperatorContextMenuItem.Click += new System.EventHandler(this.InsertSeparatorMenuItem_Click); // @@ -235,7 +244,7 @@ this.MoveUpContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveUp; this.MoveUpContextMenuItem.Name = "MoveUpContextMenuItem"; this.MoveUpContextMenuItem.ShortcutKeyDisplayString = "Ctrl+Up"; - this.MoveUpContextMenuItem.Size = new System.Drawing.Size(203, 22); + this.MoveUpContextMenuItem.Size = new System.Drawing.Size(243, 26); this.MoveUpContextMenuItem.Text = "Move &Up"; this.MoveUpContextMenuItem.Click += new System.EventHandler(this.MoveUpMenuItem_Click); // @@ -244,19 +253,21 @@ this.MoveDownContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveDown; this.MoveDownContextMenuItem.Name = "MoveDownContextMenuItem"; this.MoveDownContextMenuItem.ShortcutKeyDisplayString = "Ctrl+Down"; - this.MoveDownContextMenuItem.Size = new System.Drawing.Size(203, 22); + this.MoveDownContextMenuItem.Size = new System.Drawing.Size(243, 26); this.MoveDownContextMenuItem.Text = "Move &Down"; this.MoveDownContextMenuItem.Click += new System.EventHandler(this.MoveDownMenuItem_Click); // // statusStrip1 // this.statusStrip1.ClickThrough = true; + this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.ErrorIconButton, this.MessageLabel}); - this.statusStrip1.Location = new System.Drawing.Point(0, 356); + this.statusStrip1.Location = new System.Drawing.Point(0, 439); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(364, 22); + this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 19, 0); + this.statusStrip1.Size = new System.Drawing.Size(485, 26); this.statusStrip1.TabIndex = 8; this.statusStrip1.Text = "statusStrip1"; // @@ -267,19 +278,20 @@ this.ErrorIconButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.ExclamationRed; this.ErrorIconButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.ErrorIconButton.Name = "ErrorIconButton"; - this.ErrorIconButton.Size = new System.Drawing.Size(23, 20); + this.ErrorIconButton.Size = new System.Drawing.Size(24, 24); this.ErrorIconButton.Text = "Warning! Out of Range Addresses in list, click to remove them"; this.ErrorIconButton.Click += new System.EventHandler(this.ErrorIconButton_Click); // // MessageLabel // this.MessageLabel.Name = "MessageLabel"; - this.MessageLabel.Size = new System.Drawing.Size(31, 17); + this.MessageLabel.Size = new System.Drawing.Size(41, 21); this.MessageLabel.Text = " "; // // toolStrip1 // this.toolStrip1.ClickThrough = true; + this.toolStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.newToolStripButton, this.openToolStripButton, @@ -298,9 +310,9 @@ this.moveDownToolStripButton, this.toolStripSeparator5, this.pauseToolStripButton}); - this.toolStrip1.Location = new System.Drawing.Point(0, 24); + this.toolStrip1.Location = new System.Drawing.Point(0, 28); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(364, 25); + this.toolStrip1.Size = new System.Drawing.Size(485, 27); this.toolStrip1.TabIndex = 4; this.toolStrip1.TabStop = true; this.toolStrip1.Text = "toolStrip1"; @@ -311,7 +323,7 @@ this.newToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("newToolStripButton.Image"))); this.newToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.newToolStripButton.Name = "newToolStripButton"; - this.newToolStripButton.Size = new System.Drawing.Size(23, 22); + this.newToolStripButton.Size = new System.Drawing.Size(24, 24); this.newToolStripButton.Text = "&New"; this.newToolStripButton.Click += new System.EventHandler(this.NewListMenuItem_Click); // @@ -321,7 +333,7 @@ this.openToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("openToolStripButton.Image"))); this.openToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.openToolStripButton.Name = "openToolStripButton"; - this.openToolStripButton.Size = new System.Drawing.Size(23, 22); + this.openToolStripButton.Size = new System.Drawing.Size(24, 24); this.openToolStripButton.Text = "&Open"; this.openToolStripButton.Click += new System.EventHandler(this.OpenMenuItem_Click); // @@ -331,14 +343,14 @@ this.saveToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripButton.Image"))); this.saveToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.saveToolStripButton.Name = "saveToolStripButton"; - this.saveToolStripButton.Size = new System.Drawing.Size(23, 22); + this.saveToolStripButton.Size = new System.Drawing.Size(24, 24); this.saveToolStripButton.Text = "&Save"; this.saveToolStripButton.Click += new System.EventHandler(this.SaveMenuItem_Click); // // toolStripSeparator // this.toolStripSeparator.Name = "toolStripSeparator"; - this.toolStripSeparator.Size = new System.Drawing.Size(6, 25); + this.toolStripSeparator.Size = new System.Drawing.Size(6, 27); // // newWatchToolStripButton // @@ -346,7 +358,7 @@ this.newWatchToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.addWatch; this.newWatchToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.newWatchToolStripButton.Name = "newWatchToolStripButton"; - this.newWatchToolStripButton.Size = new System.Drawing.Size(23, 22); + this.newWatchToolStripButton.Size = new System.Drawing.Size(24, 24); this.newWatchToolStripButton.Text = "New Watch"; this.newWatchToolStripButton.ToolTipText = "New Watch"; this.newWatchToolStripButton.Click += new System.EventHandler(this.NewWatchMenuItem_Click); @@ -357,7 +369,7 @@ this.editWatchToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("editWatchToolStripButton.Image"))); this.editWatchToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.editWatchToolStripButton.Name = "editWatchToolStripButton"; - this.editWatchToolStripButton.Size = new System.Drawing.Size(23, 22); + this.editWatchToolStripButton.Size = new System.Drawing.Size(24, 24); this.editWatchToolStripButton.Text = "Edit Watch"; this.editWatchToolStripButton.Click += new System.EventHandler(this.EditWatchMenuItem_Click); // @@ -367,7 +379,7 @@ this.cutToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; this.cutToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.cutToolStripButton.Name = "cutToolStripButton"; - this.cutToolStripButton.Size = new System.Drawing.Size(23, 22); + this.cutToolStripButton.Size = new System.Drawing.Size(24, 24); this.cutToolStripButton.Text = "C&ut"; this.cutToolStripButton.ToolTipText = "Remove Watch"; this.cutToolStripButton.Click += new System.EventHandler(this.RemoveWatchMenuItem_Click); @@ -378,7 +390,7 @@ this.clearChangeCountsToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("clearChangeCountsToolStripButton.Image"))); this.clearChangeCountsToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.clearChangeCountsToolStripButton.Name = "clearChangeCountsToolStripButton"; - this.clearChangeCountsToolStripButton.Size = new System.Drawing.Size(23, 22); + this.clearChangeCountsToolStripButton.Size = new System.Drawing.Size(23, 24); this.clearChangeCountsToolStripButton.Text = "C"; this.clearChangeCountsToolStripButton.ToolTipText = "Clear Change Counts"; this.clearChangeCountsToolStripButton.Click += new System.EventHandler(this.ClearChangeCountsMenuItem_Click); @@ -389,7 +401,7 @@ this.duplicateWatchToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("duplicateWatchToolStripButton.Image"))); this.duplicateWatchToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.duplicateWatchToolStripButton.Name = "duplicateWatchToolStripButton"; - this.duplicateWatchToolStripButton.Size = new System.Drawing.Size(23, 22); + this.duplicateWatchToolStripButton.Size = new System.Drawing.Size(24, 24); this.duplicateWatchToolStripButton.Text = "Duplicate Watch"; this.duplicateWatchToolStripButton.Click += new System.EventHandler(this.DuplicateWatchMenuItem_Click); // @@ -399,7 +411,7 @@ this.PokeAddressToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke; this.PokeAddressToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta; this.PokeAddressToolBarItem.Name = "PokeAddressToolBarItem"; - this.PokeAddressToolBarItem.Size = new System.Drawing.Size(23, 22); + this.PokeAddressToolBarItem.Size = new System.Drawing.Size(24, 24); this.PokeAddressToolBarItem.Text = "toolStripButton2"; this.PokeAddressToolBarItem.ToolTipText = "Poke address"; this.PokeAddressToolBarItem.Click += new System.EventHandler(this.PokeAddressMenuItem_Click); @@ -410,7 +422,7 @@ this.FreezeAddressToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze; this.FreezeAddressToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta; this.FreezeAddressToolBarItem.Name = "FreezeAddressToolBarItem"; - this.FreezeAddressToolBarItem.Size = new System.Drawing.Size(23, 22); + this.FreezeAddressToolBarItem.Size = new System.Drawing.Size(24, 24); this.FreezeAddressToolBarItem.Text = "Freeze Address"; this.FreezeAddressToolBarItem.Click += new System.EventHandler(this.FreezeAddressMenuItem_Click); // @@ -420,7 +432,7 @@ this.seperatorToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator; this.seperatorToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.seperatorToolStripButton.Name = "seperatorToolStripButton"; - this.seperatorToolStripButton.Size = new System.Drawing.Size(23, 22); + this.seperatorToolStripButton.Size = new System.Drawing.Size(24, 24); this.seperatorToolStripButton.Text = "-"; this.seperatorToolStripButton.ToolTipText = "Insert Separator"; this.seperatorToolStripButton.Click += new System.EventHandler(this.InsertSeparatorMenuItem_Click); @@ -428,7 +440,7 @@ // toolStripSeparator6 // this.toolStripSeparator6.Name = "toolStripSeparator6"; - this.toolStripSeparator6.Size = new System.Drawing.Size(6, 25); + this.toolStripSeparator6.Size = new System.Drawing.Size(6, 27); // // moveUpToolStripButton // @@ -436,7 +448,7 @@ this.moveUpToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveUp; this.moveUpToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.moveUpToolStripButton.Name = "moveUpToolStripButton"; - this.moveUpToolStripButton.Size = new System.Drawing.Size(23, 22); + this.moveUpToolStripButton.Size = new System.Drawing.Size(24, 24); this.moveUpToolStripButton.Text = "Move Up"; this.moveUpToolStripButton.Click += new System.EventHandler(this.MoveUpMenuItem_Click); // @@ -446,14 +458,14 @@ this.moveDownToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveDown; this.moveDownToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.moveDownToolStripButton.Name = "moveDownToolStripButton"; - this.moveDownToolStripButton.Size = new System.Drawing.Size(23, 22); + this.moveDownToolStripButton.Size = new System.Drawing.Size(24, 24); this.moveDownToolStripButton.Text = "Move Down"; this.moveDownToolStripButton.Click += new System.EventHandler(this.MoveDownMenuItem_Click); // // toolStripSeparator5 // this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(6, 25); + this.toolStripSeparator5.Size = new System.Drawing.Size(6, 27); // // pauseToolStripButton // @@ -461,20 +473,22 @@ this.pauseToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Pause; this.pauseToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.pauseToolStripButton.Name = "pauseToolStripButton"; - this.pauseToolStripButton.Size = new System.Drawing.Size(23, 22); + this.pauseToolStripButton.Size = new System.Drawing.Size(24, 24); this.pauseToolStripButton.Text = "Pause"; this.pauseToolStripButton.Click += new System.EventHandler(this.PauseMenuItem_Click); // // RamWatchMenu // this.RamWatchMenu.ClickThrough = true; + this.RamWatchMenu.ImageScalingSize = new System.Drawing.Size(20, 20); this.RamWatchMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.FileSubMenu, this.WatchesSubMenu, this.OptionsSubMenu}); this.RamWatchMenu.Location = new System.Drawing.Point(0, 0); this.RamWatchMenu.Name = "RamWatchMenu"; - this.RamWatchMenu.Size = new System.Drawing.Size(364, 24); + this.RamWatchMenu.Padding = new System.Windows.Forms.Padding(8, 2, 0, 2); + this.RamWatchMenu.Size = new System.Drawing.Size(485, 28); this.RamWatchMenu.TabIndex = 3; this.RamWatchMenu.Text = "menuStrip1"; // @@ -490,7 +504,7 @@ this.toolStripSeparator1, this.ExitMenuItem}); this.FileSubMenu.Name = "FileSubMenu"; - this.FileSubMenu.Size = new System.Drawing.Size(42, 20); + this.FileSubMenu.Size = new System.Drawing.Size(50, 24); this.FileSubMenu.Text = "&Files"; this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened); // @@ -499,7 +513,7 @@ this.NewListMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NewFile; this.NewListMenuItem.Name = "NewListMenuItem"; this.NewListMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); - this.NewListMenuItem.Size = new System.Drawing.Size(195, 22); + this.NewListMenuItem.Size = new System.Drawing.Size(232, 26); this.NewListMenuItem.Text = "&New List"; this.NewListMenuItem.Click += new System.EventHandler(this.NewListMenuItem_Click); // @@ -508,7 +522,7 @@ this.OpenMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile; this.OpenMenuItem.Name = "OpenMenuItem"; this.OpenMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.OpenMenuItem.Size = new System.Drawing.Size(195, 22); + this.OpenMenuItem.Size = new System.Drawing.Size(232, 26); this.OpenMenuItem.Text = "&Open..."; this.OpenMenuItem.Click += new System.EventHandler(this.OpenMenuItem_Click); // @@ -517,7 +531,7 @@ this.SaveMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs; this.SaveMenuItem.Name = "SaveMenuItem"; this.SaveMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); - this.SaveMenuItem.Size = new System.Drawing.Size(195, 22); + this.SaveMenuItem.Size = new System.Drawing.Size(232, 26); this.SaveMenuItem.Text = "&Save"; this.SaveMenuItem.Click += new System.EventHandler(this.SaveMenuItem_Click); // @@ -526,14 +540,14 @@ this.SaveAsMenuItem.Name = "SaveAsMenuItem"; this.SaveAsMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.S))); - this.SaveAsMenuItem.Size = new System.Drawing.Size(195, 22); + this.SaveAsMenuItem.Size = new System.Drawing.Size(232, 26); this.SaveAsMenuItem.Text = "Save &As..."; this.SaveAsMenuItem.Click += new System.EventHandler(this.SaveAsMenuItem_Click); // // AppendMenuItem // this.AppendMenuItem.Name = "AppendMenuItem"; - this.AppendMenuItem.Size = new System.Drawing.Size(195, 22); + this.AppendMenuItem.Size = new System.Drawing.Size(232, 26); this.AppendMenuItem.Text = "A&ppend File..."; this.AppendMenuItem.Click += new System.EventHandler(this.OpenMenuItem_Click); // @@ -543,26 +557,26 @@ this.noneToolStripMenuItem}); this.RecentSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; this.RecentSubMenu.Name = "RecentSubMenu"; - this.RecentSubMenu.Size = new System.Drawing.Size(195, 22); + this.RecentSubMenu.Size = new System.Drawing.Size(232, 26); this.RecentSubMenu.Text = "Recent"; this.RecentSubMenu.DropDownOpened += new System.EventHandler(this.RecentSubMenu_DropDownOpened); // // noneToolStripMenuItem // this.noneToolStripMenuItem.Name = "noneToolStripMenuItem"; - this.noneToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.noneToolStripMenuItem.Size = new System.Drawing.Size(114, 24); this.noneToolStripMenuItem.Text = "None"; // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(192, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(229, 6); // // ExitMenuItem // this.ExitMenuItem.Name = "ExitMenuItem"; this.ExitMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); - this.ExitMenuItem.Size = new System.Drawing.Size(195, 22); + this.ExitMenuItem.Size = new System.Drawing.Size(232, 26); this.ExitMenuItem.Text = "&Close"; this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); // @@ -586,7 +600,7 @@ this.toolStripSeparator2, this.PauseMenuItem}); this.WatchesSubMenu.Name = "WatchesSubMenu"; - this.WatchesSubMenu.Size = new System.Drawing.Size(64, 20); + this.WatchesSubMenu.Size = new System.Drawing.Size(77, 24); this.WatchesSubMenu.Text = "&Watches"; this.WatchesSubMenu.DropDownOpened += new System.EventHandler(this.WatchesSubMenu_DropDownOpened); // @@ -595,7 +609,7 @@ this.MemoryDomainsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.Separator2}); this.MemoryDomainsSubMenu.Name = "MemoryDomainsSubMenu"; - this.MemoryDomainsSubMenu.Size = new System.Drawing.Size(224, 22); + this.MemoryDomainsSubMenu.Size = new System.Drawing.Size(266, 26); this.MemoryDomainsSubMenu.Text = "Memory Domains"; this.MemoryDomainsSubMenu.DropDownOpened += new System.EventHandler(this.MemoryDomainsSubMenu_DropDownOpened); // @@ -607,14 +621,14 @@ // toolStripSeparator8 // this.toolStripSeparator8.Name = "toolStripSeparator8"; - this.toolStripSeparator8.Size = new System.Drawing.Size(221, 6); + this.toolStripSeparator8.Size = new System.Drawing.Size(263, 6); // // NewWatchMenuItem // this.NewWatchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.FindHS; this.NewWatchMenuItem.Name = "NewWatchMenuItem"; this.NewWatchMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.W))); - this.NewWatchMenuItem.Size = new System.Drawing.Size(224, 22); + this.NewWatchMenuItem.Size = new System.Drawing.Size(266, 26); this.NewWatchMenuItem.Text = "&New Watch"; this.NewWatchMenuItem.Click += new System.EventHandler(this.NewWatchMenuItem_Click); // @@ -623,7 +637,7 @@ this.EditWatchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CutHS; this.EditWatchMenuItem.Name = "EditWatchMenuItem"; this.EditWatchMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E))); - this.EditWatchMenuItem.Size = new System.Drawing.Size(224, 22); + this.EditWatchMenuItem.Size = new System.Drawing.Size(266, 26); this.EditWatchMenuItem.Text = "&Edit Watch"; this.EditWatchMenuItem.Click += new System.EventHandler(this.EditWatchMenuItem_Click); // @@ -632,7 +646,7 @@ this.RemoveWatchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; this.RemoveWatchMenuItem.Name = "RemoveWatchMenuItem"; this.RemoveWatchMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R))); - this.RemoveWatchMenuItem.Size = new System.Drawing.Size(224, 22); + this.RemoveWatchMenuItem.Size = new System.Drawing.Size(266, 26); this.RemoveWatchMenuItem.Text = "&Remove Watch"; this.RemoveWatchMenuItem.Click += new System.EventHandler(this.RemoveWatchMenuItem_Click); // @@ -641,7 +655,7 @@ this.DuplicateWatchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Duplicate; this.DuplicateWatchMenuItem.Name = "DuplicateWatchMenuItem"; this.DuplicateWatchMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D))); - this.DuplicateWatchMenuItem.Size = new System.Drawing.Size(224, 22); + this.DuplicateWatchMenuItem.Size = new System.Drawing.Size(266, 26); this.DuplicateWatchMenuItem.Text = "&Duplicate Watch"; this.DuplicateWatchMenuItem.Click += new System.EventHandler(this.DuplicateWatchMenuItem_Click); // @@ -650,7 +664,7 @@ this.PokeAddressMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke; this.PokeAddressMenuItem.Name = "PokeAddressMenuItem"; this.PokeAddressMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P))); - this.PokeAddressMenuItem.Size = new System.Drawing.Size(224, 22); + this.PokeAddressMenuItem.Size = new System.Drawing.Size(266, 26); this.PokeAddressMenuItem.Text = "Poke Address"; this.PokeAddressMenuItem.Click += new System.EventHandler(this.PokeAddressMenuItem_Click); // @@ -659,7 +673,7 @@ this.FreezeAddressMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze; this.FreezeAddressMenuItem.Name = "FreezeAddressMenuItem"; this.FreezeAddressMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F))); - this.FreezeAddressMenuItem.Size = new System.Drawing.Size(224, 22); + this.FreezeAddressMenuItem.Size = new System.Drawing.Size(266, 26); this.FreezeAddressMenuItem.Text = "Freeze Address"; this.FreezeAddressMenuItem.Click += new System.EventHandler(this.FreezeAddressMenuItem_Click); // @@ -668,7 +682,7 @@ this.InsertSeparatorMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.InsertSeparator; this.InsertSeparatorMenuItem.Name = "InsertSeparatorMenuItem"; this.InsertSeparatorMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I))); - this.InsertSeparatorMenuItem.Size = new System.Drawing.Size(224, 22); + this.InsertSeparatorMenuItem.Size = new System.Drawing.Size(266, 26); this.InsertSeparatorMenuItem.Text = "Insert Separator"; this.InsertSeparatorMenuItem.Click += new System.EventHandler(this.InsertSeparatorMenuItem_Click); // @@ -676,21 +690,21 @@ // this.ClearChangeCountsMenuItem.Name = "ClearChangeCountsMenuItem"; this.ClearChangeCountsMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.C))); - this.ClearChangeCountsMenuItem.Size = new System.Drawing.Size(224, 22); + this.ClearChangeCountsMenuItem.Size = new System.Drawing.Size(266, 26); this.ClearChangeCountsMenuItem.Text = "&Clear Change Counts"; this.ClearChangeCountsMenuItem.Click += new System.EventHandler(this.ClearChangeCountsMenuItem_Click); // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(221, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(263, 6); // // MoveUpMenuItem // this.MoveUpMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveUp; this.MoveUpMenuItem.Name = "MoveUpMenuItem"; this.MoveUpMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Up))); - this.MoveUpMenuItem.Size = new System.Drawing.Size(224, 22); + this.MoveUpMenuItem.Size = new System.Drawing.Size(266, 26); this.MoveUpMenuItem.Text = "Move &Up"; this.MoveUpMenuItem.Click += new System.EventHandler(this.MoveUpMenuItem_Click); // @@ -699,7 +713,7 @@ this.MoveDownMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveDown; this.MoveDownMenuItem.Name = "MoveDownMenuItem"; this.MoveDownMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Down))); - this.MoveDownMenuItem.Size = new System.Drawing.Size(224, 22); + this.MoveDownMenuItem.Size = new System.Drawing.Size(266, 26); this.MoveDownMenuItem.Text = "Move &Down"; this.MoveDownMenuItem.Click += new System.EventHandler(this.MoveDownMenuItem_Click); // @@ -707,20 +721,20 @@ // this.SelectAllMenuItem.Name = "SelectAllMenuItem"; this.SelectAllMenuItem.ShortcutKeyDisplayString = "Ctrl+A"; - this.SelectAllMenuItem.Size = new System.Drawing.Size(224, 22); + this.SelectAllMenuItem.Size = new System.Drawing.Size(266, 26); this.SelectAllMenuItem.Text = "Select &All"; this.SelectAllMenuItem.Click += new System.EventHandler(this.SelectAllMenuItem_Click); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(221, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(263, 6); // // PauseMenuItem // this.PauseMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Pause; this.PauseMenuItem.Name = "PauseMenuItem"; - this.PauseMenuItem.Size = new System.Drawing.Size(224, 22); + this.PauseMenuItem.Size = new System.Drawing.Size(266, 26); this.PauseMenuItem.Text = "&Pause"; this.PauseMenuItem.Click += new System.EventHandler(this.PauseMenuItem_Click); // @@ -735,7 +749,7 @@ this.toolStripSeparator7, this.RestoreWindowSizeMenuItem}); this.OptionsSubMenu.Name = "OptionsSubMenu"; - this.OptionsSubMenu.Size = new System.Drawing.Size(61, 20); + this.OptionsSubMenu.Size = new System.Drawing.Size(73, 24); this.OptionsSubMenu.Text = "&Options"; this.OptionsSubMenu.DropDownOpened += new System.EventHandler(this.OptionsSubMenu_DropDownOpened); // @@ -746,68 +760,68 @@ this.LastChangeMenuItem, this.OriginalMenuItem}); this.DefinePreviousValueSubMenu.Name = "DefinePreviousValueSubMenu"; - this.DefinePreviousValueSubMenu.Size = new System.Drawing.Size(217, 22); + this.DefinePreviousValueSubMenu.Size = new System.Drawing.Size(258, 24); this.DefinePreviousValueSubMenu.Text = "Define Previous Value"; this.DefinePreviousValueSubMenu.DropDownOpened += new System.EventHandler(this.DefinePreviousValueSubMenu_DropDownOpened); // // PreviousFrameMenuItem // this.PreviousFrameMenuItem.Name = "PreviousFrameMenuItem"; - this.PreviousFrameMenuItem.Size = new System.Drawing.Size(155, 22); + this.PreviousFrameMenuItem.Size = new System.Drawing.Size(178, 24); this.PreviousFrameMenuItem.Text = "Previous Frame"; this.PreviousFrameMenuItem.Click += new System.EventHandler(this.PreviousFrameMenuItem_Click); // // LastChangeMenuItem // this.LastChangeMenuItem.Name = "LastChangeMenuItem"; - this.LastChangeMenuItem.Size = new System.Drawing.Size(155, 22); + this.LastChangeMenuItem.Size = new System.Drawing.Size(178, 24); this.LastChangeMenuItem.Text = "Last Change"; this.LastChangeMenuItem.Click += new System.EventHandler(this.LastChangeMenuItem_Click); // // OriginalMenuItem // this.OriginalMenuItem.Name = "OriginalMenuItem"; - this.OriginalMenuItem.Size = new System.Drawing.Size(155, 22); + this.OriginalMenuItem.Size = new System.Drawing.Size(178, 24); this.OriginalMenuItem.Text = "&Original"; this.OriginalMenuItem.Click += new System.EventHandler(this.OriginalMenuItem_Click); // // WatchesOnScreenMenuItem // this.WatchesOnScreenMenuItem.Name = "WatchesOnScreenMenuItem"; - this.WatchesOnScreenMenuItem.Size = new System.Drawing.Size(217, 22); + this.WatchesOnScreenMenuItem.Size = new System.Drawing.Size(258, 24); this.WatchesOnScreenMenuItem.Text = "Display Watches On Screen"; this.WatchesOnScreenMenuItem.Click += new System.EventHandler(this.WatchesOnScreenMenuItem_Click); // // SaveWindowPositionMenuItem // this.SaveWindowPositionMenuItem.Name = "SaveWindowPositionMenuItem"; - this.SaveWindowPositionMenuItem.Size = new System.Drawing.Size(217, 22); + this.SaveWindowPositionMenuItem.Size = new System.Drawing.Size(258, 24); this.SaveWindowPositionMenuItem.Text = "Save Window Position"; this.SaveWindowPositionMenuItem.Click += new System.EventHandler(this.SaveWindowPositionMenuItem_Click); // // AlwaysOnTopMenuItem // this.AlwaysOnTopMenuItem.Name = "AlwaysOnTopMenuItem"; - this.AlwaysOnTopMenuItem.Size = new System.Drawing.Size(217, 22); + this.AlwaysOnTopMenuItem.Size = new System.Drawing.Size(258, 24); this.AlwaysOnTopMenuItem.Text = "&Always On Top"; this.AlwaysOnTopMenuItem.Click += new System.EventHandler(this.AlwaysOnTopMenuItem_Click); // // FloatingWindowMenuItem // this.FloatingWindowMenuItem.Name = "FloatingWindowMenuItem"; - this.FloatingWindowMenuItem.Size = new System.Drawing.Size(217, 22); + this.FloatingWindowMenuItem.Size = new System.Drawing.Size(258, 24); this.FloatingWindowMenuItem.Text = "&Floating Window"; this.FloatingWindowMenuItem.Click += new System.EventHandler(this.FloatingWindowMenuItem_Click); // // toolStripSeparator7 // this.toolStripSeparator7.Name = "toolStripSeparator7"; - this.toolStripSeparator7.Size = new System.Drawing.Size(214, 6); + this.toolStripSeparator7.Size = new System.Drawing.Size(255, 6); // // RestoreWindowSizeMenuItem // this.RestoreWindowSizeMenuItem.Name = "RestoreWindowSizeMenuItem"; - this.RestoreWindowSizeMenuItem.Size = new System.Drawing.Size(217, 22); + this.RestoreWindowSizeMenuItem.Size = new System.Drawing.Size(258, 24); this.RestoreWindowSizeMenuItem.Text = "Restore Default Settings"; this.RestoreWindowSizeMenuItem.Click += new System.EventHandler(this.RestoreDefaultsMenuItem_Click); // @@ -833,11 +847,12 @@ this.WatchListView.GridLines = true; this.WatchListView.HideSelection = false; this.WatchListView.ItemCount = 0; - this.WatchListView.Location = new System.Drawing.Point(16, 76); + this.WatchListView.Location = new System.Drawing.Point(21, 94); + this.WatchListView.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.WatchListView.Name = "WatchListView"; this.WatchListView.SelectAllInProgress = false; this.WatchListView.selectedItem = -1; - this.WatchListView.Size = new System.Drawing.Size(332, 281); + this.WatchListView.Size = new System.Drawing.Size(441, 345); this.WatchListView.TabIndex = 2; this.WatchListView.UseCompatibleStateImageBehavior = false; this.WatchListView.UseCustomBackground = true; @@ -894,11 +909,30 @@ this.NotesColumn.Text = "Notes"; this.NotesColumn.Width = 128; // + // Separator4 + // + this.Separator4.Name = "Separator4"; + this.Separator4.Size = new System.Drawing.Size(240, 6); + // + // ReadBreakpointContextMenuItem + // + this.ReadBreakpointContextMenuItem.Name = "ReadBreakpointContextMenuItem"; + this.ReadBreakpointContextMenuItem.Size = new System.Drawing.Size(243, 26); + this.ReadBreakpointContextMenuItem.Text = "Set Read Breakpoint"; + this.ReadBreakpointContextMenuItem.Click += new System.EventHandler(this.ReadBreakpointContextMenuItem_Click); + // + // WriteBreakpointContextMenuItem + // + this.WriteBreakpointContextMenuItem.Name = "WriteBreakpointContextMenuItem"; + this.WriteBreakpointContextMenuItem.Size = new System.Drawing.Size(243, 26); + this.WriteBreakpointContextMenuItem.Text = "Set Write Breakpoint"; + this.WriteBreakpointContextMenuItem.Click += new System.EventHandler(this.WriteBreakpointContextMenuItem_Click); + // // RamWatch // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(364, 378); + this.ClientSize = new System.Drawing.Size(485, 465); this.Controls.Add(this.statusStrip1); this.Controls.Add(this.MemDomainLabel); this.Controls.Add(this.WatchCountLabel); @@ -906,6 +940,7 @@ this.Controls.Add(this.RamWatchMenu); this.Controls.Add(this.WatchListView); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "RamWatch"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = " Ram Watch"; @@ -1012,5 +1047,8 @@ private System.Windows.Forms.ToolStripMenuItem PauseMenuItem; private System.Windows.Forms.ToolStripButton pauseToolStripButton; private System.Windows.Forms.ToolStripSeparator toolStripSeparator6; + private System.Windows.Forms.ToolStripSeparator Separator4; + private System.Windows.Forms.ToolStripMenuItem ReadBreakpointContextMenuItem; + private System.Windows.Forms.ToolStripMenuItem WriteBreakpointContextMenuItem; } } \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs index 256a1728d4..761fa1f676 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs +++ b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs @@ -33,6 +33,9 @@ namespace BizHawk.Client.EmuHawk [RequiredService] private IEmulator _emu { get; set; } + [OptionalService] + private IDebuggable _debuggable { get; set; } + [ConfigPersist] public RamWatchSettings Settings { get; set; } @@ -1041,13 +1044,21 @@ namespace BizHawk.Client.EmuHawk DuplicateContextMenuItem.Visible = PokeContextMenuItem.Visible = FreezeContextMenuItem.Visible = - Separator6.Visible = + Separator4.Visible = + ReadBreakpointContextMenuItem.Visible = + WriteBreakpointContextMenuItem.Visible = + Separator6.Visible = InsertSeperatorContextMenuItem.Visible = MoveUpContextMenuItem.Visible = MoveDownContextMenuItem.Visible = - Separator6.Visible = indexes.Count > 0; + ReadBreakpointContextMenuItem.Enabled = + WriteBreakpointContextMenuItem.Enabled = + SelectedWatches.Any() && + _debuggable != null && + _debuggable.MemoryCallbacksAvailable(); + PokeContextMenuItem.Enabled = FreezeContextMenuItem.Visible = SelectedIndices.Any() && @@ -1094,6 +1105,36 @@ namespace BizHawk.Client.EmuHawk } } + private void ReadBreakpointContextMenuItem_Click(object sender, EventArgs e) + { + var selected = SelectedWatches.ToList(); + + if (selected.Any()) + { + var debugger = GlobalWin.Tools.Load(); + + foreach (var watch in selected) + { + debugger.AddBreakpoint((uint)watch.Address.Value, MemoryCallbackType.Read); + } + } + } + + private void WriteBreakpointContextMenuItem_Click(object sender, EventArgs e) + { + var selected = SelectedWatches.ToList(); + + if (selected.Any()) + { + var debugger = GlobalWin.Tools.Load(); + + foreach (var watch in selected) + { + debugger.AddBreakpoint((uint)watch.Address.Value, MemoryCallbackType.Write); + } + } + } + private void WatchListView_KeyDown(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Delete && !e.Control && !e.Alt && !e.Shift) diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.resx b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.resx index 3f2b49413f..7a4645f994 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.resx +++ b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.resx @@ -130,7 +130,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAERSURBVDhPrZDbSgJRGIXnpewd6jXsjSQvIrwoI0RQMChU + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAERSURBVDhPrZDbSgJRGIXnpewd6jXsjSQvIrwoI0RQMChU 0iiDPCGiE3ZCRkvR8VzTeBhnyR5/ccaZNnPhB4t9sdf6Ln5hb8QeathNJFVFKF5C8DqL4ksDVHWGDf7j LHyPg6NjviSaFqlu5yQYR+KpupaIkrMknCxT3Y7v/NYYb0ITK1c3BarbWWhLQ7IR0cTKReyZ6lZ0XYei ztHpK4bAc+h1FgQijzSxMptrGIxVSO0xX3AaStFki7bUMVFmaMm/eJMGfIH/MkGzLep0AXn4h/r3CJV3 @@ -141,7 +141,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJHSURBVDhPxZBdSNNhFMb/F110ZZEVhVBgeeHNICiiuggp + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAJHSURBVDhPxZBdSNNhFMb/F110ZZEVhVBgeeHNICiiuggp olAUyyxI0oSaH1QYC3N+tKnp5ubm1JUua5uuqdNKMwr7kApFItTUkWZqVhSVYmao5Nevvy7UoYR3HXh4 4XCe33nOKyy3lAY7l9RWMo0O/raWXxEyo5spVYTNvOGyfIRPfW+ptOkXqaPl6T83hcRmExSdgzAz3NVm YWyoYla/B+1M9JtxWLPpaH22JORIjI6gKAMB0jyEimIdo4OlbuaprwVMOOMovammpDADc34qppwUrmnl @@ -157,7 +157,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIySURBVDhPrZLfS5NRGMfff6H7boIuuq2pMZyL1eAt11CW + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIySURBVDhPrZLfS5NRGMfff6H7boIuuq2pMZyL1eAt11CW DcOKsB9vpFmaLtNExco0av6CbIVLJ61Wk3BSkT/AFCkRZSpZmrmiJQ41xSaCwdfznL15XEUX0Reem5f3 8znnec4j/Zc8fxYGla91CS3eRTx0z6OpMYS7jmnU1X6B/VYA18snUVoyjsKCt8jLHcH5c36ouCQR2NUJ 1Nas4G9ZXlmFKbULh1Kf8lJxSfI+WeCCyopv6q+/h+DQ/DJ2WV5Ao1FgPegRAveDOS4oLfmq/h6dn/DH @@ -173,7 +173,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGDSURBVDhPrZFNSwJRGIX9NYGbFoUlFElY1EJQKEYhCJsi + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGDSURBVDhPrZFNSwJRGIX9NYGbFoUlFElY1EJQKEYhCJsi LaVsERnRF5iCaSZJO1toCDVGFkgoFpWQWWRR2aIvUxm1BKN1wSnHCFw4TOCzue+9nPNw4eVVnav4Izzb QfxeGZ5TWaxT/rK3irzmC7CsusvC1G4IkbNLboIiDieF4GGUKeTeClDpppF8eeEu2PIfwfrzizSdw3Hk EnKlFpkMzV2wH77AosOFTV8A+vkl9CiHuJeLJNNZjM8tYWB0FkTvMAwmy/8ERTR6CwjlGAi1Ccence6C @@ -186,7 +186,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc @@ -201,7 +201,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHkSURBVDhPvZHfS1NhHIf3p5QypLr2D4goMwoMCi/qIugH + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHkSURBVDhPvZHfS1NhHIf3p5QypLr2D4goMwoMCi/qIugH Xe1Cr7qKDIMkZixwNhfWLGWbnuki0kXKzLU023KubBNPJrbRdOzocm6e2dPOO21mMS+CHvjcvOf9PF++ 79H9M+7RT2iRRsIi9sEAXe43yAvf2LpSHq28G9uAnytNT4jMLewtcQ2Ht2pF8ps/aOt+gccX5lxD694S +1BQFD1RkN5DSFa4Z3uONKbgHE3h8KZ4OJTC1J8UiSzmfhd2uf1CoJHbyKOsZokl0kKwm+aeJaov+wjO