Groundwork for Ctrl+Enter URL bar support.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@23569 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 3a536fe55e8c7d603604e3dce5d636b1077eded3..84732665980e7c892b87ba9d30b3bb388c2e8b13 100644 (file)
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,12 @@
+2007-06-18  Dave Hyatt  <hyatt@apple.com>
+
+        Let through more newline+modifier key combos in order to support Alt+Enter and Ctrl+Enter in the
+        SafariWin URL bar.
+       
+        Reviewed by mccullough
+
+        * WebView.cpp:
+
 2007-06-18  Dave Hyatt  <hyatt@apple.com>
 
         Add support for horizontal mouse wheeling to Windows.  Shift+wheel is supported for horizontal

diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index 9ba668cc24973d14968c2c47417cabeede19355f..35def5e953526fa3dfa3600120dd8fecc3fd67de 100644 (file)
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -949,6 +949,9 @@ static const KeyEntry keyEntries[] = {
     { VK_TAB,    0,                  "InsertTab"                                   },
     { VK_TAB,    ShiftKey,           "InsertBacktab"                               },
     { VK_RETURN, 0,                  "InsertNewline"                               },
+    { VK_RETURN, CtrlKey,            "InsertNewline"                               },
+    { VK_RETURN, AltKey,             "InsertNewline"                               },
+    { VK_RETURN, AltKey | ShiftKey,  "InsertNewline"                               },
 
     { 'C',       CtrlKey,            "Copy"                                        },
     { 'V',       CtrlKey,            "Paste"                                       },