Changeset 10612 in webkit

Timestamp:

Sep 24, 2005, 3:58:19 AM (20 years ago)

Author:

darin

Message:

Tweaked, reviewed, and landed by Darin.

• fixed ​http://bugzilla.opendarwin.org/show_bug.cgi?id=4394 Mouse clicks ignored in inline input areas

• WebView.subproj/WebHTMLView.m: (-[NSArray mouseDown:]): Removed misleading comment and added code to send mouse event to input manager. (-[NSArray mouseDragged:]): Added code to send mouse event to input manager. (-[NSArray mouseUp:]): Ditto. (-[WebHTMLView _discardMarkedText]): Umnmark text before calling markedTextAbandoned: to match behavior of NSTextView (not sure why we did things in the opposite order before). (-[WebHTMLView _updateSelectionForInputManager]): Ditto.

• unrelated tweak

• WebView.subproj/WebView.m: (-[WebView _performTextSizingSelector:withObject:onTrackingDocs:selForNonTrackingDocs:newScaleFactor:]): Fix typecast that used ... for no good reason.

Location:

trunk/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebView.subproj/WebHTMLView.m (modified) (12 diffs)
• WebView.subproj/WebView.m (modified) (1 diff)

trunk/WebKit/ChangeLog ¶

@@ +1 @@
+2005-09-24  Alexey Proskuryakov  <ap@nypop.com>
+
+        Tweaked, reviewed, and landed by Darin.
+
+        - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=4394
+          Mouse clicks ignored in inline input areas
+
+        * WebView.subproj/WebHTMLView.m:
+        (-[NSArray mouseDown:]): Removed misleading comment and added code to send mouse event to input manager.
+        (-[NSArray mouseDragged:]): Added code to send mouse event to input manager.
+        (-[NSArray mouseUp:]): Ditto.
+        (-[WebHTMLView _discardMarkedText]): Umnmark text before calling markedTextAbandoned: to match behavior
+        of NSTextView (not sure why we did things in the opposite order before).
+        (-[WebHTMLView _updateSelectionForInputManager]): Ditto.
+
+        - unrelated tweak
+
+        * WebView.subproj/WebView.m:
+        (-[WebView _performTextSizingSelector:withObject:onTrackingDocs:selForNonTrackingDocs:newScaleFactor:]):
+        Fix typecast that used ... for no good reason.
+
 2005-09-23  Duncan Wilcox  <duncan@mclink.it>
 

trunk/WebKit/WebView.subproj/WebHTMLView.m ¶

@@ -1449 +1449 @@
     // Guarantee that the autoscroll timer is invalidated, even if we don't receive
     // a mouse up event.
-        BOOL isStillDown = WKMouseIsDown();   
+    BOOL isStillDown = WKMouseIsDown();   
     if (!isStillDown){
         [self _stopAutoscrollTimer];
@@ -2214 +2214 @@
     // Ensure that we will receive mouse move events.  Is this the best place to put this?
     [[self window] setAcceptsMouseMovedEvents: YES];
-        WKSetNSWindowShouldPostEventNotifications([self window], YES);
+    WKSetNSWindowShouldPostEventNotifications([self window], YES);
 
     if (!_private->needsLayout) {
@@ -2581 +2581 @@
     [self _setMouseDownEvent:event];
 
-    // TEXTINPUT: if there is marked text and the current input
-    // manager wants to handle mouse events, we need to make sure to
-    // pass it to them. If not, then we need to notify the input
-    // manager when the marked text is abandoned (user clicks outside
-    // the marked area)
+    NSInputManager *currentInputManager = [NSInputManager currentInputManager];
+    if ([currentInputManager wantsToHandleMouseEvents] && [currentInputManager handleMouseEvent:event])
+        goto done;
 
     [_private->compController endRevertingChange:NO moveLeft:NO];
@@ -2602 +2600 @@
     }
 
+done:
     [_private->firstResponderAtMouseDownTime release];
     _private->firstResponderAtMouseDownTime = nil;
@@ -2631 +2630 @@
 - (void)mouseDragged:(NSEvent *)event
 {
+    NSInputManager *currentInputManager = [NSInputManager currentInputManager];
+    if ([currentInputManager wantsToHandleMouseEvents] && [currentInputManager handleMouseEvent:event])
+        return;
+
     [self retain];
-    
-    // TEXTINPUT: if there is marked text and the current input
-    // manager wants to handle mouse events, we need to make sure to
-    // pass it to them.
-
-    if (!_private->ignoringMouseDraggedEvents) {
+
+    if (!_private->ignoringMouseDraggedEvents)
         [[self _bridge] mouseDragged:event];
-    }
-    
+
     [self release];
 }
@@ -2859 +2857 @@
 - (void)mouseUp:(NSEvent *)event
 {
-    // TEXTINPUT: if there is marked text and the current input
-    // manager wants to handle mouse events, we need to make sure to
-    // pass it to them.
+    NSInputManager *currentInputManager = [NSInputManager currentInputManager];
+    if ([currentInputManager wantsToHandleMouseEvents] && [currentInputManager handleMouseEvent:event])
+        return;
 
     [self retain];
-    
+
     [self _stopAutoscrollTimer];
     [[self _bridge] mouseUp:event];
@@ -5000 +4998 @@
 - (void)_extractAttributes:(NSArray **)a ranges:(NSArray **)r fromAttributedString:(NSAttributedString *)string
 {
-        int length = [[string string] length];
-        int i = 0;
-        NSMutableArray *attributes = [NSMutableArray array];
-        NSMutableArray *ranges = [NSMutableArray array];
-        while (i < length) {
-            NSRange effectiveRange;
-            NSDictionary *attrs = [string attributesAtIndex:i longestEffectiveRange:&effectiveRange inRange:NSMakeRange(i,length - i)];
-            [attributes addObject:attrs];
-            [ranges addObject:[NSValue valueWithRange:effectiveRange]];
-            i = effectiveRange.location + effectiveRange.length;
-        }
-        *a = attributes;
-        *r = ranges;
+    int length = [[string string] length];
+    int i = 0;
+    NSMutableArray *attributes = [NSMutableArray array];
+    NSMutableArray *ranges = [NSMutableArray array];
+    while (i < length) {
+        NSRange effectiveRange;
+        NSDictionary *attrs = [string attributesAtIndex:i longestEffectiveRange:&effectiveRange inRange:NSMakeRange(i,length - i)];
+        [attributes addObject:attrs];
+        [ranges addObject:[NSValue valueWithRange:effectiveRange]];
+        i = effectiveRange.location + effectiveRange.length;
+    }
+    *a = attributes;
+    *r = ranges;
 }
 
@@ -5071 +5069 @@
 {
     if (![self hasMarkedText])
-        return;
+        return;
 
     _private->ignoreMarkedTextSelectionChange = YES;
 
     [self _selectMarkedText];
+    [self unmarkText];
     [[NSInputManager currentInputManager] markedTextAbandoned:self];
-    [self unmarkText];
     // FIXME: Should we be calling the delegate here?
     [[self _bridge] deleteSelectionWithSmartDelete:NO];
@@ -5091 +5089 @@
 
     if (![self _shouldReplaceSelectionWithText:text givenAction:WebViewInsertActionTyped]) {
-        [self _discardMarkedText];
-        return;
+        [self _discardMarkedText];
+        return;
     }
 
@@ -5112 +5110 @@
     NSString *text;
     if ([string isKindOfClass:[NSAttributedString class]]) {
-        text = [string string];
+        text = [string string];
         // we don't yet support inserting an attributed string but input methods
         // don't appear to require this.
     } else {
-        text = string;
+        text = string;
     }
 
@@ -5131 +5129 @@
 
     if ([selection startContainer] != [markedTextRange startContainer]) 
-        return NO;
+        return NO;
 
     if ([selection endContainer] != [markedTextRange startContainer])
-        return NO;
+        return NO;
 
     if ([selection startOffset] < [markedTextRange startOffset])
-        return NO;
+        return NO;
 
     if ([selection endOffset] > [markedTextRange endOffset])
-        return NO;
+        return NO;
 
     return YES;
@@ -5148 +5146 @@
 {
     if (![self hasMarkedText] || _private->ignoreMarkedTextSelectionChange)
-        return;
+        return;
 
     if ([self _selectionIsInsideMarkedText]) {
-        DOMRange *selection = [self _selectedRange];
-        DOMRange *markedTextDOMRange = [[self _bridge] markedTextDOMRange];
-
-        unsigned markedSelectionStart = [selection startOffset] - [markedTextDOMRange startOffset];
-        unsigned markedSelectionLength = [selection endOffset] - [selection startOffset];
-        NSRange newSelectionRange = NSMakeRange(markedSelectionStart, markedSelectionLength);
-        
-        [[NSInputManager currentInputManager] markedTextSelectionChanged:newSelectionRange client:self];
+        DOMRange *selection = [self _selectedRange];
+        DOMRange *markedTextDOMRange = [[self _bridge] markedTextDOMRange];
+
+        unsigned markedSelectionStart = [selection startOffset] - [markedTextDOMRange startOffset];
+        unsigned markedSelectionLength = [selection endOffset] - [selection startOffset];
+        NSRange newSelectionRange = NSMakeRange(markedSelectionStart, markedSelectionLength);
+
+        [[NSInputManager currentInputManager] markedTextSelectionChanged:newSelectionRange client:self];
     } else {
-        [[NSInputManager currentInputManager] markedTextAbandoned:self];
-        [self unmarkText];
+        [self unmarkText];
+        [[NSInputManager currentInputManager] markedTextAbandoned:self];
     }
 }

trunk/WebKit/WebView.subproj/WebView.m ¶

@@ -3201 +3201 @@
                 }
             } else {
-                // Incarnation to perform a selector returning a BOOL from objc/objc-runtime.h
-                isSuitable = (*(BOOL(*)(id, SEL, ...))objc_msgSend)(sizingDocView, testSel);
+                // Incantation to perform a selector returning a BOOL.
+                isSuitable = ((BOOL(*)(id, SEL))objc_msgSend)(sizingDocView, testSel);
             }