Fix Command-W behavior for main window

src/cpp/desktop-mac/MainFrameController.h

@@ -41,6 +41,8 @@
 
 - (id) invokeCommand: (NSString*) command;
 
+- (BOOL) isCommandEnabled: (NSString*) command;
+
 
 // initiate a quit sequence
 - (void) initiateQuit;

src/cpp/desktop-mac/MainFrameController.mm

@@ -140,6 +140,12 @@ - (id) invokeCommand: (NSString*) command
  command]];
 }
 
+- (BOOL) isCommandEnabled: (NSString*) command
+{
+ return [[self evaluateJavaScript: [NSString stringWithFormat: @"window.desktopHooks.isCommandEnabled(\"%@\");",
+ command]] boolValue];
+}
+
 - (BOOL) hasDesktopObject
 {
  WebScriptObject* script = [webView_ windowScriptObject];

src/cpp/desktop-mac/MainFrameMenu.mm

@@ -231,8 +231,7 @@ - (BOOL) validateMenuItem: (NSMenuItem *) item {
  if (trailingSep != Nil)
  [trailingSep setHidden: YES];
 
- NSString* enabledJs = [NSString stringWithFormat: @"window.desktopHooks.isCommandEnabled(\"%@\");", command];
- if ([[[MainFrameController instance] evaluateJavaScript: enabledJs] boolValue])
+ if ([[MainFrameController instance] isCommandEnabled: command])
  return YES;
  else
  return NO;

src/cpp/desktop-mac/MainFrameWebView.h

@@ -0,0 +1,20 @@
+/*
+ * MainFrameWebView.h
+ *
+ * Copyright (C) 2009-13 by RStudio, Inc.
+ *
+ * Unless you have received this program directly from RStudio pursuant
+ * to the terms of a commercial license agreement with RStudio, then
+ * this program is licensed to you under the terms of version 3 of the
+ * GNU Affero General Public License. This program is distributed WITHOUT
+ * ANY EXPRESS OR IMPLIED WARRANTY, INCLUDING THOSE OF NON-INFRINGEMENT,
+ * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Please refer to the
+ * AGPL (http://www.gnu.org/licenses/agpl-3.0.txt) for more details.
+ *
+ */
+
+#import <WebKit/WebKit.h>
+
+@interface MainFrameWebView : WebView
+
+@end

src/cpp/desktop-mac/MainFrameWebView.mm

@@ -0,0 +1,48 @@
+/*
+ * MainFrameWebView.mm
+ *
+ * Copyright (C) 2009-13 by RStudio, Inc.
+ *
+ * Unless you have received this program directly from RStudio pursuant
+ * to the terms of a commercial license agreement with RStudio, then
+ * this program is licensed to you under the terms of version 3 of the
+ * GNU Affero General Public License. This program is distributed WITHOUT
+ * ANY EXPRESS OR IMPLIED WARRANTY, INCLUDING THOSE OF NON-INFRINGEMENT,
+ * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Please refer to the
+ * AGPL (http://www.gnu.org/licenses/agpl-3.0.txt) for more details.
+ *
+ */
+
+#import "MainFrameWebView.h"
+#import "MainFrameController.h"
+
+@implementation MainFrameWebView
+
+- (id) initWithFrame:(NSRect)frame
+{
+ self = [super initWithFrame:frame];
+ if (self) {
+ // Initialization code here.
+ }
+ return self;
+}
+
+- (BOOL) performKeyEquivalent: (NSEvent *) theEvent
+{
+ if ([[theEvent charactersIgnoringModifiers] isEqualToString: @"w"]
+ && ([theEvent modifierFlags] & NSDeviceIndependentModifierFlagsMask) == NSCommandKeyMask)
+ {
+ if ([[MainFrameController instance] isCommandEnabled: @"closeSourceDoc"])
+ {
+ [[MainFrameController instance] invokeCommand: @"closeSourceDoc"];
+ }
+ else
+ {
+ [[self window] performClose: self];
+ }
+ return YES;
+ }
+ return [super performKeyEquivalent: theEvent];
+}
+
+@end

src/cpp/desktop-mac/WebViewController.mm

@@ -12,6 +12,7 @@
 #import "SatelliteController.h"
 #import "SecondaryWindowController.h"
 #import "Utils.hpp"
+#import "MainFrameWebView.h"
 
 struct PendingSatelliteWindow
 {
@@ -105,7 +106,7 @@ - (id)initWithURLRequest: (NSURLRequest*) request
  if (self = [super initWithWindow: window])
  {
  // create web view, save it as a member, and register as it's delegate,
- webView_ = [[WebView alloc] initWithFrame: frameRect];
+ webView_ = [[MainFrameWebView alloc] initWithFrame: frameRect];
  [webView_ setUIDelegate: self];
  [webView_ setFrameLoadDelegate: self];
  [webView_ setResourceLoadDelegate: self];