InputWidget: Line breaks only make sense in some fields

For example, any URL field should disallow line breaks. The line break modifier preference should be disregarded in an input field where there are no line breaks.

4 files changed, 17 insertions, 16 deletions

diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index 51d62125..d31130f5 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -188,8 +188,7 @@ enum iInputWidgetFlag {
     markWords_InputWidgetFlag        = iBit(8),
     needUpdateBuffer_InputWidgetFlag = iBit(9),
     enterKeyEnabled_InputWidgetFlag  = iBit(10),
-    enterKeyInsertsLineFeed_InputWidgetFlag
-                                     = iBit(11),
+    lineBreaksEnabled_InputWidgetFlag= iBit(11),
     needBackup_InputWidgetFlag       = iBit(12),
 };
 
@@ -588,10 +587,11 @@ void init_InputWidget(iInputWidget *d, size_t maxLen) {
     d->cursor       = zero_I2();
     d->prevCursor   = zero_I2();
     d->lastUpdateWidth = 0;
-    d->inFlags         = eatEscape_InputWidgetFlag | enterKeyEnabled_InputWidgetFlag;
-    if (deviceType_App() != desktop_AppDeviceType) {
-        d->inFlags |= enterKeyInsertsLineFeed_InputWidgetFlag;
-    }
+    d->inFlags         = eatEscape_InputWidgetFlag | enterKeyEnabled_InputWidgetFlag |
+                         lineBreaksEnabled_InputWidgetFlag;
+    //    if (deviceType_App() != desktop_AppDeviceType) {
+    //        d->inFlags |= enterKeyInsertsLineFeed_InputWidgetFlag;
+    //    }
     iZap(d->mark);
     setMaxLen_InputWidget(d, maxLen);
     d->visWrapLines.start = 0;
@@ -732,8 +732,8 @@ void setValidator_InputWidget(iInputWidget *d, iInputWidgetValidatorFunc validat
     d->validatorContext = context;
 }
 
-void setEnterInsertsLF_InputWidget(iInputWidget *d, iBool enterInsertsLF) {
-    iChangeFlags(d->inFlags, enterKeyInsertsLineFeed_InputWidgetFlag, enterInsertsLF);
+void setLineBreaksEnabled_InputWidget(iInputWidget *d, iBool lineBreaksEnabled) {
+    iChangeFlags(d->inFlags, lineBreaksEnabled_InputWidgetFlag, lineBreaksEnabled);
 }
 
 void setEnterKeyEnabled_InputWidget(iInputWidget *d, iBool enterKeyEnabled) {
@@ -1614,10 +1614,10 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
                 return iTrue;
             case SDLK_RETURN:
             case SDLK_KP_ENTER:
-                if (~d->inFlags & isSensitive_InputWidgetFlag && d->maxLen == 0) {
-                    if (mods == lineBreakKeyMod_ReturnKeyBehavior(prefs_App()->returnKey) ||
-                        (~d->inFlags & isUrl_InputWidgetFlag &&
-                         d->inFlags & enterKeyInsertsLineFeed_InputWidgetFlag)) {
+                if (~d->inFlags & isSensitive_InputWidgetFlag &&
+                    ~d->inFlags & isUrl_InputWidgetFlag &&
+                    d->inFlags & lineBreaksEnabled_InputWidgetFlag && d->maxLen == 0) {
+                    if (mods == lineBreakKeyMod_ReturnKeyBehavior(prefs_App()->returnKey)) {
                         pushUndo_InputWidget_(d);
                         deleteMarked_InputWidget_(d);
                         insertChar_InputWidget_(d, '\n');
@@ -1626,7 +1626,8 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
                     }
                 }
                 if (d->inFlags & enterKeyEnabled_InputWidgetFlag &&
-                    mods == acceptKeyMod_ReturnKeyBehavior(prefs_App()->returnKey)) {
+                    (mods == acceptKeyMod_ReturnKeyBehavior(prefs_App()->returnKey) ||
+                     (~d->inFlags & lineBreaksEnabled_InputWidgetFlag))) {
                     d->inFlags |= enterPressed_InputWidgetFlag;
                     setFocus_Widget(NULL);
                     return iTrue;
diff --git a/src/ui/inputwidget.h b/src/ui/inputwidget.h
index a94291ed..f7e46e8c 100644
--- a/src/ui/inputwidget.h
+++ b/src/ui/inputwidget.h
@@ -50,7 +50,7 @@ void    setFont_InputWidget             (iInputWidget *, int fontId);
 void    setContentPadding_InputWidget   (iInputWidget *, int left, int right); /* only affects the text entry */
 void    setLineLimits_InputWidget       (iInputWidget *, int minLines, int maxLines);
 void    setValidator_InputWidget        (iInputWidget *, iInputWidgetValidatorFunc validator, void *context);
-void    setEnterInsertsLF_InputWidget   (iInputWidget *, iBool enterInsertsLF);
+void    setLineBreaksEnabled_InputWidget(iInputWidget *, iBool lineBreaksEnabled);
 void    setEnterKeyEnabled_InputWidget  (iInputWidget *, iBool enterKeyEnabled);
 void    setBackupFileName_InputWidget   (iInputWidget *, const char *fileName);
 void    begin_InputWidget               (iInputWidget *);
diff --git a/src/ui/root.c b/src/ui/root.c
index 9d92c44e..c61f1b35 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -1077,6 +1077,7 @@ void createUserInterface_Root(iRoot *d) {
             setSelectAllOnFocus_InputWidget(url, iTrue);
             setId_Widget(as_Widget(url), "url");
             setLineLimits_InputWidget(url, 1, 1); /* just one line while not focused */
+            setLineBreaksEnabled_InputWidget(url, iFalse);
             setUrlContent_InputWidget(url, iTrue);
             setNotifyEdits_InputWidget(url, iTrue);
             setTextCStr_InputWidget(url, "gemini://");
@@ -1272,7 +1273,7 @@ void createUserInterface_Root(iRoot *d) {
         setHint_InputWidget(input, "${hint.findtext}");
         setSelectAllOnFocus_InputWidget(input, iTrue);
         setEatEscape_InputWidget(input, iFalse); /* unfocus and close with one keypress */
-        setEnterInsertsLF_InputWidget(input, iFalse);
+        setLineBreaksEnabled_InputWidget(input, iFalse);
         setId_Widget(addChildFlags_Widget(searchBar, iClob(input), expand_WidgetFlag),
                      "find.input");
         addChild_Widget(searchBar, iClob(newIcon_LabelWidget("  \u2b9f  ", 'g', KMOD_PRIMARY, "find.next")));
diff --git a/src/ui/uploadwidget.c b/src/ui/uploadwidget.c
index 7bfa73bd..2780f86a 100644
--- a/src/ui/uploadwidget.c
+++ b/src/ui/uploadwidget.c
@@ -117,7 +117,6 @@ void init_UploadWidget(iUploadWidget *d) {
         setFont_InputWidget(d->input, monospace_FontId);
         setLineLimits_InputWidget(d->input, 7, 20);
         setHint_InputWidget(d->input, "${hint.upload.text}");
-        setEnterInsertsLF_InputWidget(d->input, iTrue);
         setFixedSize_Widget(as_Widget(d->input), init_I2(120 * gap_UI, -1));
         addChild_Widget(page, iClob(d->input));
         appendFramelessTabPage_Widget(tabs, iClob(page), "${heading.upload.text}", '1', 0);