iOS: Custom editor font and adjusted positioning

5 files changed, 90 insertions, 23 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4200c7c5..2d11e43e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -104,6 +104,12 @@ endif ()
 set (EMB_BIN ${CMAKE_CURRENT_BINARY_DIR}/resources.lgr)
 make_resources (${EMB_BIN} ${RESOURCES})
 set_source_files_properties (${EMB_BIN} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+if (IOS)
+    set (EMB_FONTS res/fonts/SourceSans3-Regular.ttf)
+    set_source_files_properties (${EMB_FONTS}
+        PROPERTIES MACOSX_PACKAGE_LOCATION Resources
+    )
+endif ()
 
 # Source files.
 set (SOURCES
@@ -287,7 +293,7 @@ else ()
 endif ()
 
 # Target.
-add_executable (app ${SOURCES} ${RESOURCES})
+add_executable (app ${SOURCES} ${RESOURCES} ${EMB_FONTS})
 set_property (TARGET app PROPERTY C_STANDARD 11)
 if (TARGET ext-deps)
     add_dependencies (app ext-deps)
diff --git a/res/iOSBundleInfo.plist.in b/res/iOSBundleInfo.plist.in
index 09af4abf..5a02ed68 100644
--- a/res/iOSBundleInfo.plist.in
+++ b/res/iOSBundleInfo.plist.in
@@ -49,6 +49,10 @@
                 </array>
                 <key>UILaunchStoryboardName</key>
                 <string>LaunchScreen</string>
+                <key>UIAppFonts</key>
+                <array>
+                        <string>SourceSans3-Regular.ttf</string>
+                </array>
                 <key>UIBackgroundModes</key>
                 <array>
                         <string>audio</string>
diff --git a/src/ios.h b/src/ios.h
index ff07b2e8..6c5ec8d5 100644
--- a/src/ios.h
+++ b/src/ios.h
@@ -70,7 +70,9 @@ enum iSystemTextInputFlags {
     returnGo_SystemTextInputFlags          = iBit(3),
     returnSend_SystemTextInputFlags        = iBit(4),
     disableAutocorrect_SystemTextInputFlag = iBit(5),
-    alignRight_SystemTextInputFlag         = iBit(6),
+    disableAutocapitalize_SystemTextInputFlag = iBit(6),
+    alignRight_SystemTextInputFlag         = iBit(7),
+    insertNewlines_SystemTextInputFlag     = iBit(8),
 };
 
 iDeclareType(SystemTextInput)
diff --git a/src/ios.m b/src/ios.m
index 290d4804..47303b7f 100644
--- a/src/ios.m
+++ b/src/ios.m
@@ -61,6 +61,7 @@ static UIViewController *viewController_(iWindow *window) {
 }
 
 static void notifyChange_SystemTextInput_(iSystemTextInput *);
+static BOOL isNewlineAllowed_SystemTextInput_(const iSystemTextInput *);
 
 /*----------------------------------------------------------------------------------------------*/
 
@@ -269,10 +270,19 @@ didPickDocumentsAtURLs:(NSArray<NSURL *> *)urls {
     setKeyboardHeight_MainWindow(get_MainWindow(), 0);
 }
 
-- (BOOL)textFieldShouldReturn:(UITextField *)textField {
+static void sendReturnKeyPress_(void) {
     SDL_Event ev = { .type = SDL_KEYDOWN };
+    ev.key.timestamp = SDL_GetTicks();
     ev.key.keysym.sym = SDLK_RETURN;
+    ev.key.state = SDL_PRESSED;
+    SDL_PushEvent(&ev);
+    ev.type = SDL_KEYUP;
+    ev.key.state = SDL_RELEASED;
     SDL_PushEvent(&ev);
+}
+
+- (BOOL)textFieldShouldReturn:(UITextField *)textField {
+    sendReturnKeyPress_();
     return NO;
 }
 
@@ -283,6 +293,17 @@ replacementString:(NSString *)string {
     return YES;
 }
 
+- (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range
+ replacementText:(NSString *)text {
+    if ([text isEqualToString:@"\n"]) {
+        if (!isNewlineAllowed_SystemTextInput_([appState_ systemTextInput])) {
+            sendReturnKeyPress_();
+            return NO;
+        }
+    }
+    return YES;
+}
+
 - (void)textViewDidChange:(UITextView *)textView {
     iSystemTextInput *sysCtrl = [appState_ systemTextInput];
     notifyChange_SystemTextInput_(sysCtrl);
@@ -659,14 +680,23 @@ iDefineTypeConstructionArgs(SystemTextInput, (iRect rect, int flags), rect, flag
 #define REF_d_field  (__bridge UITextField *)d->field
 #define REF_d_view   (__bridge UITextView *)d->view
 
-static CGRect convertToCGRect_(const iRect *rect) {
+static CGRect convertToCGRect_(const iRect *rect, iBool expanded) {
     const iWindow *win = get_Window();
     CGRect frame;
     // TODO: Convert coordinates properly!
     frame.origin.x = rect->pos.x / win->pixelRatio;
-    frame.origin.y = (rect->pos.y - gap_UI + 2) / win->pixelRatio;
+    frame.origin.y = (rect->pos.y - gap_UI + 1) / win->pixelRatio;
     frame.size.width = rect->size.x / win->pixelRatio;
     frame.size.height = rect->size.y / win->pixelRatio;
+    /* Some padding to account for insets. If we just zero out the insets, the insertion point
+       may be clipped at the edges. */
+    if (expanded) {
+        const float inset = gap_UI / get_Window()->pixelRatio;
+        frame.origin.x -= inset + 1;
+        frame.origin.y -= inset + 1;
+        frame.size.width += 2 * inset + 2;
+        frame.size.height += inset + 1;
+    }
     return frame;
 }
 
@@ -682,7 +712,7 @@ void init_SystemTextInput(iSystemTextInput *d, iRect rect, int flags) {
     d->flags = flags;
     d->field = NULL;
     d->view  = NULL;
-    CGRect frame = convertToCGRect_(&rect);
+    CGRect frame = convertToCGRect_(&rect, (flags & multiLine_SystemTextInputFlags) != 0);
     if (flags & multiLine_SystemTextInputFlags) {
         d->view = (void *) CFBridgingRetain([[UITextView alloc] initWithFrame:frame textContainer:nil]);
         [[viewController_(get_Window()) view] addSubview:REF_d_view];
@@ -692,7 +722,9 @@ void init_SystemTextInput(iSystemTextInput *d, iRect rect, int flags) {
         [[viewController_(get_Window()) view] addSubview:REF_d_field];
     }
     UIControl<UITextInputTraits> *traits = (UIControl<UITextInputTraits> *) (d->view ? REF_d_view : REF_d_field);
-    // TODO: Use the right font:  https://developer.apple.com/documentation/uikit/text_display_and_fonts/adding_a_custom_font_to_your_app?language=objc
+    if (~flags & insertNewlines_SystemTextInputFlag) {
+        [traits setReturnKeyType:UIReturnKeyDone];
+    }
     if (flags & returnGo_SystemTextInputFlags) {
         [traits setReturnKeyType:UIReturnKeyGo];
     }
@@ -701,29 +733,38 @@ void init_SystemTextInput(iSystemTextInput *d, iRect rect, int flags) {
     }
     if (flags & disableAutocorrect_SystemTextInputFlag) {
         [traits setAutocorrectionType:UITextAutocorrectionTypeNo];
-        [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone];
         [traits setSpellCheckingType:UITextSpellCheckingTypeNo];
     }
+    if (flags & disableAutocapitalize_SystemTextInputFlag) {
+        [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone];
+    }
     if (flags & alignRight_SystemTextInputFlag) {
         if (d->field) {
             [REF_d_field setTextAlignment:NSTextAlignmentRight];
         }
+        if (d->view) {
+            [REF_d_view setTextAlignment:NSTextAlignmentRight];
+        }
     }
     UIColor *textColor = makeUIColor_(uiInputTextFocused_ColorId);
     UIColor *backgroundColor = makeUIColor_(uiInputBackgroundFocused_ColorId);
     [appState_ setSystemTextInput:d];
     if (d->field) {
-        [REF_d_field setTextColor:textColor];
-        [REF_d_field setDelegate:appState_];
-        [REF_d_field becomeFirstResponder];
+        UITextField *field = REF_d_field;
+        [field setTextColor:textColor];
+        [field setDelegate:appState_];
+        [field becomeFirstResponder];
     }
     else {
-        [REF_d_view setTextColor:textColor];
-        [REF_d_view setBackgroundColor:backgroundColor];
-        [REF_d_view setEditable:YES];
+        UITextView *view = REF_d_view;
+        [view setTextColor:textColor];
+        [view setBackgroundColor:backgroundColor];
+        [view setEditable:YES];
 //        [REF_d_view setSelectable:YES];
-        [REF_d_view setDelegate:appState_];
-        [REF_d_view becomeFirstResponder];
+        const float inset = gap_UI / get_Window()->pixelRatio;
+        //[view setTextContainerInset:(UIEdgeInsets){ inset - 1, -inset - 1, 0, -inset - 1 }];
+        [view setDelegate:appState_];
+        [view becomeFirstResponder];
     }
     d->textChangedFunc = NULL;
     d->textChangedContext = NULL;
@@ -774,7 +815,11 @@ void setFont_SystemTextInput(iSystemTextInput *d, int fontId) {
         font = [UIFont monospacedSystemFontOfSize:0.8f * height weight:UIFontWeightRegular];
     }
     else {
-        font = [UIFont systemFontOfSize:0.65f * height];
+//        font = [UIFont systemFontOfSize:0.65f * height];
+//        for (NSString *name in [UIFont fontNamesForFamilyName:@"Source Sans 3"]) {
+//            printf("fontname: %s\n", [name cStringUsingEncoding:NSUTF8StringEncoding]);
+//        }
+        font = [UIFont fontWithName:@"SourceSans3-Regular" size:height * 0.7f];
     }
     if (d->field) {
         [REF_d_field setFont:font];
@@ -795,7 +840,7 @@ const iString *text_SystemTextInput(const iSystemTextInput *d) {
 }
 
 void setRect_SystemTextInput(iSystemTextInput *d, iRect rect) {
-    CGRect frame = convertToCGRect_(&rect);
+    CGRect frame = convertToCGRect_(&rect, (d->flags & multiLine_SystemTextInputFlags) != 0);
     if (d->field) {
         [REF_d_field setFrame:frame];
     }
@@ -816,3 +861,7 @@ static void notifyChange_SystemTextInput_(iSystemTextInput *d) {
         d->textChangedFunc(d, d->textChangedContext);
     }
 }
+
+static BOOL isNewlineAllowed_SystemTextInput_(const iSystemTextInput *d) {
+    return (d->flags & insertNewlines_SystemTextInputFlag) != 0;
+}
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index ea7ed523..ad45ed92 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -765,6 +765,12 @@ void deinit_InputWidget(iInputWidget *d) {
     deinit_Array(&d->lines);
 }
 
+static iBool isAllowedToInsertNewline_InputWidget_(const iInputWidget *d) {
+    return ~d->inFlags & isSensitive_InputWidgetFlag &&
+        ~d->inFlags & isUrl_InputWidgetFlag &&
+        d->inFlags & lineBreaksEnabled_InputWidgetFlag && d->maxLen == 0;
+}
+
 #if defined (LAGRANGE_ENABLE_SYSTEM_INPUT)
 static void updateAfterVisualOffsetChange_InputWidget_(iInputWidget *d, iRoot *root) {
     iAssert(as_Widget(d)->root == root);
@@ -1062,9 +1068,11 @@ void begin_InputWidget(iInputWidget *d) {
 #if defined (LAGRANGE_ENABLE_SYSTEM_INPUT)
     d->sysCtrl = new_SystemTextInput(contentBounds_InputWidget_(d),
                                      (d->maxWrapLines > 1 ? multiLine_SystemTextInputFlags : 0) |
-                                     (d->inFlags & isUrl_InputWidgetFlag ? disableAutocorrect_SystemTextInputFlag : 0) |
+                                     (d->inFlags & isUrl_InputWidgetFlag ? (disableAutocorrect_SystemTextInputFlag |
+                                                                            disableAutocapitalize_SystemTextInputFlag) : 0) |
                                      (!cmp_String(id_Widget(w), "url") ? returnGo_SystemTextInputFlags : 0) |
-                                     (flags_Widget(w) & alignRight_WidgetFlag ? alignRight_SystemTextInputFlag : 0));
+                                     (flags_Widget(w) & alignRight_WidgetFlag ? alignRight_SystemTextInputFlag : 0) |
+                                     (isAllowedToInsertNewline_InputWidget_(d) ? insertNewlines_SystemTextInputFlag : 0));
     setFont_SystemTextInput(d->sysCtrl, d->font);
     setText_SystemTextInput(d->sysCtrl, &d->oldText);
     setTextChangedFunc_SystemTextInput(d->sysCtrl, systemInputChanged_InputWidget_, d);
@@ -2110,9 +2118,7 @@ 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->inFlags & isUrl_InputWidgetFlag &&
-                    d->inFlags & lineBreaksEnabled_InputWidgetFlag && d->maxLen == 0) {
+                if (isAllowedToInsertNewline_InputWidget_(d)) {
                     if (checkLineBreakMods_InputWidget_(d, mods)) {
                         pushUndo_InputWidget_(d);
                         deleteMarked_InputWidget_(d);