Fixes to seeking and auto restore

src/BizHawk.Client.Common/config/Binding.cs

@@ -133,6 +133,7 @@ void Bind(string tabGroup, string displayName, string defaultBinding = "", strin
 			Bind("TAStudio", "Show Cursor");
 			Bind("TAStudio", "Toggle Follow Cursor", "Shift+F");
 			Bind("TAStudio", "Toggle Auto-Restore", "Shift+R");
+			Bind("TAStudio", "Seek To Green Arrow", "R");
 			Bind("TAStudio", "Toggle Turbo Seek", "Shift+S");
 			Bind("TAStudio", "Undo", "Ctrl+Z"); // TODO: these are getting not unique enough
 			Bind("TAStudio", "Redo", "Ctrl+Y");

src/BizHawk.Client.Common/lua/CommonLibs/ClientLuaLibrary.cs

@@ -102,37 +102,11 @@ public string GetLuaEngine()
 		public void InvisibleEmulation(bool invisible)
 			=> APIs.EmuClient.InvisibleEmulation(invisible);
 
-		[LuaMethodExample("client.seekframe( 100 );")]
-		[LuaMethod("seekframe", "Makes the emulator seek to the frame specified")]
+		[LuaDeprecatedMethod]
+		[LuaMethod("seekframe", "Does nothing. Use the pause/unpause functions instead and a loop that waits for the desired frame.")]
 		public void SeekFrame(int frame)
 		{
-			if (_luaLibsImpl.IsInInputOrMemoryCallback)
-			{
-				throw new InvalidOperationException("client.seekframe() is not allowed during input/memory callbacks");
-			}
-
-			if (frame < Emulator.Frame)
-			{
-				Log("client.seekframe: cannot seek backwards");
-				return;
-			}
-			if (frame == Emulator.Frame) return;
-
-			bool wasPaused = MainForm.EmulatorPaused;
-
-			// can't re-enter lua while doing this
-			_luaLibsImpl.IsUpdateSupressed = true;
-			while (Emulator.Frame != frame)
-			{
-				MainForm.SeekFrameAdvance();
-			}
-
-			_luaLibsImpl.IsUpdateSupressed = false;
-
-			if (!wasPaused)
-			{
-				MainForm.UnpauseEmulator();
-			}
+			Log("Deprecated function client.seekframe() used. Replace the call with pause/unpause functions and a loop that waits for the desired frame.");
 		}
 
 		[LuaMethodExample("local sounds_terrible = client.get_approx_framerate() < 55;")]

src/BizHawk.Client.Common/movie/interfaces/ITasMovie.cs

@@ -7,7 +7,6 @@ namespace BizHawk.Client.Common
 	public interface ITasMovie : IMovie, INotifyPropertyChanged, IDisposable
 	{
 		bool BindMarkersToInput { get; set; }
-		bool LastPositionStable { get; set; }
 
 		IMovieChangeLog ChangeLog { get; }
 		IStateManager TasStateManager { get; }
@@ -20,6 +19,7 @@ public interface ITasMovie : IMovie, INotifyPropertyChanged, IDisposable
 		TasLagLog LagLog { get; }
 		IStringLog VerificationLog { get; }
 		int LastEditedFrame { get; }
+		bool LastEditWasRecording { get; }
 
 		Action<int> GreenzoneInvalidated { get; set; }
 

src/BizHawk.Client.Common/movie/tasproj/TasMovie.Editing.cs

@@ -27,6 +27,7 @@ public override void RecordFrame(int frame, IController source)
 
 			if (this.IsRecording())
 			{
+				LastEditWasRecording = true;
 				InvalidateAfter(frame);
 			}
 
@@ -82,9 +83,12 @@ public void SetFrame(int frame, string source)
 
 		public void ClearFrame(int frame)
 		{
+			string empty = Bk2LogEntryGenerator.EmptyEntry(Session.MovieController);
+			if (GetInputLogEntry(frame) == empty) return;
+
 			ChangeLog.AddGeneralUndo(frame, frame, $"Clear Frame: {frame}");
 
-			SetFrameAt(frame, Bk2LogEntryGenerator.EmptyEntry(Session.MovieController));
+			SetFrameAt(frame, empty);
 			Changes = true;
 
 			InvalidateAfter(frame);
@@ -211,6 +215,7 @@ public int CopyOverInput(int frame, IEnumerable<IController> inputStates)
 
 			if (Log.Count < states.Count + frame)
 			{
+				firstChangedFrame = Log.Count;
 				ExtendMovieForEdit(states.Count + frame - Log.Count);
 			}
 
@@ -224,7 +229,7 @@ public int CopyOverInput(int frame, IEnumerable<IController> inputStates)
 				}
 
 				var entry = Bk2LogEntryGenerator.GenerateLogEntry(states[i]);
-				if (firstChangedFrame == -1 && Log[frame + i] != entry)
+				if ((firstChangedFrame == -1 || firstChangedFrame > frame + i) && Log[frame + i] != entry)
 				{
 					firstChangedFrame = frame + i;
 				}
@@ -234,7 +239,11 @@ public int CopyOverInput(int frame, IEnumerable<IController> inputStates)
 
 			ChangeLog.EndBatch();
 			Changes = true;
-			InvalidateAfter(frame);
+			if (firstChangedFrame != -1)
+			{
+				// TODO: Throw out the undo action if there are no changes.
+				InvalidateAfter(firstChangedFrame);
+			}
 
 			ChangeLog.SetGeneralRedo();
 			return firstChangedFrame;

src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs

@@ -73,6 +73,7 @@ public override bool StartsFromSavestate
 		public ITasSession TasSession { get; private set; } = new TasSession();
 
 		public int LastEditedFrame { get; private set; } = -1;
+		public bool LastEditWasRecording { get; private set; }
 		public bool LastPositionStable { get; set; } = true;
 		public TasMovieMarkerList Markers { get; private set; }
 		public bool BindMarkersToInput { get; set; }
@@ -129,6 +130,7 @@ private void InvalidateAfter(int frame)
 			}
 
 			LastEditedFrame = frame;
+			LastEditWasRecording = false; // We can set it here; it's only used in the GreenzoneInvalidated action.
 
 			if (anyStateInvalidated && IsCountingRerecords)
 			{
@@ -178,14 +180,6 @@ private static string CreateDisplayValueForButton(IController adapter, string bu
 
 		public void GreenzoneCurrentFrame()
 		{
-			// todo: this isn't working quite right when autorestore is off and we're editing while seeking
-			// but accounting for that requires access to Mainform.IsSeeking
-			if (Emulator.Frame != LastEditedFrame)
-			{
-				// emulated a new frame, current editing segment may change now. taseditor logic
-				LastPositionStable = false;
-			}
-
 			LagLog[Emulator.Frame] = _inputPollable.IsLagFrame;
 
 			// We will forbibly capture a state for the last edited frame (requested by #916 for case of "platforms with analog stick")

src/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs

@@ -378,6 +378,10 @@ void SelectAndLoadFromSlot(int slot)
 					var playbackBox1 = Tools.TAStudio.TasPlaybackBox;
 					playbackBox1.AutoRestore = !playbackBox1.AutoRestore;
 					break;
+				case "Seek To Green Arrow":
+					if (!Tools.IsLoaded<TAStudio>()) return false;
+					Tools.TAStudio.RestorePosition();
+					break;
 				case "Toggle Turbo Seek":
 					if (!Tools.IsLoaded<TAStudio>()) return false;
 					var playbackBox2 = Tools.TAStudio.TasPlaybackBox;

src/BizHawk.Client.EmuHawk/MainForm.cs

@@ -1072,7 +1072,6 @@ private set
 		/// Accessing this from Lua allows to keep internal code hacks to minimum.
 		/// <list type="bullet">
 		/// <item><description><see cref="ClientLuaLibrary.InvisibleEmulation(bool)"/></description></item>
-		/// <item><description><see cref="ClientLuaLibrary.SeekFrame(int)"/></description></item>
 		/// </list>
 		/// </summary>
 		public bool InvisibleEmulation { get; set; }
@@ -3256,16 +3255,7 @@ private void StepRunLoop_Core(bool force = false)
 					if (PauseOnFrame.Value == Emulator.Frame)
 					{
 						PauseEmulator();
-						if (Tools.IsLoaded<TAStudio>()) Tools.TAStudio.StopSeeking();
-						else PauseOnFrame = null;
-					}
-					else if (Tools.IsLoaded<TAStudio>()
-						&& Tools.TAStudio.LastPositionFrame == Emulator.Frame
-						&& ((ITasMovie) MovieSession.Movie)[Emulator.Frame].Lagged is null)
-					{
-						// haven't yet greenzoned the frame, hence it's after editing
-						// then we want to pause here. taseditor fashion
-						PauseEmulator();
+						PauseOnFrame = null;
 					}
 				}
 

src/BizHawk.Client.EmuHawk/config/HotkeyConfig.cs

@@ -95,7 +95,7 @@ private void DoTabs()
 					.OrderBy(static kvp => kvp.Value.Ordinal).ThenBy(static kvp => kvp.Value.DisplayName);
 				int x = UIHelper.ScaleX(6);
 				int y = UIHelper.ScaleY(14);
-				int iwOffsetX = UIHelper.ScaleX(110);
+				int iwOffsetX = UIHelper.ScaleX(120);
 				int iwOffsetY = UIHelper.ScaleY(-4);
 				int iwWidth = UIHelper.ScaleX(120);
 

src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/TAStudioLuaLibrary.cs

@@ -143,30 +143,30 @@ public void SetPlayback(object frame)
 					throw new InvalidOperationException("tastudio.setplayback() is not allowed during input/memory callbacks");
 				}
 
-				_luaLibsImpl.IsUpdateSupressed = true;
 
 				int f;
 				if (frame is long frameNumber)
 				{
 					f = (int)frameNumber;
 				}
+				else if (frame is double frameNumber2)
+				{
+					f = (int)frameNumber2;
+				}
 				else
 				{
-					f = Tastudio.CurrentTasMovie.Markers.FindIndex((string)frame);
-					if (f == -1)
-					{
-						return;
-					}
+					int markerIndex = Tastudio.CurrentTasMovie.Markers.FindIndex((string)frame);
+					if (markerIndex == -1) return;
 
-					f = Tastudio.CurrentTasMovie.Markers[f].Frame;
+					f = Tastudio.CurrentTasMovie.Markers[markerIndex].Frame;
 				}
 
-				if (0.RangeToExclusive(Tastudio.CurrentTasMovie.InputLogLength).Contains(f))
+				if (f >= 0)
 				{
-					Tastudio.GoToFrame(f, true);
+					_luaLibsImpl.IsUpdateSupressed = true;
+					Tastudio.GoToFrame(f);
+					_luaLibsImpl.IsUpdateSupressed = false;
 				}
-
-				_luaLibsImpl.IsUpdateSupressed = false;
 			}
 		}
 
@@ -300,6 +300,11 @@ public void SubmitClearFrames(int frame, int number)
 		[LuaMethod("applyinputchanges", "")]
 		public void ApplyInputChanges()
 		{
+			if (_changeList.Count == 0)
+			{
+				return;
+			}
+
 			if (Engaged())
 			{
 				if (_luaLibsImpl.IsInInputOrMemoryCallback)
@@ -309,7 +314,7 @@ public void ApplyInputChanges()
 
 				_luaLibsImpl.IsUpdateSupressed = true;
 
-				if (_changeList.Count > 0)
+				Tastudio.ApiHawkBatchEdit(() =>
 				{
 					int size = _changeList.Count;
 
@@ -327,7 +332,6 @@ public void ApplyInputChanges()
 										Tastudio.CurrentTasMovie.SetAxisState(_changeList[i].Frame, _changeList[i].Button, _changeList[i].ValueAxis);
 										break;
 								}
-								Tastudio.RefreshForInputChange(_changeList[i].Frame);
 								break;
 							case LuaChangeTypes.InsertFrames:
 								Tastudio.InsertNumFrames(_changeList[i].Frame, _changeList[i].Number);
@@ -341,9 +345,7 @@ public void ApplyInputChanges()
 						}
 					}
 					_changeList.Clear();
-					Tastudio.JumpToGreenzone();
-					Tastudio.DoAutoRestore();
-				}
+				});
 
 				_luaLibsImpl.IsUpdateSupressed = false;
 			}

src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs

@@ -177,32 +177,11 @@ private TasBranch CreateBranch()
 			};
 		}
 
-		private void LoadBranch(TasBranch branch)
-		{
-			if (Tastudio.Settings.OldControlSchemeForBranches && !Tastudio.TasPlaybackBox.RecordingMode)
-			{
-				JumpToBranchToolStripMenuItem_Click(null, null);
-				return;
-			}
-
-			Movie.LoadBranch(branch);
-			Tastudio.LoadState(new(branch.Frame, new MemoryStream(branch.CoreData, false)));
-
-			Movie.TasStateManager.Capture(Tastudio.Emulator.Frame, Tastudio.Emulator.AsStatable());
-			QuickBmpFile.Copy(new BitmapBufferVideoProvider(branch.CoreFrameBuffer), Tastudio.VideoProvider);
-
-			if (Tastudio.Settings.OldControlSchemeForBranches && Tastudio.TasPlaybackBox.RecordingMode)
-				Movie.Truncate(branch.Frame);
-
-			MainForm.PauseOnFrame = null;
-			Tastudio.RefreshDialog();
-		}
-
 		private bool LoadSelectedBranch()
 		{
 			if (SelectedBranch == null) return false;
 			Branches.Current = BranchView.FirstSelectedRowIndex;
-			LoadBranch(SelectedBranch);
+			Tastudio.LoadBranch(SelectedBranch);
 			BranchView.Refresh();
 			Tastudio.MainForm.AddOnScreenMessage($"Loaded branch {Branches.Current + 1}");
 			return true;
@@ -352,7 +331,7 @@ private void UndoBranchToolStripMenuItem_Click(object sender, EventArgs e)
 		{
 			if (_branchUndo == BranchUndo.Load)
 			{
-				LoadBranch(_backupBranch);
+				Tastudio.LoadBranch(_backupBranch);
 				Tastudio.BranchLoadedCallback?.Invoke(Branches.IndexOf(_backupBranch));
 				Tastudio.MainForm.AddOnScreenMessage("Branch Load canceled");
 			}