17 files changed, 83 insertions, 14 deletions

diff --git a/po/compile.py b/po/compile.py
index 257f9b6f..e1839e2e 100755
--- a/po/compile.py
+++ b/po/compile.py
@@ -25,7 +25,8 @@ ESCAPES = {
     '"': '"',
     'n': '\n',
     'r': '\r',
-    't': '\t'
+    't': '\t',
+    'v': '\v',
 }
 
 if '--new' in sys.argv:
diff --git a/po/en.po b/po/en.po
index 8bcb196d..b453ba6e 100644
--- a/po/en.po
+++ b/po/en.po
@@ -1193,6 +1193,15 @@ msgstr "UI scale factor:"
 msgid "prefs.customframe"
 msgstr "Custom window frame:"
 
+msgid "prefs.returnkey"
+msgstr "Return key behavior:"
+
+msgid "prefs.returnkey.linebreak"
+msgstr "Line break"
+
+msgid "prefs.returnkey.accept"
+msgstr "Accept"
+
 msgid "prefs.animate"
 msgstr "Animations:"
 
@@ -1441,6 +1450,9 @@ msgstr "Split view menu:"
 msgid "keys.hoverurl"
 msgstr "Toggle show URL on hover"
 
+msgid "keys.upload"
+msgstr "Upload Page with Titan"
+
 msgid "error.badstatus"
 msgstr "Unknown Status Code"
 
diff --git a/res/lang/de.bin b/res/lang/de.bin
index 2ef9d61b..13575cbe 100644
--- a/res/lang/de.bin
+++ b/res/lang/de.bin
diff --git a/res/lang/en.bin b/res/lang/en.bin
index f39f3f04..92bfb3eb 100644
--- a/res/lang/en.bin
+++ b/res/lang/en.bin
diff --git a/res/lang/es.bin b/res/lang/es.bin
index 588bddb8..6b6dbc8e 100644
--- a/res/lang/es.bin
+++ b/res/lang/es.bin
diff --git a/res/lang/fi.bin b/res/lang/fi.bin
index f19686d9..edbbc72b 100644
--- a/res/lang/fi.bin
+++ b/res/lang/fi.bin
diff --git a/res/lang/fr.bin b/res/lang/fr.bin
index de1858e5..ddc3bb90 100644
--- a/res/lang/fr.bin
+++ b/res/lang/fr.bin
diff --git a/res/lang/ia.bin b/res/lang/ia.bin
index d1df3ad9..6c377e8b 100644
--- a/res/lang/ia.bin
+++ b/res/lang/ia.bin
diff --git a/res/lang/ie.bin b/res/lang/ie.bin
index 66b5526a..3198929f 100644
--- a/res/lang/ie.bin
+++ b/res/lang/ie.bin
diff --git a/res/lang/pl.bin b/res/lang/pl.bin
index 6fb392b7..ad9db0bd 100644
--- a/res/lang/pl.bin
+++ b/res/lang/pl.bin
diff --git a/res/lang/ru.bin b/res/lang/ru.bin
index 85b8a9c1..104ee326 100644
--- a/res/lang/ru.bin
+++ b/res/lang/ru.bin
diff --git a/res/lang/sr.bin b/res/lang/sr.bin
index 88798b80..60cbfb45 100644
--- a/res/lang/sr.bin
+++ b/res/lang/sr.bin
diff --git a/res/lang/tok.bin b/res/lang/tok.bin
index 03b8a0e5..6ee6f498 100644
--- a/res/lang/tok.bin
+++ b/res/lang/tok.bin
diff --git a/res/lang/zh_Hans.bin b/res/lang/zh_Hans.bin
index 7b334048..d0e2987e 100644
--- a/res/lang/zh_Hans.bin
+++ b/res/lang/zh_Hans.bin
diff --git a/res/lang/zh_Hant.bin b/res/lang/zh_Hant.bin
index 40fe7d97..8d31e63c 100644
--- a/res/lang/zh_Hant.bin
+++ b/res/lang/zh_Hant.bin
diff --git a/src/app.c b/src/app.c
index a1543a60..e5c47a17 100644
--- a/src/app.c
+++ b/src/app.c
@@ -219,6 +219,7 @@ static iString *serializePrefs_App_(const iApp *d) {
     appendFormat_String(str, "decodeurls arg:%d\n", d->prefs.decodeUserVisibleURLs);
     appendFormat_String(str, "linewidth.set arg:%d\n", d->prefs.lineWidth);
     appendFormat_String(str, "linespacing.set arg:%f\n", d->prefs.lineSpacing);
+    appendFormat_String(str, "returnkey.set arg:%d\n", d->prefs.returnKey);
     /* TODO: Set up an array of booleans in Prefs and do these in a loop. */
     appendFormat_String(str, "prefs.animate.changed arg:%d\n", d->prefs.uiAnimations);
     appendFormat_String(str, "prefs.mono.gemini.changed arg:%d\n", d->prefs.monospaceGemini);
@@ -1700,6 +1701,11 @@ static iBool handlePrefsCommands_(iWidget *d, const char *cmd) {
         setFlags_Widget(findChild_Widget(d, "prefs.quoteicon.1"), selected_WidgetFlag, arg == 1);
         return iFalse;
     }
+    else if (equal_Command(cmd, "returnkey.set")) {
+        updateDropdownSelection_(findChild_Widget(d, "prefs.returnkey"),
+                                 format_CStr("returnkey.set arg:%d", arg_Command(cmd)));
+        return iFalse;
+    }
     else if (equal_Command(cmd, "pinsplit.set")) {
         updatePrefsPinSplitButtons_(d, arg_Command(cmd));
         return iFalse;
@@ -2103,6 +2109,10 @@ iBool handleCommand_App(const char *cmd) {
         }
         return iTrue;
     }
+    else if (equal_Command(cmd, "returnkey.set")) {
+        d->prefs.returnKey = arg_Command(cmd);
+        return iTrue;
+    }
     else if (equal_Command(cmd, "pinsplit.set")) {
         d->prefs.pinSplit = arg_Command(cmd);
         return iTrue;
@@ -2536,6 +2546,8 @@ iBool handleCommand_App(const char *cmd) {
         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));
+        updateDropdownSelection_(findChild_Widget(dlg, "prefs.returnkey"),
+                                 format_CStr("returnkey.set arg:%d", d->prefs.returnKey));
         setToggle_Widget(findChild_Widget(dlg, "prefs.retainwindow"), d->prefs.retainWindowSize);
         setText_InputWidget(findChild_Widget(dlg, "prefs.uiscale"),
                             collectNewFormat_String("%g", uiScale_Window(d->window)));
diff --git a/src/ui/util.c b/src/ui/util.c
index 63600557..152df0bd 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1607,6 +1607,22 @@ static void addPrefsInputWithHeading_(iWidget *headings, iWidget *values,
     addDialogInputWithHeading_(headings, values, format_CStr("${%s}", id), id, input);
 }
 
+static size_t findWidestItemLabel_(const iMenuItem *items, size_t num) {
+    int widest = 0;
+    size_t widestPos = iInvalidPos;
+    for (size_t i = 0; i < num; i++) {
+        const int width =
+            measure_Text(uiLabel_FontId,
+                         translateCStr_Lang(items[i].label))
+                .advance.x;
+        if (widestPos == iInvalidPos || width > widest) {
+            widest = width;
+            widestPos = i;
+        }
+    }
+    return widestPos;
+}
+
 iWidget *makePreferences_Widget(void) {
     iWidget *dlg = makeSheet_Widget("prefs");
     addChildFlags_Widget(dlg,
@@ -1661,20 +1677,8 @@ iWidget *makePreferences_Widget(void) {
                 { "${lang.zh.hant} - zh", 0, 0, "uilang id:zh_Hant" },
             };
             pushBackN_Array(uiLangs, langItems, iElemCount(langItems));
-            //sort_Array(uiLangs, cmp_MenuItem_);
             /* TODO: Add an arrange flag for resizing parent to widest child. */
-            int widest = 0;
-            size_t widestPos = iInvalidPos;
-            iConstForEach(Array, i, uiLangs) {
-                const int width =
-                    measure_Text(uiLabel_FontId,
-                                 translateCStr_Lang(((const iMenuItem *) i.value)->label))
-                        .advance.x;
-                if (widestPos == iInvalidPos || width > widest) {
-                    widest = width;
-                    widestPos = index_ArrayConstIterator(&i);
-                }
-            }
+            size_t widestPos = findWidestItemLabel_(data_Array(uiLangs), size_Array(uiLangs));
             addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.uilang}")));
             setId_Widget(addChildFlags_Widget(values,
                                               iClob(makeMenuButton_LabelWidget(
@@ -1691,6 +1695,46 @@ iWidget *makePreferences_Widget(void) {
         addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.customframe}")));
         addChild_Widget(values, iClob(makeToggle_Widget("prefs.customframe")));
 #endif
+        addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.returnkey}")));
+        /* Return key behaviors. */ {
+            const iMenuItem returnKeyBehaviors[] = {
+                { "${prefs.returnkey.linebreak} "
+                  uiTextAction_ColorEscape shift_Icon return_Icon restore_ColorEscape
+                  "    ${prefs.returnkey.accept} "
+                  uiTextAction_ColorEscape return_Icon,
+                  0,
+                  0,
+                  format_CStr("returnkey.set arg:%d", default_ReturnKeyBehavior) },
+                { "${prefs.returnkey.linebreak} "
+                  uiTextAction_ColorEscape return_Icon restore_ColorEscape
+                  "    ${prefs.returnkey.accept} "
+                  uiTextAction_ColorEscape shift_Icon return_Icon,
+                  0,
+                  0,
+                  format_CStr("returnkey.set arg:%d", acceptWithShift_ReturnKeyBehavior) },
+                { "${prefs.returnkey.linebreak} "
+                   uiTextAction_ColorEscape return_Icon restore_ColorEscape
+                   "    ${prefs.returnkey.accept} " uiTextAction_ColorEscape
+#if defined (iPlatformApple)
+                    "\u2318" return_Icon,
+#else
+                     "Ctrl" return_Icon,
+#endif
+                    0,
+                    0,
+                    format_CStr("returnkey.set arg:%d", acceptWithPrimaryMod_ReturnKeyBehavior) },
+            };
+            iLabelWidget *returnKey = makeMenuButton_LabelWidget(
+                returnKeyBehaviors[findWidestItemLabel_(returnKeyBehaviors,
+                                                        iElemCount(returnKeyBehaviors))]
+                    .label,
+                returnKeyBehaviors,
+                iElemCount(returnKeyBehaviors));
+            setBackgroundColor_Widget(findChild_Widget(as_Widget(returnKey), "menu"),
+                                      uiBackgroundMenu_ColorId);
+            setId_Widget(addChildFlags_Widget(values, iClob(returnKey), alignLeft_WidgetFlag),
+                         "prefs.returnkey");
+        }
         addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.animate}")));
         addChild_Widget(values, iClob(makeToggle_Widget("prefs.animate")));
         makeTwoColumnHeading_("${heading.prefs.scrolling}", headings, values);