Android: Default return key behavior is to insert a newline

2 files changed, 12 insertions, 1 deletions

diff --git a/src/app.c b/src/app.c
index 1e66c6cf..7497d6f8 100644
--- a/src/app.c
+++ b/src/app.c
@@ -404,6 +404,12 @@ static void loadPrefs_App_(iApp *d) {
                 insert_StringSet(d->prefs.disabledFontPacks,
                                  collect_String(suffix_Command(cmd, "id")));
             }
+#if defined (iPlatformAndroidMobile)
+            else if (equal_Command(cmd, "returnkey.set")) {
+                /* Hardcoded to avoid accidental presses of the virtual Return key. */
+                d->prefs.returnKey = default_ReturnKeyBehavior;
+            }
+#endif
 #if !defined (LAGRANGE_ENABLE_DOWNLOAD_EDIT)
             else if (equal_Command(cmd, "downloads")) {
                 continue; /* can't change downloads directory */
diff --git a/src/defs.h b/src/defs.h
index 25c0ceeb..d2e13294 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -86,7 +86,7 @@ enum iToolbarAction {
 /* Return key behavior is not handled via normal bindings because only certain combinations
    are valid. */
 enum iReturnKeyBehavior {
-    default_ReturnKeyBehavior =
+    acceptWithoutMod_ReturnKeyBehavior =
         shiftReturn_ReturnKeyFlag | (return_ReturnKeyFlag << accept_ReturnKeyFlag),
     acceptWithShift_ReturnKeyBehavior =
         return_ReturnKeyFlag | (shiftReturn_ReturnKeyFlag << accept_ReturnKeyFlag),
@@ -96,6 +96,11 @@ enum iReturnKeyBehavior {
 #else
         return_ReturnKeyFlag | (controlReturn_ReturnKeyFlag << accept_ReturnKeyFlag),
 #endif
+#if defined (iPlatformAndroidMobile)
+    default_ReturnKeyBehavior = acceptWithShift_ReturnKeyBehavior,
+#else
+    default_ReturnKeyBehavior = acceptWithoutMod_ReturnKeyBehavior,
+#endif
 };
 
 int     keyMod_ReturnKeyFlag    (int flag);