Merge branch 'develop'

xjbeta · Nov 26, 2024 · 075f813 · 075f813
2 parents e10332d + 1707dcb
commit 075f813
Show file tree

Hide file tree

Showing 14 changed files with 914 additions and 513 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   release-osx:
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
       - uses: maxim-lobanov/setup-xcode@v1
         with:

diff --git a/IINA+.xcodeproj/project.pbxproj b/IINA+.xcodeproj/project.pbxproj
@@ -40,8 +40,6 @@
 		013A05EF2BC8052900AD63DD /* MainWindowTableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 013A05EE2BC8052900AD63DD /* MainWindowTableView.swift */; };
 		013CE8DE2184459E000271FB /* Danmaku.swift in Sources */ = {isa = PBXBuildFile; fileRef = 013CE8DD2184459E000271FB /* Danmaku.swift */; };
 		013CE8E021854813000271FB /* VideoDecoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 013CE8DF21854813000271FB /* VideoDecoder.swift */; };
-		013CE8F62185D992000271FB /* HttpServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 013CE8F52185D992000271FB /* HttpServer.swift */; };
-		013F9B4B2C2C0A060024020C /* Swifter in Frameworks */ = {isa = PBXBuildFile; productRef = 013F9B4A2C2C0A060024020C /* Swifter */; };
 		014327B722AF5BE100651064 /* OpenFilesWindow.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 014327B622AF5BE100651064 /* OpenFilesWindow.storyboard */; };
 		014327BA22AF5BED00651064 /* OpenFilesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 014327B822AF5BED00651064 /* OpenFilesViewController.swift */; };
 		014327BD22AF5C9D00651064 /* OpenFilesWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 014327BC22AF5C9D00651064 /* OpenFilesWindowController.swift */; };
@@ -50,6 +48,11 @@
 		01479CD7210B35480046AAAD /* MainMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01479CD6210B35480046AAAD /* MainMenu.swift */; };
 		014B447D210069FF00E7AA6A /* Bookmark.swift in Sources */ = {isa = PBXBuildFile; fileRef = 014B447B210069FF00E7AA6A /* Bookmark.swift */; };
 		014B447E210069FF00E7AA6A /* BookmarkExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 014B447C210069FF00E7AA6A /* BookmarkExtension.swift */; };
+		0155C3972CF481B9004A2042 /* DanmakuWebSocketHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0155C3952CF481B9004A2042 /* DanmakuWebSocketHandler.swift */; };
+		0155C3982CF481B9004A2042 /* DanmakuWS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0155C38F2CF481B9004A2042 /* DanmakuWS.swift */; };
+		0155C39B2CF481B9004A2042 /* HttpServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0155C3912CF481B9004A2042 /* HttpServer.swift */; };
+		0155C39C2CF481B9004A2042 /* NIOHTTPServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0155C3932CF481B9004A2042 /* NIOHTTPServer.swift */; };
+		0155C3A12CF493BC004A2042 /* HTTPHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0155C3A02CF493BC004A2042 /* HTTPHandler.swift */; };
 		015C19DC218B0D4F003B2F3A /* VideoGetStructs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 015C19DB218B0D4F003B2F3A /* VideoGetStructs.swift */; };
 		015C19F7218FC9A8003B2F3A /* Block-List-Plus.xml in Resources */ = {isa = PBXBuildFile; fileRef = 015C19F5218FC9A8003B2F3A /* Block-List-Plus.xml */; };
 		015C19F8218FC9A8003B2F3A /* Block-List-Basic.xml in Resources */ = {isa = PBXBuildFile; fileRef = 015C19F6218FC9A8003B2F3A /* Block-List-Basic.xml */; };
@@ -130,6 +133,10 @@
 		01DCD2F9259710D800D286C8 /* BilibiliDMMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01DCD2F8259710D800D286C8 /* BilibiliDMMessage.swift */; };
 		01E40FEB22C304E800864118 /* ImageLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01E40FEA22C304E800864118 /* ImageLoader.swift */; };
 		01E40FF622C39E7100864118 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 01E40FF822C39E7100864118 /* Localizable.strings */; };
+		01E668D02CEA322F008C51E7 /* NIOCore in Frameworks */ = {isa = PBXBuildFile; productRef = 01E668CF2CEA322F008C51E7 /* NIOCore */; };
+		01E668D22CEA322F008C51E7 /* NIOFoundationCompat in Frameworks */ = {isa = PBXBuildFile; productRef = 01E668D12CEA322F008C51E7 /* NIOFoundationCompat */; };
+		01E668D42CEA322F008C51E7 /* NIOHTTP1 in Frameworks */ = {isa = PBXBuildFile; productRef = 01E668D32CEA322F008C51E7 /* NIOHTTP1 */; };
+		01E668D62CEA322F008C51E7 /* NIOWebSocket in Frameworks */ = {isa = PBXBuildFile; productRef = 01E668D52CEA322F008C51E7 /* NIOWebSocket */; };
 		01E6A09C211AD62800C6EF98 /* VideoDurationFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01E6A09B211AD62800C6EF98 /* VideoDurationFormatter.swift */; };
 		01EDCCA72A791EB5001DC138 /* test.htm in Resources */ = {isa = PBXBuildFile; fileRef = 01EDCCA62A791EB5001DC138 /* test.htm */; };
 		01EDCCA82A791EE0001DC138 /* test.htm in Copy Web Files */ = {isa = PBXBuildFile; fileRef = 01EDCCA62A791EB5001DC138 /* test.htm */; };
@@ -218,7 +225,6 @@
 		013A05EE2BC8052900AD63DD /* MainWindowTableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainWindowTableView.swift; sourceTree = "<group>"; };
 		013CE8DD2184459E000271FB /* Danmaku.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Danmaku.swift; sourceTree = "<group>"; };
 		013CE8DF21854813000271FB /* VideoDecoder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoDecoder.swift; sourceTree = "<group>"; };
-		013CE8F52185D992000271FB /* HttpServer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HttpServer.swift; sourceTree = "<group>"; };
 		014327B622AF5BE100651064 /* OpenFilesWindow.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = OpenFilesWindow.storyboard; sourceTree = "<group>"; };
 		014327B822AF5BED00651064 /* OpenFilesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenFilesViewController.swift; sourceTree = "<group>"; };
 		014327BC22AF5C9D00651064 /* OpenFilesWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenFilesWindowController.swift; sourceTree = "<group>"; };
@@ -228,6 +234,11 @@
 		014B447B210069FF00E7AA6A /* Bookmark.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bookmark.swift; sourceTree = "<group>"; };
 		014B447C210069FF00E7AA6A /* BookmarkExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkExtension.swift; sourceTree = "<group>"; };
 		014FD3A42115CB3000F05399 /* Bookmark v0.2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Bookmark v0.2.xcdatamodel"; sourceTree = "<group>"; };
+		0155C38F2CF481B9004A2042 /* DanmakuWS.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DanmakuWS.swift; sourceTree = "<group>"; };
+		0155C3912CF481B9004A2042 /* HttpServer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HttpServer.swift; sourceTree = "<group>"; };
+		0155C3932CF481B9004A2042 /* NIOHTTPServer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NIOHTTPServer.swift; sourceTree = "<group>"; };
+		0155C3952CF481B9004A2042 /* DanmakuWebSocketHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DanmakuWebSocketHandler.swift; sourceTree = "<group>"; };
+		0155C3A02CF493BC004A2042 /* HTTPHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HTTPHandler.swift; sourceTree = "<group>"; };
 		015C19DB218B0D4F003B2F3A /* VideoGetStructs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoGetStructs.swift; sourceTree = "<group>"; };
 		015C19F5218FC9A8003B2F3A /* Block-List-Plus.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "Block-List-Plus.xml"; sourceTree = "<group>"; };
 		015C19F6218FC9A8003B2F3A /* Block-List-Basic.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "Block-List-Basic.xml"; sourceTree = "<group>"; };
@@ -318,12 +329,15 @@
 				01C0809127BC05A500E87A8C /* Gzip in Frameworks */,
 				01C0809D27BC0BC400E87A8C /* SocketRocket in Frameworks */,
 				01C0808827BC049500E87A8C /* CryptoSwift in Frameworks */,
+				01E668D22CEA322F008C51E7 /* NIOFoundationCompat in Frameworks */,
 				01C0809427BC06EC00E87A8C /* SwiftProtobuf in Frameworks */,
 				01C248CD2CE480F30074A76F /* DequeModule in Frameworks */,
-				013F9B4B2C2C0A060024020C /* Swifter in Frameworks */,
+				01E668D62CEA322F008C51E7 /* NIOWebSocket in Frameworks */,
+				01E668D42CEA322F008C51E7 /* NIOHTTP1 in Frameworks */,
 				01C0807C27BC00EA00E87A8C /* Alamofire in Frameworks */,
 				01C0809727BC074000E87A8C /* SDWebImage in Frameworks */,
 				01C0808527BC03E300E87A8C /* SwiftSoup in Frameworks */,
+				01E668D02CEA322F008C51E7 /* NIOCore in Frameworks */,
 				01C0808B27BC04C500E87A8C /* Marshal in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -415,7 +429,7 @@
 				01BAD2AD2B13960600A64D55 /* Extensions */,
 				018F4F5F280D89BB0045B67C /* VideoDecoder */,
 				01B090A6281CFF1B00E305B7 /* Danmaku */,
-				013CE8F52185D992000271FB /* HttpServer.swift */,
+				0155C3962CF481B9004A2042 /* HttpServer */,
 				01260177211ABD3B00C9C639 /* VideoViewsFormatter.swift */,
 				01E6A09B211AD62800C6EF98 /* VideoDurationFormatter.swift */,
 				01AEC8BB20EDFFBD001406E8 /* YouGetJSON.swift */,
@@ -461,6 +475,18 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		0155C3962CF481B9004A2042 /* HttpServer */ = {
+			isa = PBXGroup;
+			children = (
+				0155C3912CF481B9004A2042 /* HttpServer.swift */,
+				0155C3932CF481B9004A2042 /* NIOHTTPServer.swift */,
+				0155C3952CF481B9004A2042 /* DanmakuWebSocketHandler.swift */,
+				0155C38F2CF481B9004A2042 /* DanmakuWS.swift */,
+				0155C3A02CF493BC004A2042 /* HTTPHandler.swift */,
+			);
+			path = HttpServer;
+			sourceTree = "<group>";
+		};
 		016792E8212BF89A003517A7 /* SelectVideoCollectionView */ = {
 			isa = PBXGroup;
 			children = (
@@ -670,8 +696,11 @@
 				01C0809627BC074000E87A8C /* SDWebImage */,
 				01C0809927BC079200E87A8C /* Sparkle */,
 				01C0809C27BC0BC400E87A8C /* SocketRocket */,
-				013F9B4A2C2C0A060024020C /* Swifter */,
 				01C248CC2CE480F30074A76F /* DequeModule */,
+				01E668CF2CEA322F008C51E7 /* NIOCore */,
+				01E668D12CEA322F008C51E7 /* NIOFoundationCompat */,
+				01E668D32CEA322F008C51E7 /* NIOHTTP1 */,
+				01E668D52CEA322F008C51E7 /* NIOWebSocket */,
 			);
 			productName = "iina+";
 			productReference = 01AEC8A720EDFD01001406E8 /* IINA+.app */;
@@ -726,8 +755,8 @@
 				01C0809827BC079200E87A8C /* XCRemoteSwiftPackageReference "Sparkle" */,
 				01C0809B27BC0BC400E87A8C /* XCRemoteSwiftPackageReference "SocketRocket" */,
 				010CE8C72A911010002FA130 /* XCRemoteSwiftPackageReference "SwiftBrotli" */,
-				013F9B492C2C0A060024020C /* XCRemoteSwiftPackageReference "swifter" */,
 				01C248CB2CE480F30074A76F /* XCRemoteSwiftPackageReference "swift-collections" */,
+				01E668CE2CEA322F008C51E7 /* XCRemoteSwiftPackageReference "swift-nio" */,
 			);
 			productRefGroup = 01AEC8A820EDFD01001406E8 /* Products */;
 			projectDirPath = "";
@@ -796,7 +825,6 @@
 				012738C12C731EEB0031E643 /* TaskExtension.swift in Sources */,
 				010F0F1920FE4F0900F33553 /* DataModel.xcdatamodeld in Sources */,
 				0120934227A40869002C7FD3 /* JSPlayerWindowController.swift in Sources */,
-				013CE8F62185D992000271FB /* HttpServer.swift in Sources */,
 				016792E6212BDEE5003517A7 /* SelectVideoCollectionViewItem.swift in Sources */,
 				0101013921200DC5002F0F7F /* LiveUrlTableCellView.swift in Sources */,
 				018F4F6A2812D95C0045B67C /* CC163.swift in Sources */,
@@ -809,6 +837,7 @@
 				01942A3227C345060092FA5A /* DouYinDMResponse.pb.swift in Sources */,
 				01010127211DCAE8002F0F7F /* SidebarViewController.swift in Sources */,
 				01AEC8C220EFBCCF001406E8 /* MPVOption.swift in Sources */,
+				0155C3A12CF493BC004A2042 /* HTTPHandler.swift in Sources */,
 				014327BA22AF5BED00651064 /* OpenFilesViewController.swift in Sources */,
 				016792EE212C421F003517A7 /* SelectVideoCollectionViewItemView.swift in Sources */,
 				0189534F27A138310011BAAC /* JSPlayerViewController.swift in Sources */,
@@ -821,6 +850,10 @@
 				0196CB6421214B4200BCD29E /* AdvancedViewController.swift in Sources */,
 				0199489E2742852E00C71708 /* SupportSites.swift in Sources */,
 				01AEC8AD20EDFD01001406E8 /* MainViewController.swift in Sources */,
+				0155C3972CF481B9004A2042 /* DanmakuWebSocketHandler.swift in Sources */,
+				0155C3982CF481B9004A2042 /* DanmakuWS.swift in Sources */,
+				0155C39B2CF481B9004A2042 /* HttpServer.swift in Sources */,
+				0155C39C2CF481B9004A2042 /* NIOHTTPServer.swift in Sources */,
 				019948BF2743DF3600C71708 /* ObjMenuItem.swift in Sources */,
 				01683DDB2118905D0016A886 /* Bilibili.swift in Sources */,
 				0182F5DD295F108D00DB8BDD /* DouYinResponse.pb.swift in Sources */,
@@ -1068,7 +1101,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.5;
-				MARKETING_VERSION = 0.8.5;
+				MARKETING_VERSION = 0.8.6;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.xjbeta.iina-plus";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1095,7 +1128,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.5;
-				MARKETING_VERSION = 0.8.5;
+				MARKETING_VERSION = 0.8.6;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.xjbeta.iina-plus";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1137,14 +1170,6 @@
 				minimumVersion = 0.1.0;
 			};
 		};
-		013F9B492C2C0A060024020C /* XCRemoteSwiftPackageReference "swifter" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/xjbeta/swifter";
-			requirement = {
-				branch = dev;
-				kind = branch;
-			};
-		};
 		01C0807A27BC00EA00E87A8C /* XCRemoteSwiftPackageReference "Alamofire" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/Alamofire/Alamofire";
@@ -1225,14 +1250,17 @@
 				minimumVersion = 1.1.4;
 			};
 		};
+		01E668CE2CEA322F008C51E7 /* XCRemoteSwiftPackageReference "swift-nio" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/apple/swift-nio.git";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 2.76.1;
+			};
+		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		013F9B4A2C2C0A060024020C /* Swifter */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 013F9B492C2C0A060024020C /* XCRemoteSwiftPackageReference "swifter" */;
-			productName = Swifter;
-		};
 		01C0807B27BC00EA00E87A8C /* Alamofire */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 01C0807A27BC00EA00E87A8C /* XCRemoteSwiftPackageReference "Alamofire" */;
@@ -1283,6 +1311,26 @@
 			package = 01C248CB2CE480F30074A76F /* XCRemoteSwiftPackageReference "swift-collections" */;
 			productName = DequeModule;
 		};
+		01E668CF2CEA322F008C51E7 /* NIOCore */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 01E668CE2CEA322F008C51E7 /* XCRemoteSwiftPackageReference "swift-nio" */;
+			productName = NIOCore;
+		};
+		01E668D12CEA322F008C51E7 /* NIOFoundationCompat */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 01E668CE2CEA322F008C51E7 /* XCRemoteSwiftPackageReference "swift-nio" */;
+			productName = NIOFoundationCompat;
+		};
+		01E668D32CEA322F008C51E7 /* NIOHTTP1 */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 01E668CE2CEA322F008C51E7 /* XCRemoteSwiftPackageReference "swift-nio" */;
+			productName = NIOHTTP1;
+		};
+		01E668D52CEA322F008C51E7 /* NIOWebSocket */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 01E668CE2CEA322F008C51E7 /* XCRemoteSwiftPackageReference "swift-nio" */;
+			productName = NIOWebSocket;
+		};
 /* End XCSwiftPackageProductDependency section */
 
 /* Begin XCVersionGroup section */

diff --git a/IINA+.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/IINA+.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,5 +1,5 @@
 {
-  "originHash" : "e25d26158a9202447104dd429e63878698e1f4c65378618a6d336f857726dcad",
+  "originHash" : "f099a3475c0a7e2433482b156e363090726ee5c4282e5ebeb856433b055e0337",
   "pins" : [
     {
       "identity" : "alamofire",
@@ -64,6 +64,15 @@
         "version" : "2.6.4"
       }
     },
+    {
+      "identity" : "swift-atomics",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-atomics.git",
+      "state" : {
+        "revision" : "cd142fd2f64be2100422d658e7411e39489da985",
+        "version" : "1.2.0"
+      }
+    },
     {
       "identity" : "swift-collections",
       "kind" : "remoteSourceControl",
@@ -73,6 +82,15 @@
         "version" : "1.1.4"
       }
     },
+    {
+      "identity" : "swift-nio",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-nio.git",
+      "state" : {
+        "revision" : "914081701062b11e3bb9e21accc379822621995e",
+        "version" : "2.76.1"
+      }
+    },
     {
       "identity" : "swift-protobuf",
       "kind" : "remoteSourceControl",
@@ -83,21 +101,21 @@
       }
     },
     {
-      "identity" : "swiftbrotli",
+      "identity" : "swift-system",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/f-meloni/SwiftBrotli",
+      "location" : "https://github.com/apple/swift-system.git",
       "state" : {
-        "revision" : "101cedff527d7177c0f93a40b664f1f1475839f0",
-        "version" : "0.1.0"
+        "revision" : "c8a44d836fe7913603e246acab7c528c2e780168",
+        "version" : "1.4.0"
       }
     },
     {
-      "identity" : "swifter",
+      "identity" : "swiftbrotli",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/xjbeta/swifter",
+      "location" : "https://github.com/f-meloni/SwiftBrotli",
       "state" : {
-        "branch" : "dev",
-        "revision" : "b2b6331a083c5d036324c8449cc57fb17c257c3c"
+        "revision" : "101cedff527d7177c0f93a40b664f1f1475839f0",
+        "version" : "0.1.0"
       }
     },
     {

diff --git a/IINA+/AppDelegate.swift b/IINA+/AppDelegate.swift
@@ -63,6 +63,10 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         // Insert code here to tear down your application
     }
 
+    func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
+        return true
+    }
+
     func applicationShouldHandleReopen(_ sender: NSApplication, hasVisibleWindows flag: Bool) -> Bool {
         if !flag {
             for window in sender.windows {