+ Move windows of disabled monitor

Eun · Eun · commit b93094c42d57 · 2014-06-04T10:31:47.000+02:00
diff --git a/DisableMonitor-Info.plist b/DisableMonitor-Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1</string>
+	<string>1.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1</string>
+	<string>1.2</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>LSUIElement</key>
diff --git a/DisableMonitor.xcodeproj/project.pbxproj b/DisableMonitor.xcodeproj/project.pbxproj
@@ -32,7 +32,6 @@
 		592CED8018FEBDB300FDDF65 /* GLFW.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GLFW.m; sourceTree = "<group>"; };
 		592CED8618FEC42800FDDF65 /* status_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = status_icon.png; sourceTree = "<group>"; };
 		598E9891193DC99B005DEB10 /* MainMenu.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainMenu.xib; sourceTree = "<group>"; };
-		598E9893193DC9DD005DEB10 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
 		59B5766618FFDC6700B57E77 /* icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = icon.icns; sourceTree = "<group>"; };
 		8D1107310486CEB800E47090 /* DisableMonitor-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "DisableMonitor-Info.plist"; sourceTree = "<group>"; };
 		8D1107320486CEB800E47090 /* DisableMonitor.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DisableMonitor.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -208,7 +207,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				089C165DFE840E0CC02AAC07 /* English */,
-				598E9893193DC9DD005DEB10 /* de */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";
diff --git a/DisableMonitor.xcodeproj/project.xcworkspace/xcuserdata/salzmann.xcuserdatad/UserInterfaceState.xcuserstate b/DisableMonitor.xcodeproj/project.xcworkspace/xcuserdata/salzmann.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/DisableMonitor.xcodeproj/project.xcworkspace/xcuserdata/salzmann.xcuserdatad/xcdebugger/Expressions.xcexplist b/DisableMonitor.xcodeproj/project.xcworkspace/xcuserdata/salzmann.xcuserdatad/xcdebugger/Expressions.xcexplist
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VariablesViewState
+   version = "1.0">
+   <ContextStates>
+      <ContextState
+         contextName = "-[DisableMonitorAppDelegate MoveAllWindows:to:]:DisableMonitorAppDelegate.m">
+         <PersistentStrings>
+            <PersistentString
+               value = "[app processIdentifier]">
+            </PersistentString>
+         </PersistentStrings>
+      </ContextState>
+   </ContextStates>
+</VariablesViewState>
diff --git a/DisableMonitor.xcodeproj/xcuserdata/salzmann.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/DisableMonitor.xcodeproj/xcuserdata/salzmann.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -2,214 +2,4 @@
 <Bucket
    type = "1"
    version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "DisableMonitorAppDelegate.m"
-            timestampString = "423479947.018587"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "257"
-            endingLineNumber = "257"
-            landmarkName = "-DetectMonitors:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "DisableMonitorAppDelegate.m"
-            timestampString = "423479947.018587"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "304"
-            endingLineNumber = "304"
-            landmarkName = "-menuNeedsUpdate:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "DisableMonitorAppDelegate.m"
-            timestampString = "423479947.018587"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "235"
-            endingLineNumber = "235"
-            landmarkName = "-MonitorResolution:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "DisableMonitorAppDelegate.m"
-            timestampString = "423479947.018587"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "297"
-            endingLineNumber = "297"
-            landmarkName = "-menuNeedsUpdate:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "DisableMonitorAppDelegate.m"
-            timestampString = "423479947.018587"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "300"
-            endingLineNumber = "300"
-            landmarkName = "-menuNeedsUpdate:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "DisableMonitorAppDelegate.m"
-            timestampString = "423479947.018587"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "298"
-            endingLineNumber = "298"
-            landmarkName = "-menuNeedsUpdate:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "DisableMonitorAppDelegate.m"
-            timestampString = "423479947.018587"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "323"
-            endingLineNumber = "323"
-            landmarkName = "-menuNeedsUpdate:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "DisableMonitorAppDelegate.m"
-            timestampString = "423479947.018587"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "377"
-            endingLineNumber = "377"
-            landmarkName = "-menuNeedsUpdate:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "DisableMonitorAppDelegate.m"
-            timestampString = "423479947.018587"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "394"
-            endingLineNumber = "394"
-            landmarkName = "-menuNeedsUpdate:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "DisableMonitorAppDelegate.m"
-            timestampString = "423479947.018587"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "388"
-            endingLineNumber = "388"
-            landmarkName = "-menuNeedsUpdate:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "DisableMonitorAppDelegate.m"
-            timestampString = "423479947.018587"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "389"
-            endingLineNumber = "389"
-            landmarkName = "-menuNeedsUpdate:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "DisableMonitorAppDelegate.m"
-            timestampString = "423479947.018587"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "85"
-            endingLineNumber = "85"
-            landmarkName = "-ToggleMonitor:enabled:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "DisableMonitorAppDelegate.m"
-            timestampString = "423479947.018587"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "49"
-            endingLineNumber = "49"
-            landmarkName = "screenNameForDisplay()"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
 </Bucket>
diff --git a/DisableMonitorAppDelegate.m b/DisableMonitorAppDelegate.m
@@ -23,7 +23,7 @@ @implementation DisableMonitorAppDelegate
 
 @synthesize window;
 
-
+extern AXError _AXUIElementGetWindow(AXUIElementRef, CGWindowID* out);
 extern io_service_t IOServicePortFromCGDisplayID(CGDirectDisplayID displayID);
 extern CGError CGSConfigureDisplayEnabled(CGDisplayConfigRef, CGDirectDisplayID, bool);
 extern CGDisplayErr CGSGetDisplayList(CGDisplayCount maxDisplays, CGDirectDisplayID * onlineDspys, CGDisplayCount * dspyCnt);
@@ -36,9 +36,6 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
 }
 
 
-
-static void KeyArrayCallback(const void* key, const void* value, void* context) { CFArrayAppendValue(context, key);  }
-
 NSString* screenNameForDisplay(CGDirectDisplayID displayID)
 {
     NSString *screenName = nil;
@@ -77,11 +74,94 @@ -(void)ShowError:(NSString*)error
 
 #define ShowError(...) [self ShowError:[NSString stringWithFormat:__VA_ARGS__]];
 
+-(void)MoveAllWindows:(CGDirectDisplayID) display to:(CGDirectDisplayID*)todisplay
+{
+    CFArrayRef windowList = CGWindowListCopyWindowInfo(kCGWindowListExcludeDesktopElements, kCGNullWindowID);
+    CGRect bounds = CGDisplayBounds(display);
+    CGRect dstbounds = CGDisplayBounds(todisplay);
+    for (NSDictionary *windowItem in ((NSArray *)windowList))
+    {
+        NSNumber *windowLayer = (NSNumber*)[windowItem objectForKey:(id)kCGWindowLayer];
+        if ([windowLayer intValue] == 0)
+        {
+            CGRect windowBounds;
+            CGRectMakeWithDictionaryRepresentation((CFDictionaryRef)[windowItem objectForKey:(id)kCGWindowBounds], &windowBounds);
+            if (CGRectContainsRect(bounds, windowBounds))
+            {
+                BOOL bSuccess = false;
+                NSNumber *windowNumber = (NSNumber*)[windowItem objectForKey:(id)kCGWindowNumber];
+                NSNumber *windowOwnerPid = (NSNumber*)[windowItem objectForKey:(id)kCGWindowOwnerPID];
+                AXUIElementRef appRef = AXUIElementCreateApplication([windowOwnerPid longValue]);
+                if (appRef != nil) {
+                    
+                    CFArrayRef _windows;
+                    if (AXUIElementCopyAttributeValues(appRef, kAXWindowsAttribute, 0, 100, &_windows) == kAXErrorSuccess)
+                    {
+                        for (int i = 0, len = CFArrayGetCount(_windows); i < len; i++)
+                        {
+                            AXUIElementRef _windowItem = CFArrayGetValueAtIndex(_windows,i);
+                            CGWindowID windowID;
+                            if (_AXUIElementGetWindow(_windowItem, &windowID) == kAXErrorSuccess)
+                            {
+                                if (windowID == windowNumber.longValue)
+                                {
+                                    NSPoint tmpPos;
+                                    tmpPos.x = dstbounds.origin.x;
+                                    tmpPos.y = dstbounds.origin.y;
+                                    CFTypeRef _position = (CFTypeRef)(AXValueCreate(kAXValueCGPointType, (const void *)&tmpPos));
+                                    if(AXUIElementSetAttributeValue(_windowItem,kAXPositionAttribute,(CFTypeRef*)_position) == kAXErrorSuccess){
+                                            bSuccess = true;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    CFRelease(appRef);
+                }
+                
+                if (!bSuccess)
+                {
+                    NSLog(@"Could not move window %ld of %ld", windowNumber.longValue, windowOwnerPid.longValue);
+                }
+            }
+        }
+        
+    }
+    CFRelease(windowList);
+}
+
 -(void)ToggleMonitor:(CGDirectDisplayID) display enabled:(Boolean) enabled
 {
+    
+
     CGError err;
     CGDisplayConfigRef config;
     @try {
+        
+        if (enabled == false)
+        {
+            CGDirectDisplayID    displays[0x10];
+            CGDisplayCount  nDisplays = 0;
+            
+            CGDisplayErr err = CGSGetDisplayList(0x10, displays, &nDisplays);
+            
+            if (err == 0 && nDisplays > 0)
+            {
+                for (int i = 0; i < nDisplays; i++)
+                {
+                    if (displays[i] == display)
+                        continue;
+                    if (!CGDisplayIsOnline(displays[i]))
+                        continue;
+                    if (!CGDisplayIsActive(displays[i]))
+                        continue;
+                    [self MoveAllWindows:display to:displays[i]];
+                    break;
+                }
+            }
+        }
+
+        
         err = CGBeginDisplayConfiguration (&config);
         if (err != 0)
         {
@@ -100,6 +180,8 @@ -(void)ToggleMonitor:(CGDirectDisplayID) display enabled:(Boolean) enabled
             ShowError(@"Error in CGCompleteDisplayConfiguration: %d", err);
             return;
         }
+        
+        
     }
     @catch (NSException *exception) {
         
diff --git a/README.md b/README.md
@@ -10,6 +10,9 @@ Easily disable or enable a monitor on your Mac!
 
 Changelog
 =========
+1.2:
+* Move windows from disabled monitor to an active one
+
 1.1: 
 * Resolution can now be changed!
 * Bugfixes
