Hooked vertical scrolling to the mouse wheel.

4 files changed, 9 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 46ca6381..a20539e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,7 @@ dillo-fltk2
    visited page intead of one per url (this is more standard).
  - Fixed a subtle bug in klist that was affecting IO.
  - Fixed the position of the Bug Meter popup menu.
+ - Hooked vertical scrolling to the mouse wheel.
    Patches: Jorge Arellano
 +- Connected signals to <li> elements (fixes links within lists).
  - Enabled text, background-color and geometry in preferences.
diff --git a/README b/README
index 21ef6dd7..84ff93c0 100644
--- a/README
+++ b/README
@@ -25,14 +25,14 @@ Fixed    * the scrolling position is not yet updated (when following a
 Advanced * viewport scrolling is not yet optimized (takes lots of CPU)
          * you may experience crashes from "assert" statements from
            unfinished code.
-         * context menus are not yet completely hooked or activated
+Fixed    * context menus are not yet completely hooked or activated
          * Selecting text with the mouse is half hooked. This is, you
            can see the selected text in the terminal but can't paste.
          * Searching for text is not yet hooked. Look in test/ directory
            of dw2 for an example of find text.
-         * Form elements are not yet hooked/implemented. You can look
+Advanced * Form elements are not yet hooked/implemented. You can look
            in dw2' test/dw_ui_test.cc to see what's already done.
-         * Sometimes pages don't load giving a warning on an already
+Fixed    * Sometimes pages don't load giving a warning on an already
            closed IO. I'll try to look at this one soon.
 
     * no FRAMES rendering
diff --git a/src/html.hh b/src/html.hh
index 75dc1b49..47b1ea42 100644
--- a/src/html.hh
+++ b/src/html.hh
@@ -252,9 +252,9 @@ struct _DilloHtml {
    Dstr *Stash;
    bool_t StashSpace;
 
-   char *SPCBuf;           /* Buffer for white space */
+   char *SPCBuf;          /* Buffer for white space */
 
-   int pre_column;         /* current column, used in PRE tags with tabs */
+   int pre_column;        /* current column, used in PRE tags with tabs */
    bool_t PreFirstChar;   /* used to skip the first CR or CRLF in PRE tags */
    bool_t PrevWasCR;      /* Flag to help parsing of "\r\n" in PRE tags */
    bool_t PrevWasOpenTag; /* Flag to help deferred parsing of white space */
@@ -263,7 +263,7 @@ struct _DilloHtml {
    bool_t ReqTagClose;    /* Flag to help handling bad-formed HTML */
    bool_t CloseOneTag;    /* Flag to help Html_tag_cleanup_at_close() */
    bool_t TagSoup;        /* Flag to enable the parser's cleanup functions */
-   char *NameVal;          /* used for validation of "NAME" and "ID" in <A> */
+   char *NameVal;         /* used for validation of "NAME" and "ID" in <A> */
 
    /* element counters: used for validation purposes */
    uchar_t Num_HTML, Num_HEAD, Num_BODY, Num_TITLE;
diff --git a/src/uicmd.cc b/src/uicmd.cc
index 02a51010..b2d58a4d 100644
--- a/src/uicmd.cc
+++ b/src/uicmd.cc
@@ -14,6 +14,7 @@
 
 #include <stdio.h>
 #include <stdarg.h>
+#include <math.h>       /* for rint */
 #include <fltk/Widget.h>
 
 #include "dir.h"
@@ -82,6 +83,7 @@ BrowserWindow *a_UIcmd_browser_window_new(int ww, int wh)
     FltkViewport *viewport = new FltkViewport (0, p_h, ww, wh-p_h-s_h);
     layout->attachView (viewport);
     //viewport->addGadget(new_ui->fullscreen_button());
+    viewport->setScrollStep((int) rint(12.0 * prefs.font_factor));
    new_ui->set_render_layout_end();
    // This was the original code.
    // Set the render_layout widget into the UI