From 9a664cd12a8721fab780c71c175607a677b7405a Mon Sep 17 00:00:00 2001
From: "brade%netscape.com"
 <brade%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 15 Feb 2000 14:46:32 +0000
Subject: [PATCH] fix new keybindings to match what was in the old xul files
 r=akkana, Jerry.Kirk@nexwarecorp.com

git-svn-id: svn://10.0.0.236/trunk@60878 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../global/resources/skin/htmlBindings.xml    | 28 --------
 .../skin/mac/platformHTMLBindings.xml         | 70 +++++++++++++++++++
 .../skin/unix/platformHTMLBindings.xml        | 30 ++++++++
 .../skin/win/platformHTMLBindings.xml         | 31 +++++++-
 4 files changed, 130 insertions(+), 29 deletions(-)

diff --git a/mozilla/xpfe/global/resources/skin/htmlBindings.xml b/mozilla/xpfe/global/resources/skin/htmlBindings.xml
index 3fdd47d60bc..cda3cee2666 100644
--- a/mozilla/xpfe/global/resources/skin/htmlBindings.xml
+++ b/mozilla/xpfe/global/resources/skin/htmlBindings.xml
@@ -28,18 +28,8 @@
         command="cmd_selectCharPrevious"/>
     <handler type="keypress" id="key_rightshift" keycode="VK_RIGHT" shift="true" alt="false" control="false"
         command="cmd_selectCharNext"/>
-    <handler type="keypress" id="key_leftcontrol" keycode="VK_LEFT" control="true" alt="false" shift="false"
-        command="cmd_wordPrevious"/>
-    <handler type="keypress" id="key_rightcontrol" keycode="VK_RIGHT" control="true" alt="false" shift="false"
-        command="cmd_wordNext"/>
-    <handler type="keypress" id="key_leftshiftcontrol" keycode="VK_LEFT" shift="true" control="true" alt="false" 
-        command="cmd_selectWordPrevious"/>
-    <handler type="keypress" id="key_rightshiftcontrol" keycode="VK_RIGHT" shift="true" control="true" alt="false" 
-        command="cmd_selectWordNext"/>
     <handler type="keypress" id="key_undo" key="z" primary="true" 
         command="cmd_undo"/>
-    <handler type="keypress" id="key_redo" key="y" primary="true"
-        command="cmd_redo"/>
 
     </handlers>
   </binding>
@@ -47,30 +37,14 @@
   <binding name="textAreasBase">
     <handlers>
 
-    <handler type="keypress" id="key_home" keycode="VK_HOME" alt="false" shift="false" control="false"
-        command="cmd_beginLine"/>
-    <handler type="keypress" id="key_end" keycode="VK_END" alt="false" shift="false" control="false"
-        command="cmd_endLine"/>
     <handler type="keypress" id="key_left" keycode="VK_LEFT" alt="false" shift="false" control="false"
         command="cmd_charPrevious"/>
     <handler type="keypress" id="key_right" keycode="VK_RIGHT" alt="false" shift="false" control="false"
         command="cmd_charNext"/>
-    <handler type="keypress" id="key_homeshift" keycode="VK_HOME" shift="true" alt="false" control="false"
-        command="cmd_selectBeginLine"/>
-    <handler type="keypress" id="key_endshift" keycode="VK_END" shift="true" alt="false" control="false"
-        command="cmd_selectEndLine"/>
     <handler type="keypress" id="key_leftshift" keycode="VK_LEFT" shift="true" alt="false" control="false"
         command="cmd_selectCharPrevious"/>
     <handler type="keypress" id="key_rightshift" keycode="VK_RIGHT" shift="true" alt="false" control="false"
         command="cmd_selectCharNext"/>
-    <handler type="keypress" id="key_leftcontrol" keycode="VK_LEFT" control="true" alt="false" shift="false" 
-        command="cmd_wordPrevious"/>
-    <handler type="keypress" id="key_rightcontrol" keycode="VK_RIGHT" control="true" alt="false" shift="false" 
-        command="cmd_wordNext"/>
-    <handler type="keypress" id="key_leftshiftcontrol" keycode="VK_LEFT" shift="true" control="true" alt="false"
-        command="cmd_wordPrevious"/>
-    <handler type="keypress" id="key_rightshiftcontrol" keycode="VK_RIGHT" shift="true" control="true" alt="false"
-        command="cmd_wordNext"/>
     <handler type="keypress" id="key_up" keycode="VK_UP" alt="false" shift="false" control="false"
         command="cmd_linePrevious"/>
     <handler type="keypress" id="key_down" keycode="VK_DOWN" alt="false" shift="false" control="false"
@@ -85,8 +59,6 @@
         command="cmd_scrollPageDown"/>
     <handler type="keypress" id="key_undo" key="z" primary="true"
         command="cmd_undo"/>
-    <handler type="keypress" id="key_redo" key="y" primary="true"
-        command="cmd_redo"/>
 
     </handlers>
   </binding>
diff --git a/mozilla/xpfe/global/resources/skin/mac/platformHTMLBindings.xml b/mozilla/xpfe/global/resources/skin/mac/platformHTMLBindings.xml
index c1b2816fd56..84d686f2a45 100644
--- a/mozilla/xpfe/global/resources/skin/mac/platformHTMLBindings.xml
+++ b/mozilla/xpfe/global/resources/skin/mac/platformHTMLBindings.xml
@@ -7,11 +7,81 @@
   <binding name="inputFields" extends="resource:/chrome/htmlBindings.xml#inputFieldsBase">
     <handlers>
       
+      <handler type="keypress" id="key_redo" key="z" primary="true" shift="true" alt="false" control="false"
+        command="cmd_redo"/>
+
+      <handler type="keypress" id="key_up" keycode="VK_UP" alt="false" shift="false" control="false"
+        command="cmd_linePrevious"/>
+      <handler type="keypress" id="key_down" keycode="VK_DOWN" alt="false" shift="false" control="false"
+        command="cmd_lineNext"/>
+      <handler type="keypress" id="key_up_shift" keycode="VK_UP" alt="false" shift="true" control="false"
+        command="cmd_selectBeginLine"/>
+      <handler type="keypress" id="key_down_shift" keycode="VK_DOWN" alt="false" shift="true" control="false"
+        command="cmd_selectEndLine"/>
+      <handler type="keypress" id="key_up_meta" keycode="VK_UP" meta="true" alt="false" shift="false" control="false"
+        command="cmd_scrollPageUp"/>
+      <handler type="keypress" id="key_down_meta" keycode="VK_DOWN" meta="true" alt="false" shift="false" control="false"
+        command="cmd_scrollPageDown"/>
+
+      <handler type="keypress" id="key_leftalt" keycode="VK_LEFT" alt="true" shift="false" control="false" 
+        command="cmd_wordPrevious"/>
+      <handler type="keypress" id="key_rightalt" keycode="VK_RIGHT" alt="true" shift="false" control="false" 
+        command="cmd_wordNext"/>
+      <handler type="keypress" id="key_leftshiftalt" keycode="VK_LEFT" alt="true" shift="true" control="false" 
+        command="cmd_selectWordPrevious"/>
+      <handler type="keypress" id="key_rightshiftalt" keycode="VK_RIGHT" alt="true" shift="true" control="false"
+        command="cmd_selectWordNext"/>
+
+      <handler type="keypress" id="key_leftmeta" keycode="VK_LEFT" meta="true" alt="false" shift="false" control="false" 
+        command="cmd_linePrevious"/>
+      <handler type="keypress" id="key_rightmeta" keycode="VK_RIGHT" meta="true" alt="false" shift="false" control="false" 
+        command="cmd_lineNext"/>
+      <handler type="keypress" id="key_leftshiftmeta" keycode="VK_LEFT" meta="true" alt="false" shift="true" control="false" 
+        command="cmd_selectBeginLine"/>
+      <handler type="keypress" id="key_rightshiftmeta" keycode="VK_RIGHT" meta="true" alt="false" shift="true" control="false"
+        command="cmd_selectEndLine"/>
+
     </handlers>
   </binding>
 
   <binding name="textAreas" extends="resource:/chrome/htmlBindings.xml#textAreasBase">
     <handlers>
+
+      <handler type="keypress" id="key_redo" key="z" primary="true" shift="true" alt="false" control="false"
+        command="cmd_redo"/>
+
+      <handler type="keypress" id="key_home" keycode="VK_HOME" alt="false" shift="false" control="false"
+        command="cmd_scrollPageUp"/>
+      <handler type="keypress" id="key_end" keycode="VK_END" alt="false" shift="false" control="false"
+        command="cmd_scrollPageDown"/>
+      <handler type="keypress" id="key_homeshift" keycode="VK_HOME" shift="true" alt="false" control="false"
+        command="cmd_selectBeginLine"/>
+      <handler type="keypress" id="key_endshift" keycode="VK_END" shift="true" alt="false" control="false"
+        command="cmd_selectEndLine"/>
+
+      <handler type="keypress" id="key_up_meta" keycode="VK_UP" meta="true" alt="false" shift="false" control="false"
+        command="cmd_scrollPageUp"/>
+      <handler type="keypress" id="key_down_meta" keycode="VK_DOWN" meta="true" alt="false" shift="false" control="false"
+        command="cmd_scrollPageDown"/>
+
+      <handler type="keypress" id="key_leftalt" keycode="VK_LEFT" alt="true" shift="false" control="false" 
+        command="cmd_wordPrevious"/>
+      <handler type="keypress" id="key_rightalt" keycode="VK_RIGHT" alt="true" shift="false" control="false" 
+        command="cmd_wordNext"/>
+      <handler type="keypress" id="key_leftshiftalt" keycode="VK_LEFT" alt="true" shift="true" control="false" 
+        command="cmd_selectWordPrevious"/>
+      <handler type="keypress" id="key_rightshiftalt" keycode="VK_RIGHT" alt="true" shift="true" control="false"
+        command="cmd_selectWordNext"/>
+
+      <handler type="keypress" id="key_leftmeta" keycode="VK_LEFT" meta="true" alt="false" shift="false" control="false" 
+        command="cmd_linePrevious"/>
+      <handler type="keypress" id="key_rightmeta" keycode="VK_RIGHT" meta="true" alt="false" shift="false" control="false" 
+        command="cmd_lineNext"/>
+      <handler type="keypress" id="key_leftshiftmeta" keycode="VK_LEFT" meta="true" alt="false" shift="true" control="false" 
+        command="cmd_selectBeginLine"/>
+      <handler type="keypress" id="key_rightshiftmeta" keycode="VK_RIGHT" meta="true" alt="false" shift="true" control="false"
+        command="cmd_selectEndLine"/>
+
     </handlers>
   </binding>
 
diff --git a/mozilla/xpfe/global/resources/skin/unix/platformHTMLBindings.xml b/mozilla/xpfe/global/resources/skin/unix/platformHTMLBindings.xml
index 201636e19f2..0e6b9fd700a 100644
--- a/mozilla/xpfe/global/resources/skin/unix/platformHTMLBindings.xml
+++ b/mozilla/xpfe/global/resources/skin/unix/platformHTMLBindings.xml
@@ -37,6 +37,17 @@
     <handler type="keypress" id="key_winredo" key="r" control="true"
         command="cmd_redo"/>
 
+    <!-- navigating by word keys -->
+    <handler type="keypress" id="key_leftcontrol" keycode="VK_LEFT" control="true" alt="false" shift="false"
+        command="cmd_wordPrevious"/>
+    <handler type="keypress" id="key_rightcontrol" keycode="VK_RIGHT" control="true" alt="false" shift="false"
+        command="cmd_wordNext"/>
+    <handler type="keypress" id="key_leftshiftcontrol" keycode="VK_LEFT" shift="true" control="true" alt="false" 
+        command="cmd_selectWordPrevious"/>
+    <handler type="keypress" id="key_rightshiftcontrol" keycode="VK_RIGHT" shift="true" control="true" alt="false" 
+        command="cmd_selectWordNext"/>
+    <handler type="keypress" id="key_redo" key="y" primary="true"
+        command="cmd_redo"/>
     </handlers>
   </binding>
 
@@ -79,6 +90,25 @@
     <handler type="keypress" id="key_lineup" key="p" control="true"
         command="cmd_linePrevious"/>
 
+    <!-- handle home/end/arrow keys and redo -->
+    <handler type="keypress" id="key_home" keycode="VK_HOME" alt="false" shift="false" control="false"
+        command="cmd_beginLine"/>
+    <handler type="keypress" id="key_end" keycode="VK_END" alt="false" shift="false" control="false"
+        command="cmd_endLine"/>
+    <handler type="keypress" id="key_homeshift" keycode="VK_HOME" shift="true" alt="false" control="false"
+        command="cmd_selectBeginLine"/>
+    <handler type="keypress" id="key_endshift" keycode="VK_END" shift="true" alt="false" control="false"
+        command="cmd_selectEndLine"/>
+    <handler type="keypress" id="key_leftcontrol" keycode="VK_LEFT" control="true" alt="false" shift="false" 
+        command="cmd_wordPrevious"/>
+    <handler type="keypress" id="key_rightcontrol" keycode="VK_RIGHT" control="true" alt="false" shift="false" 
+        command="cmd_wordNext"/>
+    <handler type="keypress" id="key_leftshiftcontrol" keycode="VK_LEFT" shift="true" control="true" alt="false"
+        command="cmd_wordPrevious"/>
+    <handler type="keypress" id="key_rightshiftcontrol" keycode="VK_RIGHT" shift="true" control="true" alt="false"
+        command="cmd_wordNext"/>
+    <handler type="keypress" id="key_redo" key="y" primary="true"
+        command="cmd_redo"/>
     </handlers>
   </binding>
 
diff --git a/mozilla/xpfe/global/resources/skin/win/platformHTMLBindings.xml b/mozilla/xpfe/global/resources/skin/win/platformHTMLBindings.xml
index 1a403b418e2..69b41dad2a9 100644
--- a/mozilla/xpfe/global/resources/skin/win/platformHTMLBindings.xml
+++ b/mozilla/xpfe/global/resources/skin/win/platformHTMLBindings.xml
@@ -14,12 +14,41 @@
 	      command="cmd_selectCharPrevious"/>
       <handler type="keypress" id="key_rightshift" keycode="VK_DOWN" shift="true" alt="false" control="false"
 	      command="cmd_selectCharNext"/>
+
+      <handler type="keypress" id="key_leftcontrol" keycode="VK_LEFT" control="true" alt="false" shift="false"
+        command="cmd_wordPrevious"/>
+      <handler type="keypress" id="key_rightcontrol" keycode="VK_RIGHT" control="true" alt="false" shift="false"
+        command="cmd_wordNext"/>
+      <handler type="keypress" id="key_leftshiftcontrol" keycode="VK_LEFT" shift="true" control="true" alt="false" 
+        command="cmd_selectWordPrevious"/>
+      <handler type="keypress" id="key_rightshiftcontrol" keycode="VK_RIGHT" shift="true" control="true" alt="false" 
+        command="cmd_selectWordNext"/>
+      <handler type="keypress" id="key_redo" key="y" primary="true"
+        command="cmd_redo"/>
     </handlers>
   </binding>
 
   <binding name="textAreas" extends="resource:/chrome/htmlBindings.xml#textAreasBase">
     <handlers>
-    </handlers>
+      <handler type="keypress" id="key_home" keycode="VK_HOME" alt="false" shift="false" control="false"
+        command="cmd_beginLine"/>
+      <handler type="keypress" id="key_end" keycode="VK_END" alt="false" shift="false" control="false"
+        command="cmd_endLine"/>
+      <handler type="keypress" id="key_homeshift" keycode="VK_HOME" shift="true" alt="false" control="false"
+        command="cmd_selectBeginLine"/>
+      <handler type="keypress" id="key_endshift" keycode="VK_END" shift="true" alt="false" control="false"
+        command="cmd_selectEndLine"/>
+      <handler type="keypress" id="key_leftcontrol" keycode="VK_LEFT" control="true" alt="false" shift="false" 
+        command="cmd_wordPrevious"/>
+      <handler type="keypress" id="key_rightcontrol" keycode="VK_RIGHT" control="true" alt="false" shift="false" 
+        command="cmd_wordNext"/>
+      <handler type="keypress" id="key_leftshiftcontrol" keycode="VK_LEFT" shift="true" control="true" alt="false"
+        command="cmd_wordPrevious"/>
+      <handler type="keypress" id="key_rightshiftcontrol" keycode="VK_RIGHT" shift="true" control="true" alt="false"
+        command="cmd_wordNext"/>
+      <handler type="keypress" id="key_redo" key="y" primary="true"
+        command="cmd_redo"/>
+     </handlers>
   </binding>
 
 </bindings>