[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
trey
trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:22:17 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit f23a0ea77049591c9b9d23481a3e6cebd0b99acf
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 28 18:39:44 2003 +0000
WebCore:
2940179 - Arrow cursor should change to link cursor after click of link in non-frontmost window
3158238 - cursor shape does not track after double-click to activate a window
Reviewed by Darin.
* khtml/khtmlview.cpp:
(KHTMLView::viewportMouseDoubleClickEvent): We get this when the mouse
goes up the second time, so clear d->mousePressed.
* kwq/KWQKHTMLPart.mm:
(KWQKHTMLPart::mouseMoved): Pitch any mousemoved that comes through while
we think the mouse is down. Those screw up our tracking, like 3137661. This is
part of the 2940179 fix.
WebKit:
2940179 - Arrow cursor should change to link cursor after click of link in non-frontmost window
3158240 - cursor does not track when switching from panels to safari windows
Two changes here: First, we post fake mousemoved events to get the cursor fixed up
without checking if the mouse is down (WC deals with that now). That fixes 2940179,
because the button is down when we get notified of becoming key.
Second, we observe key window instead of main window notifications everywhere, so we
update the cursor when clicking between a panel and our doc windows.
Reviewed by Darin.
* WebView.subproj/WebHTMLView.m:
(-[WebHTMLView addMouseMovedObserver]): s/main/key/g
(-[WebHTMLView addWindowObservers]): s/main/key/g
(-[WebHTMLView removeWindowObservers]): s/main/key/g
(-[WebHTMLView windowDidBecomeKey:]): s/main/key/g
(-[WebHTMLView windowDidResignKey:]): s/main/key/g
* WebView.subproj/WebHTMLViewPrivate.m:
(-[WebHTMLView _frameOrBoundsChanged]): Always post mousemoved event.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3475 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 3398e1a..14bd55c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,19 @@
+2003-01-28 Trey Matteson <trey at apple.com>
+
+ 2940179 - Arrow cursor should change to link cursor after click of link in non-frontmost window
+
+ 3158238 - cursor shape does not track after double-click to activate a window
+
+ Reviewed by Darin.
+
+ * khtml/khtmlview.cpp:
+ (KHTMLView::viewportMouseDoubleClickEvent): We get this when the mouse
+ goes up the second time, so clear d->mousePressed.
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::mouseMoved): Pitch any mousemoved that comes through while
+ we think the mouse is down. Those screw up our tracking, like 3137661. This is
+ part of the 2940179 fix.
+
2003-01-27 Trey Matteson <trey at apple.com>
3157146 REGRESSION: using a pop-up menu turns the cursor into an I-beam
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3398e1a..14bd55c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,19 @@
+2003-01-28 Trey Matteson <trey at apple.com>
+
+ 2940179 - Arrow cursor should change to link cursor after click of link in non-frontmost window
+
+ 3158238 - cursor shape does not track after double-click to activate a window
+
+ Reviewed by Darin.
+
+ * khtml/khtmlview.cpp:
+ (KHTMLView::viewportMouseDoubleClickEvent): We get this when the mouse
+ goes up the second time, so clear d->mousePressed.
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::mouseMoved): Pitch any mousemoved that comes through while
+ we think the mouse is down. Those screw up our tracking, like 3137661. This is
+ part of the 2940179 fix.
+
2003-01-27 Trey Matteson <trey at apple.com>
3157146 REGRESSION: using a pop-up menu turns the cursor into an I-beam
diff --git a/WebCore/khtml/khtmlview.cpp b/WebCore/khtml/khtmlview.cpp
index 79dc4d7..70b1df9 100644
--- a/WebCore/khtml/khtmlview.cpp
+++ b/WebCore/khtml/khtmlview.cpp
@@ -486,6 +486,10 @@ void KHTMLView::viewportMouseDoubleClickEvent( QMouseEvent *_mouse )
//kdDebug( 6000 ) << "mouseDblClickEvent: x=" << xm << ", y=" << ym << endl;
d->isDoubleClick = true;
+#if APPLE_CHANGES
+ // We get this instead of a second mouse-up
+ d->mousePressed = false;
+#endif
DOM::NodeImpl::MouseEvent mev( _mouse->stateAfter(), DOM::NodeImpl::MouseDblClick );
m_part->xmlDocImpl()->prepareMouseEvent( false, xm, ym, &mev );
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 8a59068..a3433ff 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -1216,7 +1216,9 @@ void KWQKHTMLPart::doFakeMouseUpAfterWidgetTracking(NSEvent *downEvent)
void KWQKHTMLPart::mouseMoved(NSEvent *event)
{
- if (!d->m_view) {
+ // Reject a mouse moved if the button is down - screws up tracking during autoscroll
+ // These happen because WK sometimes has to fake up moved events.
+ if (!d->m_view || d->m_bMousePressed) {
return;
}
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 1eabfba..8460677 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,26 @@
+2003-01-28 Trey Matteson <trey at apple.com>
+
+ 2940179 - Arrow cursor should change to link cursor after click of link in non-frontmost window
+ 3158240 - cursor does not track when switching from panels to safari windows
+
+ Two changes here: First, we post fake mousemoved events to get the cursor fixed up
+ without checking if the mouse is down (WC deals with that now). That fixes 2940179,
+ because the button is down when we get notified of becoming key.
+
+ Second, we observe key window instead of main window notifications everywhere, so we
+ update the cursor when clicking between a panel and our doc windows.
+
+ Reviewed by Darin.
+
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView addMouseMovedObserver]): s/main/key/g
+ (-[WebHTMLView addWindowObservers]): s/main/key/g
+ (-[WebHTMLView removeWindowObservers]): s/main/key/g
+ (-[WebHTMLView windowDidBecomeKey:]): s/main/key/g
+ (-[WebHTMLView windowDidResignKey:]): s/main/key/g
+ * WebView.subproj/WebHTMLViewPrivate.m:
+ (-[WebHTMLView _frameOrBoundsChanged]): Always post mousemoved event.
+
2003-01-28 John Sullivan <sullivan at apple.com>
- fixed 3158304 -- Assertion failure cancelling "Add Bookmark"
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index b819c21..d9a2cd1 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -138,7 +138,7 @@
- (void)addMouseMovedObserver
{
- if ([[self window] isMainWindow] && ![self _insideAnotherHTMLView]) {
+ if ([[self window] isKeyWindow] && ![self _insideAnotherHTMLView]) {
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(mouseMovedNotification:)
name:NSMouseMovedNotification object:nil];
[self _frameOrBoundsChanged];
@@ -185,10 +185,10 @@
{
NSWindow *window = [self window];
if (window) {
- [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowDidBecomeMain:)
- name:NSWindowDidBecomeMainNotification object:window];
- [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowDidResignMain:)
- name:NSWindowDidResignMainNotification object:window];
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowDidBecomeKey:)
+ name:NSWindowDidBecomeKeyNotification object:window];
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowDidResignKey:)
+ name:NSWindowDidResignKeyNotification object:window];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowWillClose:)
name:NSWindowWillCloseNotification object:window];
}
@@ -199,9 +199,9 @@
NSWindow *window = [self window];
if (window) {
[[NSNotificationCenter defaultCenter] removeObserver:self
- name:NSWindowDidBecomeMainNotification object:window];
+ name:NSWindowDidBecomeKeyNotification object:window];
[[NSNotificationCenter defaultCenter] removeObserver:self
- name:NSWindowDidResignMainNotification object:window];
+ name:NSWindowDidResignKeyNotification object:window];
[[NSNotificationCenter defaultCenter] removeObserver:self
name:NSWindowWillCloseNotification object:window];
}
@@ -584,13 +584,13 @@
return YES;
}
-- (void)windowDidBecomeMain:(NSNotification *)notification
+- (void)windowDidBecomeKey:(NSNotification *)notification
{
ASSERT([notification object] == [self window]);
[self addMouseMovedObserver];
}
-- (void)windowDidResignMain: (NSNotification *)notification
+- (void)windowDidResignKey: (NSNotification *)notification
{
ASSERT([notification object] == [self window]);
[self removeMouseMovedObserver];
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index fa1513f..457245b 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -186,15 +186,10 @@ static BOOL forceRealHitTest = NO;
[self setNeedsLayout:YES];
[self setNeedsDisplay:YES];
}
-
- // Don't update mouseover while mouse is down.
- int mouseIsDown;
- PSbuttondown(&mouseIsDown);
- if (!mouseIsDown) {
- SEL selector = @selector(_updateMouseoverWithFakeEvent);
- [NSObject cancelPreviousPerformRequestsWithTarget:self selector:selector object:nil];
- [self performSelector:selector withObject:nil afterDelay:0];
- }
+
+ SEL selector = @selector(_updateMouseoverWithFakeEvent);
+ [NSObject cancelPreviousPerformRequestsWithTarget:self selector:selector object:nil];
+ [self performSelector:selector withObject:nil afterDelay:0];
}
- (NSDictionary *)_elementAtPoint:(NSPoint)point
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list