Index: content/events/src/nsEventStateManager.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/events/src/nsEventStateManager.cpp,v
retrieving revision 1.466
diff -u -u -r1.466 nsEventStateManager.cpp
--- content/events/src/nsEventStateManager.cpp	19 Nov 2003 02:23:25 -0000	1.466
+++ content/events/src/nsEventStateManager.cpp	29 Jan 2004 09:11:52 -0000
@@ -150,7 +150,9 @@
  MOUSE_SCROLL_N_LINES,
  MOUSE_SCROLL_PAGE,
  MOUSE_SCROLL_HISTORY,
- MOUSE_SCROLL_TEXTSIZE
+ MOUSE_SCROLL_TEXTSIZE,
+ MOUSE_SCROLL_N_INDEXES,
+ MOUSE_SCROLL_PAGE_H
 };
 
 nsEventStateManager::nsEventStateManager()
@@ -1928,7 +1930,7 @@
         if (aBool) {
           numLines = msEvent->delta;
           if (msEvent->scrollFlags & nsMouseScrollEvent::kIsFullPage)
-            action = MOUSE_SCROLL_PAGE;
+            action = (msEvent->scrollFlags & nsMouseScrollEvent::kIsHorizontal)? MOUSE_SCROLL_PAGE_H: MOUSE_SCROLL_PAGE;
         }
         else
           mPrefBranch->GetIntPref("mousewheel.withshiftkey.numlines",
@@ -1940,7 +1942,7 @@
         if (aBool) {
           numLines = msEvent->delta;
           if (msEvent->scrollFlags & nsMouseScrollEvent::kIsFullPage)
-            action = MOUSE_SCROLL_PAGE;          
+            action = (msEvent->scrollFlags & nsMouseScrollEvent::kIsHorizontal)? MOUSE_SCROLL_PAGE_H: MOUSE_SCROLL_PAGE;
         }
         else
           mPrefBranch->GetIntPref("mousewheel.withcontrolkey.numlines",
@@ -1951,7 +1953,7 @@
         if (aBool) {
           numLines = msEvent->delta;
           if (msEvent->scrollFlags & nsMouseScrollEvent::kIsFullPage)
-            action = MOUSE_SCROLL_PAGE;
+            action = (msEvent->scrollFlags & nsMouseScrollEvent::kIsHorizontal)? MOUSE_SCROLL_PAGE_H: MOUSE_SCROLL_PAGE;
         }
         else
           mPrefBranch->GetIntPref("mousewheel.withaltkey.numlines",
@@ -1962,7 +1964,7 @@
         if (aBool) {
           numLines = msEvent->delta;
           if (msEvent->scrollFlags & nsMouseScrollEvent::kIsFullPage)
-            action = MOUSE_SCROLL_PAGE;
+            action = (msEvent->scrollFlags & nsMouseScrollEvent::kIsHorizontal)? MOUSE_SCROLL_PAGE_H: MOUSE_SCROLL_PAGE;
         }
         else
           mPrefBranch->GetIntPref("mousewheel.withnokey.numlines", &numLines);
@@ -1972,12 +1974,16 @@
         numLines = -numLines;
 
       switch (action) {
+      case MOUSE_SCROLL_N_INDEXS:
+      case MOUSE_SCROLL_PAGE_H:
+        // msEvent->scrollFlags ^= (nsMouseScrollEvent::kIsVertical | nsMouseScrollEvent::kIsHorizontal);  // this may exchange horizontal <-> vertical
+        msEvent->scrollFlags |= nsMouseScrollEvent::kIsHorizontal;
       case MOUSE_SCROLL_N_LINES:
       case MOUSE_SCROLL_PAGE:
         {
           DoWheelScroll(aPresContext, aTargetFrame, msEvent, numLines,
                         (msEvent->scrollFlags & nsMouseScrollEvent::kIsHorizontal),
-                        (action == MOUSE_SCROLL_PAGE), PR_FALSE);
+                        (action == MOUSE_SCROLL_PAGE || action == MOUSE_SCROLL_PAGE_H), PR_FALSE);
 
         }
 
Index: xpfe/components/prefwindow/resources/content/pref-mousewheel.xul
===================================================================
RCS file: /cvsroot/mozilla/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul,v
retrieving revision 1.40
diff -u -u -r1.40 pref-mousewheel.xul
--- xpfe/components/prefwindow/resources/content/pref-mousewheel.xul	22 Nov 2003 18:12:18 -0000	1.40
+++ xpfe/components/prefwindow/resources/content/pref-mousewheel.xul	29 Jan 2004 09:11:53 -0000
@@ -38,10 +38,10 @@
 
   <script type="application/x-javascript">
   <![CDATA[
-  var _elementIDs = ["mousewheelWithNoKeyAction", "mousewheelWithNoKeyNumlines", "mousewheelWithNoKeySysNumlines", 
-                     "mousewheelWithAltKeyAction", "mousewheelWithAltKeyNumlines", "mousewheelWithAltKeySysNumlines", 
-                     "mousewheelWithCtrlKeyAction", "mousewheelWithCtrlKeyNumlines", "mousewheelWithCtrlKeySysNumlines", 
-                     "mousewheelWithShiftKeyAction", "mousewheelWithShiftKeyNumlines", "mousewheelWithShiftKeySysNumlines"]; 
+  var _elementIDs = ["mousewheelWithNoKeyAction", "mousewheelWithNoKeyNumlines", "mousewheelWithNoKeySysNumlines", "mousewheelWithNoKeyNumindexes", "mousewheelWithNoKeySysNumindexes", 
+                     "mousewheelWithAltKeyAction", "mousewheelWithAltKeyNumlines", "mousewheelWithAltKeySysNumlines", "mousewheelWithAltKeyNumindexes", "mousewheelWithAltKeySysNumindexes", 
+                     "mousewheelWithCtrlKeyAction", "mousewheelWithCtrlKeyNumlines", "mousewheelWithCtrlKeySysNumlines", "mousewheelWithCtrlKeyNumindexes", "mousewheelWithCtrlKeySysNumindexes", 
+                     "mousewheelWithShiftKeyAction", "mousewheelWithShiftKeyNumlines", "mousewheelWithShiftKeySysNumlines", "mousewheelWithShiftKeyNumindexes", "mousewheelWithShiftKeySysNumindexes"]; 
    
   function switchPage( aElement )
   {
@@ -60,8 +60,8 @@
   
   function Startup()
   {
-    var fields = ["mousewheelWithNoKeyNumlines", "mousewheelWithAltKeyNumlines", "mousewheelWithCtrlKeyNumlines", "mousewheelWithShiftKeyNumlines"];
-    var checkboxes = ["mousewheelWithNoKeySysNumlines", "mousewheelWithAltKeySysNumlines", "mousewheelWithCtrlKeySysNumlines", "mousewheelWithShiftKeySysNumlines"];
+    var fields = ["mousewheelWithNoKeyNumlines", "mousewheelWithAltKeyNumlines", "mousewheelWithCtrlKeyNumlines", "mousewheelWithShiftKeyNumlines", "mousewheelWithNoKeyNumindexes", "mousewheelWithAltKeyNumindexes", "mousewheelWithCtrlKeyNumindexes", "mousewheelWithShiftKeyNumindexes"];
+    var checkboxes = ["mousewheelWithNoKeySysNumlines", "mousewheelWithAltKeySysNumlines", "mousewheelWithCtrlKeySysNumlines", "mousewheelWithShiftKeySysNumlines", "mousewheelWithNoKeySysNumindexes", "mousewheelWithAltKeySysNumindexes", "mousewheelWithCtrlKeySysNumindexes", "mousewheelWithShiftKeySysNumindexes"];
     for( var i = 0; i < checkboxes.length; i++ )
     {
       var currEl = document.getElementById( checkboxes[i] );
@@ -116,6 +116,23 @@
           </vbox>
         </hbox>
         <radio value="1" label="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/>
+        <separator/>
+         <hbox align="start">
+          <radio value="4" label="&scroll.label;" accesskey="&scroll.accesskey;"/>
+          <vbox align="start">
+            <hbox align="center">
+              <textbox id="mousewheelWithNoKeyNumindexes" size="3" 
+                         preftype="int" prefstring="mousewheel.withnokey.numlines"
+                         prefattribute="value"/>
+              <label value="&scrollIndexes.label;"/>
+            </hbox>
+            <checkbox id="mousewheelWithNoKeySysNumindexes" label="&useSystemDefault.label;" accesskey="&useSystemDefault.accesskey;"
+                      prefstring="mousewheel.withnokey.sysnumlines"
+                      oncommand="enableField(this, 'mousewheelWithNoKeyNumindexes', true);"/>
+          </vbox>
+        </hbox>
+        <radio value="5" label="&scrollPgLtPgRt.label;" accesskey="&scrollPgLtPgRt.accesskey;"/>
+        <separator/>
         <radio value="2" label="&history.label;" accesskey="&history.accesskey;"/>
         <radio value="3" label="&textsize.label;" accesskey="&textsize.accesskey;"/>
       </radiogroup>
@@ -137,6 +154,22 @@
           </vbox>
         </hbox>
         <radio value="1" label="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/>
+        <separator/>
+        <hbox align="start">
+          <radio value="4" label="&scroll.label;" accesskey="&scroll.accesskey;"/>
+          <vbox align="start">
+            <hbox align="center">
+              <textbox id="mousewheelWithAltKeyNumindexes" size="3" 
+                        preftype="int" prefstring="mousewheel.withaltkey.numlines"/>
+              <label value="&scrollIndexes.label;"/>
+            </hbox>
+            <checkbox id="mousewheelWithAltKeySysNumindexes" label="&useSystemDefault.label;" accesskey="&useSystemDefault.accesskey;"
+                      prefstring="mousewheel.withaltkey.sysnumlines"
+                      oncommand="enableField(this, 'mousewheelWithAltKeyNumindexes', true);"/>
+          </vbox>
+        </hbox>
+        <radio value="5" label="&scrollPgLtPgRt.label;" accesskey="&scrollPgLtPgRt.accesskey;"/>
+        <separator/>
         <radio value="2" label="&history.label;" accesskey="&history.accesskey;"/>
         <radio value="3" label="&textsize.label;" accesskey="&textsize.accesskey;"/>
       </radiogroup>
@@ -158,6 +191,22 @@
           </vbox>
         </hbox>
         <radio value="1" label="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/>
+        <separator/>
+        <hbox align="start">
+          <radio value="4" label="&scroll.label;" accesskey="&scroll.accesskey;"/>
+          <vbox align="start">
+            <hbox align="center">
+              <textbox id="mousewheelWithCtrlKeyNumindexes" size="3" 
+                       preftype="int" prefstring="mousewheel.withcontrolkey.numlines"/>
+              <label value="&scrollIndexes.label;"/>
+            </hbox>
+            <checkbox id="mousewheelWithCtrlKeySysNumindexes" label="&useSystemDefault.label;" accesskey="&useSystemDefault.accesskey;"
+                      prefstring="mousewheel.withcontrolkey.sysnumlines"
+                      oncommand="enableField(this, 'mousewheelWithCtrlKeyNumindexes', true);"/>
+          </vbox>
+        </hbox>
+        <radio value="5" label="&scrollPgLtPgRt.label;" accesskey="&scrollPgLtPgRt.accesskey;"/>
+        <separator/>
         <radio value="2" label="&history.label;" accesskey="&history.accesskey;"/>
         <radio value="3" label="&textsize.label;" accesskey="&textsize.accesskey;"/>
       </radiogroup>
@@ -178,6 +227,22 @@
           </vbox>
         </hbox>
         <radio value="1" label="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/>
+        <separator/>
+        <hbox align="start">
+          <radio value="4" label="&scroll.label;" accesskey="&scroll.accesskey;"/>
+          <vbox align="start">
+            <hbox align="center">
+              <textbox id="mousewheelWithShiftKeyNumindexes" size="3" 
+                         preftype="int" prefstring="mousewheel.withshiftkey.numlines"/>
+              <label value="&scrollIndexes.label;"/>
+            </hbox>
+            <checkbox id="mousewheelWithShiftKeySysNumindexes" label="&useSystemDefault.label;" accesskey="&useSystemDefault.accesskey;"
+                      prefstring="mousewheel.withshiftkey.sysnumlines"
+                      oncommand="enableField(this, 'mousewheelWithShiftKeyNumindexes', true);"/>
+          </vbox>
+        </hbox>
+        <radio value="5" label="&scrollPgLtPgRt.label;" accesskey="&scrollPgLtPgRt.accesskey;"/>
+        <separator/>
         <radio value="2" label="&history.label;" accesskey="&history.accesskey;"/>
         <radio value="3" label="&textsize.label;" accesskey="&textsize.accesskey;"/>
       </radiogroup>
Index: xpfe/components/prefwindow/resources/locale/en-US/pref-mousewheel.dtd
===================================================================
RCS file: /cvsroot/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-mousewheel.dtd,v
retrieving revision 1.10
diff -u -u -r1.10 pref-mousewheel.dtd
--- xpfe/components/prefwindow/resources/locale/en-US/pref-mousewheel.dtd	16 Aug 2000 22:48:49 -0000	1.10
+++ xpfe/components/prefwindow/resources/locale/en-US/pref-mousewheel.dtd	29 Jan 2004 09:11:53 -0000
@@ -11,10 +11,13 @@
 <!ENTITY scroll.label                 "Scroll the document by ">
 <!ENTITY scroll.accesskey             "s">
 <!ENTITY scrollLines.label            " lines. ">
+<!ENTITY scrollIndexes.label            " indexes. ">
 <!ENTITY useSystemDefault.label       "Use system default">
 <!ENTITY useSystemDefault.accesskey   "y">
 <!ENTITY scrollPgUpPgDn.label         "Scroll a page up or a page down">
 <!ENTITY scrollPgUpPgDn.accesskey     "p">
+<!ENTITY scrollPgLtPgRt.label         "Scroll a page left or a page right">
+<!ENTITY scrollPgLtPgRt.accesskey     "r">
 <!ENTITY history.label                "Move back and forward in the browsing history">
 <!ENTITY history.accesskey            "h">
 <!ENTITY textsize.label               "Make the text larger or smaller">