8 files changed, 69 insertions, 5 deletions

diff --git a/src/app.c b/src/app.c
index 1f7abbc4..3ee78ee4 100644
--- a/src/app.c
+++ b/src/app.c
@@ -210,6 +210,8 @@ static iString *serializePrefs_App_(const iApp *d) {
     appendFormat_String(str, "headingfont.set arg:%d\n", d->prefs.headingFont);
     appendFormat_String(str, "zoom.set arg:%d\n", d->prefs.zoomPercent);
     appendFormat_String(str, "smoothscroll arg:%d\n", d->prefs.smoothScrolling);
+    appendFormat_String(str, "scrollspeed arg:%d type:%d\n", d->prefs.smoothScrollSpeed[keyboard_ScrollType], keyboard_ScrollType);
+    appendFormat_String(str, "scrollspeed arg:%d type:%d\n", d->prefs.smoothScrollSpeed[mouse_ScrollType], mouse_ScrollType);
     appendFormat_String(str, "imageloadscroll arg:%d\n", d->prefs.loadImageInsteadOfScrolling);
     appendFormat_String(str, "cachesize.set arg:%d\n", d->prefs.maxCacheSize);
     appendFormat_String(str, "memorysize.set arg:%d\n", d->prefs.maxMemorySize);
@@ -1604,6 +1606,15 @@ static void updatePrefsPinSplitButtons_(iWidget *d, int value) {
     }
 }
 
+static void updateScrollSpeedButtons_(iWidget *d, enum iScrollType type, const int value) {
+    const char *typeStr = (type == mouse_ScrollType ? "mouse" : "keyboard");
+    for (int i = 0; i <= 40; i++) {
+        setFlags_Widget(findChild_Widget(d, format_CStr("prefs.scrollspeed.%s.%d", typeStr, i)),
+                        selected_WidgetFlag,
+                        i == value);
+    }
+}
+
 static void updateDropdownSelection_(iLabelWidget *dropButton, const char *selectedCommand) {
     iWidget *menu = findChild_Widget(as_Widget(dropButton), "menu");
     iForEach(ObjectList, i, children_Widget(menu)) {
@@ -1692,6 +1703,10 @@ static iBool handlePrefsCommands_(iWidget *d, const char *cmd) {
         updatePrefsPinSplitButtons_(d, arg_Command(cmd));
         return iFalse;
     }
+    else if (equal_Command(cmd, "scrollspeed")) {
+        updateScrollSpeedButtons_(d, argLabel_Command(cmd, "type"), arg_Command(cmd));
+        return iFalse;
+    }
     else if (equal_Command(cmd, "doctheme.dark.set")) {
         updateColorThemeButton_(findChild_Widget(d, "prefs.doctheme.dark"), arg_Command(cmd));
         return iFalse;
@@ -2065,6 +2080,13 @@ iBool handleCommand_App(const char *cmd) {
         d->prefs.smoothScrolling = arg_Command(cmd);
         return iTrue;
     }
+    else if (equal_Command(cmd, "scrollspeed")) {
+        const int type = argLabel_Command(cmd, "type");
+        if (type == keyboard_ScrollType || type == mouse_ScrollType) {
+            d->prefs.smoothScrollSpeed[type] = iClamp(arg_Command(cmd), 1, 40);
+        }
+        return iTrue;
+    }
     else if (equal_Command(cmd, "decodeurls")) {
         d->prefs.decodeUserVisibleURLs = arg_Command(cmd);
         return iTrue;
@@ -2501,6 +2523,8 @@ iBool handleCommand_App(const char *cmd) {
         setToggle_Widget(findChild_Widget(dlg, "prefs.animate"), d->prefs.uiAnimations);
         setText_InputWidget(findChild_Widget(dlg, "prefs.userfont"), &d->prefs.symbolFontPath);
         updatePrefsPinSplitButtons_(dlg, d->prefs.pinSplit);
+        updateScrollSpeedButtons_(dlg, mouse_ScrollType, d->prefs.smoothScrollSpeed[mouse_ScrollType]);
+        updateScrollSpeedButtons_(dlg, keyboard_ScrollType, d->prefs.smoothScrollSpeed[keyboard_ScrollType]);
         updateDropdownSelection_(findChild_Widget(dlg, "prefs.uilang"), cstr_String(&d->prefs.uiLanguage));
         setToggle_Widget(findChild_Widget(dlg, "prefs.retainwindow"), d->prefs.retainWindowSize);
         setText_InputWidget(findChild_Widget(dlg, "prefs.uiscale"),
diff --git a/src/defs.h b/src/defs.h
index 3ea28e95..5067cce3 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -41,6 +41,12 @@ enum iFileVersion {
     latest_FileVersion = 4,
 };
 
+enum iScrollType {
+    keyboard_ScrollType,
+    mouse_ScrollType,
+    max_ScrollType
+};
+
 /* Icons */
 
 #define menu_Icon           "\U0001d362"
diff --git a/src/prefs.c b/src/prefs.c
index 557c6887..f06aab19 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -41,6 +41,8 @@ void init_Prefs(iPrefs *d) {
     d->pinSplit          = 1;
     d->hoverLink         = iFalse;
     d->smoothScrolling   = iTrue;
+    d->smoothScrollSpeed[keyboard_ScrollType] = 10;
+    d->smoothScrollSpeed[mouse_ScrollType]    = 10;
     d->loadImageInsteadOfScrolling = iFalse;
     d->collapsePreOnLoad = iFalse;
     d->openArchiveIndexPages = iTrue;
diff --git a/src/prefs.h b/src/prefs.h
index c1519459..7de6df5d 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -57,6 +57,7 @@ struct Impl_Prefs {
     iString          downloadDir;
     iBool            hoverLink;
     iBool            smoothScrolling;
+    int              smoothScrollSpeed[max_ScrollType];
     iBool            loadImageInsteadOfScrolling;
     iBool            collapsePreOnLoad;
     iString          searchUrl;
@@ -91,3 +92,8 @@ struct Impl_Prefs {
 };
 
 iDeclareTypeConstruction(Prefs)
+    
+iLocalDef float scrollSpeedFactor_Prefs(const iPrefs *d, enum iScrollType type) {
+    iAssert(type >= 0 && type < max_ScrollType);
+    return 10.0f / iMax(1, d->smoothScrollSpeed[type]);
+}
diff --git a/src/ui/command.h b/src/ui/command.h
index 10a29101..8dbaafad 100644
--- a/src/ui/command.h
+++ b/src/ui/command.h
@@ -41,3 +41,7 @@ const iString * string_Command      (const char *, const char *label); /* space-
 iRangecc        range_Command       (const char *, const char *label); /* space-delimited */
 const char *    suffixPtr_Command   (const char *, const char *label); /* until end-of-command */
 iString *       suffix_Command      (const char *, const char *label); /* until end-of-command */
+
+iLocalDef iBool hasLabel_Command(const char *d, const char *label) {
+    return suffixPtr_Command(d, label) != NULL;
+}
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 38f34c77..b59233c7 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -201,7 +201,9 @@ static void updateSideIconBuf_DocumentWidget_   (const iDocumentWidget *d);
 static void prerender_DocumentWidget_           (iAny *);
 static void scrollBegan_DocumentWidget_         (iAnyObject *, int, uint32_t);
 
-static const int smoothDuration_DocumentWidget_  = 600; /* milliseconds */
+static const int smoothDuration_DocumentWidget_(enum iScrollType type) {
+    return 600 /* milliseconds */ * scrollSpeedFactor_Prefs(prefs_App(), type);
+}
 
 enum iRequestState {
     blank_RequestState,
@@ -2913,7 +2915,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         const float amount = argLabel_Command(cmd, "full") != 0 ? 1.0f : 0.5f;
         smoothScroll_DocumentWidget_(d,
                                      dir * amount * height_Rect(documentBounds_DocumentWidget_(d)),
-                                     smoothDuration_DocumentWidget_);
+                                     smoothDuration_DocumentWidget_(keyboard_ScrollType));
         return iTrue;
     }
     else if (equal_Command(cmd, "scroll.top") && document_App() == d) {
@@ -2942,7 +2944,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         }
         smoothScroll_DocumentWidget_(d,
                                      3 * lineHeight_Text(paragraph_FontId) * dir,
-                                     smoothDuration_DocumentWidget_);
+                                     smoothDuration_DocumentWidget_(keyboard_ScrollType));
         return iTrue;
     }
     else if (equal_Command(cmd, "document.goto") && document_App() == d) {
@@ -3381,7 +3383,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
             smoothScroll_DocumentWidget_(
                 d,
                 -3 * amount * lineHeight_Text(paragraph_FontId),
-                smoothDuration_DocumentWidget_ *
+                smoothDuration_DocumentWidget_(mouse_ScrollType) *
                     /* accelerated speed for repeated wheelings */
                     (!isFinished_SmoothScroll(&d->scrollY) && pos_Anim(&d->scrollY.pos) < 0.25f
                          ? 0.5f
diff --git a/src/ui/listwidget.c b/src/ui/listwidget.c
index f7c43a93..29aa9d1f 100644
--- a/src/ui/listwidget.c
+++ b/src/ui/listwidget.c
@@ -347,7 +347,8 @@ static iBool processEvent_ListWidget_(iListWidget *d, const SDL_Event *ev) {
         else {
             /* Traditional mouse wheel. */
             amount *= 3 * d->itemHeight;
-            moveSpan_SmoothScroll(&d->scrollY, amount, 200);            
+            moveSpan_SmoothScroll(
+                &d->scrollY, amount, 200 * scrollSpeedFactor_Prefs(prefs_App(), mouse_ScrollType));
         }
         return iTrue;
     }
diff --git a/src/ui/util.c b/src/ui/util.c
index d68274ad..220e3a50 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1678,6 +1678,25 @@ iWidget *makePreferences_Widget(void) {
         makeTwoColumnHeading_("${heading.prefs.scrolling}", headings, values);
         addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.smoothscroll}")));
         addChild_Widget(values, iClob(makeToggle_Widget("prefs.smoothscroll")));
+        /* Scroll speeds. */ {
+            for (int type = 0; type < max_ScrollType; type++) {
+                const char *typeStr = (type == mouse_ScrollType ? "mouse" : "keyboard");
+                addChild_Widget(headings,
+                                iClob(makeHeading_Widget(type == mouse_ScrollType
+                                                             ? "${prefs.scrollspeed.mouse}"
+                                                             : "${prefs.scrollspeed.keyboard}")));
+                iWidget *scrollSpeed = new_Widget();
+                addRadioButton_(scrollSpeed, format_CStr("prefs.scrollspeed.%s.7",  typeStr), "0", format_CStr("scrollspeed arg:7  type:%d", type));
+                addRadioButton_(scrollSpeed, format_CStr("prefs.scrollspeed.%s.10", typeStr), "1", format_CStr("scrollspeed arg:10 type:%d", type));
+                addRadioButton_(scrollSpeed, format_CStr("prefs.scrollspeed.%s.13", typeStr), "2", format_CStr("scrollspeed arg:13 type:%d", type));
+                addRadioButton_(scrollSpeed, format_CStr("prefs.scrollspeed.%s.17", typeStr), "3", format_CStr("scrollspeed arg:17 type:%d", type));
+                addRadioButton_(scrollSpeed, format_CStr("prefs.scrollspeed.%s.23", typeStr), "4", format_CStr("scrollspeed arg:23 type:%d", type));
+                addRadioButton_(scrollSpeed, format_CStr("prefs.scrollspeed.%s.30", typeStr), "5", format_CStr("scrollspeed arg:30 type:%d", type));
+                addRadioButton_(scrollSpeed, format_CStr("prefs.scrollspeed.%s.40", typeStr), "6", format_CStr("scrollspeed arg:40 type:%d", type));
+                addChildFlags_Widget(
+                    values, iClob(scrollSpeed), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
+            }
+        }
         addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.imageloadscroll}")));
         addChild_Widget(values, iClob(makeToggle_Widget("prefs.imageloadscroll")));
         if (deviceType_App() == phone_AppDeviceType) {