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

[trey]

The following commit has been merged in the debian/unstable branch:
commit 0b78c34143799d92e913be5863026042005146e8
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 23 09:03:28 2003 +0000

    	3153313 cursor changes during text selection when we cross links
    
            Reviewed by Dave.
    
            * khtml/khtmlview.cpp:
            (KHTMLView::viewportMousePressEvent):  Remember mouse is down.
            (KHTMLView::viewportMouseMoveEvent):  Use ibeam while mouse down.
            (KHTMLView::viewportMouseReleaseEvent):  Remember that it's up.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3416 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 79bd4dd..810d6bd 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-01-22  Trey Matteson  <trey at apple.com>
+
+	3153313 cursor changes during text selection when we cross links
+
+        Reviewed by Dave.
+
+        * khtml/khtmlview.cpp:
+        (KHTMLView::viewportMousePressEvent):  Remember mouse is down.
+        (KHTMLView::viewportMouseMoveEvent):  Use ibeam while mouse down.
+        (KHTMLView::viewportMouseReleaseEvent):  Remember that it's up.
+
 2003-01-22  David Hyatt  <hyatt at apple.com>
 
 	Fix first-line regression caused by my removal of a local variable.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 79bd4dd..810d6bd 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-01-22  Trey Matteson  <trey at apple.com>
+
+	3153313 cursor changes during text selection when we cross links
+
+        Reviewed by Dave.
+
+        * khtml/khtmlview.cpp:
+        (KHTMLView::viewportMousePressEvent):  Remember mouse is down.
+        (KHTMLView::viewportMouseMoveEvent):  Use ibeam while mouse down.
+        (KHTMLView::viewportMouseReleaseEvent):  Remember that it's up.
+
 2003-01-22  David Hyatt  <hyatt at apple.com>
 
 	Fix first-line regression caused by my removal of a local variable.
diff --git a/WebCore/khtml/khtmlview.cpp b/WebCore/khtml/khtmlview.cpp
index e3864da..79dc4d7 100644
--- a/WebCore/khtml/khtmlview.cpp
+++ b/WebCore/khtml/khtmlview.cpp
@@ -98,6 +98,7 @@ public:
 	timerId = 0;
         repaintTimerId = 0;
         complete = false;
+        mousePressed = false;
 	tooltip = 0;
     }
     ~KHTMLViewPrivate()
@@ -140,6 +141,7 @@ public:
 	timerId = 0;
         repaintTimerId = 0;
         complete = false;
+        mousePressed = false;
         firstRelayout = true;
         layoutSchedulingEnabled = true;
         updateRect = QRect();
@@ -177,6 +179,7 @@ public:
     bool complete;
     bool firstRelayout;
     bool layoutSchedulingEnabled;
+    bool mousePressed;
     QRect updateRect;
     KHTMLToolTip *tooltip;
 };
@@ -437,6 +440,7 @@ void KHTMLView::viewportMousePressEvent( QMouseEvent *_mouse )
     //kdDebug( 6000 ) << "\nmousePressEvent: x=" << xm << ", y=" << ym << endl;
 
     d->isDoubleClick = false;
+    d->mousePressed = true;
 
     DOM::NodeImpl::MouseEvent mev( _mouse->stateAfter(), DOM::NodeImpl::MousePress );
     m_part->xmlDocImpl()->prepareMouseEvent( false, xm, ym, &mev );
@@ -573,7 +577,10 @@ void KHTMLView::viewportMouseMoveEvent( QMouseEvent * _mouse )
 
     switch ( style ? style->cursor() : CURSOR_AUTO) {
     case CURSOR_AUTO:
-        if ( mev.url.length() && m_part->settings()->changeCursor() )
+        if ( d->mousePressed )
+            // during selection, use an IBeam no matter what we're over
+            c = KCursor::ibeamCursor();
+        else if ( mev.url.length() && m_part->settings()->changeCursor() )
             c = m_part->urlCursor();
         else if ( mev.innerNode.nodeType() == Node::TEXT_NODE
                   || mev.innerNode.nodeType() == Node::CDATA_SECTION_NODE )
@@ -645,6 +652,8 @@ void KHTMLView::viewportMouseReleaseEvent( QMouseEvent * _mouse )
     int xm, ym;
     viewportToContents(_mouse->x(), _mouse->y(), xm, ym);
 
+    d->mousePressed = false;
+
     //kdDebug( 6000 ) << "\nmouseReleaseEvent: x=" << xm << ", y=" << ym << endl;
 
     DOM::NodeImpl::MouseEvent mev( _mouse->stateAfter(), DOM::NodeImpl::MouseRelease );

-- 
WebKit Debian packaging