display(iOS): fix scale/origin saving

This was broken in the re-factor. We fix the functionality and also
clean up the code and make it so the persistent value is always up to
date.

Fixes #3669

Configuration/UTMViewState.h

@@ -25,8 +25,6 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) double displayScale;
 @property (nonatomic, assign) double displayOriginX;
 @property (nonatomic, assign) double displayOriginY;
-@property (nonatomic, assign) double displaySizeWidth;
-@property (nonatomic, assign) double displaySizeHeight;
 @property (nonatomic, assign) BOOL hasSaveState;
 @property (nonatomic, copy, nullable) NSData *sharedDirectory;
 @property (nonatomic, copy, nullable) NSString *sharedDirectoryPath;

Configuration/UTMViewState.m

@@ -20,8 +20,6 @@
 const NSString *const kUTMViewStateDisplayScaleKey = @"DisplayScale";
 const NSString *const kUTMViewStateDisplayOriginXKey = @"DisplayOriginX";
 const NSString *const kUTMViewStateDisplayOriginYKey = @"DisplayOriginY";
-const NSString *const kUTMViewStateDisplaySizeWidthKey = @"DisplaySizeWidth";
-const NSString *const kUTMViewStateDisplaySizeHeightKey = @"DisplaySizeHeight";
 const NSString *const kUTMViewStateShowToolbarKey = @"ShowToolbar";
 const NSString *const kUTMViewStateShowKeyboardKey = @"ShowKeyboard";
 const NSString *const kUTMViewStateSuspendedKey = @"Suspended";
@@ -79,24 +77,6 @@ - (void)setDisplayOriginY:(double)displayOriginY {
     _rootDict[kUTMViewStateDisplayOriginYKey] = @(displayOriginY);
 }
 
-- (double)displaySizeWidth {
-    return [_rootDict[kUTMViewStateDisplaySizeWidthKey] doubleValue];
-}
-
-- (void)setDisplaySizeWidth:(double)displaySizeWidth {
-    [self propertyWillChange];
-    _rootDict[kUTMViewStateDisplaySizeWidthKey] = @(displaySizeWidth);
-}
-
-- (double)displaySizeHeight {
-    return [_rootDict[kUTMViewStateDisplaySizeHeightKey] doubleValue];
-}
-
-- (void)setDisplaySizeHeight:(double)displaySizeHeight {
-    [self propertyWillChange];
-    _rootDict[kUTMViewStateDisplaySizeHeightKey] = @(displaySizeHeight);
-}
-
 - (BOOL)hasSaveState {
     return [_rootDict[kUTMViewStateSuspendedKey] boolValue];
 }
@@ -216,8 +196,6 @@ - (instancetype)init {
         self.displayScale = 1.0;
         self.displayOriginX = 0;
         self.displayOriginY = 0;
-        self.displaySizeWidth = 0;
-        self.displaySizeHeight = 0;
     }
     return self;
 }

Managers/UTMInputOutput.h

@@ -31,8 +31,6 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)connectWithCompletion:(ioConnectCompletionHandler_t)block;
 - (void)disconnect;
 - (CSScreenshot* _Nullable)screenshot;
-- (void)syncViewState:(UTMViewState *)viewState;
-- (void)restoreViewState:(UTMViewState *)viewState;
 
 @end
 

Managers/UTMQemuVirtualMachine.m

@@ -59,11 +59,6 @@ - (UTMQemuConfiguration *)qemuConfig {
     return (UTMQemuConfiguration *)self.config;
 }
 
-- (void)setDelegate:(id<UTMVirtualMachineDelegate>)delegate {
-    [super setDelegate:delegate];
-    [self.ioService restoreViewState:self.viewState];
-}
-
 - (id)ioDelegate {
     if ([self.ioService isKindOfClass:[UTMSpiceIO class]]) {
         return ((UTMSpiceIO *)self.ioService).delegate;
@@ -403,9 +398,6 @@ - (void)_vmStartWithCompletion:(void (^)(NSError * _Nullable))completion {
     assert(self.qemu.isConnected);
     assert(self.ioService.isConnected);
     [self changeState:kVMStarted];
-    dispatch_async(dispatch_get_main_queue(), ^{
-        [self.ioService restoreViewState:self.viewState];
-    });
     if (self.viewState.hasSaveState) {
         [self _vmDeleteStateWithCompletion:^(NSError *error){
             // ignore error
@@ -439,9 +431,6 @@ - (void)_vmStopForce:(BOOL)force completion:(void (^)(NSError * _Nullable))compl
         completion([self errorGeneric]);
         return;
     }
-    dispatch_sync(dispatch_get_main_queue(), ^{
-        [self.ioService syncViewState:self.viewState];
-    });
     if (!force) {
         [self changeState:kVMStopping];
     }
@@ -484,9 +473,6 @@ - (void)_vmResetWithCompletion:(void (^)(NSError * _Nullable))completion {
         completion([self errorGeneric]);
         return;
     }
-    dispatch_sync(dispatch_get_main_queue(), ^{
-        [self.ioService syncViewState:self.viewState];
-    });
     [self changeState:kVMStopping];
     if (self.viewState.hasSaveState) {
         [self _vmDeleteStateWithCompletion:^(NSError *error) {}];
@@ -525,9 +511,6 @@ - (void)_vmPauseWithCompletion:(void (^)(NSError * _Nullable))completion {
         completion([self errorGeneric]);
         return;
     }
-    dispatch_sync(dispatch_get_main_queue(), ^{
-        [self.ioService syncViewState:self.viewState];
-    });
     [self changeState:kVMPausing];
     dispatch_sync(dispatch_get_main_queue(), ^{
         [self updateScreenshot];
@@ -657,9 +640,6 @@ - (void)_vmResumeWithCompletion:(void (^)(NSError * _Nullable))completion {
     }
     if (!resumeError) {
         [self changeState:kVMStarted];
-        dispatch_async(dispatch_get_main_queue(), ^{
-            [self.ioService restoreViewState:self.viewState];
-        });
     } else {
         [self changeState:kVMStopped];
     }

Managers/UTMSpiceIO.m

@@ -126,24 +126,6 @@ - (CSScreenshot *)screenshot {
     return [self.primaryDisplay screenshot];
 }
 
-- (void)syncViewState:(UTMViewState *)viewState {
-    viewState.displayOriginX = self.primaryDisplay.viewportOrigin.x;
-    viewState.displayOriginY = self.primaryDisplay.viewportOrigin.y;
-    viewState.displaySizeWidth = self.primaryDisplay.displaySize.width;
-    viewState.displaySizeHeight = self.primaryDisplay.displaySize.height;
-    viewState.displayScale = self.primaryDisplay.viewportScale;
-}
-
-- (void)restoreViewState:(UTMViewState *)viewState {
-    self.primaryDisplay.viewportOrigin = CGPointMake(viewState.displayOriginX, viewState.displayOriginY);
-    self.primaryDisplay.displaySize = CGSizeMake(viewState.displaySizeWidth, viewState.displaySizeHeight);
-    if (viewState.displayScale) { // cannot be zero
-        self.primaryDisplay.viewportScale = viewState.displayScale;
-    } else {
-        self.primaryDisplay.viewportScale = 1.0; // default value
-    }
-}
-
 #pragma mark - CSConnectionDelegate
 
 - (void)spiceConnected:(CSConnection *)connection {

Managers/UTMTerminalIO.m

@@ -63,10 +63,4 @@ - (CSScreenshot *)screenshot {
     return nil;
 }
 
-- (void)syncViewState:(UTMViewState *)viewState {
-}
-
-- (void)restoreViewState:(UTMViewState *)viewState {
-}
-
 @end

Platform/iOS/Display/VMDisplayMetalViewController+Touch.m

@@ -296,6 +296,9 @@ - (void)moveScreen:(UIPanGestureRecognizer *)sender {
         viewport.x = CGPointToPixel(translation.x) + _lastTwoPanOrigin.x;
         viewport.y = CGPointToPixel(translation.y) + _lastTwoPanOrigin.y;
         self.vmDisplay.viewportOrigin = [self clipDisplayToView:viewport];
+        // persist this change in viewState
+        self.vm.viewState.displayOriginX = self.vmDisplay.viewportOrigin.x;
+        self.vm.viewState.displayOriginY = self.vmDisplay.viewportOrigin.y;
     }
     if (sender.state == UIGestureRecognizerStateEnded) {
         // TODO: decelerate
@@ -433,6 +436,8 @@ - (IBAction)gesturePinch:(UIPinchGestureRecognizer *)sender {
     if (sender.state == UIGestureRecognizerStateEnded && (self.twoFingerPanType == VMGestureTypeMoveScreen || self.threeFingerPanType == VMGestureTypeMoveScreen)) {
         NSAssert(sender.scale > 0, @"sender.scale cannot be 0");
         self.vmDisplay.viewportScale *= sender.scale;
+        // persist this change in viewState
+        self.vm.viewState.displayScale = self.vmDisplay.viewportScale;
         sender.scale = 1.0;
     }
 }

Platform/iOS/Display/VMDisplayMetalViewController.m

@@ -175,11 +175,19 @@ - (void)resizeDisplayToFit {
     CGSize scaled = CGSizeMake(viewSize.width / displaySize.width, viewSize.height / displaySize.height);
     self.vmDisplay.viewportScale = MIN(scaled.width, scaled.height);
     self.vmDisplay.viewportOrigin = CGPointMake(0, 0);
+    // persist this change in viewState
+    self.vm.viewState.displayScale = self.vmDisplay.viewportScale;
+    self.vm.viewState.displayOriginX = 0;
+    self.vm.viewState.displayOriginY = 0;
 }
 
 - (void)resetDisplay {
     self.vmDisplay.viewportScale = 1.0;
     self.vmDisplay.viewportOrigin = CGPointMake(0, 0);
+    // persist this change in viewState
+    self.vm.viewState.displayScale = 1.0;
+    self.vm.viewState.displayOriginX = 0;
+    self.vm.viewState.displayOriginY = 0;
 }
 
 #pragma mark - Resizing
@@ -205,6 +213,12 @@ - (void)spiceDidCreateDisplay:(CSDisplayMetal *)display {
     if (display.isPrimaryDisplay) {
         self.vmDisplay = display;
         _renderer.source = display;
+        // restore last size
+        display.viewportOrigin = CGPointMake(self.vm.viewState.displayOriginX, self.vm.viewState.displayOriginY);
+        double displayScale = self.vm.viewState.displayScale;
+        if (displayScale) { // cannot be zero
+            display.viewportScale = displayScale;
+        }
     }
 }
 

Platform/iOS/Display/VMToolbarActions.swift

@@ -229,9 +229,8 @@ import SwiftUI
         }
         if viewController.vm.state == .vmStarted {
             let yes = UIAlertAction(title: NSLocalizedString("Yes", comment: "VMDisplayViewController"), style: .destructive) { action in
-                DispatchQueue.global(qos: .background).async {
-                    viewController.vm.requestVmDeleteState()
-                    viewController.vm.requestVmStop()
+                viewController.vm.requestVmDeleteState()
+                viewController.vm.vmStop { _ in
                     viewController.terminateApplication()
                 }
             }

Platform/macOS/UTMDataExtension.swift

@@ -58,12 +58,13 @@ extension UTMData {
         if vm.viewState.hasSaveState {
             vm.requestVmDeleteState()
         }
-        vm.requestVmStop(force: true)
-        if let window = vmWindows[vm] {
-            DispatchQueue.main.async {
-                window.close()
+        vm.vmStop(force: true, completion: { _ in
+            if let window = self.vmWindows[vm] {
+                DispatchQueue.main.async {
+                    window.close()
+                }
             }
-        }
+        })
     }
 
     func trySendTextSpice(vm: UTMQemuVirtualMachine, text: String) {