[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
mjs
mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:23:25 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit e92733b812eae95397fec5fd1218b2ec81f37bbd
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jul 5 01:15:37 2002 +0000
Say "Go to" instead of "Link to" for links that won't open a new
window. Also, the code is now set up to change the status text
when modifier keys are pressed, but the code is disabled for now
because it's impossible to do reliably.
* khtml/khtml_part.cpp:
(KHTMLPart::overURL):
(KHTMLPart::khtmlMouseMoveEvent):
* khtml/khtml_part.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1515 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 1824259..992f5a4 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-07-04 Maciej Stachowiak <mjs at apple.com>
+
+ Say "Go to" instead of "Link to" for links that won't open a new
+ window. Also, the code is now set up to change the status text
+ when modifier keys are pressed, but the code is disabled for now
+ because it's impossible to do reliably.
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::overURL):
+ (KHTMLPart::khtmlMouseMoveEvent):
+ * khtml/khtml_part.h:
+
2002-07-03 Darin Adler <darin at apple.com>
A small KURL speed improvement.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 1824259..992f5a4 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2002-07-04 Maciej Stachowiak <mjs at apple.com>
+
+ Say "Go to" instead of "Link to" for links that won't open a new
+ window. Also, the code is now set up to change the status text
+ when modifier keys are pressed, but the code is disabled for now
+ because it's impossible to do reliably.
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::overURL):
+ (KHTMLPart::khtmlMouseMoveEvent):
+ * khtml/khtml_part.h:
+
2002-07-03 Darin Adler <darin at apple.com>
A small KURL speed improvement.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 1824259..992f5a4 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2002-07-04 Maciej Stachowiak <mjs at apple.com>
+
+ Say "Go to" instead of "Link to" for links that won't open a new
+ window. Also, the code is now set up to change the status text
+ when modifier keys are pressed, but the code is disabled for now
+ because it's impossible to do reliably.
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::overURL):
+ (KHTMLPart::khtmlMouseMoveEvent):
+ * khtml/khtml_part.h:
+
2002-07-03 Darin Adler <darin at apple.com>
A small KURL speed improvement.
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 0228320..ed0c1d2 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -2127,7 +2127,11 @@ void KHTMLPart::slotClearSelection()
emitSelectionChanged();
}
+#ifdef APPLE_CHANGES
+void KHTMLPart::overURL( const QString &url, const QString &target, int modifierState)
+#else
void KHTMLPart::overURL( const QString &url, const QString &target, bool shiftPressed )
+#endif
{
#ifndef APPLE_CHANGES
if ( !d->m_kjsStatusBarText.isEmpty() && !shiftPressed ) {
@@ -2247,10 +2251,14 @@ void KHTMLPart::overURL( const QString &url, const QString &target, bool shiftPr
{
#endif
QString extra;
+#ifdef APPLE_CHANGES
+ QString prefix = "Go to ";
+#endif
if (target == QString::fromLatin1("_blank"))
{
#ifdef APPLE_CHANGES
extra = " in new window";
+ prefix = "Open ";
#else
extra = i18n(" (In new window)");
#endif
@@ -2269,6 +2277,7 @@ void KHTMLPart::overURL( const QString &url, const QString &target, bool shiftPr
extra = " in other frame";
} else {
extra = " in new window";
+ prefix = "Open ";
}
#else
extra = i18n(" (In other frame)");
@@ -2320,11 +2329,25 @@ void KHTMLPart::overURL( const QString &url, const QString &target, bool shiftPr
#endif
#ifdef APPLE_CHANGES
// FIXME: needs localization
- if (extra.isEmpty()) {
- emit setStatusBarText("Link to " + u.prettyURL() + extra);
- } else {
- emit setStatusBarText("Open " + u.prettyURL() + extra);
+
+#if FLAGS_CHANGE_FIXED
+ // FIXME: it would be nice to change the text based on currently
+ // pressed modifiers, but we can't do that until we can detect
+ // modifier state changes, which requires a fix to 2981619
+ if (modifierState & MetaButton) {
+ prefix = "Open ";
+ if (modifierState & ShiftButton) {
+ extra = " in new window, behind current window";
+ } else {
+ extra = " in new window";
+ }
+ } else if (modifierState & AltButton) {
+ prefix = "Download ";
+ extra = "";
}
+#endif
+
+ emit setStatusBarText(prefix + u.prettyURL() + extra);
#else
emit setStatusBarText(u.prettyURL() + extra);
#endif
@@ -4073,7 +4096,9 @@ void KHTMLPart::khtmlMouseMoveEvent( khtml::MouseMoveEvent *event )
// The mouse is over something
if ( url.length() )
{
+#ifndef APPLE_CHANGES
bool shiftPressed = ( _mouse->state() & ShiftButton );
+#endif
// Image map
if ( !innerNode.isNull() && innerNode.elementId() == ID_IMG )
@@ -4092,18 +4117,30 @@ void KHTMLPart::khtmlMouseMoveEvent( khtml::MouseMoveEvent *event )
d->m_overURL = url.string() + QString("?%1,%2").arg(x).arg(y);
d->m_overURLTarget = target.string();
+#ifdef APPLE_CHANGES
+ overURL( d->m_overURL, target.string(), _mouse->state() );
+#else
overURL( d->m_overURL, target.string(), shiftPressed );
+#endif
return;
}
}
}
// normal link
+#ifdef APPLE_CHANGES
+ if ( TRUE )
+#else
if ( d->m_overURL.isEmpty() || d->m_overURL != url || d->m_overURLTarget != target )
+#endif
{
d->m_overURL = url.string();
d->m_overURLTarget = target.string();
+#ifdef APPLE_CHANGES
+ overURL( d->m_overURL, target.string(), _mouse->state() );
+#else
overURL( d->m_overURL, target.string(), shiftPressed );
+#endif
}
}
else // Not over a link...
diff --git a/WebCore/khtml/khtml_part.h b/WebCore/khtml/khtml_part.h
index 59116d6..9432316 100644
--- a/WebCore/khtml/khtml_part.h
+++ b/WebCore/khtml/khtml_part.h
@@ -1009,7 +1009,11 @@ private:
void startAutoScroll();
void stopAutoScroll();
+#ifdef APPLE_CHANGES
+ void overURL( const QString &url, const QString &target, int modifierState = 0);
+#else
void overURL( const QString &url, const QString &target, bool shiftPressed = false );
+#endif
/**
* @internal
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list