From 3ef413d57db437de388feed5b477485387fc815e Mon Sep 17 00:00:00 2001
From: "akkana%netscape.com"
 <akkana%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 18 Jul 2000 23:04:24 +0000
Subject: [PATCH] 42885: Move browser and editor XUL bindings out of global
 (i.e.   widget-toolkit) and into communicator (i.e. core).   Also remove the
 obsolete files platformInputBindings.xul and   platformTextAreaBindings.xul:
 text controls use XBL bindings now,   and the XUL bindings are no longer
 used.   r=ben,saari

git-svn-id: svn://10.0.0.236/trunk@74402 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../communicator/resources/content/MANIFEST   |   2 +
 .../resources/content/Makefile.in             |   2 +
 .../resources/content/browserBindings.xul     |  52 ++++++++
 .../resources/content/editorBindings.xul      | 112 ++++++++++++++++++
 .../resources/content/makefile.win            |   2 +
 .../xpfe/global/resources/content/MANIFEST    |   4 -
 .../xpfe/global/resources/content/Makefile.in |   4 -
 .../global/resources/content/mac/MANIFEST     |   4 -
 .../global/resources/content/makefile.win     |   4 -
 .../global/resources/content/os2/Makefile.in  |   5 -
 .../global/resources/content/unix/Makefile.in |   5 -
 .../global/resources/content/win/makefile.win |   4 -
 12 files changed, 170 insertions(+), 30 deletions(-)
 create mode 100644 mozilla/xpfe/communicator/resources/content/browserBindings.xul
 create mode 100644 mozilla/xpfe/communicator/resources/content/editorBindings.xul

diff --git a/mozilla/xpfe/communicator/resources/content/MANIFEST b/mozilla/xpfe/communicator/resources/content/MANIFEST
index 6a99f0fe6ee..86f639fd596 100644
--- a/mozilla/xpfe/communicator/resources/content/MANIFEST
+++ b/mozilla/xpfe/communicator/resources/content/MANIFEST
@@ -6,3 +6,5 @@ taskbarOverlay.xul
 tasksOverlay.js
 tasksOverlay.xul
 dialogBindings.xml
+browserBindings.xul
+editorBindings.xul
diff --git a/mozilla/xpfe/communicator/resources/content/Makefile.in b/mozilla/xpfe/communicator/resources/content/Makefile.in
index 96e01e1535d..0f389f4c66a 100644
--- a/mozilla/xpfe/communicator/resources/content/Makefile.in
+++ b/mozilla/xpfe/communicator/resources/content/Makefile.in
@@ -44,6 +44,8 @@ CHROME_CONTENT = \
 		tasksOverlay.js \
 		tasksOverlay.xul \
 		dialogBindings.xml \
+		browserBindings.xul \
+		editorBindings.xul \
 		$(NULL)
 
 DIRS 		= unix
diff --git a/mozilla/xpfe/communicator/resources/content/browserBindings.xul b/mozilla/xpfe/communicator/resources/content/browserBindings.xul
new file mode 100644
index 00000000000..3695d3be596
--- /dev/null
+++ b/mozilla/xpfe/communicator/resources/content/browserBindings.xul
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<?xul-overlay href="chrome://global/content/platformGlobalOverlay.xul"?>
+
+<window id="browserBindings"
+   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <keyset id="browserKeySet">
+    <key id="key_page_up" keycode="VK_PAGE_UP" shift="false" control="false" alt="false"
+        onkeypress="
+            var controller =
+            document.commandDispatcher.getControllerForCommand('cmd_scrollPageUp');
+            controller.doCommand('cmd_scrollPageUp');"/>
+    <key id="key_page_down" keycode="VK_PAGE_DOWN" shift="false" control="false" alt="false"
+        onkeypress="
+            var controller =
+            document.commandDispatcher.getControllerForCommand('cmd_scrollPageDown');
+            controller.doCommand('cmd_scrollPageDown');"/>
+    <key id="space" key=" " shift="false" control="false" alt="false"
+        onkeypress="
+			var v = document.commandDispatcher.focusedElement;
+			
+			if (v &amp;&amp; (v.localName == 'INPUT' || v.localName == 'TEXTAREA')) {
+			  return true;
+            }
+
+            var controller =
+            document.commandDispatcher.getControllerForCommand('cmd_scrollPageDown');
+            controller.doCommand('cmd_scrollPageDown');
+    "/>
+
+    <key id="key_page_up" keycode="VK_UP" shift="false" control="false" alt="false"
+        onkeypress="
+            var controller =
+            document.commandDispatcher.getControllerForCommand('cmd_scrollLineUp');
+            controller.doCommand('cmd_scrollLineUp');"/>
+    <key id="key_page_down" keycode="VK_DOWN" shift="false" control="false" alt="false"
+        onkeypress="
+            var controller =
+            document.commandDispatcher.getControllerForCommand('cmd_scrollLineDown');
+            controller.doCommand('cmd_scrollLineDown');"/>
+    <key id="key_left" keycode="VK_LEFT" shift="false" control="false" alt="false"
+        onkeypress="
+            var controller =
+            document.commandDispatcher.getControllerForCommand('cmd_scrollLeft');
+            controller.doCommand('cmd_scrollLeft');"/>
+    <key id="key_right" keycode="VK_RIGHT" shift="false" control="false" alt="false"
+        onkeypress="
+            var controller =
+            document.commandDispatcher.getControllerForCommand('cmd_scrollRight');
+            controller.doCommand('cmd_scrollRight');"/>
+	</keyset>
+</window>
diff --git a/mozilla/xpfe/communicator/resources/content/editorBindings.xul b/mozilla/xpfe/communicator/resources/content/editorBindings.xul
new file mode 100644
index 00000000000..6434ac01e4b
--- /dev/null
+++ b/mozilla/xpfe/communicator/resources/content/editorBindings.xul
@@ -0,0 +1,112 @@
+<?xml version="1.0"?>
+
+<window id="editorBindings"
+   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <keyset id="editorKeySet">
+    <key id="key_home" keycode="VK_HOME" shift="false" control="false" alt="false"
+        onkeypress="
+            var controller =
+            document.commandDispatcher.getControllerForCommand('cmd_beginLine');
+            controller.doCommand('cmd_beginLine');"/>
+    <key id="key_end" keycode="VK_END" shift="false" control="false" alt="false"
+        onkeypress="
+            var controller =
+            document.commandDispatcher.getControllerForCommand('cmd_endLine');
+            controller.doCommand('cmd_endLine');"/>
+    <key id="key_left" keycode="VK_LEFT" shift="false" control="false" alt="false"
+        onkeypress="
+            var controller =
+            document.commandDispatcher.getControllerForCommand('cmd_charPrevious');
+            controller.doCommand('cmd_charPrevious');"/>
+    <key id="key_right" keycode="VK_RIGHT" shift="false" control="false" alt="false"
+        onkeypress="
+            var controller =
+            document.commandDispatcher.getControllerForCommand('cmd_charNext');
+            controller.doCommand('cmd_charNext');"/>
+    <key id="key_homeshift" keycode="VK_HOME" shift="true" control="false" alt="false"
+        onkeypress="
+            var controller =
+            document.commandDispatcher.getControllerForCommand('cmd_selectBeginLine');
+            controller.doCommand('cmd_selectBeginLine');"/>
+    <key id="key_endshift" keycode="VK_END" shift="true" control="false" alt="false"
+        onkeypress="
+            var controller =
+            document.commandDispatcher.getControllerForCommand('cmd_selectEndLine');
+            controller.doCommand('cmd_selectEndLine');"/>
+    <key id="key_leftshift" keycode="VK_LEFT" shift="true" control="false" alt="false"
+        onkeypress="
+            var controller =
+            document.commandDispatcher.getControllerForCommand('cmd_selectCharPrevious');
+            controller.doCommand('cmd_selectCharPrevious');"/>
+    <key id="key_rightshift" keycode="VK_RIGHT" shift="true" control="false" alt="false"
+        onkeypress="
+            var controller =
+            document.commandDispatcher.getControllerForCommand('cmd_selectCharNext');
+            controller.doCommand('cmd_selectCharNext');"/>
+    <key id="key_pageup" keycode="VK_PAGE_UP" shift="false" control="false" alt="false"
+        onkeypress="
+            var controller =
+            document.commandDispatcher.getControllerForCommand('cmd_scrollPageUp');
+            controller.doCommand('cmd_scrollPageUp');"/>
+    <key id="key_pagedown" keycode="VK_PAGE_DOWN" shift="false" control="false" alt="false"
+        onkeypress="
+            var controller =
+            document.commandDispatcher.getControllerForCommand('cmd_scrollPageDown');
+            controller.doCommand('cmd_scrollPageDown');"/>
+    <key id="key_left" keycode="VK_UP" shift="false" control="false" alt="false"
+        onkeypress="
+            var controller =
+            document.commandDispatcher.getControllerForCommand('cmd_linePrevious');
+            controller.doCommand('cmd_linePrevious');"/>
+    <key id="key_right" keycode="VK_DOWN" shift="false" control="false" alt="false"
+        onkeypress="
+            var controller =
+            document.commandDispatcher.getControllerForCommand('cmd_lineNext');
+            controller.doCommand('cmd_lineNext');"/>
+    <key id="key_left_shift" keycode="VK_UP" shift="true" alt="false"
+        onkeypress="
+            var controller =
+            document.commandDispatcher.getControllerForCommand('cmd_selectLinePrevious');
+            controller.doCommand('cmd_selectLinePrevious');"/>
+    <key id="key_right_shift" keycode="VK_DOWN" shift="true" alt="false"
+        onkeypress="
+            var controller =
+            document.commandDispatcher.getControllerForCommand('cmd_selectLineNext');
+            controller.doCommand('cmd_selectLineNext');"/>
+    <key id="key_undo" key="z" xulkey="true" shift="false"
+        onkeypress="
+            var controller =
+            document.commandDispatcher.getControllerForCommand('cmd_undo');
+            controller.doCommand('cmd_undo');"/>
+    <key id="key_redo" key="y" xulkey="true" shift="false"
+        onkeypress="
+            var controller =
+            document.commandDispatcher.getControllerForCommand('cmd_redo');
+            controller.doCommand('cmd_redo');"/>
+	<key id="key_space" key=" " cancel="true"/>
+
+<!-- cut, copy, paste, undo and redo keys -->
+<key id="emCutKey" key="x" control="true" shift="false"
+  onkeypress="
+    var controller = document.commandDispatcher.getControllerForCommand('cmd_cut');
+    controller.doCommand('cmd_cut');"/>
+<key id="emCopyKey" key="c" xulkey="true" shift="false"
+  onkeypress="
+    var controller = document.commandDispatcher.getControllerForCommand('cmd_copy');
+    controller.doCommand('cmd_copy');"/>
+<key id="emPasteKey" key="v" xulkey="true" shift="false"
+  onkeypress="
+    var controller = document.commandDispatcher.getControllerForCommand('cmd_paste');
+    controller.doCommand('cmd_paste');"/>
+<key id="emUndoKey" key="z" xulkey="true" shift="false"
+  onkeypress="
+    var controller = document.commandDispatcher.getControllerForCommand('cmd_undo');
+    controller.doCommand('cmd_undo');"/>
+<key id="emRedoKey" key="r" xulkey="true" shift="false"
+  onkeypress="
+    var controller = document.commandDispatcher.getControllerForCommand('cmd_redo');
+    controller.doCommand('cmd_redo');"/>
+
+  </keyset>
+</window>
diff --git a/mozilla/xpfe/communicator/resources/content/makefile.win b/mozilla/xpfe/communicator/resources/content/makefile.win
index 2c6b2f1adaf..638d5ae5bed 100644
--- a/mozilla/xpfe/communicator/resources/content/makefile.win
+++ b/mozilla/xpfe/communicator/resources/content/makefile.win
@@ -41,6 +41,8 @@ CHROME_CONTENT = \
 	.\tasksOverlay.js \
 	.\tasksOverlay.xul \
 	.\dialogBindings.xml \
+	.\browserBindings.xul \
+	.\editorBindings.xul \
 	$(NULL)
 
 include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/xpfe/global/resources/content/MANIFEST b/mozilla/xpfe/global/resources/content/MANIFEST
index efddbcae2ff..8ef72b8fa61 100644
--- a/mozilla/xpfe/global/resources/content/MANIFEST
+++ b/mozilla/xpfe/global/resources/content/MANIFEST
@@ -1,7 +1,3 @@
-browserBindings.xul
-editorBindings.xul
-inputBindings.xul
-textAreaBindings.xul
 hiddenWindow.xul
 globalOverlay.xul
 globalOverlay.js
diff --git a/mozilla/xpfe/global/resources/content/Makefile.in b/mozilla/xpfe/global/resources/content/Makefile.in
index 056ae51a758..90242a7f1be 100644
--- a/mozilla/xpfe/global/resources/content/Makefile.in
+++ b/mozilla/xpfe/global/resources/content/Makefile.in
@@ -43,10 +43,6 @@ CHROME_MISC= \
 
 CHROME_CONTENT= \
 		manifest.rdf \
-		browserBindings.xul \
-		editorBindings.xul \
-		inputBindings.xul \
-		textAreaBindings.xul \
 		hiddenWindow.xul \
 		globalOverlay.xul \
 		globalOverlay.js \
diff --git a/mozilla/xpfe/global/resources/content/mac/MANIFEST b/mozilla/xpfe/global/resources/content/mac/MANIFEST
index 226c64062a7..a47df63b27f 100644
--- a/mozilla/xpfe/global/resources/content/mac/MANIFEST
+++ b/mozilla/xpfe/global/resources/content/mac/MANIFEST
@@ -1,7 +1,3 @@
 platformDialogOverlay.xul
 platformGlobalOverlay.xul
-platformBrowserBindings.xul
-platformInputBindings.xul
-platformTextAreaBindings.xul
-platformEditorBindings.xul
 platformHTMLBindings.xml
diff --git a/mozilla/xpfe/global/resources/content/makefile.win b/mozilla/xpfe/global/resources/content/makefile.win
index dc1e1b4260e..aba9bf6f742 100644
--- a/mozilla/xpfe/global/resources/content/makefile.win
+++ b/mozilla/xpfe/global/resources/content/makefile.win
@@ -34,10 +34,6 @@ CHROME_MISC= \
 	$(NULL)
 
 CHROME_CONTENT= \
-	.\browserBindings.xul \
-	.\editorBindings.xul \
-	.\inputBindings.xul \
-	.\textAreaBindings.xul \
 	.\hiddenWindow.xul \
 	.\globalOverlay.xul \
 	.\globalOverlay.js \
diff --git a/mozilla/xpfe/global/resources/content/os2/Makefile.in b/mozilla/xpfe/global/resources/content/os2/Makefile.in
index 7a49dbbf483..19a260c7ac3 100644
--- a/mozilla/xpfe/global/resources/content/os2/Makefile.in
+++ b/mozilla/xpfe/global/resources/content/os2/Makefile.in
@@ -32,11 +32,6 @@ CHROME_CONTENT_DIR = global/content
 CHROME_CONTENT = \
 		platformGlobalOverlay.xul \
 		platformDialogOverlay.xul \
-		platformInputBindings.xul \
-		platformBrowserBindings.xul \
-		platformInputBindings.xul \
-		platformEditorBindings.xul \
-		platformTextAreaBindings.xul \
 		platformHTMLBindings.xml \
 		$(NULL)
 
diff --git a/mozilla/xpfe/global/resources/content/unix/Makefile.in b/mozilla/xpfe/global/resources/content/unix/Makefile.in
index 1d0b78990e9..73ad9758b02 100644
--- a/mozilla/xpfe/global/resources/content/unix/Makefile.in
+++ b/mozilla/xpfe/global/resources/content/unix/Makefile.in
@@ -32,11 +32,6 @@ CHROME_CONTENT_DIR = global/content
 CHROME_CONTENT = \
 		platformGlobalOverlay.xul \
 		platformDialogOverlay.xul \
-		platformInputBindings.xul \
-		platformBrowserBindings.xul \
-		platformInputBindings.xul \
-		platformEditorBindings.xul \
-		platformTextAreaBindings.xul \
 		platformHTMLBindings.xml \
 		printdialog.xul \
 		printdialog.js \
diff --git a/mozilla/xpfe/global/resources/content/win/makefile.win b/mozilla/xpfe/global/resources/content/win/makefile.win
index fe448fa4430..deb6ec8b577 100644
--- a/mozilla/xpfe/global/resources/content/win/makefile.win
+++ b/mozilla/xpfe/global/resources/content/win/makefile.win
@@ -27,10 +27,6 @@ CHROME_CONTENT_DIR = global\content
 CHROME_CONTENT = \
 	.\platformGlobalOverlay.xul \
 	.\platformDialogOverlay.xul \
-	.\platformBrowserBindings.xul \
-	.\platformInputBindings.xul \
-	.\platformTextAreaBindings.xul \
-	.\platformEditorBindings.xul \
 	.\platformHTMLBindings.xml \
 	$(NULL)