Changeset 23813 in webkit

Timestamp:

Jun 27, 2007 1:19:53 AM (17 years ago)

Author:

oliver

Message:

Reviewed by Maciej.

Hopefully fix remainder of the IME issues on Mac.
We now assume that the IME silently consumes any event given
to it during text composition, and only override this assumption
if the NSTextInput or NSResponder callbacks are made.

This prevents us from treating those events that the IME has
consumed internally (eg. candidate window navigation) as unhandled
events that should be bubbled.

This fixes:

<rdar://problem/5107538> Major problems handling key press event with non-english Input Methods
<rdar://problem/4196249> REGRESSION: Mail: Inputting space (U+0020) with IM deletes subsequent line breaks on Mail.app
<rdar://problem/5015544> REGRESSION: Reverse conversion keyboard command does not work in Safari.
<rdar://problem/5045121> REGRESSION: Inline is confirmed after press left/right arrow keys, happens in Mail but not in TextEdit.
<rdar://problem/5076807> REGRESSION: Can't undo conversion of inline text (by hitting ESC)
<rdar://problem/5085781> REGRESSION: Active input area lost "selected" highlight
<rdar://problem/5094200> space key pressed to close the associated words candidate window gets inserted as text
<rdar://problem/5228294> Candidate item for character matrix is sometimes skipped

• WebKit.xcodeproj/project.pbxproj:
• WebView/WebHTMLView.mm: (-[WebHTMLView launchKeyEvent:]): (-[WebHTMLView keyDown:]): (-[WebHTMLView keyUp:]): (-[WebHTMLView _interceptEditingKeyEvent:shouldSaveCommand:]): (-[WebHTMLView unmarkText]): (-[WebHTMLView setMarkedText:selectedRange:]): (-[WebHTMLView doCommandBySelector:]): (-[WebHTMLView insertText:]):

Location:

trunk/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebKit.xcodeproj/project.pbxproj (modified) (1 diff)
• WebView/WebHTMLView.mm (modified) (9 diffs)

trunk/WebKit/ChangeLog

@@ +1 @@
+2007-06-26  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Maciej.
+
+        Hopefully fix remainder of the IME issues on Mac.  
+        We now assume that the IME silently consumes any event given
+        to it during text composition, and only override this assumption
+        if the NSTextInput or NSResponder callbacks are made.
+
+        This prevents us from treating those events that the IME has 
+        consumed internally (eg. candidate window navigation) as unhandled
+        events that should be bubbled.
+
+        This fixes:
+          <rdar://problem/5107538> Major problems handling key press event with non-english Input Methods
+          <rdar://problem/4196249> REGRESSION: Mail: Inputting space (U+0020) with IM deletes subsequent line breaks on Mail.app
+          <rdar://problem/5015544> REGRESSION: Reverse conversion keyboard command does not work in Safari.
+          <rdar://problem/5045121> REGRESSION: Inline is confirmed after press left/right arrow keys, happens in Mail but not in TextEdit.
+          <rdar://problem/5076807> REGRESSION: Can't undo conversion of inline text (by hitting ESC)
+          <rdar://problem/5085781> REGRESSION: Active input area lost "selected" highlight
+          <rdar://problem/5094200> space key pressed to close the associated words candidate window gets inserted as text
+          <rdar://problem/5228294> Candidate item for character matrix is sometimes skipped
+
+        * WebKit.xcodeproj/project.pbxproj:
+        * WebView/WebHTMLView.mm:
+        (-[WebHTMLView launchKeyEvent:]):
+        (-[WebHTMLView keyDown:]):
+        (-[WebHTMLView keyUp:]):
+        (-[WebHTMLView _interceptEditingKeyEvent:shouldSaveCommand:]):
+        (-[WebHTMLView unmarkText]):
+        (-[WebHTMLView setMarkedText:selectedRange:]):
+        (-[WebHTMLView doCommandBySelector:]):
+        (-[WebHTMLView insertText:]):
+
 2007-06-26  Jim Correia  <jim.correia@pobox.com>
 

trunk/WebKit/WebKit.xcodeproj/project.pbxproj

@@ -1331 +1331 @@
                         productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
                         projectDirPath = "";
-                        projectRoot = "";
                         targets = (
                                 9398100A0824BF01008DF038 /* WebKit */,

trunk/WebKit/WebView/WebHTMLView.mm

@@ -302 +302 @@
     BOOL eventWasHandled;
     BOOL shouldSaveCommand;
+    // The Input Method may consume an event and not tell us, in
+    // which case we should not bubble the event up the DOM
+    BOOL consumedByIM;
 };
 
@@ -3272 +3275 @@
 - (void)keyDown:(NSEvent *)event
 {
+    RetainPtr<WebHTMLView> selfProtector = self;
     BOOL eventWasSentToWebCore = (_private->keyDownEvent == event);
-
-    [self retain];
 
     BOOL callSuper = NO;
@@ -3295 +3297 @@
     else
         [NSCursor setHiddenUntilMouseMoves:YES];
-
-    [self release];
 }
 
@@ -5137 +5137 @@
     parameters.eventWasHandled = false;
     parameters.shouldSaveCommand = shouldSave;
+    // If we're performing input composition assume that the IM has consumed the event, 
+    // and only change this assumption in one of the NSTextInput/Responder callbacks is used.
+    parameters.consumedByIM = [self hasMarkedText];
         
     if (const PlatformKeyboardEvent* platformEvent = event->keyEvent()) {
@@ -5160 +5163 @@
         _private->interpretKeyEventsParameters = 0;
     }
-    return parameters.eventWasHandled;
+    return parameters.eventWasHandled || parameters.consumedByIM;
 }
 
@@ -5308 +5311 @@
     _private->interpretKeyEventsParameters = 0;
 
-    if (parameters)
+    if (parameters) {
         parameters->eventWasHandled = YES;
-
+        parameters->consumedByIM = NO;
+    }
+    
     if (Frame* coreFrame = core([self _frame]))
         coreFrame->editor()->unmarkText();
@@ -5361 +5366 @@
     _private->interpretKeyEventsParameters = 0;
 
-    if (parameters)
+    if (parameters) {
         parameters->eventWasHandled = YES;
-
+        parameters->consumedByIM = NO;
+    }
+    
     Frame* coreFrame = core([self _frame]);
     if (!coreFrame)
@@ -5409 +5416 @@
 - (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.
     WebHTMLViewInterpretKeyEventsParameters* parameters = _private->interpretKeyEventsParameters;
+    if (parameters)
+        parameters->consumedByIM = NO;
+
+    if (selector == @selector(noop:))
+        return;
 
     KeyboardEvent* event = parameters ? parameters->event : 0;
@@ -5461 +5470 @@
     WebHTMLViewInterpretKeyEventsParameters* parameters = _private->interpretKeyEventsParameters;
     _private->interpretKeyEventsParameters = 0;
+    if (parameters)
+        parameters->consumedByIM = NO;
 
     // We don't support inserting an attributed string but input methods don't appear to require this.