Fix gamepanel being off-center, add two-speed rewind, work started on auto-resizing window (wip, disabled)

BizHawk.MultiClient/MainForm.cs

@@ -27,15 +27,18 @@ namespace BizHawk.MultiClient
         {
             Global.MainForm = this;
             Global.Config = ConfigService.Load<Config>("config.ini");
-            InitializeComponent();
 
-			if (Global.Direct3D != null)
+            if (Global.Direct3D != null)
-				renderTarget = new ViewportPanel();
+                renderTarget = new ViewportPanel();
-			else renderTarget = retainedPanel = new RetainedViewportPanel();
+            else renderTarget = retainedPanel = new RetainedViewportPanel();
 
             renderTarget.Dock = DockStyle.Fill;
             renderTarget.BackColor = Color.Black;
             Controls.Add(renderTarget);
+
+            InitializeComponent();
+
+			
             Database.LoadDatabase("gamedb.txt");
 
 			if (Global.Direct3D != null)
@@ -313,7 +316,7 @@ namespace BizHawk.MultiClient
 
             if (/*Global.Config.RewindEnabled && */Global.ClientControls["Rewind"])
             {
-                Rewind();
+                Rewind(Global.ClientControls["Fast Forward"] ? 3 : 1);
                 return;
             }
    
@@ -819,5 +822,18 @@ namespace BizHawk.MultiClient
             //TODO: autoload
             RamSearch1.Show();
         }
+
+        public void SignalFrameBufferResized()
+        {
+            var video = Global.Emulator.VideoProvider;
+
+            int targetZoom = 3;
+
+            int borderWidth = this.Size.Width - renderTarget.Size.Width;
+            int borderHeight = this.Size.Height - renderTarget.Size.Height;
+
+            ClientSize = new Size((video.BufferWidth*targetZoom) + borderWidth, (video.BufferHeight*targetZoom + borderHeight));
+            this.Invalidate();
+        }
     }
 }

BizHawk.MultiClient/Rewind.cs

@@ -148,14 +148,17 @@ namespace BizHawk.MultiClient
             Global.Emulator.LoadStateBinary(new BinaryReader(output));
         }
 
-        private void Rewind()
+        private void Rewind(int frames)
         {
-            if (RewindBuf.Count == 0)
+            for (int i = 0; i < frames; i++)
-                return;
+            {
-            if (LastState.Length < 0x10000)
+                if (RewindBuf.Count == 0)
-                Rewind64K();
+                    return;
-            else
+                if (LastState.Length < 0x10000)
-                RewindLarge();
+                    Rewind64K();
+                else
+                    RewindLarge();
+            }
 
             Global.Emulator.FrameAdvance(true);
             Global.Sound.UpdateSound(Global.Emulator.SoundProvider);