Merge branch 'v2' of https://github.com/gnachman/iTerm2 into v2

ffa3270a · George Nachman · 29b78900 · 744ffe46 · ffa3270a · ffa3270a
Commit ffa3270a authored 11 years ago by George Nachman
--- a/Coprocess.m
+++ b/Coprocess.m
@@ -83,7 +83,7 @@ static NSString *kCoprocessMruKey = @"Coprocess MRU";
                         defaultButton:@"OK"
                       alternateButton:nil
                           otherButton:nil
-             informativeTextWithFormat:nil] runModal];
+             informativeTextWithFormat:@""] runModal];
        return nil;
    }
  

--- a/Makefile
+++ b/Makefile
@@ -80,8 +80,8 @@ release:
 	security unlock-keychain ~/Library/Keychains/login.keychain
 	cp release-iTerm.plist iTerm.plist
 	make Deployment
-	cp legacy-iTerm.plist iTerm.plist
-	make LeopardPPC
+	#cp legacy-iTerm.plist iTerm.plist
+	#make LeopardPPC
 	./release.sh RanFromMakefile
  
 force:
--- a/PTYTask.m
+++ b/PTYTask.m
@@ -114,6 +114,7 @@ static TaskNotifier* taskNotifier = nil;
            return nil;
        }
        fcntl(unblockPipe[0], F_SETFL, O_NONBLOCK);
+        fcntl(unblockPipe[1], F_SETFL, O_NONBLOCK);
        unblockPipeR = unblockPipe[0];
        unblockPipeW = unblockPipe[1];
    }
@@ -541,7 +542,7 @@ setup_tty_param(
    [writeBuffer release];
    [tty release];
    [path release];
-	[command_ release];
+        [command_ release];
  
    @synchronized (self) {
        [[self coprocess] mainProcessDidTerminate];
@@ -568,7 +569,7 @@ static void reapchild(int n)
  
 - (NSString *)command
 {
-	return command_;
+        return command_;
 }
  
 - (void)launchWithPath:(NSString*)progpath
@@ -793,6 +794,9 @@ static void reapchild(int n)
  
    // forward the data to our delegate
    if ([delegate respondsToSelector:@selector(readTask:)]) {
+        // This waitsUntilDone because otherwise we can read data from a child process faster than
+        // we can parse it. The main thread will quickly end up overloaded with calls to readTask:,
+        // never catching up, and never having a chance to draw or respond to input.
        [delegate performSelectorOnMainThread:@selector(readTask:)
                                   withObject:data 
                                waitUntilDone:YES];

--- a/PseudoTerminal.m
+++ b/PseudoTerminal.m
@@ -3389,6 +3389,9 @@ NSString *sessionsKey = @"sessions";
        newX = sf.origin.x;
    }
    [currentTime setFrameOrigin:NSMakePoint(newX, f.origin.y)];
+
+    [bottomBar setNeedsDisplay:YES];
+    [[[self currentSession] TEXTVIEW] setNeedsDisplay:YES];
 }
  
 - (IBAction)irButton:(id)sender
@@ -4444,7 +4447,7 @@ NSString *sessionsKey = @"sessions";
        currentScreen = [NSScreen mainScreen];
    }
  
-    if (currentScreen == menubarScreen) {
+    if (currentScreen == menubarScreen || IsMavericksOrLater()) {
        int flags = NSApplicationPresentationAutoHideDock | NSApplicationPresentationAutoHideMenuBar;
        iTermApplicationDelegate *itad = (iTermApplicationDelegate *)[[iTermApplication sharedApplication] delegate];
        [itad setFutureApplicationPresentationOptions:flags unset:0];

--- a/SBSystemPreferences.h
+++ b/SBSystemPreferences.h
+/*
+ * SBSystemPreferences.h
+ */
+
+#import <AppKit/AppKit.h>
+#import <ScriptingBridge/ScriptingBridge.h>
+
+
+@class SBSystemPreferencesApplication, SBSystemPreferencesDocument, SBSystemPreferencesWindow, SBSystemPreferencesPane, SBSystemPreferencesAnchor;
+
+enum SBSystemPreferencesSaveOptions {
+	SBSystemPreferencesSaveOptionsYes = 'yes ' /* Save the file. */,
+	SBSystemPreferencesSaveOptionsNo = 'no  ' /* Do not save the file. */,
+	SBSystemPreferencesSaveOptionsAsk = 'ask ' /* Ask the user whether or not to save the file. */
+};
+typedef enum SBSystemPreferencesSaveOptions SBSystemPreferencesSaveOptions;
+
+enum SBSystemPreferencesPrintingErrorHandling {
+	SBSystemPreferencesPrintingErrorHandlingStandard = 'lwst' /* Standard PostScript error handling */,
+	SBSystemPreferencesPrintingErrorHandlingDetailed = 'lwdt' /* print a detailed report of PostScript errors */
+};
+typedef enum SBSystemPreferencesPrintingErrorHandling SBSystemPreferencesPrintingErrorHandling;
+
+
+
+/*
+ * Standard Suite
+ */
+
+// The application's top-level scripting object.
+@interface SBSystemPreferencesApplication : SBApplication
+
+- (SBElementArray *) documents;
+- (SBElementArray *) windows;
+
+@property (copy, readonly) NSString *name;  // The name of the application.
+@property (readonly) BOOL frontmost;  // Is this the active application?
+@property (copy, readonly) NSString *version;  // The version number of the application.
+
+- (id) open:(id)x;  // Open a document.
+- (void) print:(id)x withProperties:(NSDictionary *)withProperties printDialog:(BOOL)printDialog;  // Print a document.
+- (void) quitSaving:(SBSystemPreferencesSaveOptions)saving;  // Quit the application.
+- (BOOL) exists:(id)x;  // Verify that an object exists.
+
+@end
+
+// A document.
+@interface SBSystemPreferencesDocument : SBObject
+
+@property (copy, readonly) NSString *name;  // Its name.
+@property (readonly) BOOL modified;  // Has it been modified since the last save?
+@property (copy, readonly) NSURL *file;  // Its location on disk, if it has one.
+
+- (void) closeSaving:(SBSystemPreferencesSaveOptions)saving savingIn:(NSURL *)savingIn;  // Close a document.
+- (void) saveIn:(NSURL *)in_ as:(id)as;  // Save a document.
+- (void) printWithProperties:(NSDictionary *)withProperties printDialog:(BOOL)printDialog;  // Print a document.
+- (void) delete;  // Delete an object.
+- (void) duplicateTo:(SBObject *)to withProperties:(NSDictionary *)withProperties;  // Copy an object.
+- (void) moveTo:(SBObject *)to;  // Move an object to a new location.
+
+@end
+
+// A window.
+@interface SBSystemPreferencesWindow : SBObject
+
+@property (copy, readonly) NSString *name;  // The title of the window.
+- (NSInteger) id;  // The unique identifier of the window.
+@property NSInteger index;  // The index of the window, ordered front to back.
+@property NSRect bounds;  // The bounding rectangle of the window.
+@property (readonly) BOOL closeable;  // Does the window have a close button?
+@property (readonly) BOOL miniaturizable;  // Does the window have a minimize button?
+@property BOOL miniaturized;  // Is the window minimized right now?
+@property (readonly) BOOL resizable;  // Can the window be resized?
+@property BOOL visible;  // Is the window visible right now?
+@property (readonly) BOOL zoomable;  // Does the window have a zoom button?
+@property BOOL zoomed;  // Is the window zoomed right now?
+@property (copy, readonly) SBSystemPreferencesDocument *document;  // The document whose contents are displayed in the window.
+
+- (void) closeSaving:(SBSystemPreferencesSaveOptions)saving savingIn:(NSURL *)savingIn;  // Close a document.
+- (void) saveIn:(NSURL *)in_ as:(id)as;  // Save a document.
+- (void) printWithProperties:(NSDictionary *)withProperties printDialog:(BOOL)printDialog;  // Print a document.
+- (void) delete;  // Delete an object.
+- (void) duplicateTo:(SBObject *)to withProperties:(NSDictionary *)withProperties;  // Copy an object.
+- (void) moveTo:(SBObject *)to;  // Move an object to a new location.
+
+@end
+
+
+
+/*
+ * System Preferences
+ */
+
+// System Preferences top level scripting object
+@interface SBSystemPreferencesApplication (SystemPreferences)
+
+- (SBElementArray *) panes;
+
+@property (copy) SBSystemPreferencesPane *currentPane;  // the currently selected pane
+@property (copy, readonly) SBSystemPreferencesWindow *preferencesWindow;  // the main preferences window
+@property BOOL showAll;  // Is SystemPrefs in show all view. (Setting to false will do nothing)
+
+@end
+
+// a preference pane
+@interface SBSystemPreferencesPane : SBObject
+
+- (SBElementArray *) anchors;
+
+- (NSString *) id;  // locale independent name of the preference pane; can refer to a pane using the expression: pane id "<name>"
+@property (copy, readonly) NSString *localizedName;  // localized name of the preference pane
+@property (copy, readonly) NSString *name;  // name of the preference pane as it appears in the title bar; can refer to a pane using the expression: pane "<name>"
+
+- (void) closeSaving:(SBSystemPreferencesSaveOptions)saving savingIn:(NSURL *)savingIn;  // Close a document.
+- (void) saveIn:(NSURL *)in_ as:(id)as;  // Save a document.
+- (void) printWithProperties:(NSDictionary *)withProperties printDialog:(BOOL)printDialog;  // Print a document.
+- (void) delete;  // Delete an object.
+- (void) duplicateTo:(SBObject *)to withProperties:(NSDictionary *)withProperties;  // Copy an object.
+- (void) moveTo:(SBObject *)to;  // Move an object to a new location.
+- (id) reveal;  // Reveals an anchor within a preference pane or preference pane itself
+
+@end
+
+// an anchor within a preference pane
+@interface SBSystemPreferencesAnchor : SBObject
+
+@property (copy, readonly) NSString *name;  // name of the anchor within a preference pane
+
+- (void) closeSaving:(SBSystemPreferencesSaveOptions)saving savingIn:(NSURL *)savingIn;  // Close a document.
+- (void) saveIn:(NSURL *)in_ as:(id)as;  // Save a document.
+- (void) printWithProperties:(NSDictionary *)withProperties printDialog:(BOOL)printDialog;  // Print a document.
+- (void) delete;  // Delete an object.
+- (void) duplicateTo:(SBObject *)to withProperties:(NSDictionary *)withProperties;  // Copy an object.
+- (void) moveTo:(SBObject *)to;  // Move an object to a new location.
+- (id) reveal;  // Reveals an anchor within a preference pane or preference pane itself
+
+@end
+
--- a/iTerm.h
+++ b/iTerm.h
@@ -36,6 +36,7 @@
 #define OSX_TIGERORLATER (floor(NSAppKitVersionNumber) > 743)
 #define OSX_LEOPARDORLATER (floor(NSAppKitVersionNumber) > 824)
  
+BOOL IsMavericksOrLater(void);
 BOOL IsMountainLionOrLater(void);
 BOOL IsLionOrLater(void);
 BOOL IsSnowLeopardOrLater(void);

--- a/iTerm.plist
+++ b/iTerm.plist
@@ -192,8 +192,8 @@
 	<key>SUPublicDSAKeyFile</key>
 	<string>dsa_pub.pem</string>
 	<key>SUFeedURLForTesting</key>
-	<string>http://iterm2.com/appcasts/legacy_testing.xml</string>
+	<string>http://iterm2.com/appcasts/testing.xml</string>
 	<key>SUFeedURLForFinal</key>
-	<string>http://iterm2.com/appcasts/legacy_final.xml</string>
+	<string>http://iterm2.com/appcasts/final.xml</string>
 </dict>
 </plist>
--- a/iTerm.xcodeproj/project.pbxproj
+++ b/iTerm.xcodeproj/project.pbxproj
@@ -406,6 +406,8 @@
 		9DB3D6F1176CCABE0071CCF8 /* PrefsArrangements@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9DB3D6EF176CCABE0071CCF8 /* PrefsArrangements@2x.png */; };
 		A073973E14C768E400786414 /* ColorsMenuItemView.h in Headers */ = {isa = PBXBuildFile; fileRef = A073973D14C768E400786414 /* ColorsMenuItemView.h */; };
 		A073974014C7694600786414 /* ColorsMenuItemView.m in Sources */ = {isa = PBXBuildFile; fileRef = A073973F14C7694600786414 /* ColorsMenuItemView.m */; };
+		A6AA395C18275EB800A19BD5 /* SBSystemPreferences.h in Headers */ = {isa = PBXBuildFile; fileRef = A6AA395B18275EB800A19BD5 /* SBSystemPreferences.h */; };
+		A6AA395E18275EF200A19BD5 /* ScriptingBridge.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A6AA395D18275EF200A19BD5 /* ScriptingBridge.framework */; };
 		DDF0FD65062916F70080EF74 /* iTermApplication.h in Headers */ = {isa = PBXBuildFile; fileRef = DDF0FD63062916F70080EF74 /* iTermApplication.h */; };
 		DDF0FD66062916F70080EF74 /* iTermApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = DDF0FD64062916F70080EF74 /* iTermApplication.m */; };
 		F638C2620AD483BF00BEE23D /* iTerm.strings in Resources */ = {isa = PBXBuildFile; fileRef = FB151F2903648AC401F955DB /* iTerm.strings */; };
@@ -746,6 +748,8 @@
 		9DB3D6EF176CCABE0071CCF8 /* PrefsArrangements@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "PrefsArrangements@2x.png"; path = "images/PrefsArrangements@2x.png"; sourceTree = "<group>"; };
 		A073973D14C768E400786414 /* ColorsMenuItemView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ColorsMenuItemView.h; sourceTree = "<group>"; };
 		A073973F14C7694600786414 /* ColorsMenuItemView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ColorsMenuItemView.m; sourceTree = "<group>"; };
+		A6AA395B18275EB800A19BD5 /* SBSystemPreferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBSystemPreferences.h; sourceTree = "<group>"; };
+		A6AA395D18275EF200A19BD5 /* ScriptingBridge.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ScriptingBridge.framework; path = System/Library/Frameworks/ScriptingBridge.framework; sourceTree = SDKROOT; };
 		DD02572409CB9398008F320C /* PSMAquaTabStyle.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PSMAquaTabStyle.h; sourceTree = "<group>"; };
 		DD02572509CB9398008F320C /* PSMAquaTabStyle.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PSMAquaTabStyle.m; sourceTree = "<group>"; };
 		DD02572609CB9398008F320C /* PSMMetalTabStyle.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PSMMetalTabStyle.h; sourceTree = "<group>"; };
@@ -849,6 +853,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				A6AA395E18275EF200A19BD5 /* ScriptingBridge.framework in Frameworks */,
 				874206530564169600CFC3F1 /* AppKit.framework in Frameworks */,
 				F6E2DEDA0AE2F67200D20B3B /* Sparkle.framework in Frameworks */,
 				1D13EADC12113A2D00909F9C /* libncurses.dylib in Frameworks */,
@@ -885,6 +890,7 @@
 				1DEB293D1288899A00B2CB9F /* Carbon.framework */,
 				1D94EAC712D641D3008225A9 /* AddressBook.framework */,
 				1DF0897013DBAF4C00A52AD8 /* Quartz.framework */,
+				A6AA395D18275EF200A19BD5 /* ScriptingBridge.framework */,
 			);
 			name = JTerminal;
 			sourceTree = "<group>";
@@ -892,6 +898,7 @@
 		0464AB0E006CD2EC7F000001 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				A6F6C520182765990077ADC2 /* ScriptingBridgeGeneratedCode */,
 				1D06E7D014BC04110097C0ED /* Profiles */,
 				1D06E7CF14BC03BE0097C0ED /* GTM */,
 				1D3D21921483142800FAC8E7 /* tmux */,
@@ -1376,6 +1383,14 @@
 			name = Categories;
 			sourceTree = "<group>";
 		};
+		A6F6C520182765990077ADC2 /* ScriptingBridgeGeneratedCode */ = {
+			isa = PBXGroup;
+			children = (
+				A6AA395B18275EB800A19BD5 /* SBSystemPreferences.h */,
+			);
+			name = ScriptingBridgeGeneratedCode;
+			sourceTree = "<group>";
+		};
 		DD02571D09CB9363008F320C /* PSMTabBarControl */ = {
 			isa = PBXGroup;
 			children = (
@@ -1644,6 +1659,7 @@
 				A073973E14C768E400786414 /* ColorsMenuItemView.h in Headers */,
 				1DA26AC015007507004B5792 /* BackgroundThread.h in Headers */,
 				1D2F3B3D1516BA470044C337 /* iTermFontPanel.h in Headers */,
+				A6AA395C18275EB800A19BD5 /* SBSystemPreferences.h in Headers */,
 				1D48B32316706FC3000046EE /* NSView+iTerm.h in Headers */,
 				1D48B379167E809D000046EE /* CharacterRun.h in Headers */,
 				1D70BA351680158700824B72 /* PTYFontInfo.h in Headers */,
@@ -2353,7 +2369,7 @@
 				);
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_OPTIMIZATION_LEVEL = 3;
-				GCC_VERSION = com.apple.compilers.llvmgcc42;
+				GCC_VERSION = "";
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
 				GCC_WARN_MISSING_PARENTHESES = YES;
@@ -2379,7 +2395,7 @@
 					"-licucore",
 				);
 				PRODUCT_NAME = iTerm;
-				SDKROOT = macosx10.6;
+				SDKROOT = macosx;
 				VALID_ARCHS = "i386 x86_64";
 				WARNING_CFLAGS = "-Wall";
 				WRAPPER_EXTENSION = app;
@@ -2403,7 +2419,7 @@
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_MODEL_TUNING = G4;
 				GCC_OPTIMIZATION_LEVEL = 3;
-				GCC_VERSION = com.apple.compilers.llvmgcc42;
+				GCC_VERSION = "";
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
 				GCC_WARN_MISSING_PARENTHESES = YES;

--- a/iTermController.m
+++ b/iTermController.m
@@ -32,27 +32,29 @@
 #define DEBUG_METHOD_TRACE    0
  
 #import "iTermController.h"
+#import "FutureMethods.h"
+#import "GTMCarbonEvent.h"
+#import "ITAddressBookMgr.h"
+#import "NSStringITerm.h"
+#import "NSView+iTerm.h"
+#import "PTYSession.h"
+#import "PTYTab.h"
+#import "PasteboardHistory.h"
 #import "PreferencePanel.h"
 #import "PseudoTerminal.h"
-#import "PTYSession.h"
+#import "PseudoTerminal.h"
+#import "SBSystemPreferences.h"
+#import "UKCrashReporter/UKCrashReporter.h"
 #import "VT100Screen.h"
-#import "NSStringITerm.h"
-#import "ITAddressBookMgr.h"
-#import <iTermGrowlDelegate.h>
-#import "PasteboardHistory.h"
-#import <Carbon/Carbon.h>
-#import "iTermApplicationDelegate.h"
+#import "WindowArrangements.h"
+#import "iTerm.h"
 #import "iTermApplication.h"
-#import "UKCrashReporter/UKCrashReporter.h"
-#import "PTYTab.h"
-#import "iTermKeyBindingMgr.h"
-#import "PseudoTerminal.h"
+#import "iTermApplicationDelegate.h"
 #import "iTermExpose.h"
-#import "FutureMethods.h"
-#import "GTMCarbonEvent.h"
-#import "iTerm.h"
-#import "WindowArrangements.h"
-#import "NSView+iTerm.h"
+#import "iTermKeyBindingMgr.h"
+#import <Carbon/Carbon.h>
+#import <ScriptingBridge/ScriptingBridge.h>
+#import <iTermGrowlDelegate.h>
 #include <objc/runtime.h>
  
 //#define HOTKEY_WINDOW_VERBOSE_LOGGING
@@ -124,6 +126,26 @@ BOOL IsLionOrLater(void) {
    return result;
 }
  
+static BOOL UncachedIsMavericksOrLater(void) {
+    unsigned major;
+    unsigned minor;
+    if ([iTermController getSystemVersionMajor:&major minor:&minor bugFix:nil]) {
+        return (major == 10 && minor >= 7) || (major > 10);
+    } else {
+        return NO;
+    }
+}
+
+BOOL IsMavericksOrLater(void) {
+    static BOOL result;
+    static BOOL initialized;
+    if (!initialized) {
+        initialized = YES;
+        result = UncachedIsMavericksOrLater();
+    }
+    return result;
+}
+
 BOOL IsSnowLeopardOrLater(void) {
    unsigned major;
    unsigned minor;
@@ -1926,6 +1948,62 @@ static CGEventRef OnTappedEvent(CGEventTapProxy proxy, CGEventType type, CGEvent
    }
 }
  
+- (NSString *)accessibilityMessageForHotkey {
+    return @"You have assigned a \"hotkey\" that opens iTerm2 at any time. "
+           @"To use it, you must turn on \"access for assistive devices\" in the Universal "
+           @"Access preferences panel in System Preferences and restart iTerm2.";
+}
+
+- (NSString *)accessibilityMessageForModifier {
+    return @"You have chosen to remap certain modifier keys. For this to work for all key "
+           @"combinations (such as cmd-tab), you must turn on \"access for assistive devices\" "
+           @"in the Universal Access preferences panel in System Preferences and restart iTerm2.";
+}
+
+- (void)openMavericksAccessibilityPane
+{
+    [[NSWorkspace sharedWorkspace] openFile:@"/System/Library/PreferencePanes/Security.prefPane"];
+    SBSystemPreferencesApplication *systemPrefs =
+    [SBApplication applicationWithBundleIdentifier:@"com.apple.systempreferences"];
+    
+    [systemPrefs activate];
+    
+    SBElementArray *panes = [systemPrefs panes];
+    SBSystemPreferencesPane *speechPane = nil;
+    
+    for (SBSystemPreferencesPane *pane in panes) {
+        if ([[pane id] isEqualToString:@"com.apple.preference.security"]) {
+            speechPane = pane;
+            break;
+        }
+    }
+    [systemPrefs setCurrentPane:speechPane];
+    
+    SBElementArray *anchors = [speechPane anchors];
+    
+    for (SBSystemPreferencesAnchor *anchor in anchors) {
+        if ([anchor.name isEqualToString:@"Privacy"]) {
+            [anchor reveal];
+        }
+    }
+    
+    for (SBSystemPreferencesAnchor *anchor in anchors) {
+        if ([anchor.name isEqualToString:@"Privacy_Accessibility"]) {
+            [anchor reveal];
+        }
+    }
+}
+
+- (void)navigatePrefPane
+{
+    // NOTE: Pre-Mavericks only.
+    [[NSWorkspace sharedWorkspace] openFile:@"/System/Library/PreferencePanes/UniversalAccessPref.prefPane"];
+}
+
+- (NSString *)accessibilityActionMessage {
+    return @"Open System Preferences";
+}
+
 - (BOOL)registerHotkey:(int)keyCode modifiers:(int)modifiers
 {
    if (carbonHotKey_) {
@@ -1935,10 +2013,14 @@ static CGEventRef OnTappedEvent(CGEventTapProxy proxy, CGEventType type, CGEvent
    hotkeyModifiers_ = modifiers & (NSCommandKeyMask | NSControlKeyMask | NSAlternateKeyMask | NSShiftKeyMask);
 #ifdef USE_EVENT_TAP_FOR_HOTKEY
    if (![self startEventTap]) {
+        if (IsMavericksOrLater()) {
+            [self requestAccessibilityPermission];
+            return;
+        }
        switch (NSRunAlertPanel(@"Could not enable hotkey",
-                                @"You have assigned a \"hotkey\" that opens iTerm2 at any time. To use it, you must turn on \"access for assistive devices\" in the Universal Access preferences panel in System Preferences and restart iTerm2.",
+                                [self accessibilityMessageForHotkey],
                                @"OK",
-                                @"Open System Preferences",
+                                [self accessibilityActionMessage],
                                @"Disable Hotkey",
                                nil)) {
            case NSAlertOtherReturn:
@@ -1946,7 +2028,7 @@ static CGEventRef OnTappedEvent(CGEventTapProxy proxy, CGEventType type, CGEvent
                break;
  
            case NSAlertAlternateReturn:
-                [[NSWorkspace sharedWorkspace] openFile:@"/System/Library/PreferencePanes/UniversalAccessPref.prefPane"];
+                [self navigatePrefPane]
                return NO;
        }
    }
@@ -1968,17 +2050,40 @@ static CGEventRef OnTappedEvent(CGEventTapProxy proxy, CGEventType type, CGEvent
    OnHotKeyEvent();
 }
  
+- (void)requestAccessibilityPermission {
+#ifndef BLOCKS_NOT_AVAILABLE
+    static int count;
+    NSDictionary *options = @{(id)kAXTrustedCheckOptionPrompt:@YES};
+    // Show a dialog prompting the user to open system prefs.
+    if (!AXIsProcessTrustedWithOptions((CFDictionaryRef)options)) {
+        if ((count % 3) == 1) {
+            [[NSAlert alertWithMessageText:@"You have to restart iTerm2 after granting accessibility permission."
+                             defaultButton:@"OK"
+                           alternateButton:nil
+                               otherButton:nil
+                 informativeTextWithFormat:@""] runModal];
+        }
+        ++count;
+        return;
+    }
+#endif
+}
+
 - (void)beginRemappingModifiers
 {
    if (![self startEventTap]) {
+        if (IsMavericksOrLater()) {
+            [self requestAccessibilityPermission];
+            return;
+        }
        switch (NSRunAlertPanel(@"Could not remap modifiers",
-                                @"You have chosen to remap certain modifier keys. For this to work for all key combinations (such as cmd-tab), you must turn on \"access for assistive devices\" in the Universal Access preferences panel in System Preferences and restart iTerm2.",
+                                [self accessibilityMessageForModifier],
                                @"OK",
-                                @"Open System Preferences",
+                                [self accessibilityActionMessage],
                                nil,
                                nil)) {
            case NSAlertAlternateReturn:
-                [[NSWorkspace sharedWorkspace] openFile:@"/System/Library/PreferencePanes/UniversalAccessPref.prefPane"];
+                [self navigatePrefPane];
                break;
        }
    }

--- a/release.sh
+++ b/release.sh
@@ -35,7 +35,7 @@ NAME=$(echo $VERSION | sed -e "s/\\./_/g")
 SVNDIR=~/iterm2-website
 ORIG_DIR=`pwd`
  
-set -x
+#set -x
 ./sign.sh
  
 cd build/Deployment
@@ -52,7 +52,8 @@ NEWFILES=""
 test -f $SVNDIR/downloads/beta/iTerm2-${NAME}.summary || (echo "iTerm2 "$VERSION" beta (OS 10.6+, Intel-only)" > $SVNDIR/downloads/beta/iTerm2-${NAME}.summary)
 test -f $SVNDIR/downloads/beta/iTerm2-${NAME}.description || (echo "This is the recommended beta build for most users. **ENTER CHANGES HERE**" > $SVNDIR/downloads/beta/iTerm2-${NAME}.description)
 vi $SVNDIR/downloads/beta/iTerm2-${NAME}.description
-NEWFILES=${NEWFILES}" downloads/beta/iTerm2-${NAME}.summary downloads/beta/iTerm2-${NAME}.description downloads/beta/iTerm2-${NAME}.description"
+vi $SVNDIR/downloads/beta/iTerm2-${NAME}.changelog
+NEWFILES=${NEWFILES}" downloads/beta/iTerm2-${NAME}.summary downloads/beta/iTerm2-${NAME}.description downloads/beta/iTerm2-${NAME}.changelog downloads/beta/iTerm2-${NAME}.zip appcasts/testing.xml appcasts/testing_changes.txt"
  
 # Prepare the sparkle xml file
 SparkleSign testing.xml template.xml
@@ -72,7 +73,7 @@ cp iTerm2-${NAME}.zip $SVNDIR/downloads/beta/
 test -f $SVNDIR/downloads/beta/iTerm2-${NAME}.summary || (echo "iTerm2 "$VERSION" beta (OS 10.6+, Intel-only)" > $SVNDIR/downloads/beta/iTerm2-${NAME}.summary)
 test -f $SVNDIR/downloads/beta/iTerm2-${NAME}.description || (echo "This build has a limited set of features but supports OS 10.5 and PowerPC. If you have an Intel Mac that runs OS 10.6 or newer, you don't want this." > $SVNDIR/downloads/beta/iTerm2-${NAME}.description)
 vi $SVNDIR/downloads/beta/iTerm2-${NAME}.description
-NEWFILES="${NEWFILES}downloads/beta/iTerm2-${NAME}.summary downloads/beta/iTerm2-${NAME}.description downloads/beta/iTerm2-${NAME}.description"
+NEWFILES="${NEWFILES}downloads/beta/iTerm2-${NAME}.summary downloads/beta/iTerm2-${NAME}.description downloads/beta/iTerm2-${NAME}.description downloads/beta/iTerm2-${NAME}.zip appcasts/legacy_testing.xml"
  
 # Prepare the sparkle xml file
 SparkleSign legacy_testing.xml legacy_template.xml
@@ -81,7 +82,7 @@ SparkleSign legacy_testing.xml legacy_template.xml
  
 echo "git tag v${VERSION}"
 echo "git commit -am ${VERSION}"
-echo "git push origin master"
+echo "git push origin v2"
 echo "git push --tags"
 echo "cd "$SVNDIR
 echo "git add "$NEWFILES