From d34368e98dbe31d9689d0afa890b8b28d2a8e952 Mon Sep 17 00:00:00 2001 From: adelikat Date: Fri, 14 Dec 2012 02:17:47 +0000 Subject: [PATCH] Atari 7800 - hook up input on client side, implement joystick button 2 in controller definition --- .../Consoles/Atari/7800/Atari7800.cs | 6 +- BizHawk.MultiClient/Config.cs | 42 +++ BizHawk.MultiClient/Global.cs | 2 + BizHawk.MultiClient/MainForm.cs | 42 +++ .../config/ControllerConfig.Designer.cs | 317 ++++++++++++++---- .../config/ControllerConfig.cs | 6 + 6 files changed, 339 insertions(+), 76 deletions(-) diff --git a/BizHawk.Emulation/Consoles/Atari/7800/Atari7800.cs b/BizHawk.Emulation/Consoles/Atari/7800/Atari7800.cs index 8d1bff7122..f9a443bdfe 100644 --- a/BizHawk.Emulation/Consoles/Atari/7800/Atari7800.cs +++ b/BizHawk.Emulation/Consoles/Atari/7800/Atari7800.cs @@ -114,11 +114,11 @@ namespace BizHawk.Emulation public IController Controller { get; set; } public static readonly ControllerDefinition Atari7800ControllerDefinition = new ControllerDefinition { - Name = "Atari 7800 Basic Controller", //TODO + Name = "Atari 7800 Basic Controller", BoolButtons = { - "P1 Up", "P1 Down", "P1 Left", "P1 Right", "P1 Button", - "P2 Up", "P2 Down", "P2 Left", "P2 Right", "P2 Button", + "P1 Up", "P1 Down", "P1 Left", "P1 Right", "P1 B1", "P1 B2", + "P2 Up", "P2 Down", "P2 Left", "P2 Right", "P2 B1", "P2 B2", "Reset", "Select" } }; diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs index ef3234e002..74918566a0 100644 --- a/BizHawk.MultiClient/Config.cs +++ b/BizHawk.MultiClient/Config.cs @@ -38,6 +38,12 @@ namespace BizHawk.MultiClient Atari2600AutoController[1] = new SingleButtonJoyStickTemplate(false); Atari2600ConsoleButtons[0] = new Atari2600ConsoleButtonsTemplate(true); + Atari7800Controller[0] = new DoubleButtonJoyStickTemplate(true); + Atari7800Controller[1] = new DoubleButtonJoyStickTemplate(false); + Atari7800AutoController[0] = new DoubleButtonJoyStickTemplate(false); + Atari7800AutoController[1] = new DoubleButtonJoyStickTemplate(false); + Atari7800ConsoleButtons[0] = new Atari2600ConsoleButtonsTemplate(true); + NESAutoController[0] = new NESControllerTemplate(false); NESAutoController[1] = new NESControllerTemplate(false); NESAutoController[2] = new NESControllerTemplate(false); @@ -707,6 +713,11 @@ namespace BizHawk.MultiClient public bool Atari2600_LeftDifficulty = true; public bool Atari2600_RightDifficulty = true; + //Atari 7800 Settings + public DoubleButtonJoyStickTemplate[] Atari7800Controller = new DoubleButtonJoyStickTemplate[2]; + public DoubleButtonJoyStickTemplate[] Atari7800AutoController = new DoubleButtonJoyStickTemplate[2]; + public Atari2600ConsoleButtonsTemplate[] Atari7800ConsoleButtons = new Atari2600ConsoleButtonsTemplate[1]; + //ColecoVision public ColecoVisionControllerTemplate[] ColecoController = new ColecoVisionControllerTemplate[2]; public ColecoVisionControllerTemplate[] ColecoAutoController = new ColecoVisionControllerTemplate[2]; @@ -1114,6 +1125,37 @@ namespace BizHawk.MultiClient } } + public class DoubleButtonJoyStickTemplate : iControllerConfigObject + { + public string Up = ""; + public string Down = ""; + public string Left = ""; + public string Right = ""; + public string Button1 = ""; + public string Button2 = ""; + public bool Enabled; + + public DoubleButtonJoyStickTemplate() { } + public DoubleButtonJoyStickTemplate(bool defaults) + { + if (defaults) + { + SetDefaults(); + } + } + + public void SetDefaults() + { + Enabled = true; + Up = "UpArrow, X1 DpadUp, X1 LStickUp"; + Down = "DownArrow, X1 DpadDown, X1 LStickDown"; + Left = "LeftArrow, X1 DpadLeft, X1 LStickLeft"; + Right = "RightArrow, X1 DpadRight, X1 LStickRight"; + Button1 = "Z, X1 A"; + Button2 = "X, X1 X"; + } + } + public class Atari2600ConsoleButtonsTemplate : iControllerConfigObject { public string Reset = ""; diff --git a/BizHawk.MultiClient/Global.cs b/BizHawk.MultiClient/Global.cs index 19b51035b7..57af6d9d1c 100644 --- a/BizHawk.MultiClient/Global.cs +++ b/BizHawk.MultiClient/Global.cs @@ -32,6 +32,7 @@ namespace BizHawk.MultiClient public static Controller GBControls; public static Controller GBAControls; public static Controller Atari2600Controls; + public static Controller Atari7800Controls; public static Controller NullControls; public static Controller ColecoControls; public static Controller Commodore64Controls; @@ -46,6 +47,7 @@ namespace BizHawk.MultiClient public static AutofireController AutofireGBAControls; public static AutofireController AutofireGenControls; public static AutofireController AutofireAtari2600Controls; + public static AutofireController AutofireAtari7800Controls; public static AutofireController AutofireCommodore64Controls; public static AutofireController AutofireColecoControls; diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index 7d65f5eb8a..e68f22c2df 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -19,6 +19,7 @@ using BizHawk.Emulation.Consoles.Intellivision; using BizHawk.Emulation.Consoles.GB; using BizHawk.Emulation.Consoles.Nintendo.GBA; using BizHawk.Emulation.Computers.Commodore64; +using BizHawk.Emulation; namespace BizHawk.MultiClient { @@ -994,6 +995,43 @@ namespace BizHawk.MultiClient Global.AutofireAtari2600Controls = autofireA2600Controls; + var a7800Controls = new Controller(Atari7800.Atari7800ControllerDefinition); + a7800Controls.BindMulti("P1 Up", Global.Config.Atari7800Controller[0].Up); + a7800Controls.BindMulti("P1 Left", Global.Config.Atari7800Controller[0].Left); + a7800Controls.BindMulti("P1 Right", Global.Config.Atari7800Controller[0].Right); + a7800Controls.BindMulti("P1 Down", Global.Config.Atari7800Controller[0].Down); + a7800Controls.BindMulti("P1 B1", Global.Config.Atari7800Controller[0].Button1); + a7800Controls.BindMulti("P1 B2", Global.Config.Atari7800Controller[0].Button2); + + a7800Controls.BindMulti("P2 Up", Global.Config.Atari7800Controller[1].Up); + a7800Controls.BindMulti("P2 Left", Global.Config.Atari7800Controller[1].Left); + a7800Controls.BindMulti("P2 Right", Global.Config.Atari7800Controller[1].Right); + a7800Controls.BindMulti("P2 Down", Global.Config.Atari7800Controller[1].Down); + a7800Controls.BindMulti("P2 B1", Global.Config.Atari7800Controller[1].Button1); + a7800Controls.BindMulti("P2 B2", Global.Config.Atari7800Controller[1].Button2); + + a7800Controls.BindMulti("Reset", Global.Config.Atari2600ConsoleButtons[0].Reset); + a7800Controls.BindMulti("Select", Global.Config.Atari2600ConsoleButtons[0].Select); + + Global.Atari7800Controls = a7800Controls; + + var autofireA7800Controls = new AutofireController(Atari7800.Atari7800ControllerDefinition); + autofireA7800Controls.BindMulti("P1 Up", Global.Config.Atari7800AutoController[0].Up); + autofireA7800Controls.BindMulti("P1 Left", Global.Config.Atari7800AutoController[0].Left); + autofireA7800Controls.BindMulti("P1 Right", Global.Config.Atari7800AutoController[0].Right); + autofireA7800Controls.BindMulti("P1 Down", Global.Config.Atari7800AutoController[0].Down); + autofireA7800Controls.BindMulti("P1 B1", Global.Config.Atari7800AutoController[0].Button1); + autofireA7800Controls.BindMulti("P1 B2", Global.Config.Atari7800AutoController[0].Button2); + + autofireA7800Controls.BindMulti("P2 Up", Global.Config.Atari7800AutoController[1].Up); + autofireA7800Controls.BindMulti("P2 Left", Global.Config.Atari7800AutoController[1].Left); + autofireA7800Controls.BindMulti("P2 Right", Global.Config.Atari7800AutoController[1].Right); + autofireA7800Controls.BindMulti("P2 Down", Global.Config.Atari7800AutoController[1].Down); + autofireA7800Controls.BindMulti("P2 B1", Global.Config.Atari7800AutoController[1].Button1); + autofireA7800Controls.BindMulti("P2 B2", Global.Config.Atari7800AutoController[1].Button2); + + Global.AutofireAtari7800Controls = autofireA2600Controls; + var colecoControls = new Controller(ColecoVision.ColecoVisionControllerDefinition); colecoControls.BindMulti("P1 Up", Global.Config.ColecoController[0].Up); colecoControls.BindMulti("P1 Left", Global.Config.ColecoController[0].Left); @@ -1484,6 +1522,10 @@ namespace BizHawk.MultiClient Global.ActiveController = Global.Atari2600Controls; Global.AutoFireController = Global.AutofireAtari2600Controls; break; + case "A78": + Global.ActiveController = Global.Atari7800Controls; + Global.AutoFireController = Global.AutofireAtari7800Controls; + break; case "PCE": case "PCECD": Global.ActiveController = Global.PCEControls; diff --git a/BizHawk.MultiClient/config/ControllerConfig.Designer.cs b/BizHawk.MultiClient/config/ControllerConfig.Designer.cs index 16b95011cc..c81291342f 100644 --- a/BizHawk.MultiClient/config/ControllerConfig.Designer.cs +++ b/BizHawk.MultiClient/config/ControllerConfig.Designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); this.PlatformTabControl = new System.Windows.Forms.TabControl(); this.tabPageNES = new System.Windows.Forms.TabPage(); this.pictureBox14 = new System.Windows.Forms.PictureBox(); @@ -78,6 +79,13 @@ this.GBController1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPage32 = new System.Windows.Forms.TabPage(); this.GBAutofire1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); + this.tabPageGBA = new System.Windows.Forms.TabPage(); + this.pictureBox13 = new System.Windows.Forms.PictureBox(); + this.tabControl1 = new System.Windows.Forms.TabControl(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.GBAController1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.GBAAutofire1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.tabPageGenesis = new System.Windows.Forms.TabPage(); this.pictureBox6 = new System.Windows.Forms.PictureBox(); this.tabControl9 = new System.Windows.Forms.TabControl(); @@ -174,13 +182,19 @@ this.label38 = new System.Windows.Forms.Label(); this.AllowLR = new System.Windows.Forms.CheckBox(); this.AutoTab = new System.Windows.Forms.CheckBox(); - this.tabPageGBA = new System.Windows.Forms.TabPage(); - this.pictureBox13 = new System.Windows.Forms.PictureBox(); - this.tabControl1 = new System.Windows.Forms.TabControl(); - this.tabPage1 = new System.Windows.Forms.TabPage(); - this.GBAController1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); - this.tabPage2 = new System.Windows.Forms.TabPage(); - this.GBAAutofire1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); + this.tabPageAtari7800 = new System.Windows.Forms.TabPage(); + this.pictureBox16 = new System.Windows.Forms.PictureBox(); + this.tabControl11 = new System.Windows.Forms.TabControl(); + this.tabPage3 = new System.Windows.Forms.TabPage(); + this.Atari7800Controller1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); + this.tabPage4 = new System.Windows.Forms.TabPage(); + this.Atari7800Controller2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); + this.tabPage5 = new System.Windows.Forms.TabPage(); + this.Atari7800ConsoleButtons = new BizHawk.MultiClient.ControllerConfigPanel(); + this.tabPage6 = new System.Windows.Forms.TabPage(); + this.Atari7800Autofire1Panel = new BizHawk.MultiClient.ControllerConfigPanel(); + this.tabPage7 = new System.Windows.Forms.TabPage(); + this.Atari7800Autofire2Panel = new BizHawk.MultiClient.ControllerConfigPanel(); this.PlatformTabControl.SuspendLayout(); this.tabPageNES.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox14)).BeginInit(); @@ -211,6 +225,11 @@ this.tabControl4.SuspendLayout(); this.tabPage31.SuspendLayout(); this.tabPage32.SuspendLayout(); + this.tabPageGBA.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox13)).BeginInit(); + this.tabControl1.SuspendLayout(); + this.tabPage1.SuspendLayout(); + this.tabPage2.SuspendLayout(); this.tabPageGenesis.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).BeginInit(); this.tabControl9.SuspendLayout(); @@ -267,11 +286,14 @@ this.tabPage63.SuspendLayout(); this.tabPageTI83.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit(); - this.tabPageGBA.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox13)).BeginInit(); - this.tabControl1.SuspendLayout(); - this.tabPage1.SuspendLayout(); - this.tabPage2.SuspendLayout(); + this.tabPageAtari7800.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox16)).BeginInit(); + this.tabControl11.SuspendLayout(); + this.tabPage3.SuspendLayout(); + this.tabPage4.SuspendLayout(); + this.tabPage5.SuspendLayout(); + this.tabPage6.SuspendLayout(); + this.tabPage7.SuspendLayout(); this.SuspendLayout(); // // PlatformTabControl @@ -287,6 +309,7 @@ this.PlatformTabControl.Controls.Add(this.tabPageSMS); this.PlatformTabControl.Controls.Add(this.tabPagePCE); this.PlatformTabControl.Controls.Add(this.tabPageAtari2600); + this.PlatformTabControl.Controls.Add(this.tabPageAtari7800); this.PlatformTabControl.Controls.Add(this.tabPageC64); this.PlatformTabControl.Controls.Add(this.tabPageColeco); this.PlatformTabControl.Controls.Add(this.tabPageTI83); @@ -765,6 +788,77 @@ this.GBAutofire1Panel.Size = new System.Drawing.Size(359, 332); this.GBAutofire1Panel.TabIndex = 2; // + // tabPageGBA + // + this.tabPageGBA.Controls.Add(this.pictureBox13); + this.tabPageGBA.Controls.Add(this.tabControl1); + this.tabPageGBA.Location = new System.Drawing.Point(4, 22); + this.tabPageGBA.Name = "tabPageGBA"; + this.tabPageGBA.Size = new System.Drawing.Size(787, 425); + this.tabPageGBA.TabIndex = 10; + this.tabPageGBA.Text = "GBA"; + this.tabPageGBA.UseVisualStyleBackColor = true; + // + // pictureBox13 + // + this.pictureBox13.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.pictureBox13.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.pictureBox13.Image = global::BizHawk.MultiClient.Properties.Resources.GBA_Controller; + this.pictureBox13.Location = new System.Drawing.Point(419, 37); + this.pictureBox13.Name = "pictureBox13"; + this.pictureBox13.Size = new System.Drawing.Size(236, 138); + this.pictureBox13.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.pictureBox13.TabIndex = 6; + this.pictureBox13.TabStop = false; + // + // tabControl1 + // + this.tabControl1.Controls.Add(this.tabPage1); + this.tabControl1.Controls.Add(this.tabPage2); + this.tabControl1.Location = new System.Drawing.Point(17, 15); + this.tabControl1.Name = "tabControl1"; + this.tabControl1.SelectedIndex = 0; + this.tabControl1.Size = new System.Drawing.Size(379, 398); + this.tabControl1.TabIndex = 5; + // + // tabPage1 + // + this.tabPage1.Controls.Add(this.GBAController1Panel); + this.tabPage1.Location = new System.Drawing.Point(4, 22); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.Padding = new System.Windows.Forms.Padding(3); + this.tabPage1.Size = new System.Drawing.Size(371, 372); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "Controller 1"; + this.tabPage1.UseVisualStyleBackColor = true; + // + // GBAController1Panel + // + this.GBAController1Panel.Location = new System.Drawing.Point(6, 6); + this.GBAController1Panel.Name = "GBAController1Panel"; + this.GBAController1Panel.Size = new System.Drawing.Size(359, 332); + this.GBAController1Panel.TabIndex = 1; + // + // tabPage2 + // + this.tabPage2.Controls.Add(this.GBAAutofire1Panel); + this.tabPage2.Location = new System.Drawing.Point(4, 22); + this.tabPage2.Name = "tabPage2"; + this.tabPage2.Padding = new System.Windows.Forms.Padding(3); + this.tabPage2.Size = new System.Drawing.Size(371, 372); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = "Autofire 1"; + this.tabPage2.UseVisualStyleBackColor = true; + // + // GBAAutofire1Panel + // + this.GBAAutofire1Panel.Location = new System.Drawing.Point(6, 6); + this.GBAAutofire1Panel.Name = "GBAAutofire1Panel"; + this.GBAAutofire1Panel.Size = new System.Drawing.Size(359, 332); + this.GBAAutofire1Panel.TabIndex = 2; + // // tabPageGenesis // this.tabPageGenesis.Controls.Add(this.pictureBox6); @@ -1229,7 +1323,7 @@ this.tabPageAtari2600.Name = "tabPageAtari2600"; this.tabPageAtari2600.Size = new System.Drawing.Size(787, 425); this.tabPageAtari2600.TabIndex = 5; - this.tabPageAtari2600.Text = "Atari"; + this.tabPageAtari2600.Text = "Atari 2600"; this.tabPageAtari2600.UseVisualStyleBackColor = true; // // pictureBox5 @@ -1724,76 +1818,132 @@ this.AutoTab.UseVisualStyleBackColor = true; this.AutoTab.CheckedChanged += new System.EventHandler(this.AutoTab_CheckedChanged); // - // tabPageGBA + // tabPageAtari7800 // - this.tabPageGBA.Controls.Add(this.pictureBox13); - this.tabPageGBA.Controls.Add(this.tabControl1); - this.tabPageGBA.Location = new System.Drawing.Point(4, 22); - this.tabPageGBA.Name = "tabPageGBA"; - this.tabPageGBA.Size = new System.Drawing.Size(787, 425); - this.tabPageGBA.TabIndex = 10; - this.tabPageGBA.Text = "GBA"; - this.tabPageGBA.UseVisualStyleBackColor = true; + this.tabPageAtari7800.Controls.Add(this.pictureBox16); + this.tabPageAtari7800.Controls.Add(this.tabControl11); + this.tabPageAtari7800.Location = new System.Drawing.Point(4, 22); + this.tabPageAtari7800.Name = "tabPageAtari7800"; + this.tabPageAtari7800.Size = new System.Drawing.Size(787, 425); + this.tabPageAtari7800.TabIndex = 11; + this.tabPageAtari7800.Text = "Atari 7800"; + this.tabPageAtari7800.UseVisualStyleBackColor = true; // - // pictureBox13 + // pictureBox16 // - this.pictureBox13.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.pictureBox16.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.pictureBox13.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.pictureBox13.Image = global::BizHawk.MultiClient.Properties.Resources.GBA_Controller; - this.pictureBox13.Location = new System.Drawing.Point(419, 37); - this.pictureBox13.Name = "pictureBox13"; - this.pictureBox13.Size = new System.Drawing.Size(236, 138); - this.pictureBox13.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.pictureBox13.TabIndex = 6; - this.pictureBox13.TabStop = false; + this.pictureBox16.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.pictureBox16.Image = global::BizHawk.MultiClient.Properties.Resources.atari_controller; + this.pictureBox16.Location = new System.Drawing.Point(426, 37); + this.pictureBox16.Name = "pictureBox16"; + this.pictureBox16.Size = new System.Drawing.Size(177, 199); + this.pictureBox16.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.pictureBox16.TabIndex = 6; + this.pictureBox16.TabStop = false; // - // tabControl1 + // tabControl11 // - this.tabControl1.Controls.Add(this.tabPage1); - this.tabControl1.Controls.Add(this.tabPage2); - this.tabControl1.Location = new System.Drawing.Point(17, 15); - this.tabControl1.Name = "tabControl1"; - this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(379, 398); - this.tabControl1.TabIndex = 5; + this.tabControl11.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left))); + this.tabControl11.Controls.Add(this.tabPage3); + this.tabControl11.Controls.Add(this.tabPage4); + this.tabControl11.Controls.Add(this.tabPage5); + this.tabControl11.Controls.Add(this.tabPage6); + this.tabControl11.Controls.Add(this.tabPage7); + this.tabControl11.Location = new System.Drawing.Point(17, 15); + this.tabControl11.Name = "tabControl11"; + this.tabControl11.SelectedIndex = 0; + this.tabControl11.Size = new System.Drawing.Size(389, 401); + this.tabControl11.TabIndex = 5; // - // tabPage1 + // tabPage3 // - this.tabPage1.Controls.Add(this.GBAController1Panel); - this.tabPage1.Location = new System.Drawing.Point(4, 22); - this.tabPage1.Name = "tabPage1"; - this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(371, 372); - this.tabPage1.TabIndex = 0; - this.tabPage1.Text = "Controller 1"; - this.tabPage1.UseVisualStyleBackColor = true; + this.tabPage3.Controls.Add(this.Atari7800Controller1Panel); + this.tabPage3.Location = new System.Drawing.Point(4, 22); + this.tabPage3.Name = "tabPage3"; + this.tabPage3.Padding = new System.Windows.Forms.Padding(3); + this.tabPage3.Size = new System.Drawing.Size(381, 375); + this.tabPage3.TabIndex = 0; + this.tabPage3.Text = "Joystick 1"; + this.tabPage3.UseVisualStyleBackColor = true; // - // GBAController1Panel + // Atari7800Controller1Panel // - this.GBAController1Panel.Location = new System.Drawing.Point(6, 6); - this.GBAController1Panel.Name = "GBAController1Panel"; - this.GBAController1Panel.Size = new System.Drawing.Size(359, 332); - this.GBAController1Panel.TabIndex = 1; + this.Atari7800Controller1Panel.Location = new System.Drawing.Point(10, 10); + this.Atari7800Controller1Panel.Name = "Atari7800Controller1Panel"; + this.Atari7800Controller1Panel.Size = new System.Drawing.Size(365, 332); + this.Atari7800Controller1Panel.TabIndex = 1; // - // tabPage2 + // tabPage4 // - this.tabPage2.Controls.Add(this.GBAAutofire1Panel); - this.tabPage2.Location = new System.Drawing.Point(4, 22); - this.tabPage2.Name = "tabPage2"; - this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(371, 372); - this.tabPage2.TabIndex = 1; - this.tabPage2.Text = "Autofire 1"; - this.tabPage2.UseVisualStyleBackColor = true; + this.tabPage4.Controls.Add(this.Atari7800Controller2Panel); + this.tabPage4.Location = new System.Drawing.Point(4, 22); + this.tabPage4.Name = "tabPage4"; + this.tabPage4.Padding = new System.Windows.Forms.Padding(3); + this.tabPage4.Size = new System.Drawing.Size(381, 375); + this.tabPage4.TabIndex = 1; + this.tabPage4.Text = "Joystick 2"; + this.tabPage4.UseVisualStyleBackColor = true; // - // GBAAutofire1Panel + // Atari7800Controller2Panel // - this.GBAAutofire1Panel.Location = new System.Drawing.Point(6, 6); - this.GBAAutofire1Panel.Name = "GBAAutofire1Panel"; - this.GBAAutofire1Panel.Size = new System.Drawing.Size(359, 332); - this.GBAAutofire1Panel.TabIndex = 2; + this.Atari7800Controller2Panel.Location = new System.Drawing.Point(10, 10); + this.Atari7800Controller2Panel.Name = "Atari7800Controller2Panel"; + this.Atari7800Controller2Panel.Size = new System.Drawing.Size(365, 332); + this.Atari7800Controller2Panel.TabIndex = 2; + // + // tabPage5 + // + this.tabPage5.Controls.Add(this.Atari7800ConsoleButtons); + this.tabPage5.Location = new System.Drawing.Point(4, 22); + this.tabPage5.Name = "tabPage5"; + this.tabPage5.Size = new System.Drawing.Size(381, 375); + this.tabPage5.TabIndex = 2; + this.tabPage5.Text = "Console"; + this.tabPage5.UseVisualStyleBackColor = true; + // + // Atari7800ConsoleButtons + // + this.Atari7800ConsoleButtons.Location = new System.Drawing.Point(10, 10); + this.Atari7800ConsoleButtons.Name = "Atari7800ConsoleButtons"; + this.Atari7800ConsoleButtons.Size = new System.Drawing.Size(359, 125); + this.Atari7800ConsoleButtons.TabIndex = 1; + // + // tabPage6 + // + this.tabPage6.Controls.Add(this.Atari7800Autofire1Panel); + this.tabPage6.Location = new System.Drawing.Point(4, 22); + this.tabPage6.Name = "tabPage6"; + this.tabPage6.Size = new System.Drawing.Size(381, 375); + this.tabPage6.TabIndex = 3; + this.tabPage6.Text = "Autofire 1"; + this.tabPage6.UseVisualStyleBackColor = true; + // + // Atari7800Autofire1Panel + // + this.Atari7800Autofire1Panel.Location = new System.Drawing.Point(10, 10); + this.Atari7800Autofire1Panel.Name = "Atari7800Autofire1Panel"; + this.Atari7800Autofire1Panel.Size = new System.Drawing.Size(368, 332); + this.Atari7800Autofire1Panel.TabIndex = 3; + // + // tabPage7 + // + this.tabPage7.Controls.Add(this.Atari7800Autofire2Panel); + this.tabPage7.Location = new System.Drawing.Point(4, 22); + this.tabPage7.Name = "tabPage7"; + this.tabPage7.Size = new System.Drawing.Size(381, 375); + this.tabPage7.TabIndex = 4; + this.tabPage7.Text = "Autofire 2"; + this.tabPage7.UseVisualStyleBackColor = true; + // + // Atari7800Autofire2Panel + // + this.Atari7800Autofire2Panel.Location = new System.Drawing.Point(10, 10); + this.Atari7800Autofire2Panel.Name = "Atari7800Autofire2Panel"; + this.Atari7800Autofire2Panel.Size = new System.Drawing.Size(368, 332); + this.Atari7800Autofire2Panel.TabIndex = 3; // // ControllerConfig // @@ -1841,6 +1991,11 @@ this.tabControl4.ResumeLayout(false); this.tabPage31.ResumeLayout(false); this.tabPage32.ResumeLayout(false); + this.tabPageGBA.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox13)).EndInit(); + this.tabControl1.ResumeLayout(false); + this.tabPage1.ResumeLayout(false); + this.tabPage2.ResumeLayout(false); this.tabPageGenesis.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).EndInit(); this.tabControl9.ResumeLayout(false); @@ -1897,11 +2052,14 @@ this.tabPage63.ResumeLayout(false); this.tabPageTI83.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).EndInit(); - this.tabPageGBA.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox13)).EndInit(); - this.tabControl1.ResumeLayout(false); - this.tabPage1.ResumeLayout(false); - this.tabPage2.ResumeLayout(false); + this.tabPageAtari7800.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox16)).EndInit(); + this.tabControl11.ResumeLayout(false); + this.tabPage3.ResumeLayout(false); + this.tabPage4.ResumeLayout(false); + this.tabPage5.ResumeLayout(false); + this.tabPage6.ResumeLayout(false); + this.tabPage7.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -2062,5 +2220,18 @@ private ControllerConfigPanel GBAController1Panel; private System.Windows.Forms.TabPage tabPage2; private ControllerConfigPanel GBAAutofire1Panel; + private System.Windows.Forms.TabPage tabPageAtari7800; + private System.Windows.Forms.PictureBox pictureBox16; + private System.Windows.Forms.TabControl tabControl11; + private System.Windows.Forms.TabPage tabPage3; + private ControllerConfigPanel Atari7800Controller1Panel; + private System.Windows.Forms.TabPage tabPage4; + private ControllerConfigPanel Atari7800Controller2Panel; + private System.Windows.Forms.TabPage tabPage5; + private ControllerConfigPanel Atari7800ConsoleButtons; + private System.Windows.Forms.TabPage tabPage6; + private ControllerConfigPanel Atari7800Autofire1Panel; + private System.Windows.Forms.TabPage tabPage7; + private ControllerConfigPanel Atari7800Autofire2Panel; } } \ No newline at end of file diff --git a/BizHawk.MultiClient/config/ControllerConfig.cs b/BizHawk.MultiClient/config/ControllerConfig.cs index b1e6707e6c..e20ac8d805 100644 --- a/BizHawk.MultiClient/config/ControllerConfig.cs +++ b/BizHawk.MultiClient/config/ControllerConfig.cs @@ -83,6 +83,12 @@ namespace BizHawk.MultiClient Atari2600Autofire1Panel.LoadSettings(Global.Config.Atari2600AutoController[0]); Atari2600Autofire2Panel.LoadSettings(Global.Config.Atari2600AutoController[1]); + Atari7800Controller1Panel.LoadSettings(Global.Config.Atari7800Controller[0]); + Atari7800Controller2Panel.LoadSettings(Global.Config.Atari7800Controller[1]); + Atari7800ConsoleButtons.LoadSettings(Global.Config.Atari7800ConsoleButtons[0]); + Atari7800Autofire1Panel.LoadSettings(Global.Config.Atari7800AutoController[0]); + Atari7800Autofire2Panel.LoadSettings(Global.Config.Atari7800AutoController[1]); + TI83ControllerPanel.Spacing = 24; TI83ControllerPanel.InputSize = 110; TI83ControllerPanel.LabelPadding = 5;