6 files changed, 65 insertions, 14 deletions

diff --git a/src/defs.h b/src/defs.h
index 6f58e749..cf04514e 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -47,6 +47,39 @@ enum iScrollType {
     max_ScrollType
 };
 
+enum iReturnKeyFlag {
+    return_ReturnKeyFlag        = 0,
+    shiftReturn_ReturnKeyFlag   = 1,
+    controlReturn_ReturnKeyFlag = 2,
+    guiReturn_ReturnKeyFlag     = 3,
+    mask_ReturnKeyFlag          = 0xf,
+    accept_ReturnKeyFlag        = 4, /* shift */
+};
+
+/* Return key behavior is not handled via normal bindings because only certain combinations
+   are valid. */
+enum iReturnKeyBehavior {
+    default_ReturnKeyBehavior =
+        shiftReturn_ReturnKeyFlag | (return_ReturnKeyFlag << accept_ReturnKeyFlag),
+    acceptWithShift_ReturnKeyBehavior =
+        return_ReturnKeyFlag | (shiftReturn_ReturnKeyFlag << accept_ReturnKeyFlag),
+    acceptWithPrimaryMod_ReturnKeyBehavior =
+#if defined (iPlatformApple)
+        return_ReturnKeyFlag | (guiReturn_ReturnKeyFlag << accept_ReturnKeyFlag),
+#else
+        return_ReturnKeyFlag | (controlReturn_ReturnKeyFlag << accept_ReturnKeyFlag),
+#endif
+};
+
+int     keyMod_ReturnKeyFlag    (int flag);
+
+iLocalDef int lineBreakKeyMod_ReturnKeyBehavior(int behavior) {
+    return keyMod_ReturnKeyFlag(behavior & mask_ReturnKeyFlag);
+}
+iLocalDef int acceptKeyMod_ReturnKeyBehavior(int behavior) {
+    return keyMod_ReturnKeyFlag((behavior >> accept_ReturnKeyFlag) & mask_ReturnKeyFlag);
+}
+
 /* Icons */
 
 #define menu_Icon           "\U0001d362"
diff --git a/src/prefs.c b/src/prefs.c
index f06aab19..13a95a3d 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -39,6 +39,7 @@ void init_Prefs(iPrefs *d) {
     d->sideIcon          = iTrue;
     d->hideToolbarOnScroll = iTrue;
     d->pinSplit          = 1;
+    d->returnKey         = default_ReturnKeyBehavior;
     d->hoverLink         = iFalse;
     d->smoothScrolling   = iTrue;
     d->smoothScrollSpeed[keyboard_ScrollType] = 10;
diff --git a/src/prefs.h b/src/prefs.h
index 7de6df5d..58c73bf7 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -54,6 +54,7 @@ struct Impl_Prefs {
     iBool            hideToolbarOnScroll;
     int              pinSplit; /* 0: no pinning, 1: left doc, 2: right doc */
     /* Behavior */
+    int              returnKey;
     iString          downloadDir;
     iBool            hoverLink;
     iBool            smoothScrolling;
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 1504426f..b041f5b4 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1887,10 +1887,14 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
                     /* The line break and URL length counters are positioned differently on mobile.
                        There is no line breaks in sensitive input. */
                     if (deviceType_App() == desktop_AppDeviceType) {
-                        lineBreak = new_LabelWidget("${dlg.input.linebreak}"
-                                                    uiTextAction_ColorEscape
-                                                    "  " shiftReturn_Icon,
-                                                    NULL);
+                        iString *keyStr = collectNew_String();
+                        toString_Sym(SDLK_RETURN,
+                                     lineBreakKeyMod_ReturnKeyBehavior(prefs_App()->returnKey),
+                                     keyStr);
+                        lineBreak = new_LabelWidget(
+                            format_CStr("${dlg.input.linebreak}" uiTextAction_ColorEscape "  %s",
+                                        cstr_String(keyStr)),
+                            NULL);
                         insertChildAfter_Widget(buttons, iClob(lineBreak), 0);
                     }
                     else {
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index 3a979b20..2c1c3165 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -1693,8 +1693,9 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
             case SDLK_RETURN:
             case SDLK_KP_ENTER:
                 if (~d->inFlags & isSensitive_InputWidgetFlag && d->maxLen == 0) {
-                    if (mods == KMOD_SHIFT || (~d->inFlags & isUrl_InputWidgetFlag &&
-                                               d->inFlags & enterKeyInsertsLineFeed_InputWidgetFlag)) {
+                    if (mods == lineBreakKeyMod_ReturnKeyBehavior(prefs_App()->returnKey) ||
+                        (~d->inFlags & isUrl_InputWidgetFlag &&
+                         d->inFlags & enterKeyInsertsLineFeed_InputWidgetFlag)) {
                         pushUndo_InputWidget_(d);
                         deleteMarked_InputWidget_(d);
                         insertChar_InputWidget_(d, '\n');
@@ -1702,11 +1703,13 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
                         return iTrue;
                     }
                 }
-                if (d->inFlags & enterKeyEnabled_InputWidgetFlag) {
+                if (d->inFlags & enterKeyEnabled_InputWidgetFlag &&
+                    mods == acceptKeyMod_ReturnKeyBehavior(prefs_App()->returnKey)) {
                     d->inFlags |= enterPressed_InputWidgetFlag;
                     setFocus_Widget(NULL);
+                    return iTrue;
                 }
-                return iTrue;
+                return iFalse;
             case SDLK_ESCAPE:
                 end_InputWidget(d, iFalse);
                 setFocus_Widget(NULL);
diff --git a/src/ui/util.c b/src/ui/util.c
index da7a69b4..63600557 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -169,6 +169,13 @@ int keyMods_Sym(int kmods) {
     return kmods;
 }
 
+int keyMod_ReturnKeyFlag(int flag) {
+    flag &= mask_ReturnKeyFlag;
+    const int kmods[4] = { 0, KMOD_SHIFT, KMOD_CTRL, KMOD_GUI };
+    if (flag < 0 || flag >= iElemCount(kmods)) return 0;
+    return kmods[flag];
+}
+
 int openTabMode_Sym(int kmods) {
     const int km = keyMods_Sym(kmods);
     return (km == KMOD_SHIFT ? otherRoot_OpenTabFlag : 0) | /* open to the side */
@@ -1307,12 +1314,14 @@ iWidget *makeValueInput_Widget(iWidget *parent, const iString *initialValue, con
     setId_Widget(as_Widget(input), "input");
     updateValueInputWidth_(dlg);
     addChild_Widget(dlg, iClob(makePadding_Widget(gap_UI)));
-    addChild_Widget(
-        dlg,
-        iClob(makeDialogButtons_Widget(
-            (iMenuItem[]){ { "${cancel}", SDLK_ESCAPE, 0, "valueinput.cancel" },
-                           { acceptLabel, 0, 0, "valueinput.accept" } },
-            2)));
+    addChild_Widget(dlg,
+                    iClob(makeDialogButtons_Widget(
+                        (iMenuItem[]){ { "${cancel}", SDLK_ESCAPE, 0, "valueinput.cancel" },
+                                       { acceptLabel,
+                                         SDLK_RETURN,
+                                         acceptKeyMod_ReturnKeyBehavior(prefs_App()->returnKey),
+                                         "valueinput.accept" } },
+                        2)));
     finalizeSheet_Mobile(dlg);
     if (parent) {
         setFocus_Widget(as_Widget(input));