Camino only - Bug 405744: Fix command-forward/back shortcuts. r/sr=pink

camino/src/browser/BrowserWindowController.mm

@@ -3287,18 +3287,6 @@ public:
     [self loadURL:frameURL];
 }
 
-// map command-left arrow to 'back'
-- (void)moveToBeginningOfLine:(id)sender
-{
-  [self back:sender];
-}
-
-// map command-right arrow to 'forward'
-- (void)moveToEndOfLine:(id)sender
-{
-  [self forward:sender];
-}
-
 //
 // -currentEditor:
 //

camino/src/browser/BrowserWrapper.mm

@@ -865,6 +865,30 @@ enum StatusPriority {
   [[mWindow delegate] onShowContextMenu:flags domEvent:aEvent domNode:aNode];
 }
 
+- (BOOL)performKeyEquivalent:(NSEvent*)theEvent
+{
+  // Catch Command-back/forward, and map them to history back/forward unless
+  // there is a text area or plugin focused in the Gecko view.
+  if (([theEvent modifierFlags] & NSDeviceIndependentModifierFlagsMask ==
+       NSCommandKeyMask | NSNumericPadKeyMask | NSFunctionKeyMask) &&
+      !([mBrowserView isTextFieldFocused] || [mBrowserView isPluginFocused]))
+  {
+    NSString* characters = [theEvent charactersIgnoringModifiers];
+    if ([characters length] > 0) {
+      unichar keyChar = [characters characterAtIndex:0];
+      if (keyChar == NSLeftArrowFunctionKey) {
+        [mBrowserView goBack];
+        return YES;
+      }
+      else if (keyChar == NSRightArrowFunctionKey) {
+        [mBrowserView goForward];
+        return YES;
+      }
+    }
+  }
+  return [super performKeyEquivalent:theEvent];
+}
+
 // -deleteBackward:
 //
 // map backspace key to Back according to browser.backspace_action pref

camino/src/embedding/CHBrowserView.mm

@@ -80,6 +80,7 @@
 #include "nsIWebBrowserFocus.h"
 #include "nsIDOMNSDocument.h"
 #include "nsIDOMHTMLDocument.h"
+#include "nsIDOMNSHTMLDocument.h"
 #include "nsIDOMLocation.h"
 #include "nsIWebBrowserPersist.h"
 #include "nsIProperties.h"
@@ -1307,9 +1308,8 @@ const char kDirServiceContractID[] = "@mozilla.org/file/directory_service;1";
 // -isTextFieldFocused
 //
 // Determine if a text field in the content area has focus. Returns YES if the
-// focus is in a <input type="text"> or <textarea>
+// focus is in a <input type="text">, input type="password", or <textarea>
 //
-// XXX - should we be counting Midas here as well?
 - (BOOL)isTextFieldFocused
 {
   BOOL isFocused = NO;
@@ -1324,10 +1324,32 @@ const char kDirServiceContractID[] = "@mozilla.org/file/directory_service;1";
     input->GetType(type);
     if (type == NS_LITERAL_STRING("text"))
       isFocused = YES;
+    if (type == NS_LITERAL_STRING("password"))
+      isFocused = YES;
   }
-  else if (textArea)
+  else if (textArea) {
     isFocused = YES;
-  
+  }
+  else { // check for Midas
+    nsCOMPtr<nsIFocusController> controller = dont_AddRef([self focusController]);
+    if (controller) {
+      nsCOMPtr<nsIDOMWindowInternal> winInternal;
+      controller->GetFocusedWindow(getter_AddRefs(winInternal));
+      nsCOMPtr<nsIDOMWindow> focusedWindow(do_QueryInterface(winInternal));
+      if (focusedWindow) {
+        nsCOMPtr<nsIDOMDocument> domDoc;
+        focusedWindow->GetDocument(getter_AddRefs(domDoc));
+        nsCOMPtr<nsIDOMNSHTMLDocument> htmlDoc(do_QueryInterface(domDoc));
+        if (htmlDoc) {
+          nsAutoString designMode;
+          htmlDoc->GetDesignMode(designMode);
+          if (designMode.EqualsLiteral("on"))
+            isFocused = YES;
+        }
+      }
+    }
+  }
+
   return isFocused;
 }