[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 a95750be1f04da03a7dc40fd17a99c05b8eff79e
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 22 05:29:45 2003 +0000

    	3032718 - I-beam cursor behavior different between web view and text view
    
    	Now that the innerNode is the real text element instead of an enclosing
    	tag element, it's a piece of cake to test for a text node and set the ibeam cursor.
    
            Reviewed by Chris
    
            * khtml/khtmlview.cpp:
            (KHTMLView::viewportMouseMoveEvent):  Set iBeam if over text.
            * kwq/KWQKCursor.mm:
            (KCursor::ibeamCursor):  Make this cursor have the Cocoa ibeam instead of arrow.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3395 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 36fa8ef..c4ab40b 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,17 @@
+2003-01-21  Trey Matteson  <trey at apple.com>
+
+	3032718 - I-beam cursor behavior different between web view and text view
+
+	Now that the innerNode is the real text element instead of an enclosing
+	tag element, it's a piece of cake to test for a text node and set the ibeam cursor.
+
+        Reviewed by Chris
+
+        * khtml/khtmlview.cpp:
+        (KHTMLView::viewportMouseMoveEvent):  Set iBeam if over text.
+        * kwq/KWQKCursor.mm:
+        (KCursor::ibeamCursor):  Make this cursor have the Cocoa ibeam instead of arrow.
+
 2003-01-21  David Hyatt  <hyatt at apple.com>
 
 	Fix selection so that it will go up to the parent node
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 36fa8ef..c4ab40b 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2003-01-21  Trey Matteson  <trey at apple.com>
+
+	3032718 - I-beam cursor behavior different between web view and text view
+
+	Now that the innerNode is the real text element instead of an enclosing
+	tag element, it's a piece of cake to test for a text node and set the ibeam cursor.
+
+        Reviewed by Chris
+
+        * khtml/khtmlview.cpp:
+        (KHTMLView::viewportMouseMoveEvent):  Set iBeam if over text.
+        * kwq/KWQKCursor.mm:
+        (KCursor::ibeamCursor):  Make this cursor have the Cocoa ibeam instead of arrow.
+
 2003-01-21  David Hyatt  <hyatt at apple.com>
 
 	Fix selection so that it will go up to the parent node
diff --git a/WebCore/khtml/khtmlview.cpp b/WebCore/khtml/khtmlview.cpp
index 33954af..e3864da 100644
--- a/WebCore/khtml/khtmlview.cpp
+++ b/WebCore/khtml/khtmlview.cpp
@@ -575,6 +575,9 @@ void KHTMLView::viewportMouseMoveEvent( QMouseEvent * _mouse )
     case CURSOR_AUTO:
         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 )
+            c = KCursor::ibeamCursor();
         break;
     case CURSOR_CROSS:
         c = KCursor::crossCursor();
diff --git a/WebCore/kwq/KWQKCursor.mm b/WebCore/kwq/KWQKCursor.mm
index e947127..3d9c28c 100644
--- a/WebCore/kwq/KWQKCursor.mm
+++ b/WebCore/kwq/KWQKCursor.mm
@@ -65,6 +65,6 @@ QCursor KCursor::sizeHorCursor() { return QCursor(); }
 QCursor KCursor::sizeVerCursor() { return QCursor(); }
 QCursor KCursor::sizeBDiagCursor() { return QCursor(); }
 QCursor KCursor::sizeFDiagCursor() { return QCursor(); }
-QCursor KCursor::ibeamCursor() { return QCursor(); }
+QCursor KCursor::ibeamCursor() { return QCursor([NSCursor IBeamCursor]); }
 QCursor KCursor::waitCursor() { return QCursor(); }
 QCursor KCursor::whatsThisCursor() { return QCursor(); }

-- 
WebKit Debian packaging