Changeset 21346 in webkit

Timestamp:

May 9, 2007 7:28:52 PM (17 years ago)

Author:

oliver

Message:

2007-05-09 Adele Peterson <​adele@apple.com>

Reviewed by Oliver.

Re-applying fix for <rdar://problem/5107538> REGRESSION: Page scroll when selecting characters from inline input candidate window by arrow buttons
​http://bugs.webkit.org/show_bug.cgi?id=13263

We don't need to call interpretKeyEvents for cmd-key events as
they events will be interpreted by performKeyEquivalent.

• WebView/WebHTMLView.mm: (-[WebHTMLView _interceptEditingKeyEvent:shouldSaveCommand:]): (-[WebHTMLView doCommandBySelector:]):

Location:

trunk/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebHTMLView.mm (modified) (3 diffs)

trunk/WebKit/ChangeLog

@@ +1 @@
+2007-05-09  Adele Peterson  <adele@apple.com>
+
+        Reviewed by Oliver.
+        
+        Re-applying fix for <rdar://problem/5107538> REGRESSION: Page scroll when selecting characters from inline input candidate window by arrow buttons
+        http://bugs.webkit.org/show_bug.cgi?id=13263
+        
+        We don't need to call interpretKeyEvents for cmd-key events as
+        they events will be interpreted by performKeyEquivalent.
+
+        * WebView/WebHTMLView.mm:
+        (-[WebHTMLView _interceptEditingKeyEvent:shouldSaveCommand:]):
+        (-[WebHTMLView doCommandBySelector:]):
+
 2007-05-09  Mark Rowe  <mrowe@apple.com>
 

trunk/WebKit/WebView/WebHTMLView.mm

@@ -5280 +5280 @@
         _private->interpretKeyEventsParameters = &parameters;
         KeypressCommand command = event->keypressCommand();
-        bool hasKeypressCommand = !command.commandNames.isEmpty() || !command.text.isEmpty();
-
-        if (parameters.shouldSaveCommand || !hasKeypressCommand)
-            [self interpretKeyEvents:[NSArray arrayWithObject:macEvent]];
-        else {
+
+        if (parameters.shouldSaveCommand || command.isEmpty()) {
+            // We don't need to call interpretKeyEvents for cmd-key events.  These events will be interpreted by performKeyEquivalent
+            if (!event->metaKey()) {
+                [self interpretKeyEvents:[NSArray arrayWithObject:macEvent]];
+                // If we have no command after calling interpretKeyEvents, we assume the input method handled the key.
+                if (event->keypressCommand().isEmpty())
+                    parameters.eventWasHandled = true;
+            }
+        } else {
             if (!command.text.isEmpty())
                 [self insertText:command.text];
@@ -5508 +5513 @@
 - (void)doCommandBySelector:(SEL)selector
 {
-    if (selector == @selector(noop:))
-        return;
-
     // Use pointer to get parameters passed to us by the caller of interpretKeyEvents.
     // The same call to interpretKeyEvents can do more than one command.
@@ -5522 +5524 @@
         command.commandNames.append(NSStringFromSelector(selector));
         event->setKeypressCommand(command);
-    } else {
+    } else if (selector != @selector(noop:)) {
         // Make sure that only direct calls to doCommandBySelector: see the parameters by setting to 0.
         _private->interpretKeyEventsParameters = 0;