From a4b45aee7bc49ea4629588720a47f5dee21f3aa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fjo=CC=88lnir=20A=CC=81sgeirsson?= <fjolnir@asgeirsson.is>
Date: Tue, 15 Oct 2013 14:58:42 +0900
Subject: [PATCH 1/9] Added Focus follows mouse option

---
 Afloat.h                             |   2 +
 Afloat.m                             |  28 +-
 AfloatStorage.h                      |   3 +
 AfloatStorage.m                      |  33 +-
 en.lproj/Afloat.nib/designable.nib   | 557 ++++-----------------------
 en.lproj/Afloat.nib/keyedobjects.nib | Bin 4778 -> 4152 bytes
 6 files changed, 142 insertions(+), 481 deletions(-)

diff --git a/Afloat.h b/Afloat.h
index 8ae455f..724175f 100644
--- a/Afloat.h
+++ b/Afloat.h
@@ -30,6 +30,8 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 - (IBAction) makeMoreTransparent:(id) sender;
 - (IBAction) makeLessTransparent:(id) sender;
 
+- (IBAction) toggleFocusFollowsMouse:(id)sender;
+
 - (IBAction) showAdjustEffectsPanel:(id) sender;
 
 - (CGFloat) currentAlphaValueForWindow:(NSWindow*) w;
diff --git a/Afloat.m b/Afloat.m
index 36f7c9d..8f88f9d 100644
--- a/Afloat.m
+++ b/Afloat.m
@@ -141,6 +141,11 @@ - (void) install {
 	
 	// Scripting support.
 	[self installScriptingSupport];
+    
+    // Set up tracking rectangles
+    for(NSWindow *window in [NSApp windows]) {
+        [self beginTrackingWindow:window];
+    }
 }
 
 - (NSUInteger) indexForInstallingInMenu:(NSMenu*) m {
@@ -180,6 +185,8 @@ - (BOOL) validateMenuItem:(NSMenuItem*) item {
 		return c != nil;
 	} else if ([item action] == @selector(showWindowFileInFinder:))
 		return [[self currentWindow] representedURL]? [[[self currentWindow] representedURL] isFileURL] : NO;
+    else if ([item action] == @selector(toggleFocusFollowsMouse:))
+        [item setState:[[AfloatStorage globalValueForKey:@"FocusFollowsMouse"] boolValue] ? NSOnState : NSOffState];
 	
 	return YES;
 }
@@ -309,11 +316,6 @@ - (void) setAlphaValue:(CGFloat) f forWindow:(NSWindow*) window animated:(BOOL)
 	
 	[AfloatStorage setSharedValue:[NSNumber numberWithFloat:f] window:window key:kAfloatLastAlphaValueKey];
 	
-	if (f == 1.0)
-		[self endTrackingWindow:window];
-	else
-		[self beginTrackingWindow:window];
-	
 	if (animate) {
 		[NSAnimationContext beginGrouping];
 		[[NSAnimationContext currentContext] setDuration:0.3];
@@ -366,10 +368,18 @@ - (void) mouseEntered:(NSEvent*) e {
 	L0Log(@"%@", e);
 	
 	[self animateFadeInForWindow:[e window]];
+
+    BOOL focusFollowsMouse = [[AfloatStorage globalValueForKey:@"FocusFollowsMouse"] boolValue];
+    BOOL commandDown       = [NSEvent modifierFlags] & NSCommandKeyMask ? YES : NO;
+    if(((focusFollowsMouse && !commandDown) || (!focusFollowsMouse && commandDown)) && ![[e window] isKeyWindow]) {
+        [[e window] makeKeyAndOrderFront:nil];
+        [NSApp activateIgnoringOtherApps:YES];
+    }
 }
 
 - (void) windowDidBecomeMain:(NSNotification*) n {
 	[self animateFadeInForWindow:[n object]];
+    [self beginTrackingWindow:[n object]];
 }
 
 - (void) animateFadeInForWindow:(NSWindow*) w {
@@ -390,6 +400,7 @@ - (void) mouseExited:(NSEvent*) e {
 
 - (void) windowDidResignMain:(NSNotification*) n {
 	[self animateFadeOutForWindow:[n object]];
+    [self beginTrackingWindow:[n object]];
 }
 
 - (void) animateFadeOutForWindow:(NSWindow*) w {
@@ -406,6 +417,13 @@ - (void) animateFadeOutForWindow:(NSWindow*) w {
 	
 }
 
+- (IBAction) toggleFocusFollowsMouse:(id)sender {
+    BOOL enable = ![[AfloatStorage globalValueForKey:@"FocusFollowsMouse"] boolValue];
+
+    [AfloatStorage setGlobalValue:@(enable)
+                           forKey:@"FocusFollowsMouse"];
+}
+
 - (IBAction) showAdjustEffectsPanel:(id) sender {
 	NSWindow* w = [self currentWindow];
 	if (!w) { NSBeep(); return; }
diff --git a/AfloatStorage.h b/AfloatStorage.h
index 8731542..4a9dfee 100644
--- a/AfloatStorage.h
+++ b/AfloatStorage.h
@@ -23,6 +23,9 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 + (id) sharedValueForWindow:(NSWindow*) w key:(NSString*) k;
 + (void) setSharedValue:(id) v window:(NSWindow*) w key:(NSString*) k;
 
++ (id) globalValueForKey:(NSString *) k;
++ (void) setGlobalValue:(id) v forKey:(NSString *) k;
+
 - (id) valueForWindow:(NSWindow*) w key:(NSString*) k;
 - (void) setValue:(id) v forWindow:(NSWindow*) w key:(NSString*) k;
 
diff --git a/AfloatStorage.m b/AfloatStorage.m
index de16a18..c1c08e1 100644
--- a/AfloatStorage.m
+++ b/AfloatStorage.m
@@ -101,9 +101,6 @@ - (BOOL) canSaveWindow:(NSWindow*) w category:(NSString**) cat key:(NSString**)
 		if (key) *key = [w frameAutosaveName];
 		return YES;
 	}
-	
-	
-	
 	return NO;	
 }
 
@@ -155,6 +152,36 @@ + (void) setSharedValue:(id) v window:(NSWindow*) w key:(NSString*) k {
 	[[self sharedStorage] setValue:v forWindow:w key:k];
 }
 
++ (void)_withGlobalStorage:(BOOL (^)(NSMutableDictionary *storage)) block
+{
+    NSString *bundleIdentifier = [[NSBundle bundleForClass:self] bundleIdentifier];
+    NSString *storagePath      = [[NSString stringWithFormat:@"~/Library/Preferences/%@.plist", bundleIdentifier] stringByExpandingTildeInPath];
+    NSDistributedLock *lock = [NSDistributedLock lockWithPath:[storagePath stringByAppendingPathExtension:@"lock"]];
+    
+    NSMutableDictionary *storage = [NSMutableDictionary dictionaryWithContentsOfFile:storagePath]
+                                   ?: [NSMutableDictionary new];
+    if(block(storage))
+        [storage writeToFile:storagePath atomically:YES];
+    
+    [lock unlock];
+}
+
++ (id) globalValueForKey:(NSString *) k {
+    __block id value;
+    [self _withGlobalStorage:^(NSMutableDictionary *storage) {
+        value = [storage objectForKey:k];
+        return NO;
+    }];
+    return value;
+}
+
++ (void) setGlobalValue:(id) v forKey:(NSString *) k {
+    [self _withGlobalStorage:^(NSMutableDictionary *storage) {
+        [storage setObject:v forKey:k];
+        return YES;
+    }];
+}
+
 @synthesize delegate = _delegate;
 
 @end
diff --git a/en.lproj/Afloat.nib/designable.nib b/en.lproj/Afloat.nib/designable.nib
index 30efd19..9c4d6b4 100644
--- a/en.lproj/Afloat.nib/designable.nib
+++ b/en.lproj/Afloat.nib/designable.nib
@@ -1,473 +1,84 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.02">
-	<data>
-		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">9C31</string>
-		<string key="IBDocument.InterfaceBuilderVersion">644</string>
-		<string key="IBDocument.AppKitVersion">949.26</string>
-		<string key="IBDocument.HIToolboxVersion">352.00</string>
-		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="22"/>
-		</object>
-		<object class="NSArray" key="IBDocument.PluginDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSCustomObject" id="1001">
-				<string key="NSClassName">Afloat</string>
-			</object>
-			<object class="NSCustomObject" id="1003">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="1004">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSMenu" id="130294207">
-				<string key="NSTitle"/>
-				<object class="NSMutableArray" key="NSMenuItems">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="NSMenuItem" id="150697053">
-						<reference key="NSMenu" ref="130294207"/>
-						<string key="NSTitle">Keep Afloat</string>
-						<string key="NSKeyEquiv">a</string>
-						<int key="NSKeyEquivModMask">1310985</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<object class="NSCustomResource" key="NSOnImage" id="399514010">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">NSMenuCheckmark</string>
-						</object>
-						<object class="NSCustomResource" key="NSMixedImage" id="139249560">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">NSMenuMixedState</string>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="593188854">
-						<reference key="NSMenu" ref="130294207"/>
-						<string key="NSTitle">Transparency</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="399514010"/>
-						<reference key="NSMixedImage" ref="139249560"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="846961709">
-							<string key="NSTitle">Transparency</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="46479698">
-									<reference key="NSMenu" ref="846961709"/>
-									<string key="NSTitle">Translucent</string>
-									<string key="NSKeyEquiv">1</string>
-									<int key="NSKeyEquivModMask">1310985</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="399514010"/>
-									<reference key="NSMixedImage" ref="139249560"/>
-								</object>
-								<object class="NSMenuItem" id="934158159">
-									<reference key="NSMenu" ref="846961709"/>
-									<string key="NSTitle">Opaque</string>
-									<string key="NSKeyEquiv">0</string>
-									<int key="NSKeyEquivModMask">1310985</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="399514010"/>
-									<reference key="NSMixedImage" ref="139249560"/>
-								</object>
-								<object class="NSMenuItem" id="758959318">
-									<reference key="NSMenu" ref="846961709"/>
-									<string key="NSTitle">Make Less Transparent</string>
-									<string type="base64-UTF8" key="NSKeyEquiv">75ysA</string>
-									<int key="NSKeyEquivModMask">1310720</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="399514010"/>
-									<reference key="NSMixedImage" ref="139249560"/>
-								</object>
-								<object class="NSMenuItem" id="42577020">
-									<reference key="NSMenu" ref="846961709"/>
-									<string key="NSTitle">Make More Transparent</string>
-									<string type="base64-UTF8" key="NSKeyEquiv">75ytA</string>
-									<int key="NSKeyEquivModMask">1310720</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="399514010"/>
-									<reference key="NSMixedImage" ref="139249560"/>
-								</object>
-							</object>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="405747730">
-						<reference key="NSMenu" ref="130294207"/>
-						<string key="NSTitle">Turn Overlays Back to Normal</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="399514010"/>
-						<reference key="NSMixedImage" ref="139249560"/>
-					</object>
-					<object class="NSMenuItem" id="555293349">
-						<reference key="NSMenu" ref="130294207"/>
-						<bool key="NSIsDisabled">YES</bool>
-						<bool key="NSIsSeparator">YES</bool>
-						<string key="NSTitle"/>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="399514010"/>
-						<reference key="NSMixedImage" ref="139249560"/>
-					</object>
-					<object class="NSMenuItem" id="432873915">
-						<reference key="NSMenu" ref="130294207"/>
-						<string key="NSTitle">Adjust Effects</string>
-						<string key="NSKeyEquiv">f</string>
-						<int key="NSKeyEquivModMask">1310985</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="399514010"/>
-						<reference key="NSMixedImage" ref="139249560"/>
-					</object>
-					<object class="NSMenuItem" id="260154841">
-						<reference key="NSMenu" ref="130294207"/>
-						<bool key="NSIsDisabled">YES</bool>
-						<bool key="NSIsSeparator">YES</bool>
-						<string key="NSTitle"/>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="399514010"/>
-						<reference key="NSMixedImage" ref="139249560"/>
-					</object>
-					<object class="NSMenuItem" id="810364617">
-						<reference key="NSMenu" ref="130294207"/>
-						<string type="base64-UTF8" key="NSTitle">U2hvdyBXaW5kb3cncyBGaWxlIGluIEZpbmRlcg</string>
-						<string type="base64-UTF8" key="NSKeyEquiv">75yAA</string>
-						<int key="NSKeyEquivModMask">1310720</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="399514010"/>
-						<reference key="NSMixedImage" ref="139249560"/>
-					</object>
-				</object>
-			</object>
-		</object>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<object class="NSMutableArray" key="connectionRecords">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">_menuWithItems</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="130294207"/>
-					</object>
-					<int key="connectionID">12</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleAlwaysOnTop:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="150697053"/>
-					</object>
-					<int key="connectionID">13</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">makeTranslucent:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="46479698"/>
-					</object>
-					<int key="connectionID">14</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">makeOpaque:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="934158159"/>
-					</object>
-					<int key="connectionID">15</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">makeLessTransparent:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="758959318"/>
-					</object>
-					<int key="connectionID">16</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">makeMoreTransparent:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="42577020"/>
-					</object>
-					<int key="connectionID">17</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showAdjustEffectsPanel:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="432873915"/>
-					</object>
-					<int key="connectionID">18</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">disableAllOverlays:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="405747730"/>
-					</object>
-					<int key="connectionID">20</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showWindowFileInFinder:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="810364617"/>
-					</object>
-					<int key="connectionID">23</int>
-				</object>
-			</object>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<object class="NSArray" key="orderedObjects">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<object class="NSArray" key="object" id="1002">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<reference key="children" ref="1000"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="1001"/>
-						<reference key="parent" ref="1002"/>
-						<string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="1003"/>
-						<reference key="parent" ref="1002"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="1004"/>
-						<reference key="parent" ref="1002"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1</int>
-						<reference key="object" ref="130294207"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="150697053"/>
-							<reference ref="432873915"/>
-							<reference ref="593188854"/>
-							<reference ref="555293349"/>
-							<reference ref="405747730"/>
-							<reference ref="260154841"/>
-							<reference ref="810364617"/>
-						</object>
-						<reference key="parent" ref="1002"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2</int>
-						<reference key="object" ref="150697053"/>
-						<reference key="parent" ref="130294207"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4</int>
-						<reference key="object" ref="432873915"/>
-						<reference key="parent" ref="130294207"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5</int>
-						<reference key="object" ref="593188854"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="846961709"/>
-						</object>
-						<reference key="parent" ref="130294207"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">6</int>
-						<reference key="object" ref="846961709"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="46479698"/>
-							<reference ref="934158159"/>
-							<reference ref="42577020"/>
-							<reference ref="758959318"/>
-						</object>
-						<reference key="parent" ref="593188854"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">7</int>
-						<reference key="object" ref="46479698"/>
-						<reference key="parent" ref="846961709"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">8</int>
-						<reference key="object" ref="555293349"/>
-						<reference key="parent" ref="130294207"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">9</int>
-						<reference key="object" ref="934158159"/>
-						<reference key="parent" ref="846961709"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">10</int>
-						<reference key="object" ref="42577020"/>
-						<reference key="parent" ref="846961709"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">11</int>
-						<reference key="object" ref="758959318"/>
-						<reference key="parent" ref="846961709"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">19</int>
-						<reference key="object" ref="405747730"/>
-						<reference key="parent" ref="130294207"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">21</int>
-						<reference key="object" ref="260154841"/>
-						<reference key="parent" ref="130294207"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">22</int>
-						<reference key="object" ref="810364617"/>
-						<reference key="parent" ref="130294207"/>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="flattenedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSMutableArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>-1.IBPluginDependency</string>
-					<string>-2.IBPluginDependency</string>
-					<string>-3.IBPluginDependency</string>
-					<string>1.IBEditorWindowLastContentRect</string>
-					<string>1.IBPluginDependency</string>
-					<string>1.editorWindowContentRectSynchronizationRect</string>
-					<string>10.IBPluginDependency</string>
-					<string>11.IBPluginDependency</string>
-					<string>19.IBPluginDependency</string>
-					<string>2.IBPluginDependency</string>
-					<string>21.IBPluginDependency</string>
-					<string>22.IBPluginDependency</string>
-					<string>4.IBPluginDependency</string>
-					<string>5.IBPluginDependency</string>
-					<string>6.IBEditorWindowLastContentRect</string>
-					<string>6.IBPluginDependency</string>
-					<string>6.editorWindowContentRectSynchronizationRect</string>
-					<string>7.IBPluginDependency</string>
-					<string>8.IBPluginDependency</string>
-					<string>9.IBPluginDependency</string>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{338, 394}, {294, 123}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{170, 454}, {185, 73}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{632, 414}, {253, 83}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{355, 424}, {253, 83}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="unlocalizedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-			</object>
-			<nil key="activeLocalization"/>
-			<object class="NSMutableDictionary" key="localizations">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-			</object>
-			<nil key="sourceID"/>
-			<int key="maxID">23</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">Afloat</string>
-					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSMutableArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>disableAllOverlays:</string>
-							<string>makeLessTransparent:</string>
-							<string>makeMoreTransparent:</string>
-							<string>makeOpaque:</string>
-							<string>makeTranslucent:</string>
-							<string>showAdjustEffectsPanel:</string>
-							<string>showWindowFileInFinder:</string>
-							<string>toggleAlwaysOnTop:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">_menuWithItems</string>
-						<string key="NS.object.0">NSMenu</string>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">Afloat.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">AfloatStorage.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">JRSwizzle.h</string>
-					</object>
-				</object>
-			</object>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.LastKnownRelativeProjectPath">../Afloat.xcodeproj</string>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-	</data>
-</archive>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4510" systemVersion="13A598" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+    <dependencies>
+        <deployment version="1050" defaultVersion="1080" identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4510"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="Afloat">
+            <connections>
+                <outlet property="_menuWithItems" destination="1" id="12"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application"/>
+        <menu id="1">
+            <items>
+                <menuItem title="Keep Afloat" keyEquivalent="a" id="2">
+                    <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
+                    <connections>
+                        <action selector="toggleAlwaysOnTop:" target="-2" id="13"/>
+                    </connections>
+                </menuItem>
+                <menuItem title="Transparency" id="5">
+                    <menu key="submenu" title="Transparency" id="6">
+                        <items>
+                            <menuItem title="Translucent" keyEquivalent="1" id="7">
+                                <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
+                                <connections>
+                                    <action selector="makeTranslucent:" target="-2" id="14"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Opaque" keyEquivalent="0" id="9">
+                                <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
+                                <connections>
+                                    <action selector="makeOpaque:" target="-2" id="15"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Make Less Transparent" keyEquivalent="" id="11">
+                                <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
+                                <connections>
+                                    <action selector="makeLessTransparent:" target="-2" id="16"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Make More Transparent" keyEquivalent="" id="10">
+                                <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
+                                <connections>
+                                    <action selector="makeMoreTransparent:" target="-2" id="17"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Turn Overlays Back to Normal" id="19">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <connections>
+                        <action selector="disableAllOverlays:" target="-2" id="20"/>
+                    </connections>
+                </menuItem>
+                <menuItem title="Focus Follows Mouse" keyEquivalent="f" id="eIg-EB-FkF">
+                    <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
+                    <connections>
+                        <action selector="toggleFocusFollowsMouse:" target="-2" id="unm-ml-z2e"/>
+                    </connections>
+                </menuItem>
+                <menuItem isSeparatorItem="YES" id="8">
+                    <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                </menuItem>
+                <menuItem title="Adjust Effects" id="4">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <connections>
+                        <action selector="showAdjustEffectsPanel:" target="-2" id="18"/>
+                    </connections>
+                </menuItem>
+                <menuItem isSeparatorItem="YES" id="21"/>
+                <menuItem title="Show Window's File in Finder" keyEquivalent="" id="22">
+                    <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
+                    <connections>
+                        <action selector="showWindowFileInFinder:" target="-2" id="23"/>
+                    </connections>
+                </menuItem>
+            </items>
+        </menu>
+    </objects>
+</document>
\ No newline at end of file
diff --git a/en.lproj/Afloat.nib/keyedobjects.nib b/en.lproj/Afloat.nib/keyedobjects.nib
index b6c18756b1749d8e9eefc810b5ce58ce5ced784a..1955fd731fc22b67d2527ef58d70845c73b4a301 100644
GIT binary patch
literal 4152
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
DiJO3I

literal 4778
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
CZg}wk


From 413dc15a1789285f7808c87d4a72ce7f77eb938e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fjo=CC=88lnir=20A=CC=81sgeirsson?= <fjolnir@asgeirsson.is>
Date: Tue, 15 Oct 2013 15:02:19 +0900
Subject: [PATCH 2/9] Cleanup

---
 Afloat.m | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Afloat.m b/Afloat.m
index 8f88f9d..2db4c19 100644
--- a/Afloat.m
+++ b/Afloat.m
@@ -418,9 +418,7 @@ - (void) animateFadeOutForWindow:(NSWindow*) w {
 }
 
 - (IBAction) toggleFocusFollowsMouse:(id)sender {
-    BOOL enable = ![[AfloatStorage globalValueForKey:@"FocusFollowsMouse"] boolValue];
-
-    [AfloatStorage setGlobalValue:@(enable)
+    [AfloatStorage setGlobalValue:@([[AfloatStorage globalValueForKey:@"FocusFollowsMouse"] boolValue])
                            forKey:@"FocusFollowsMouse"];
 }
 

From 30d96a8edb6fa89ed1010573350946b81c22473f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fjo=CC=88lnir=20A=CC=81sgeirsson?= <fjolnir@asgeirsson.is>
Date: Tue, 15 Oct 2013 15:11:04 +0900
Subject: [PATCH 3/9] Fixed typo

---
 Afloat.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Afloat.m b/Afloat.m
index 2db4c19..e9aafc4 100644
--- a/Afloat.m
+++ b/Afloat.m
@@ -418,7 +418,7 @@ - (void) animateFadeOutForWindow:(NSWindow*) w {
 }
 
 - (IBAction) toggleFocusFollowsMouse:(id)sender {
-    [AfloatStorage setGlobalValue:@([[AfloatStorage globalValueForKey:@"FocusFollowsMouse"] boolValue])
+    [AfloatStorage setGlobalValue:@(![[AfloatStorage globalValueForKey:@"FocusFollowsMouse"] boolValue])
                            forKey:@"FocusFollowsMouse"];
 }
 

From 1f2ed5e6bcb6ef58fcd8a6fe1b8655f33cc3c875 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fjo=CC=88lnir=20A=CC=81sgeirsson?= <fjolnir@asgeirsson.is>
Date: Wed, 16 Oct 2013 17:29:04 +0900
Subject: [PATCH 4/9] Actually acquires a lock on the global storage now.

---
 AfloatStorage.m | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/AfloatStorage.m b/AfloatStorage.m
index c1c08e1..66c21d8 100644
--- a/AfloatStorage.m
+++ b/AfloatStorage.m
@@ -158,6 +158,10 @@ + (void)_withGlobalStorage:(BOOL (^)(NSMutableDictionary *storage)) block
     NSString *storagePath      = [[NSString stringWithFormat:@"~/Library/Preferences/%@.plist", bundleIdentifier] stringByExpandingTildeInPath];
     NSDistributedLock *lock = [NSDistributedLock lockWithPath:[storagePath stringByAppendingPathExtension:@"lock"]];
     
+    while(![lock tryLock]) {
+        usleep(100);
+    }
+    
     NSMutableDictionary *storage = [NSMutableDictionary dictionaryWithContentsOfFile:storagePath]
                                    ?: [NSMutableDictionary new];
     if(block(storage))

From 6f9b3e9dbec4c658f4cf3e130574dbd5d2795a52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fjo=CC=88lnir=20A=CC=81sgeirsson?= <fjolnir@asgeirsson.is>
Date: Tue, 22 Oct 2013 21:06:53 +0900
Subject: [PATCH 5/9] Fixed crasher

---
 AfloatStorage.m | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/AfloatStorage.m b/AfloatStorage.m
index 66c21d8..add7076 100644
--- a/AfloatStorage.m
+++ b/AfloatStorage.m
@@ -49,7 +49,10 @@ - (id) valueForWindow:(NSWindow*) w key:(NSString*) k {
 
 - (void) setValue:(id) v forWindow:(NSWindow*) w key:(NSString*) k {
 	NSMutableDictionary* d = [self mutableDictionaryForWindow:w];
-	[d setObject:v forKey:k];
+    if(v)
+        [d setObject:v forKey:k];
+    else
+        [d removeObjectForKey:k];
 	[self saveWindowIfRequired:w];
 }
 
@@ -181,7 +184,10 @@ + (id) globalValueForKey:(NSString *) k {
 
 + (void) setGlobalValue:(id) v forKey:(NSString *) k {
     [self _withGlobalStorage:^(NSMutableDictionary *storage) {
-        [storage setObject:v forKey:k];
+        if(v)
+            [storage setObject:v forKey:k];
+        else
+            [storage removeObjectForKey:k];
         return YES;
     }];
 }

From d667180c23d6421c56fd953a1fc259a3d16ab04e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fjo=CC=88lnir=20A=CC=81sgeirsson?= <fjolnir@asgeirsson.is>
Date: Wed, 23 Oct 2013 01:12:24 +0900
Subject: [PATCH 6/9] Changed focus follows mouse shortcut to not conflict with
 fullscreen

---
 en.lproj/Afloat.nib/designable.nib   |   4 ++--
 en.lproj/Afloat.nib/keyedobjects.nib | Bin 4152 -> 4159 bytes
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/en.lproj/Afloat.nib/designable.nib b/en.lproj/Afloat.nib/designable.nib
index 9c4d6b4..757f407 100644
--- a/en.lproj/Afloat.nib/designable.nib
+++ b/en.lproj/Afloat.nib/designable.nib
@@ -56,8 +56,8 @@
                         <action selector="disableAllOverlays:" target="-2" id="20"/>
                     </connections>
                 </menuItem>
-                <menuItem title="Focus Follows Mouse" keyEquivalent="f" id="eIg-EB-FkF">
-                    <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
+                <menuItem title="Focus Follows Mouse" keyEquivalent="F" id="eIg-EB-FkF">
+                    <modifierMask key="keyEquivalentModifierMask" shift="YES" control="YES" command="YES"/>
                     <connections>
                         <action selector="toggleFocusFollowsMouse:" target="-2" id="unm-ml-z2e"/>
                     </connections>
diff --git a/en.lproj/Afloat.nib/keyedobjects.nib b/en.lproj/Afloat.nib/keyedobjects.nib
index 1955fd731fc22b67d2527ef58d70845c73b4a301..cec20b8d3117c8b736c4c1edce5c408040973da3 100644
GIT binary patch
delta 1001
zcmY+;YfRQ<6aesZ_zUNG&N=vU5!@>_1VbReG-XCw4N|PVaZy|=yb!`0(M1zUV~l{x
z(k_PniLtUGx>$3LHCnUPBD;NXHUmUbWQ1i#ty(!^L_~jKedzgce&>14WzVq%T??9G
zo#XiF0sj+$UN{YX@GT6(k1zs%z&QK`6Yw_zhGG~p`Y-}xFc#x*J|<uyCSwX_;9^{c
z%P|XYz}v9^3voS`W8;CJGDDByhxl=4BKCzweFbGu4qrnzR5aKqhy`$GQ9?@YIVgsW
zunD5z3~Yui&=0pl3ET~<q0yT-=gpk=;(0fZa`6YZnUeiy{?~P7t5=`yIZf%#pD^Y+
zW{oom|F{9;_ndN1nm8(iIq2Xlcb{445E{3`%=5HfE#3+D-hVYqoM_Jko9g&I^K7CM
z?^$ItoFvb7&os{-o9-<2L|)>o@LbNRW+etXB7C^Y4RQ|Vxo`7)-@10_g47;JgD5P*
zfZNM!Ie4XQp7)Pc?$z=@*kjXIw^gnS!9(r|c_{Y-xT&onWoGCj474>A^gt3U!Y=$|
zOMcO9IR#tq3zk){F0C$YM{j#cgfG7+5UdH7XIGWoTe&M()s3Iw=ba6D6zeSsg_DmW
zDVkC#jW*C$+D<!YCsorfdW34Img?wHdWl}9SLro+o!+Fw^ga#HAPvzlU7+vjB3+^p
z!$!?)6Jesv9209Y&GlxjDKr&ko2fJVO_MojnoWy2V%{?+O|Q9NE}Ky^R&U15gpIL_
zY>K_crrX6f+pf18>>c(_TWs&KyKRlFwRN`Mw%Eh=9eczcwH@|L+i%a>0Xt}i>?nt^
zVP@sooWfbWl5gajIh!|eke}qe{4_ty`?-k^ax=GZE5FEx_!VyBc7B83;`$DLmpl15
zpWsvc4Uh8#Px6$YI1(x(Rz$+ZCy^2@F)~;Dk|=k{M%gSSQYvK<lnSYo`{hB|E<0qW
zJS@AVMrx%_>ZMU0mp$^7?2~8YIeA`M<&<<wuk=a3oRt9?lpz_em+$1FT#^y_S$>h<
z<afC&qcSGrG9i;PrKpaEDydb`aP?`VMr(}DRlmmRRT{4ex=@oeSyMGlGxS<rs>?J}
nS7?^z=q<WN^R+<NX|Y!7Hf_*7>caF137HWiznDq>i~7R9mrneI

delta 1016
zcmY+;dra146bJBg_`!Rg=bRJo8$%~Z#!W7UjiEU;b46+i3J6)vlshJjfxW#Wv=%R>
zl{qi$w=QNDQM2YU*ZjwIk?gWI*SsJQq9$`ztTjhQjEJzG&_A6&&ga>4zGpj~iN_Q7
zO?SS;lWlR^S9igA=!PpW0KdQ>{0^h=7mUH*a1$dj3N1#XA7gPE#^X#(#3W3^bj-rJ
zn1l0hAuhsvEWkosgH;&DgKdNNIG^Gd$C9xp%DqWGIs<3n$*^@TC1q^vhjs7-tcMur
zfela!z3?!UK{+ggR;YptPz@Koe$g$a75J08pVH%c{+Fuq65f0=bAhs)KVif*X1OyC
z|F}ga&U3;&XJ%3n#9{<G?jDnp=tC+COe-iUsI7dku^|*}toLZBsR}g)-$Nf7Z{bcy
zz3?9<+llc^vzg8e&tjYG%<_E3&UI2fKk%I6`Gd`JvORsA?JV$I#F=I><{b_A@m{x%
zb8(e>gcJNl9ncAxU2qq~U@_*oef$tt--^Y1$K47hxXY!;v`&8EHur$!xMyVZisP`f
zJ)AMM_ZjB3hYP!4Hl*PR>?|!PS(#f{S?3+UtRhs=fhQodEZ{FF$*<W`Q~f}&YEx}f
zP4FCkg<l`rp+~UAM~0Y`qA8WqsE{^L9o16<HPTb`G=->%nrREYMsLuY^cKBM?bJb^
zP%rgSKV72BbcF`!DqS;ChKx00ZZm#!yU8~5Os>f{m8RA-o1JEt*=_ckHgm`vHQ$-j
z=CZkNhRh8!++s#-z$V!gJKLt)OuNLcwuN?$EwO8Dg$>$}ZL-aFt8KF#_I-QEerONd
zleWut+g{se`|S`TI~>KtmQ#2>FW`l|n3wQlT+Xfh0`K6Lcqi}T-Mp9E*yUIGb>7bh
z_#nT-@A6@8`G`N}&-q(E#pijLM|hOSc$_B$Btjy^Cq`IQq9q_P5-WGeBl4&`F6(5y
zluEf&O0{g1O;RWI(jc29C?RQ*X4xvw$@3DHZL(cnl$YfdapjbJFQ?_KbV;}LN}u%0
zCHb*M2IQ(-lb>Z!ewE+kx(vw;8I}<ll`$EY2?dSNNcE{vR@G<?XpF|{be*B`nxL~Z
zQIj=Q(=<cpXqMis*_xyC^*&vy_v=c{(^a}wtF>02)v)e?$%=@W62Afe)a$>l`~C&j
C`31cI


From f9e159f60ec01a43bcbd59d1446e94618dc2355f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fjo=CC=88lnir=20A=CC=81sgeirsson?= <fjolnir@asgeirsson.is>
Date: Wed, 23 Oct 2013 01:13:02 +0900
Subject: [PATCH 7/9] Removed the ability to momentarily toggle focus follows
 mouse (it was just annoying)

---
 Afloat.m | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Afloat.m b/Afloat.m
index e9aafc4..eb5e297 100644
--- a/Afloat.m
+++ b/Afloat.m
@@ -370,8 +370,8 @@ - (void) mouseEntered:(NSEvent*) e {
 	[self animateFadeInForWindow:[e window]];
 
     BOOL focusFollowsMouse = [[AfloatStorage globalValueForKey:@"FocusFollowsMouse"] boolValue];
-    BOOL commandDown       = [NSEvent modifierFlags] & NSCommandKeyMask ? YES : NO;
-    if(((focusFollowsMouse && !commandDown) || (!focusFollowsMouse && commandDown)) && ![[e window] isKeyWindow]) {
+    BOOL modsDown          = ([NSEvent modifierFlags] & NSCommandKeyMask) ? YES : NO;
+    if(focusFollowsMouse && !modsDown && ![[e window] isKeyWindow]) {
         [[e window] makeKeyAndOrderFront:nil];
         [NSApp activateIgnoringOtherApps:YES];
     }

From 4a280a4e3befee736cf5e0d94c28c9e2cd7e320a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fjo=CC=88lnir=20A=CC=81sgeirsson?= <fjolnir@asgeirsson.is>
Date: Fri, 9 May 2014 13:53:41 +0900
Subject: [PATCH 8/9] Removed support for garbage collected apps (In order to
 build with latest clang)

---
 .gitignore                       | 5 ++++-
 Afloat.xcodeproj/project.pbxproj | 9 ++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index ce713f8..b422b1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,7 @@
 Build
 build
 TemporaryItems
-.DS_Store
\ No newline at end of file
+.DS_Store
+Afloat.xcodeproj/project.xcworkspace/xcuserdata
+Afloat.xcodeproj/xcuserdata
+AfloatScripting/AfloatScripting.xcodeproj/xcuserdata
diff --git a/Afloat.xcodeproj/project.pbxproj b/Afloat.xcodeproj/project.pbxproj
index a0f940a..fb06d3b 100644
--- a/Afloat.xcodeproj/project.pbxproj
+++ b/Afloat.xcodeproj/project.pbxproj
@@ -333,7 +333,7 @@
 		089C1669FE841209C02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0420;
+				LastUpgradeCheck = 0510;
 			};
 			buildConfigurationList = 1DEB913E08733D840010E9CD /* Build configuration list for PBXProject "Afloat" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -509,12 +509,10 @@
 				);
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_OBJC_GC = supported;
-				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = Afloat_Prefix.pch;
-				GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
+				GCC_PREPROCESSOR_DEFINITIONS = "";
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
 				LIBRARY_SEARCH_PATHS = (
@@ -525,7 +523,6 @@
 				PRODUCT_NAME = Afloat;
 				SDKROOT = macosx;
 				WRAPPER_EXTENSION = bundle;
-				ZERO_LINK = YES;
 			};
 			name = Debug;
 		};
@@ -540,8 +537,6 @@
 					"\"$(SRCROOT)\"",
 				);
 				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_ENABLE_OBJC_GC = supported;
-				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = Afloat_Prefix.pch;
 				INFOPLIST_FILE = Info.plist;

From 767320b321aa6c4fb303f9d31808fc9368dfbb93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fjo=CC=88lnir=20A=CC=81sgeirsson?= <fjolnir@asgeirsson.is>
Date: Fri, 9 May 2014 14:34:57 +0900
Subject: [PATCH 9/9] Silenced a bunch of warnings

---
 AfloatBadgeController.h  | 2 +-
 AfloatPanelController.h  | 2 +-
 AfloatStorage.m          | 2 +-
 AfloatWindowIdentifier.m | 2 +-
 Afloat_Prefix.pch        | 5 +----
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/AfloatBadgeController.h b/AfloatBadgeController.h
index f084185..ad3b378 100644
--- a/AfloatBadgeController.h
+++ b/AfloatBadgeController.h
@@ -22,7 +22,7 @@ typedef NSUInteger AfloatBadgeType;
 	unsigned int enqueuedFades;
 }
 
-@property(retain) NSWindow* parentWindow;
+@property(retain, nonatomic) NSWindow* parentWindow;
 
 - (id) initAttachedToWindow:(NSWindow*) parentWindow;
 + (id) badgeControllerForWindow:(NSWindow*) w;
diff --git a/AfloatPanelController.h b/AfloatPanelController.h
index de943ee..065ae74 100644
--- a/AfloatPanelController.h
+++ b/AfloatPanelController.h
@@ -27,7 +27,7 @@ typedef enum {
 
 - (IBAction) disableAllOverlays:(id) sender;
 
-@property(retain) NSWindow* parentWindow;
+@property(retain, nonatomic) NSWindow* parentWindow;
 @property CGFloat alphaValue;
 // @property(getter=isKeptAfloat) BOOL keptAfloat;
 @property AfloatWindowState windowState;
diff --git a/AfloatStorage.m b/AfloatStorage.m
index add7076..4043cfa 100644
--- a/AfloatStorage.m
+++ b/AfloatStorage.m
@@ -159,7 +159,7 @@ + (void)_withGlobalStorage:(BOOL (^)(NSMutableDictionary *storage)) block
 {
     NSString *bundleIdentifier = [[NSBundle bundleForClass:self] bundleIdentifier];
     NSString *storagePath      = [[NSString stringWithFormat:@"~/Library/Preferences/%@.plist", bundleIdentifier] stringByExpandingTildeInPath];
-    NSDistributedLock *lock = [NSDistributedLock lockWithPath:[storagePath stringByAppendingPathExtension:@"lock"]];
+    NSDistributedLock *lock = [NSDistributedLock lockWithPath:[storagePath stringByAppendingPathExtension:@"lockfile"]];
     
     while(![lock tryLock]) {
         usleep(100);
diff --git a/AfloatWindowIdentifier.m b/AfloatWindowIdentifier.m
index 4086e27..4b29e8c 100644
--- a/AfloatWindowIdentifier.m
+++ b/AfloatWindowIdentifier.m
@@ -154,7 +154,7 @@ - (void) dealloc {
 @synthesize category = _category, key = _key, canMatchMultipleWindows = _canMatchMultipleWindows;
 
 + (NSArray*) allIdentifiersForWindow:(NSWindow*) w {
-	NSMutableArray* results = [NSArray array];
+	NSMutableArray* results = [NSMutableArray array];
 	
 	for (Class c in [self identifierSubclasses]) {
 		if ([c canInitWithWindow:w])
diff --git a/Afloat_Prefix.pch b/Afloat_Prefix.pch
index 85b134d..50e8e32 100644
--- a/Afloat_Prefix.pch
+++ b/Afloat_Prefix.pch
@@ -21,10 +21,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 		#define L0LogS(x) NSLog(@"<Afloat - DEBUG: '%s'>: " x, __func__)
 
 	#else
-		
-		// this removes any "unused variables" warnings for variables
-		// that are only used to log debug values.
-		#define L0Log(x, args...) do { {args;} } while(0)
+		#define L0Log(x, args...) do {} while(0)
 		#define L0LogS(x) do {} while(0)
 
 	#endif // DEBUG