Fix selector tap coordinate mapping

Author: DjDeveloperr

cli/DFPrivateSimulatorDisplayBridge.h

@@ -37,6 +37,7 @@ NS_SWIFT_NAME(PrivateSimulatorDisplayBridge)
 @property (nonatomic, weak, nullable) id<DFPrivateSimulatorDisplayBridgeDelegate> delegate;
 @property (nonatomic, readonly, getter=isDisplayReady) BOOL displayReady;
 @property (nonatomic, readonly) NSString *displayStatus;
+@property (nonatomic, readonly) CGSize displaySize;
 
 - (nullable CVPixelBufferRef)copyPixelBuffer CF_RETURNS_RETAINED;
 

cli/DFPrivateSimulatorDisplayBridge.m

@@ -2989,6 +2989,21 @@ - (NSString *)displayStatus {
     return status;
 }
 
+- (CGSize)displaySize {
+    __block CGSize size = CGSizeZero;
+    dispatch_block_t work = ^{
+        size = self->_displayPixelSize;
+    };
+
+    if (dispatch_get_specific(DFPrivateSimulatorCallbackQueueKey) != NULL) {
+        work();
+    } else {
+        dispatch_sync(_callbackQueue, work);
+    }
+
+    return size;
+}
+
 - (BOOL)sendTouchAtNormalizedX:(double)normalizedX
                    normalizedY:(double)normalizedY
                          phase:(DFPrivateSimulatorTouchPhase)phase

cli/native/XCWNativeBridge.h

@@ -59,6 +59,7 @@ char * _Nullable xcw_native_get_pasteboard_text(const char * _Nonnull udid, char
 
 void * _Nullable xcw_native_input_create(const char * _Nonnull udid, char * _Nullable * _Nullable error_message);
 void xcw_native_input_destroy(void * _Nullable handle);
+bool xcw_native_input_display_size(void * _Nonnull handle, double * _Nullable width, double * _Nullable height);
 bool xcw_native_input_send_touch(void * _Nonnull handle, double x, double y, const char * _Nonnull phase, char * _Nullable * _Nullable error_message);
 bool xcw_native_input_send_multitouch(void * _Nonnull handle, double x1, double y1, double x2, double y2, const char * _Nonnull phase, char * _Nullable * _Nullable error_message);
 

cli/native/XCWNativeBridge.m

@@ -325,6 +325,22 @@ void xcw_native_input_destroy(void *handle) {
     }
 }
 
+bool xcw_native_input_display_size(void *handle, double *width, double *height) {
+    @autoreleasepool {
+        if (handle == NULL) {
+            return false;
+        }
+        CGSize size = [(__bridge DFPrivateSimulatorDisplayBridge *)handle displaySize];
+        if (width != NULL) {
+            *width = size.width;
+        }
+        if (height != NULL) {
+            *height = size.height;
+        }
+        return size.width > 0.0 && size.height > 0.0;
+    }
+}
+
 bool xcw_native_input_send_touch(void *handle, double x, double y, const char *phase, char **error_message) {
     @autoreleasepool {
         if (handle == NULL) {

scripts/integration/cli.mjs

@@ -363,18 +363,13 @@ async function runCliControls() {
   );
   await cliStep(
     "CLI focus fixture text field",
-    ["tap", simulatorUDID, "--id", "fixture.message", "--wait-timeout-ms", "5000"],
-    {},
-    { expectFixture: true },
-  );
-  await cliStep(
-    "CLI focus fixture text field normalized",
     [
       "tap",
       simulatorUDID,
-      "0.708",
-      "0.5",
-      "--normalized",
+      "--id",
+      "fixture.message",
+      "--wait-timeout-ms",
+      "5000",
       "--duration-ms",
       "120",
       "--post-delay-ms",
@@ -900,7 +895,10 @@ async function verifyUi(label, options = {}) {
 }
 
 async function resolveKnownSystemPrompts(snapshot, label) {
-  if (!looksLikeOpenUrlPrompt(snapshot) && !looksLikeKeyboardTipPrompt(snapshot)) {
+  if (
+    !looksLikeOpenUrlPrompt(snapshot) &&
+    !looksLikeKeyboardTipPrompt(snapshot)
+  ) {
     return snapshot;
   }
   const promptKind = looksLikeOpenUrlPrompt(snapshot)
@@ -934,7 +932,10 @@ async function resolveKnownSystemPrompts(snapshot, label) {
         maxElapsedMs: describeUiBudgetMs,
       },
     );
-    if (!looksLikeOpenUrlPrompt(current) && !looksLikeKeyboardTipPrompt(current)) {
+    if (
+      !looksLikeOpenUrlPrompt(current) &&
+      !looksLikeKeyboardTipPrompt(current)
+    ) {
       logStep(`system ${promptKind} prompt cleared by ${action.label}`);
       return current;
     }
@@ -946,13 +947,21 @@ function openUrlPromptActions(snapshot) {
   const actions = [
     {
       label: "key enter",
-      run: () => simdeckJson(["key", simulatorUDID, "enter"], { timeoutMs: 60_000 }),
+      run: () =>
+        simdeckJson(["key", simulatorUDID, "enter"], { timeoutMs: 60_000 }),
     },
     {
       label: "tap Open by label",
       run: () =>
         simdeckJson(
-          ["tap", simulatorUDID, "--label", "Open", "--wait-timeout-ms", "5000"],
+          [
+            "tap",
+            simulatorUDID,
+            "--label",
+            "Open",
+            "--wait-timeout-ms",
+            "5000",
+          ],
           { timeoutMs: 60_000 },
         ),
     },
@@ -1064,10 +1073,7 @@ function buttonCandidatePoints(snapshot, label) {
     return [];
   }
   const bounds = rootBounds(snapshot);
-  const candidates = [
-    point,
-    { x: point.y, y: point.x },
-  ];
+  const candidates = [point, { x: point.y, y: point.x }];
   if (bounds) {
     candidates.push(
       { x: bounds.width - point.x, y: point.y },
@@ -1087,10 +1093,7 @@ function openButtonCandidatePoints(snapshot) {
     return [];
   }
   const bounds = rootBounds(snapshot);
-  const candidates = [
-    point,
-    { x: point.y, y: point.x },
-  ];
+  const candidates = [point, { x: point.y, y: point.x }];
   if (bounds) {
     candidates.push(
       { x: bounds.width - point.x, y: point.y },
@@ -1266,12 +1269,7 @@ function runBuffer(command, args, options = {}) {
       `${command} ${args.join(" ")} took ${elapsedMs}ms, above ${options.maxElapsedMs}ms budget`,
     );
   }
-  logCommandResult(
-    command,
-    args,
-    elapsedMs,
-    `<${result.stdout.length} bytes>`,
-  );
+  logCommandResult(command, args, elapsedMs, `<${result.stdout.length} bytes>`);
   return result.stdout;
 }