[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[mjs]

The following commit has been merged in the debian/unstable branch:
commit e7a4e15742ac925a8b7d61d91c5cc2d026f6477a
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 5 08:34:22 2003 +0000

            Reviewed by Darin.
    
    	- fixed - REGRESSION (85-92): Javascript on page isn't triggered by typed characters (onKeyUp)
    
    	(This actually also requires an AppKit fix to be a full fix.)
    
            * kwq/KWQListBox.mm:
            (-[KWQTableView keyDown:]): Added. Send event through DOM.
            (-[KWQTableView keyUp:]): Likewise.
            (-[KWQTableView becomeFirstResponder]): Added. Report focus change
    	to DOM.
    	* kwq/KWQTextArea.mm:
            (-[KWQTextAreaTextView keyUp:]): Added. Send event through DOM.
            * kwq/KWQTextField.mm:
            (-[KWQTextField textView:shouldHandleEvent:]): Pass NSKeyUp events too
    	(not going to work until we get an AppKit fix).
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4943 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 42cfbee..a1e30c2 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,22 @@
+2003-09-05  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin.
+
+	- fixed - REGRESSION (85-92): Javascript on page isn't triggered by typed characters (onKeyUp)
+
+	(This actually also requires an AppKit fix to be a full fix.)
+
+        * kwq/KWQListBox.mm:
+        (-[KWQTableView keyDown:]): Added. Send event through DOM.
+        (-[KWQTableView keyUp:]): Likewise.
+        (-[KWQTableView becomeFirstResponder]): Added. Report focus change
+	to DOM.
+	* kwq/KWQTextArea.mm:
+        (-[KWQTextAreaTextView keyUp:]): Added. Send event through DOM.
+        * kwq/KWQTextField.mm:
+        (-[KWQTextField textView:shouldHandleEvent:]): Pass NSKeyUp events too
+	(not going to work until we get an AppKit fix).
+
 2003-09-04  John Sullivan  <sullivan at apple.com>
 
 	- fixed 3399880 -- Repro crash when filling out a form to
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 42cfbee..a1e30c2 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,22 @@
+2003-09-05  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin.
+
+	- fixed - REGRESSION (85-92): Javascript on page isn't triggered by typed characters (onKeyUp)
+
+	(This actually also requires an AppKit fix to be a full fix.)
+
+        * kwq/KWQListBox.mm:
+        (-[KWQTableView keyDown:]): Added. Send event through DOM.
+        (-[KWQTableView keyUp:]): Likewise.
+        (-[KWQTableView becomeFirstResponder]): Added. Report focus change
+	to DOM.
+	* kwq/KWQTextArea.mm:
+        (-[KWQTextAreaTextView keyUp:]): Added. Send event through DOM.
+        * kwq/KWQTextField.mm:
+        (-[KWQTextField textView:shouldHandleEvent:]): Pass NSKeyUp events too
+	(not going to work until we get an AppKit fix).
+
 2003-09-04  John Sullivan  <sullivan at apple.com>
 
 	- fixed 3399880 -- Repro crash when filling out a form to
diff --git a/WebCore/kwq/KWQListBox.mm b/WebCore/kwq/KWQListBox.mm
index 37109b0..a50c1ea 100644
--- a/WebCore/kwq/KWQListBox.mm
+++ b/WebCore/kwq/KWQListBox.mm
@@ -26,7 +26,9 @@
 #import "KWQListBox.h"
 
 #import "KWQAssertions.h"
+#import "KWQKHTMLPart.h"
 #import "KWQView.h"
+#import "WebCoreBridge.h"
 #import "WebCoreScrollView.h"
 
 #define MIN_LINES 4 /* ensures we have a scroll bar */
@@ -279,6 +281,37 @@ QSize QListBox::sizeForNumberOfLines(int lines) const
     }
 }
 
+- (void)keyDown:(NSEvent *)event
+{
+    WebCoreBridge *bridge = KWQKHTMLPart::bridgeForWidget(_box);
+    [bridge interceptKeyEvent:event toView:self];
+    // FIXME: In theory, if the bridge intercepted the event we should return not call super.
+    // But the code in the Web Kit that this replaces did not do that, so lets not do it until
+    // we can do more testing to see if it works well.
+    [super keyDown:event];
+}
+
+- (void)keyUp:(NSEvent *)event
+{
+    WebCoreBridge *bridge = KWQKHTMLPart::bridgeForWidget(_box);
+    [bridge interceptKeyEvent:event toView:self];
+    // FIXME: In theory, if the bridge intercepted the event we should return not call super.
+    // But the code in the Web Kit that this replaces did not do that, so lets not do it until
+    // we can do more testing to see if it works well.
+    [super keyUp:event];
+}
+
+- (BOOL)becomeFirstResponder
+{
+    BOOL become = [super becomeFirstResponder];
+
+    if (become) {
+	QFocusEvent event(QEvent::FocusIn);
+	const_cast<QObject *>(_box->eventFilterObject())->eventFilter(_box, &event);
+    }
+
+    return become;
+}
 
 - (int)numberOfRowsInTableView:(NSTableView *)tableView
 {
diff --git a/WebCore/kwq/KWQTextArea.mm b/WebCore/kwq/KWQTextArea.mm
index 36f13ae..13a2a5c 100644
--- a/WebCore/kwq/KWQTextArea.mm
+++ b/WebCore/kwq/KWQTextArea.mm
@@ -607,6 +607,16 @@ static NSString *WebContinuousSpellCheckingEnabled = @"WebContinuousSpellCheckin
     [super keyDown:event];
 }
 
+- (void)keyUp:(NSEvent *)event
+{
+    WebCoreBridge *bridge = KWQKHTMLPart::bridgeForWidget(widget);
+    [bridge interceptKeyEvent:event toView:self];
+    // FIXME: In theory, if the bridge intercepted the event we should return not call super.
+    // But the code in the Web Kit that this replaces did not do that, so lets not do it until
+    // we can do more testing to see if it works well.
+    [super keyUp:event];
+}
+
 @end
 
 @implementation NSView (KWQTextArea)
diff --git a/WebCore/kwq/KWQTextField.mm b/WebCore/kwq/KWQTextField.mm
index b07b656..14b18be 100644
--- a/WebCore/kwq/KWQTextField.mm
+++ b/WebCore/kwq/KWQTextField.mm
@@ -463,7 +463,7 @@
 	return YES;
     }
 
-    if ([event type] == NSKeyDown) {
+    if ([event type] == NSKeyDown || [event type] == NSKeyUp) {
         WebCoreBridge *bridge = KWQKHTMLPart::bridgeForWidget(widget);
         [bridge interceptKeyEvent:event toView:view];
         // FIXME: In theory, if the bridge intercepted the event we should return NO.

-- 
WebKit Debian packaging