Work on external display

Nakarima · Jul 23, 2019 · 8b21362 · 8b21362
1 parent 83075eb
commit 8b21362
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 16 deletions.
diff --git a/Blink/Info.plist b/Blink/Info.plist
@@ -132,7 +132,7 @@
 		<true/>
 		<key>UISceneConfigurations</key>
 		<dict>
-			<key>UIWindowSceneSessionRoleExternalDisplay</key>
+			<key>UIWindowSceneSessionRoleApplication</key>
 			<array>
 				<dict>
 					<key>UISceneDelegateClassName</key>
@@ -141,7 +141,7 @@
 					<string>main</string>
 				</dict>
 			</array>
-			<key>UIWindowSceneSessionRoleApplication</key>
+			<key>UIWindowSceneSessionRoleExternalDisplay</key>
 			<array>
 				<dict>
 					<key>UISceneDelegateClassName</key>

diff --git a/Blink/SceneDelegate.swift b/Blink/SceneDelegate.swift
@@ -49,7 +49,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     let spaceCntrl = SpaceController()
     spaceCntrl.restoreWith(stateRestorationActivity: session.stateRestorationActivity)
     window?.rootViewController = spaceCntrl
-    window?.makeKeyAndVisible()
+    window?.isHidden = false
   }
 
   private func _tuneOverscanIfNeeded(session: UISceneSession) {
@@ -84,4 +84,5 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
   private var _spaceController: SpaceController? {
     window?.rootViewController as? SpaceController
   }
+
 }
diff --git a/Blink/SpaceController.swift b/Blink/SpaceController.swift
@@ -651,7 +651,37 @@ extension SpaceController {
 
 
   @objc func _focusOtherScreenAction() {
+    let app = UIApplication.shared
+    let sessions = Array(app.openSessions)
+      .sorted(by: {(a, b) in
+      a.persistentIdentifier > b.persistentIdentifier
+    })
+//    view.window?.windowScene?.session.persistentIdentifier
+    guard
+      sessions.count > 1,
+      let session = view.window?.windowScene?.session,
+      let idx = sessions.firstIndex(of: session)?.advanced(by: 1)
+    else  {
+      return
+    }
+
+    let nextSession: UISceneSession
+    if idx < sessions.endIndex {
+      nextSession = sessions[idx]
+    } else {
+     nextSession = sessions[0]
+    }
 
+    if let scene = nextSession.scene as? UIWindowScene,
+      scene.activationState == .foregroundActive || scene.activationState == .foregroundInactive,
+      let delegate = scene.delegate as? SceneDelegate,
+      let window = delegate.window,
+      let spaceCtrl = window.rootViewController as? SpaceController
+      {
+      window.makeKeyAndVisible()
+    } else {
+      app.requestSceneSessionActivation(nextSession, userActivity: nil, options: nil, errorHandler: nil)
+    }
   }
 
   @objc func _moveToOtherScreenAction() {

diff --git a/Blink/TermInput.m b/Blink/TermInput.m
@@ -411,19 +411,6 @@ - (BOOL)becomeFirstResponder
   return res;
 }
 
-- (BOOL)canResignFirstResponder {
-  return UIApplication.sharedApplication.applicationState == UIApplicationStateActive;
-}
-
-- (BOOL)resignFirstResponder
-{
-  if (UIApplication.sharedApplication.applicationState == UIApplicationStateInactive) {
-    return NO;
-  }
-  [_device blur];
-  return [super resignFirstResponder];
-}
-
 - (void)reset
 {
   _skipTextStorageDelete = YES;